From 89e8fe07b871c33cdb56ea73542186f7403f8133 Mon Sep 17 00:00:00 2001 From: Evan Ma <1292678148@qq.com> Date: Mon, 22 Mar 2021 18:30:19 +0800 Subject: [PATCH] fix(config): compile type compatibility in css-loader v4 (#9014) --- .../unit/__snapshots__/webpack.test.js.snap | 18 ++++++++++++++++++ packages/config/src/config/build.js | 7 ++++++- .../test/__snapshots__/options.test.js.snap | 3 +++ .../config/__snapshots__/index.test.js.snap | 6 ++++++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/packages/cli/test/unit/__snapshots__/webpack.test.js.snap b/packages/cli/test/unit/__snapshots__/webpack.test.js.snap index 7f32c46343..8f2278dc36 100644 --- a/packages/cli/test/unit/__snapshots__/webpack.test.js.snap +++ b/packages/cli/test/unit/__snapshots__/webpack.test.js.snap @@ -135,6 +135,9 @@ exports[`webpack nuxt webpack module.rules 1`] = ` \\"options\\": Object { \\"esModule\\": false, \\"importLoaders\\": 2, + \\"modules\\": Object { + \\"compileType\\": \\"icss\\", + }, \\"sourceMap\\": false, \\"url\\": [Function isUrlResolvingEnabled], }, @@ -208,6 +211,9 @@ exports[`webpack nuxt webpack module.rules 1`] = ` \\"options\\": Object { \\"esModule\\": false, \\"importLoaders\\": 2, + \\"modules\\": Object { + \\"compileType\\": \\"icss\\", + }, \\"sourceMap\\": false, \\"url\\": [Function isUrlResolvingEnabled], }, @@ -287,6 +293,9 @@ exports[`webpack nuxt webpack module.rules 1`] = ` \\"options\\": Object { \\"esModule\\": false, \\"importLoaders\\": 2, + \\"modules\\": Object { + \\"compileType\\": \\"icss\\", + }, \\"sourceMap\\": false, \\"url\\": [Function isUrlResolvingEnabled], }, @@ -375,6 +384,9 @@ exports[`webpack nuxt webpack module.rules 1`] = ` \\"options\\": Object { \\"esModule\\": false, \\"importLoaders\\": 2, + \\"modules\\": Object { + \\"compileType\\": \\"icss\\", + }, \\"sourceMap\\": false, \\"url\\": [Function isUrlResolvingEnabled], }, @@ -463,6 +475,9 @@ exports[`webpack nuxt webpack module.rules 1`] = ` \\"options\\": Object { \\"esModule\\": false, \\"importLoaders\\": 2, + \\"modules\\": Object { + \\"compileType\\": \\"icss\\", + }, \\"sourceMap\\": false, \\"url\\": [Function isUrlResolvingEnabled], }, @@ -548,6 +563,9 @@ exports[`webpack nuxt webpack module.rules 1`] = ` \\"options\\": Object { \\"esModule\\": false, \\"importLoaders\\": 2, + \\"modules\\": Object { + \\"compileType\\": \\"icss\\", + }, \\"sourceMap\\": false, \\"url\\": [Function isUrlResolvingEnabled], }, diff --git a/packages/config/src/config/build.js b/packages/config/src/config/build.js index f7f65160d0..739ca30b1f 100644 --- a/packages/config/src/config/build.js +++ b/packages/config/src/config/build.js @@ -34,7 +34,12 @@ export default () => ({ embed: 'src' } }, - css: { esModule: false }, + css: { + esModule: false, + modules: { + compileType: 'icss' + } + }, cssModules: { esModule: false, modules: { diff --git a/packages/config/test/__snapshots__/options.test.js.snap b/packages/config/test/__snapshots__/options.test.js.snap index 940b35855c..4520472855 100644 --- a/packages/config/test/__snapshots__/options.test.js.snap +++ b/packages/config/test/__snapshots__/options.test.js.snap @@ -71,6 +71,9 @@ Object { "loaders": Object { "css": Object { "esModule": false, + "modules": Object { + "compileType": "icss", + }, "sourceMap": false, }, "cssModules": Object { diff --git a/packages/config/test/config/__snapshots__/index.test.js.snap b/packages/config/test/config/__snapshots__/index.test.js.snap index b05a8db82a..46d9e806c4 100644 --- a/packages/config/test/config/__snapshots__/index.test.js.snap +++ b/packages/config/test/config/__snapshots__/index.test.js.snap @@ -55,6 +55,9 @@ Object { "loaders": Object { "css": Object { "esModule": false, + "modules": Object { + "compileType": "icss", + }, }, "cssModules": Object { "esModule": false, @@ -441,6 +444,9 @@ Object { "loaders": Object { "css": Object { "esModule": false, + "modules": Object { + "compileType": "icss", + }, }, "cssModules": Object { "esModule": false,