feat(next-css): Support extra options for extract-css-chunks-webpack-…

…plugin
vercel · Jul 22, 2019 · 36ac834 · 36ac834
1 parent 087e8e3
commit 36ac834
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/packages/next-css/css-loader-config.js b/packages/next-css/css-loader-config.js
@@ -14,7 +14,8 @@ module.exports = (
     dev,
     isServer,
     postcssLoaderOptions = {},
-    loaders = []
+    loaders = [],
+    extractCssOptions = {}
   }
 ) => {
   // We have to keep a list of extensions for the splitchunk config
@@ -33,7 +34,7 @@ module.exports = (
 
   if (!isServer && !extractCssInitialized) {
     config.plugins.push(
-      new ExtractCssChunks({
+      new ExtractCssChunks(Object.assign({}, {
         // Options similar to the same options in webpackOptions.output
         // both options are optional
         filename: dev
@@ -43,7 +44,8 @@ module.exports = (
           ? 'static/chunks/[name].chunk.css'
           : 'static/chunks/[name].[contenthash:8].chunk.css',
         hot: dev
-      })
+      },
+      extractCssOptions))
     )
     extractCssInitialized = true
   }

diff --git a/packages/next-css/index.js b/packages/next-css/index.js
@@ -10,13 +10,14 @@ module.exports = (nextConfig = {}) => {
       }
 
       const { dev, isServer } = options
-      const { cssModules, cssLoaderOptions, postcssLoaderOptions } = nextConfig
+      const { cssModules, cssLoaderOptions, postcssLoaderOptions, extractCssOptions } = nextConfig
 
       options.defaultLoaders.css = cssLoaderConfig(config, {
         extensions: ['css'],
         cssModules,
         cssLoaderOptions,
         postcssLoaderOptions,
+        extractCssOptions,
         dev,
         isServer
       })

diff --git a/packages/next-css/package.json b/packages/next-css/package.json
@@ -6,7 +6,7 @@
   "repository": "zeit/next-plugins",
   "dependencies": {
     "css-loader": "^2.1.0",
-    "extract-css-chunks-webpack-plugin": "^3.3.2",
+    "extract-css-chunks-webpack-plugin": "^4.5.6",
     "find-up": "^3.0.0",
     "ignore-loader": "~0.1.2",
     "optimize-css-assets-webpack-plugin": "^5.0.1",

diff --git a/packages/next-sass/index.js b/packages/next-sass/index.js
@@ -14,14 +14,16 @@ module.exports = (nextConfig = {}) => {
         cssModules,
         cssLoaderOptions,
         postcssLoaderOptions,
-        sassLoaderOptions = {}
+        sassLoaderOptions = {},
+        extractCssOptions
       } = nextConfig
 
       options.defaultLoaders.sass = cssLoaderConfig(config, {
         extensions: ['scss', 'sass'],
         cssModules,
         cssLoaderOptions,
         postcssLoaderOptions,
+        extractCssOptions,
         dev,
         isServer,
         loaders: [