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
9f6fdb95
Unverified
Commit
9f6fdb95
authored
Jan 13, 2020
by
Joe Haddad
Committed by
GitHub
Jan 13, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ignore CSS Ordering Warnings (#10068)
parent
2cd8f1c9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
11 deletions
+31
-11
webpack-config.ts
packages/next/build/webpack-config.ts
+0
-9
index.ts
packages/next/build/webpack/config/blocks/css/index.ts
+22
-1
helpers.ts
packages/next/build/webpack/config/helpers.ts
+9
-1
No files found.
packages/next/build/webpack-config.ts
View file @
9f6fdb95
...
@@ -35,7 +35,6 @@ import BuildManifestPlugin from './webpack/plugins/build-manifest-plugin'
...
@@ -35,7 +35,6 @@ import BuildManifestPlugin from './webpack/plugins/build-manifest-plugin'
import
ChunkNamesPlugin
from
'./webpack/plugins/chunk-names-plugin'
import
ChunkNamesPlugin
from
'./webpack/plugins/chunk-names-plugin'
import
{
CssMinimizerPlugin
}
from
'./webpack/plugins/css-minimizer-plugin'
import
{
CssMinimizerPlugin
}
from
'./webpack/plugins/css-minimizer-plugin'
import
{
importAutoDllPlugin
}
from
'./webpack/plugins/dll-import'
import
{
importAutoDllPlugin
}
from
'./webpack/plugins/dll-import'
import
MiniCssExtractPlugin
from
'./webpack/plugins/mini-css-extract-plugin'
import
{
DropClientPage
}
from
'./webpack/plugins/next-drop-client-page-plugin'
import
{
DropClientPage
}
from
'./webpack/plugins/next-drop-client-page-plugin'
import
NextEsmPlugin
from
'./webpack/plugins/next-esm-plugin'
import
NextEsmPlugin
from
'./webpack/plugins/next-esm-plugin'
import
NextJsSsrImportPlugin
from
'./webpack/plugins/nextjs-ssr-import'
import
NextJsSsrImportPlugin
from
'./webpack/plugins/nextjs-ssr-import'
...
@@ -781,14 +780,6 @@ export default async function getBaseWebpackConfig(
...
@@ -781,14 +780,6 @@ export default async function getBaseWebpackConfig(
clientManifest
:
config
.
experimental
.
granularChunks
,
clientManifest
:
config
.
experimental
.
granularChunks
,
modern
:
config
.
experimental
.
modern
,
modern
:
config
.
experimental
.
modern
,
}),
}),
// Extract CSS as CSS file(s) in the client-side production bundle.
config
.
experimental
.
css
&&
!
isServer
&&
!
dev
&&
new
MiniCssExtractPlugin
({
filename
:
'static/css/[contenthash].css'
,
chunkFilename
:
'static/css/[contenthash].chunk.css'
,
}),
tracer
&&
tracer
&&
new
ProfilingPlugin
({
new
ProfilingPlugin
({
tracer
,
tracer
,
...
...
packages/next/build/webpack/config/blocks/css/index.ts
View file @
9f6fdb95
...
@@ -2,7 +2,7 @@ import curry from 'lodash.curry'
...
@@ -2,7 +2,7 @@ import curry from 'lodash.curry'
import
path
from
'path'
import
path
from
'path'
import
webpack
,
{
Configuration
,
RuleSetRule
}
from
'webpack'
import
webpack
,
{
Configuration
,
RuleSetRule
}
from
'webpack'
import
MiniCssExtractPlugin
from
'../../../plugins/mini-css-extract-plugin'
import
MiniCssExtractPlugin
from
'../../../plugins/mini-css-extract-plugin'
import
{
loader
}
from
'../../helpers'
import
{
loader
,
plugin
}
from
'../../helpers'
import
{
ConfigurationContext
,
ConfigurationFn
,
pipe
}
from
'../../utils'
import
{
ConfigurationContext
,
ConfigurationFn
,
pipe
}
from
'../../utils'
import
{
getCssModuleLocalIdent
}
from
'./getCssModuleLocalIdent'
import
{
getCssModuleLocalIdent
}
from
'./getCssModuleLocalIdent'
import
{
import
{
...
@@ -325,6 +325,27 @@ export const css = curry(async function css(
...
@@ -325,6 +325,27 @@ export const css = curry(async function css(
)
)
}
}
if
(
ctx
.
isClient
&&
ctx
.
isProduction
)
{
// Extract CSS as CSS file(s) in the client-side production bundle.
fns
.
push
(
plugin
(
new
MiniCssExtractPlugin
({
filename
:
'static/css/[contenthash].css'
,
chunkFilename
:
'static/css/[contenthash].css'
,
// Next.js guarantees that CSS order doesn't matter, due to imposed
// restrictions:
// 1. Global CSS can only be defined in a single entrypoint (_app)
// 2. CSS Modules generate scoped class names by default and cannot
// include Global CSS (:global() selector).
//
// If this warning were to trigger, it'd be unactionable by the user,
// but also not valid -- so we disable it.
ignoreOrder
:
true
,
})
)
)
}
const
fn
=
pipe
(...
fns
)
const
fn
=
pipe
(...
fns
)
return
fn
(
config
)
return
fn
(
config
)
})
})
packages/next/build/webpack/config/helpers.ts
View file @
9f6fdb95
import
curry
from
'lodash.curry'
import
curry
from
'lodash.curry'
import
{
Configuration
,
RuleSetRule
}
from
'webpack'
import
{
Configuration
,
Plugin
,
RuleSetRule
}
from
'webpack'
export
const
loader
=
curry
(
function
loader
(
export
const
loader
=
curry
(
function
loader
(
rule
:
RuleSetRule
,
rule
:
RuleSetRule
,
...
@@ -40,3 +40,11 @@ export const unshiftLoader = curry(function loader(
...
@@ -40,3 +40,11 @@ export const unshiftLoader = curry(function loader(
config
.
module
.
rules
.
unshift
(
rule
)
config
.
module
.
rules
.
unshift
(
rule
)
return
config
return
config
})
})
export
const
plugin
=
curry
(
function
plugin
(
p
:
Plugin
,
config
:
Configuration
)
{
if
(
!
config
.
plugins
)
{
config
.
plugins
=
[]
}
config
.
plugins
.
push
(
p
)
return
config
})
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