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

fix: make minicss-extract-plugin compatible with plugins #29599

Merged
merged 9 commits into from
Feb 19, 2021
Merged

fix: make minicss-extract-plugin compatible with plugins #29599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
614baf7
update gatsby-plugin-sass
wardpeet Feb 19, 2021
f7bb97d
update gatsby-plugin-less
wardpeet Feb 19, 2021
f418fbe
update gatsby-plugin-stylus
wardpeet Feb 19, 2021
80c0a58
update gatsby-plugin-netlify-cms
wardpeet Feb 19, 2021
0831d0b
update gatsby-plugin-postcss
wardpeet Feb 19, 2021
50a4f88
bring back null-loader
wardpeet Feb 19, 2021
ec0cdee
fix utils
wardpeet Feb 19, 2021
cfa707f
revert
wardpeet Feb 19, 2021
5d9e744
fix cssmodules
wardpeet Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 12 additions & 36 deletions packages/gatsby-plugin-less/src/__tests__/__snapshots__/gatsby-node.js.snap
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 9 additions & 20 deletions packages/gatsby-plugin-less/src/gatsby-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
import resolve from "./resolve"

exports.onCreateWebpackConfig = (
{ actions, stage, rules, plugins, loaders },
{ actions, stage, loaders },
{ cssLoaderOptions = {}, postCssPlugins, loaderOptions, lessOptions }
) => {
const isSSR = [`develop-html`, `build-html`].includes(stage)
const { setWebpackConfig } = actions
const PRODUCTION = stage !== `develop`
const isSSR = stage.includes(`html`)

const lessLoader = {
loader: resolve(`less-loader`),
options: {
sourceMap: !PRODUCTION,
lessOptions: {
...lessOptions,
},
Expand All @@ -33,27 +31,18 @@ exports.onCreateWebpackConfig = (
const lessRuleModules = {
test: /\.module\.less$/,
use: [
!isSSR && loaders.miniCssExtract({ hmr: false }),
loaders.miniCssExtract({ modules: true }),
loaders.css({ ...cssLoaderOptions, modules: true, importLoaders: 2 }),
loaders.postcss({ plugins: postCssPlugins }),
lessLoader,
].filter(Boolean),
],
}

let configRules = []

switch (stage) {
case `develop`:
case `build-javascript`:
case `build-html`:
case `develop-html`:
configRules = configRules.concat([
{
oneOf: [lessRuleModules, lessRule],
},
])
break
}
const configRules = [
{
oneOf: [lessRuleModules, lessRule],
},
]

setWebpackConfig({
module: {
Expand Down
29 changes: 0 additions & 29 deletions packages/gatsby-plugin-netlify-cms/src/gatsby-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,35 +55,6 @@ function replaceRule(value, stage) {
return null
}

// use MiniCssExtractPlugin.loader in development
if (stage === `develop` && value.test && isCssRule(value)) {
function replaceStyleLoader(rule) {
if (rule.loader.includes(`style-loader`)) {
return {
...rule,
loader: MiniCssExtractPlugin.loader,
options: {
hmr: true,
},
}
}

return rule
}

if (value.use) {
return {
...value,
use: value.use.map(replaceStyleLoader),
}
} else if (value.loader) {
return {
...value,
loader: replaceStyleLoader(value),
}
}
}

return value
}

Expand Down
31 changes: 8 additions & 23 deletions packages/gatsby-plugin-postcss/src/__tests__/__snapshots__/gatsby-node.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ exports[`gatsby-plugin-postcss Stage: build-html / Css options 1`] = `
Object {
"test": /\\\\\\.module\\\\\\.css\\$/,
"use": Array [
"miniCssExtract",
"css-loader({\\"camelCase\\":true,\\"importLoaders\\":1,\\"modules\\":true})",
Object {
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": false,
},
},
],
Expand All @@ -31,12 +31,12 @@ exports[`gatsby-plugin-postcss Stage: build-html / Css options 1`] = `
Object {
"test": /\\\\\\.module\\\\\\.css\\$/,
"use": Array [
"miniCssExtract",
"css-loader({\\"camelCase\\":true,\\"importLoaders\\":1,\\"modules\\":true})",
Object {
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": true,
},
},
],
Expand All @@ -56,7 +56,6 @@ exports[`gatsby-plugin-postcss Stage: build-html / Css options 1`] = `
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": false,
},
},
],
Expand All @@ -70,7 +69,6 @@ exports[`gatsby-plugin-postcss Stage: build-html / Css options 1`] = `
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": false,
},
},
],
Expand All @@ -84,7 +82,6 @@ exports[`gatsby-plugin-postcss Stage: build-html / Css options 1`] = `
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": true,
},
},
],
Expand All @@ -98,7 +95,6 @@ exports[`gatsby-plugin-postcss Stage: build-html / Css options 1`] = `
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": true,
},
},
],
Expand Down Expand Up @@ -149,12 +145,12 @@ exports[`gatsby-plugin-postcss Stage: build-html / No options 1`] = `
Object {
"test": /\\\\\\.module\\\\\\.css\\$/,
"use": Array [
"miniCssExtract",
"css-loader({\\"importLoaders\\":1,\\"modules\\":true})",
Object {
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": false,
},
},
],
Expand Down Expand Up @@ -193,6 +189,7 @@ exports[`gatsby-plugin-postcss Stage: build-html / PostCss options 1`] = `
Object {
"test": /\\\\\\.module\\\\\\.css\\$/,
"use": Array [
"miniCssExtract",
"css-loader({\\"importLoaders\\":1,\\"modules\\":true})",
Object {
"loader": "/resolved/path/postcss-loader",
Expand All @@ -216,6 +213,7 @@ exports[`gatsby-plugin-postcss Stage: build-html / PostCss options 1`] = `
Object {
"test": /\\\\\\.module\\\\\\.css\\$/,
"use": Array [
"miniCssExtract",
"css-loader({\\"importLoaders\\":1,\\"modules\\":true})",
Object {
"loader": "/resolved/path/postcss-loader",
Expand Down Expand Up @@ -360,7 +358,6 @@ exports[`gatsby-plugin-postcss Stage: build-javascript / Css options 1`] = `
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": false,
},
},
],
Expand All @@ -374,7 +371,6 @@ exports[`gatsby-plugin-postcss Stage: build-javascript / Css options 1`] = `
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": false,
},
},
],
Expand All @@ -388,7 +384,6 @@ exports[`gatsby-plugin-postcss Stage: build-javascript / Css options 1`] = `
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": true,
},
},
],
Expand All @@ -402,7 +397,6 @@ exports[`gatsby-plugin-postcss Stage: build-javascript / Css options 1`] = `
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": true,
},
},
],
Expand Down Expand Up @@ -459,7 +453,6 @@ exports[`gatsby-plugin-postcss Stage: build-javascript / No options 1`] = `
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": false,
},
},
],
Expand All @@ -473,7 +466,6 @@ exports[`gatsby-plugin-postcss Stage: build-javascript / No options 1`] = `
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": false,
},
},
],
Expand Down Expand Up @@ -627,7 +619,6 @@ exports[`gatsby-plugin-postcss Stage: develop / Css options 1`] = `
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": true,
},
},
],
Expand All @@ -641,7 +632,6 @@ exports[`gatsby-plugin-postcss Stage: develop / Css options 1`] = `
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": true,
},
},
],
Expand Down Expand Up @@ -698,7 +688,6 @@ exports[`gatsby-plugin-postcss Stage: develop / No options 1`] = `
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": true,
},
},
],
Expand All @@ -712,7 +701,6 @@ exports[`gatsby-plugin-postcss Stage: develop / No options 1`] = `
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": true,
},
},
],
Expand Down Expand Up @@ -824,12 +812,12 @@ exports[`gatsby-plugin-postcss Stage: develop-html / Css options 1`] = `
Object {
"test": /\\\\\\.module\\\\\\.css\\$/,
"use": Array [
"miniCssExtract",
"css-loader({\\"camelCase\\":true,\\"importLoaders\\":1,\\"modules\\":true})",
Object {
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": true,
},
},
],
Expand All @@ -849,7 +837,6 @@ exports[`gatsby-plugin-postcss Stage: develop-html / Css options 1`] = `
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": false,
},
},
],
Expand All @@ -863,7 +850,6 @@ exports[`gatsby-plugin-postcss Stage: develop-html / Css options 1`] = `
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": false,
},
},
],
Expand All @@ -877,7 +863,6 @@ exports[`gatsby-plugin-postcss Stage: develop-html / Css options 1`] = `
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": true,
},
},
],
Expand All @@ -891,7 +876,6 @@ exports[`gatsby-plugin-postcss Stage: develop-html / Css options 1`] = `
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": true,
},
},
],
Expand Down Expand Up @@ -942,12 +926,12 @@ exports[`gatsby-plugin-postcss Stage: develop-html / No options 1`] = `
Object {
"test": /\\\\\\.module\\\\\\.css\\$/,
"use": Array [
"miniCssExtract",
"css-loader({\\"importLoaders\\":1,\\"modules\\":true})",
Object {
"loader": "/resolved/path/postcss-loader",
"options": Object {
"postcssOptions": Object {},
"sourceMap": true,
},
},
],
Expand Down Expand Up @@ -986,6 +970,7 @@ exports[`gatsby-plugin-postcss Stage: develop-html / PostCss options 1`] = `
Object {
"test": /\\\\\\.module\\\\\\.css\\$/,
"use": Array [
"miniCssExtract",
"css-loader({\\"importLoaders\\":1,\\"modules\\":true})",
Object {
"loader": "/resolved/path/postcss-loader",
Expand Down
33 changes: 11 additions & 22 deletions packages/gatsby-plugin-postcss/src/gatsby-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,13 @@ const findCssRules = config =>

exports.onCreateWebpackConfig = (
{ actions, stage, loaders, getConfig },
{ cssLoaderOptions = {}, postCssPlugins, ...postcssLoaderOptions }
// eslint-disable-next-line no-unused-vars
{ cssLoaderOptions = {}, postCssPlugins, plugins, ...postcssLoaderOptions }
) => {
const isProduction = !stage.includes(`develop`)
const isSSR = stage.includes(`html`)
const isSSR = [`develop-html`, `build-html`].includes(stage)
const config = getConfig()
const cssRules = findCssRules(config)

delete postcssLoaderOptions.plugins

if (!postcssLoaderOptions.postcssOptions) {
postcssLoaderOptions.postcssOptions = {}
}
Expand All @@ -34,37 +32,28 @@ exports.onCreateWebpackConfig = (

const postcssLoader = {
loader: resolve(`postcss-loader`),
options: { sourceMap: !isProduction, ...postcssLoaderOptions },
options: postcssLoaderOptions,
}
const postcssRule = {
test: CSS_PATTERN,
use: isSSR
? [loaders.null()]
: [loaders.css({ ...cssLoaderOptions, importLoaders: 1 }), postcssLoader],
: [
loaders.miniCssExtract(),
loaders.css({ ...cssLoaderOptions, importLoaders: 1 }),
postcssLoader,
],
}
const postcssRuleModules = {
test: MODULE_CSS_PATTERN,
use: [
loaders.miniCssExtract({ modules: true }),
loaders.css({ ...cssLoaderOptions, importLoaders: 1, modules: true }),
postcssLoader,
],
}

if (!isSSR) {
postcssRule.use.unshift(loaders.miniCssExtract())
postcssRuleModules.use.unshift(loaders.miniCssExtract({ hmr: false }))
}

const postcssRules = { oneOf: [] }

switch (stage) {
case `develop`:
case `build-javascript`:
case `build-html`:
case `develop-html`:
postcssRules.oneOf.push(...[postcssRuleModules, postcssRule])
break
}
const postcssRules = { oneOf: [postcssRuleModules, postcssRule] }

if (cssRules) {
cssRules.oneOf.unshift(...postcssRules.oneOf)
Expand Down
Loading