Unverified Commit 9f6fdb95 authored by Joe Haddad's avatar Joe Haddad Committed by GitHub

Ignore CSS Ordering Warnings (#10068)

parent 2cd8f1c9
...@@ -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,
......
...@@ -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)
}) })
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
})
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment