diff --git a/package.json b/package.json index 3a951fc21..863e1c704 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "bundle-stats-webpack-plugin": "2.2.0", "clean-webpack-plugin": "3.0.0", "copy-webpack-plugin": "6.0.3", - "css-loader": "4.0.0", + "css-loader": "3.6.0", "cssnano": "4.1.10", "debug": "4.1.1", "dotenv": "8.2.0", diff --git a/src/webpack/config/css.js b/src/webpack/config/css.js index bb74f2602..61c830b08 100644 --- a/src/webpack/config/css.js +++ b/src/webpack/config/css.js @@ -4,6 +4,8 @@ const cssnano = require('cssnano'); const postcssReporter = require('postcss-reporter'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); +const { paths } = require('../defaults'); + module.exports = (options, env) => { const { include = [], node = false, lint = false, filename = '[name].css' } = options; @@ -18,10 +20,10 @@ module.exports = (options, env) => { loader: 'css-loader', options: { sourceMap: true, + onlyLocals: node, modules: { - mode: 'local', - localIdentName: isDevelopment ? '[path][name]__[local]' : '[hash:base64:5]', - exportOnlyLocals: node + context: paths.src, + localIdentName: isDevelopment ? '[path][name]__[local]' : '[hash:base64:5]' } } }, diff --git a/yarn.lock b/yarn.lock index 1fb536557..63abd4cd7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4328,24 +4328,24 @@ css-declaration-sorter@^4.0.1: postcss "^7.0.1" timsort "^0.3.0" -css-loader@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-4.0.0.tgz#814434d4e1e2d5f430c70e85e78268db7f3cced1" - integrity sha512-/7d5slKnmY2S39FNifJ7JQ8MhcMM/rDIjAZ2Sc/Z8lnOWOmc10hijg28ovBtljY364pQaF01O2nj5AIBDnJ9vQ== +css-loader@3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645" + integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ== dependencies: - camelcase "^6.0.0" + camelcase "^5.3.1" cssesc "^3.0.0" icss-utils "^4.1.1" - loader-utils "^2.0.0" + loader-utils "^1.2.3" normalize-path "^3.0.0" postcss "^7.0.32" postcss-modules-extract-imports "^2.0.0" - postcss-modules-local-by-default "^3.0.3" + postcss-modules-local-by-default "^3.0.2" postcss-modules-scope "^2.2.0" postcss-modules-values "^3.0.0" postcss-value-parser "^4.1.0" schema-utils "^2.7.0" - semver "^7.3.2" + semver "^6.3.0" css-parse@~2.0.0: version "2.0.0" @@ -10013,7 +10013,7 @@ postcss-modules-extract-imports@^2.0.0: dependencies: postcss "^7.0.5" -postcss-modules-local-by-default@^3.0.3: +postcss-modules-local-by-default@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0" integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==