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 extract-text--webpack-plugin instance reuse errors #3652

Merged
merged 1 commit into from
Jan 22, 2018
Merged

fix extract-text--webpack-plugin instance reuse errors #3652

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions packages/gatsby/src/utils/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@ const genBabelConfig = require(`./babel-config`)
const { withBasePath } = require(`./path`)
const HashedChunkIdsPlugin = require(`./hashed-chunk-ids-plugin`)

// Use separate extract-text-webpack-plugin instances for each stage per the docs
const extractDevelopHtml = new ExtractTextPlugin(`build-html-styles.css`)
const extractBuildHtml = new ExtractTextPlugin(`build-html-styles.css`, {
allChunks: true,
})
const extractBuildCss = new ExtractTextPlugin(`styles.css`, { allChunks: true })
const extractBuildJavascript = new ExtractTextPlugin(`build-js-styles.css`, {
allChunks: true,
})

// Five stages or modes:
// 1) develop: for `gatsby develop` command, hot reload and CSS injection into page
// 2) develop-html: same as develop without react-hmre in the babel config for html renderer
Expand Down Expand Up @@ -200,7 +210,7 @@ module.exports = async (
__PATH_PREFIX__: JSON.stringify(store.getState().config.pathPrefix),
__POLYFILL__: store.getState().config.polyfill,
}),
new ExtractTextPlugin(`build-html-styles.css`),
extractDevelopHtml,
]
case `build-css`:
return [
Expand All @@ -210,7 +220,7 @@ module.exports = async (
__PATH_PREFIX__: JSON.stringify(store.getState().config.pathPrefix),
__POLYFILL__: store.getState().config.polyfill,
}),
new ExtractTextPlugin(`styles.css`, { allChunks: true }),
extractBuildCss,
]
case `build-html`:
return [
Expand All @@ -224,7 +234,7 @@ module.exports = async (
__PATH_PREFIX__: JSON.stringify(store.getState().config.pathPrefix),
__POLYFILL__: store.getState().config.polyfill,
}),
new ExtractTextPlugin(`build-html-styles.css`, { allChunks: true }),
extractBuildHtml,
]
case `build-javascript`: {
// Get array of page template component names.
Expand Down Expand Up @@ -298,7 +308,7 @@ module.exports = async (
__POLYFILL__: store.getState().config.polyfill,
}),
// Extract CSS so it doesn't get added to JS bundles.
new ExtractTextPlugin(`build-js-styles.css`, { allChunks: true }),
extractBuildJavascript,
// Write out mapping between chunk names and their hashed names. We use
// this to add the needed javascript files to each HTML page.
new StatsWriterPlugin(),
Expand Down Expand Up @@ -435,13 +445,13 @@ module.exports = async (
config.loader(`css`, {
test: /\.css$/,
exclude: [/\.module\.css$/],
loader: ExtractTextPlugin.extract([`css?minimize`, `postcss`]),
loader: extractBuildCss.extract([`css?minimize`, `postcss`]),
})

// CSS modules
config.loader(`cssModules`, {
test: /\.module\.css$/,
loader: ExtractTextPlugin.extract(`style`, [
loader: extractBuildCss.extract(`style`, [
cssModulesConfig(stage),
`postcss`,
]),
Expand Down Expand Up @@ -471,10 +481,10 @@ module.exports = async (
// CSS modules
config.loader(`cssModules`, {
test: /\.module\.css$/,
loader: ExtractTextPlugin.extract(`style`, [
cssModulesConfig(stage),
`postcss`,
]),
loader: (stage === `build-html`
? extractBuildHtml
: extractDevelopHtml
).extract(`style`, [cssModulesConfig(stage), `postcss`]),
})

return config
Expand All @@ -491,13 +501,13 @@ module.exports = async (
test: /\.css$/,
exclude: [/\.module\.css$/],
// loader: `null`,
loader: ExtractTextPlugin.extract([`css`]),
loader: extractBuildJavascript.extract([`css`]),
})

// CSS modules
config.loader(`cssModules`, {
test: /\.module\.css$/,
loader: ExtractTextPlugin.extract(`style`, [
loader: extractBuildJavascript.extract(`style`, [
cssModulesConfig(stage),
`postcss`,
]),
Expand Down