Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
32633c83
Commit
32633c83
authored
Oct 08, 2019
by
Yamagishi Kazutoshi
Committed by
JJ Kasper
Oct 08, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add src directory support for global CSS (#8999)
parent
3c978792
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
7 deletions
+3
-7
webpack-config.ts
packages/next/build/webpack-config.ts
+3
-7
No files found.
packages/next/build/webpack-config.ts
View file @
32633c83
...
@@ -299,14 +299,10 @@ export default async function getBaseWebpackConfig(
...
@@ -299,14 +299,10 @@ export default async function getBaseWebpackConfig(
:
config
.
crossOrigin
:
config
.
crossOrigin
let
customAppFile
:
string
|
null
=
config
.
experimental
.
css
let
customAppFile
:
string
|
null
=
config
.
experimental
.
css
?
await
findPageFile
(
?
await
findPageFile
(
pagesDir
,
'/_app'
,
config
.
pageExtensions
)
path
.
join
(
dir
,
'pages'
),
'/_app'
,
config
.
pageExtensions
)
:
null
:
null
if
(
customAppFile
)
{
if
(
customAppFile
)
{
customAppFile
=
path
.
resolve
(
path
.
join
(
dir
,
'pages'
,
customAppFile
))
customAppFile
=
path
.
resolve
(
path
.
join
(
pagesDir
,
customAppFile
))
}
}
let
webpackConfig
:
webpack
.
Configuration
=
{
let
webpackConfig
:
webpack
.
Configuration
=
{
...
@@ -668,7 +664,7 @@ export default async function getBaseWebpackConfig(
...
@@ -668,7 +664,7 @@ export default async function getBaseWebpackConfig(
'Custom <App>'
'Custom <App>'
)}
. Please move all global CSS imports to
${
chalk
.
cyan
(
)}
. Please move all global CSS imports to
${
chalk
.
cyan
(
customAppFile
customAppFile
?
path
.
relative
(
d
ir
,
customAppFile
)
?
path
.
relative
(
pagesD
ir
,
customAppFile
)
:
'pages/_app.js'
:
'pages/_app.js'
)}
.\n`
+
)}
.\n`
+
`Read more: https://err.sh/next.js/global-css`
,
`Read more: https://err.sh/next.js/global-css`
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment