Unverified Commit 394533ff authored by Jan Nicklas's avatar Jan Nicklas Committed by GitHub

next-flight-css-loader - fix !=! support (#51115)

<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation

- Read the Docs Contribution Guide to ensure your contribution follows
the docs guidelines:
https://nextjs.org/docs/community/contribution-guide

### Adding or Updating Examples

- The "examples guidelines" are followed from our contributing doc
https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See
https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See:
https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature
request has been accepted for implementation before opening a PR. (A
discussion must be opened, see
https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added
(https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md



## For Maintainers

- Minimal description (aim for explaining to someone not on the team to
understand the PR)
- When linking to a Slack thread, you might want to share details of the
conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic
behind a change

-->

### What?

- Use a `cssModules` option to configure the `next-flight-css-loader.ts`
based on the match resource.
- Added types
- Ran prettier

### Why?

NextJs supports css modules and global css files.
The `next-flight-css-loader.ts` is capable of dealing with both formats.

However under the hood the loader shares almost no code for css modules
and global css files.
To branch into the correct behaviour the `next-flight-css-loader.ts`
checks the extension of the file using
`this.resourcePath.match(/\.module\.(css|sass|scss)$/)`.

`this.resourcePath` does not include the information from webpacks `!=!`
import syntax.

One solution would be to use `this._module.matchResource` instead of
`this.resourcePath`.
But imho passing it from the webpack.config.js instead of duplicating
the css module file regexp felt cleaner.

### Further questions

- Should we update the loader banner comment?
- Can we drop `this.data.__checksum` in the pitch loader function for
css modules? (it would speed up css modules and for me it looks like it
isn't needed anymore for css modules because of
https://github.com/vercel/next.js/commit/2eeb0c7f4968421b35ee5435417ede35673d815a
(4. April by @shuding)
- Should we split the loader into two loaders?

Fixes #52208

---------
Co-authored-by: 's avatarShu Ding <g@shud.in>
parent 13e769a3
...@@ -258,7 +258,14 @@ export const css = curry(async function css( ...@@ -258,7 +258,14 @@ export const css = curry(async function css(
test: regexCssModules, test: regexCssModules,
issuerLayer: APP_LAYER_RULE, issuerLayer: APP_LAYER_RULE,
use: [ use: [
require.resolve('../../../loaders/next-flight-css-loader'), {
loader: require.resolve(
'../../../loaders/next-flight-css-loader'
),
options: {
cssModules: true,
},
},
...getCssModuleLoader( ...getCssModuleLoader(
{ ...ctx, isAppDir: true }, { ...ctx, isAppDir: true },
lazyPostCSSInitializer lazyPostCSSInitializer
...@@ -291,7 +298,14 @@ export const css = curry(async function css( ...@@ -291,7 +298,14 @@ export const css = curry(async function css(
test: regexSassModules, test: regexSassModules,
issuerLayer: APP_LAYER_RULE, issuerLayer: APP_LAYER_RULE,
use: [ use: [
require.resolve('../../../loaders/next-flight-css-loader'), {
loader: require.resolve(
'../../../loaders/next-flight-css-loader'
),
options: {
cssModules: true,
},
},
...getCssModuleLoader( ...getCssModuleLoader(
{ ...ctx, isAppDir: true }, { ...ctx, isAppDir: true },
lazyPostCSSInitializer, lazyPostCSSInitializer,
...@@ -338,7 +352,14 @@ export const css = curry(async function css( ...@@ -338,7 +352,14 @@ export const css = curry(async function css(
sideEffects: true, sideEffects: true,
test: [regexCssGlobal, regexSassGlobal], test: [regexCssGlobal, regexSassGlobal],
issuerLayer: APP_LAYER_RULE, issuerLayer: APP_LAYER_RULE,
use: require.resolve('../../../loaders/next-flight-css-loader'), use: {
loader: require.resolve(
'../../../loaders/next-flight-css-loader'
),
options: {
cssModules: false,
},
},
}) })
: null, : null,
markRemovable({ markRemovable({
...@@ -389,7 +410,14 @@ export const css = curry(async function css( ...@@ -389,7 +410,14 @@ export const css = curry(async function css(
test: regexCssGlobal, test: regexCssGlobal,
issuerLayer: APP_LAYER_RULE, issuerLayer: APP_LAYER_RULE,
use: [ use: [
require.resolve('../../../loaders/next-flight-css-loader'), {
loader: require.resolve(
'../../../loaders/next-flight-css-loader'
),
options: {
cssModules: false,
},
},
...getGlobalCssLoader( ...getGlobalCssLoader(
{ ...ctx, isAppDir: true }, { ...ctx, isAppDir: true },
lazyPostCSSInitializer lazyPostCSSInitializer
...@@ -401,7 +429,14 @@ export const css = curry(async function css( ...@@ -401,7 +429,14 @@ export const css = curry(async function css(
test: regexSassGlobal, test: regexSassGlobal,
issuerLayer: APP_LAYER_RULE, issuerLayer: APP_LAYER_RULE,
use: [ use: [
require.resolve('../../../loaders/next-flight-css-loader'), {
loader: require.resolve(
'../../../loaders/next-flight-css-loader'
),
options: {
cssModules: false,
},
},
...getGlobalCssLoader( ...getGlobalCssLoader(
{ ...ctx, isAppDir: true }, { ...ctx, isAppDir: true },
lazyPostCSSInitializer, lazyPostCSSInitializer,
......
...@@ -5,52 +5,56 @@ ...@@ -5,52 +5,56 @@
*/ */
import crypto from 'crypto' import crypto from 'crypto'
import type webpack from 'webpack'
export function pitch(this: any) { type NextServerCSSLoaderOptions = {
if (process.env.NODE_ENV !== 'production') { cssModules: boolean
const content = this.fs.readFileSync(this.resourcePath)
this.data.__checksum = crypto
.createHash('sha256')
.update(typeof content === 'string' ? Buffer.from(content) : content)
.digest()
.toString('hex')
}
} }
const NextServerCSSLoader = function (this: any, content: string) { const NextServerCSSLoader: webpack.LoaderDefinitionFunction<NextServerCSSLoaderOptions> =
this.cacheable && this.cacheable() function (content) {
this.cacheable && this.cacheable()
// Only add the checksum during development. const options = this.getOptions()
if (process.env.NODE_ENV !== 'production') { let isCSSModule = options.cssModules
const isCSSModule = this.resourcePath.match(/\.module\.(css|sass|scss)$/)
const checksum = crypto // Only add the checksum during development.
.createHash('sha256') if (process.env.NODE_ENV !== 'production') {
.update( // This check is only for backwards compatibility.
this.data.__checksum + // TODO: Remove this in the next major version (next 14)
(typeof content === 'string' ? Buffer.from(content) : content) if (isCSSModule === undefined) {
) this.emitWarning(
.digest() new Error(
.toString('hex') "No 'cssModules' option was found for the next-flight-css-loader plugin."
.substring(0, 12) )
)
if (isCSSModule) { isCSSModule =
return `\ this.resourcePath.match(/\.module\.(css|sass|scss)$/) !== null
}
const checksum = crypto
.createHash('sha256')
.update(typeof content === 'string' ? Buffer.from(content) : content)
.digest()
.toString('hex')
.substring(0, 12)
if (isCSSModule) {
return `\
${content} ${content}
module.exports.__checksum = ${JSON.stringify(checksum)} module.exports.__checksum = ${JSON.stringify(checksum)}
` `
} }
// Server CSS imports are always available for HMR, so we attach // Server CSS imports are always available for HMR, so we attach
// `module.hot.accept()` to the generated module. // `module.hot.accept()` to the generated module.
const hmrCode = 'if (module.hot) { module.hot.accept() }' const hmrCode = 'if (module.hot) { module.hot.accept() }'
return `\ return `\
export default ${JSON.stringify(checksum)} export default ${JSON.stringify(checksum)}
${hmrCode} ${hmrCode}
` `
} }
return content return content
} }
export default NextServerCSSLoader export default NextServerCSSLoader
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