Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dedupe CSS Regexes #10206

Merged
merged 1 commit into from Jan 22, 2020
Merged

Dedupe CSS Regexes #10206

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 19 additions & 9 deletions packages/next/build/webpack/config/blocks/css/index.ts
View file
Open in desktop
Expand Up @@ -13,6 +13,11 @@ import {
} from './messages'
import { getPostCssPlugins } from './plugins'

// RegExps for Stylesheets
const regexCssAll = /\.css$/
const regexCssGlobal = /(?<!\.module)\.css$/
const regexCssModules = /\.module\.css$/

function getClientStyleLoader({
isDevelopment,
assetPrefix,
Expand Down Expand Up @@ -106,7 +111,7 @@ export const css = curry(async function css(
loader({
oneOf: [
{
test: /\.css$/,
test: regexCssAll,
// Use a loose regex so we don't have to crawl the file system to
// find the real file name (if present).
issuer: { test: /pages[\\/]_document\./ },
Expand All @@ -133,7 +138,7 @@ export const css = curry(async function css(
// via the `pure` mode in `css-loader`.
sideEffects: false,
// CSS Modules are activated via this specific extension.
test: /\.module\.css$/,
test: regexCssModules,
// CSS Modules are only supported in the user's application. We're
// not yet allowing CSS imports _within_ `node_modules`.
issuer: {
Expand Down Expand Up @@ -191,7 +196,7 @@ export const css = curry(async function css(
loader({
oneOf: [
{
test: /\.module\.css$/,
test: regexCssModules,
use: {
loader: 'error-loader',
options: {
Expand All @@ -206,7 +211,9 @@ export const css = curry(async function css(
if (ctx.isServer) {
fns.push(
loader({
oneOf: [{ test: /\.css$/, use: require.resolve('ignore-loader') }],
oneOf: [
{ test: regexCssGlobal, use: require.resolve('ignore-loader') },
],
})
)
} else if (ctx.customAppFile) {
Expand All @@ -219,7 +226,7 @@ export const css = curry(async function css(
// no side-effects.
// See https://github.com/webpack/webpack/issues/6571
sideEffects: true,
test: /\.css$/,
test: regexCssGlobal,
issuer: { include: ctx.customAppFile },

use: [
Expand Down Expand Up @@ -257,7 +264,7 @@ export const css = curry(async function css(
loader({
oneOf: [
{
test: /\.css$/,
test: regexCssGlobal,
issuer: { include: [/node_modules/] },
use: {
loader: 'error-loader',
Expand All @@ -275,7 +282,7 @@ export const css = curry(async function css(
loader({
oneOf: [
{
test: /\.css$/,
test: regexCssGlobal,
use: {
loader: 'error-loader',
options: {
Expand All @@ -298,7 +305,7 @@ export const css = curry(async function css(
oneOf: [
{
// This should only be applied to CSS files
issuer: { test: /\.css$/ },
issuer: { test: regexCssAll },
// Exclude extensions that webpack handles by default
exclude: [/\.(js|mjs|jsx|ts|tsx)$/, /\.html$/, /\.json$/],
use: {
Expand All @@ -323,12 +330,15 @@ export const css = curry(async function css(
new MiniCssExtractPlugin({
filename: 'static/css/[contenthash].css',
chunkFilename: 'static/css/[contenthash].css',
// Next.js guarantees that CSS order doesn't matter, due to imposed
// 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).
//
// While not a perfect guarantee (e.g. liberal use of `:global()`
// selector), this assumption is required to code-split CSS.
//
// If this warning were to trigger, it'd be unactionable by the user,
// but also not valid -- so we disable it.
ignoreOrder: true,
Expand Down