diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39613ea2..f205a346 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+### [5.1.3](https://github.com/webpack-contrib/css-loader/compare/v5.1.2...v5.1.3) (2021-03-15)
+
+
+### Bug Fixes
+
+* the `auto` option works using inline module syntax ([#1274](https://github.com/webpack-contrib/css-loader/issues/1274)) ([1db2f4d](https://github.com/webpack-contrib/css-loader/commit/1db2f4df3ff9ae8f0667a2304853c8e7cdd0afc1))
+* ident generation for CSS modules using inline module syntax ([#1274](https://github.com/webpack-contrib/css-loader/issues/1274)) ([1db2f4d](https://github.com/webpack-contrib/css-loader/commit/1db2f4df3ff9ae8f0667a2304853c8e7cdd0afc1))
+
### [5.1.2](https://github.com/webpack-contrib/css-loader/compare/v5.1.1...v5.1.2) (2021-03-10)
diff --git a/package-lock.json b/package-lock.json
index 886e1617..1db38618 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
{
"name": "css-loader",
- "version": "5.1.2",
+ "version": "5.1.3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
- "version": "5.1.1",
+ "version": "5.1.2",
"license": "MIT",
"dependencies": {
"camelcase": "^6.2.0",
@@ -33,7 +33,7 @@
"del": "^6.0.0",
"del-cli": "^3.0.1",
"es-check": "^5.2.3",
- "eslint": "^7.21.0",
+ "eslint": "^7.22.0",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-import": "^2.22.1",
"file-loader": "^6.2.0",
@@ -56,7 +56,7 @@
"stylus": "^0.54.8",
"stylus-loader": "^4.3.0",
"url-loader": "^4.1.1",
- "webpack": "^5.24.4"
+ "webpack": "^5.26.0"
},
"engines": {
"node": ">= 10.13.0"
@@ -106,9 +106,9 @@
}
},
"node_modules/@babel/compat-data": {
- "version": "7.13.8",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.8.tgz",
- "integrity": "sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog==",
+ "version": "7.13.11",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.11.tgz",
+ "integrity": "sha512-BwKEkO+2a67DcFeS3RLl0Z3Gs2OvdXewuWjc1Hfokhb5eQWP9YRYH1/+VrVZvql2CfjOiNGqSAFOYt4lsqTHzg==",
"dev": true
},
"node_modules/@babel/core": {
@@ -206,9 +206,9 @@
}
},
"node_modules/@babel/helper-create-class-features-plugin": {
- "version": "7.13.10",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.10.tgz",
- "integrity": "sha512-YV7r2YxdTUaw84EwNkyrRke/TJHR/UXGiyvACRqvdVJ2/syV2rQuJNnaRLSuYiop8cMRXOgseTGoJCWX0q2fFg==",
+ "version": "7.13.11",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz",
+ "integrity": "sha512-ays0I7XYq9xbjCSvT+EvysLgfc3tOkwCULHjrnscGT3A9qD4sk3wXnJ3of0MAWsWGjdinFvajHU2smYuqXKMrw==",
"dev": true,
"dependencies": {
"@babel/helper-function-name": "^7.12.13",
@@ -448,9 +448,9 @@
}
},
"node_modules/@babel/parser": {
- "version": "7.13.10",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.10.tgz",
- "integrity": "sha512-0s7Mlrw9uTWkYua7xWr99Wpk2bnGa0ANleKfksYAES8LpWH4gW1OUr42vqKNf0us5UQNfru2wPqMqRITzq/SIQ==",
+ "version": "7.13.11",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.11.tgz",
+ "integrity": "sha512-PhuoqeHoO9fc4ffMEVk4qb/w/s2iOSWohvbHxLtxui0eBg3Lg5gN1U8wp1V1u61hOWkPQJJyJzGH6Y+grwkq8Q==",
"dev": true,
"bin": {
"parser": "bin/babel-parser.js"
@@ -2815,9 +2815,9 @@
}
},
"node_modules/@types/babel__traverse": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.0.tgz",
- "integrity": "sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==",
+ "version": "7.11.1",
+ "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.1.tgz",
+ "integrity": "sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==",
"dev": true,
"dependencies": {
"@babel/types": "^7.3.0"
@@ -2916,9 +2916,9 @@
"dev": true
},
"node_modules/@types/node": {
- "version": "14.14.33",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.33.tgz",
- "integrity": "sha512-oJqcTrgPUF29oUP8AsUqbXGJNuPutsetaa9kTQAQce5Lx5dTYWV02ScBiT/k1BX/Z7pKeqedmvp39Wu4zR7N7g==",
+ "version": "14.14.34",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.34.tgz",
+ "integrity": "sha512-dBPaxocOK6UVyvhbnpFIj2W+S+1cBTkHQbFQfeeJhoKFbzYcVUGHvddeWPSucKATb3F0+pgDq0i6ghEaZjsugA==",
"dev": true
},
"node_modules/@types/normalize-package-data": {
@@ -4031,9 +4031,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001198",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001198.tgz",
- "integrity": "sha512-r5GGgESqOPZzwvdLVER374FpQu2WluCF1Z2DSiFJ89KSmGjT0LVKjgv4NcAqHmGWF9ihNpqRI9KXO9Ex4sKsgA==",
+ "version": "1.0.30001200",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001200.tgz",
+ "integrity": "sha512-ic/jXfa6tgiPBAISWk16jRI2q8YfjxHnSG7ddSL1ptrIP8Uy11SayFrjXRAk3NumHpDb21fdTkbTxb/hOrFrnQ==",
"dev": true
},
"node_modules/caporal": {
@@ -5944,9 +5944,9 @@
}
},
"node_modules/electron-to-chromium": {
- "version": "1.3.684",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.684.tgz",
- "integrity": "sha512-GV/vz2EmmtRSvfGSQ5A0Lucic//IRSDijgL15IgzbBEEnp4rfbxeUSZSlBfmsj7BQvE4sBdgfsvPzLCnp6L21w==",
+ "version": "1.3.687",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.687.tgz",
+ "integrity": "sha512-IpzksdQNl3wdgkzf7dnA7/v10w0Utf1dF2L+B4+gKrloBrxCut+au+kky3PYvle3RMdSxZP+UiCZtLbcYRxSNQ==",
"dev": true
},
"node_modules/emittery": {
@@ -6212,9 +6212,9 @@
}
},
"node_modules/eslint": {
- "version": "7.21.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.21.0.tgz",
- "integrity": "sha512-W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg==",
+ "version": "7.22.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.22.0.tgz",
+ "integrity": "sha512-3VawOtjSJUQiiqac8MQc+w457iGLfuNGLFn8JmF051tTKbh5/x/0vlcEj8OgDCaw7Ysa2Jn8paGshV7x2abKXg==",
"dev": true,
"dependencies": {
"@babel/code-frame": "7.12.11",
@@ -6234,7 +6234,7 @@
"file-entry-cache": "^6.0.1",
"functional-red-black-tree": "^1.0.1",
"glob-parent": "^5.0.0",
- "globals": "^12.1.0",
+ "globals": "^13.6.0",
"ignore": "^4.0.6",
"import-fresh": "^3.0.0",
"imurmurhash": "^0.1.4",
@@ -6242,7 +6242,7 @@
"js-yaml": "^3.13.1",
"json-stable-stringify-without-jsonify": "^1.0.1",
"levn": "^0.4.1",
- "lodash": "^4.17.20",
+ "lodash": "^4.17.21",
"minimatch": "^3.0.4",
"natural-compare": "^1.4.0",
"optionator": "^0.9.1",
@@ -6502,12 +6502,12 @@
}
},
"node_modules/eslint/node_modules/globals": {
- "version": "12.4.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
- "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+ "version": "13.6.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.6.0.tgz",
+ "integrity": "sha512-YFKCX0SiPg7l5oKYCJ2zZGxcXprVXHcSnVuvzrT3oSENQonVLqM5pf9fN5dLGZGyCjhw8TN8Btwe/jKnZ0pjvQ==",
"dev": true,
"dependencies": {
- "type-fest": "^0.8.1"
+ "type-fest": "^0.20.2"
},
"engines": {
"node": ">=8"
@@ -6538,12 +6538,15 @@
}
},
"node_modules/eslint/node_modules/type-fest": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
"dev": true,
"engines": {
- "node": ">=8"
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/espree": {
@@ -11414,9 +11417,9 @@
"dev": true
},
"node_modules/jsdom": {
- "version": "16.5.0",
- "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.5.0.tgz",
- "integrity": "sha512-QxZH0nmDTnTTVI0YDm4RUlaUPl5dcyn62G5TMDNfMmTW+J1u1v9gCR8WR+WZ6UghAa7nKJjDOFaI00eMMWvJFQ==",
+ "version": "16.5.1",
+ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.5.1.tgz",
+ "integrity": "sha512-pF73EOsJgwZekbDHEY5VO/yKXUkab/DuvrQB/ANVizbr6UAHJsDdHXuotZYwkJSGQl1JM+ivXaqY+XBDDL4TiA==",
"dev": true,
"dependencies": {
"abab": "^2.0.5",
@@ -12833,9 +12836,9 @@
"dev": true
},
"node_modules/nanoid": {
- "version": "3.1.20",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
- "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==",
+ "version": "3.1.22",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.22.tgz",
+ "integrity": "sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ==",
"bin": {
"nanoid": "bin/nanoid.cjs"
},
@@ -12961,9 +12964,9 @@
}
},
"node_modules/node-notifier": {
- "version": "8.0.1",
- "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.1.tgz",
- "integrity": "sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA==",
+ "version": "8.0.2",
+ "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
+ "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
"dev": true,
"optional": true,
"dependencies": {
@@ -18302,9 +18305,9 @@
}
},
"node_modules/uglify-js": {
- "version": "3.13.0",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.0.tgz",
- "integrity": "sha512-TWYSWa9T2pPN4DIJYbU9oAjQx+5qdV5RUDxwARg8fmJZrD/V27Zj0JngW5xg1DFz42G0uDYl2XhzF6alSzD62w==",
+ "version": "3.13.1",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.1.tgz",
+ "integrity": "sha512-EWhx3fHy3M9JbaeTnO+rEqzCe1wtyQClv6q3YWq0voOj4E+bMZBErVS1GAHPDiRGONYq34M1/d8KuQMgvi6Gjw==",
"dev": true,
"optional": true,
"bin": {
@@ -18626,9 +18629,9 @@
}
},
"node_modules/webpack": {
- "version": "5.24.4",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.24.4.tgz",
- "integrity": "sha512-RXOdxF9hFFFhg47BryCgyFrEyyu7Y/75/uiI2DoUiTMqysK+WczVSTppvkR47oZcmI/DPaXCiCiaXBP8QjkNpA==",
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.26.0.tgz",
+ "integrity": "sha512-9kQATUOGQBkqzNKFmFON4KXZDsXnE7xk58tBxca8aCi+6/QhAbmWIvtGqBL66XIsBFpomFH0/0KyCaySo0ta2g==",
"dev": true,
"dependencies": {
"@types/eslint-scope": "^3.7.0",
@@ -18976,9 +18979,9 @@
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
},
"node_modules/yaml": {
- "version": "1.10.0",
- "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz",
- "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==",
+ "version": "1.10.2",
+ "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+ "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
"dev": true,
"engines": {
"node": ">= 6"
@@ -19003,9 +19006,9 @@
}
},
"node_modules/yargs-parser": {
- "version": "20.2.6",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.6.tgz",
- "integrity": "sha512-AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA==",
+ "version": "20.2.7",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
+ "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
"dev": true,
"engines": {
"node": ">=10"
@@ -19067,9 +19070,9 @@
}
},
"@babel/compat-data": {
- "version": "7.13.8",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.8.tgz",
- "integrity": "sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog==",
+ "version": "7.13.11",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.11.tgz",
+ "integrity": "sha512-BwKEkO+2a67DcFeS3RLl0Z3Gs2OvdXewuWjc1Hfokhb5eQWP9YRYH1/+VrVZvql2CfjOiNGqSAFOYt4lsqTHzg==",
"dev": true
},
"@babel/core": {
@@ -19155,9 +19158,9 @@
}
},
"@babel/helper-create-class-features-plugin": {
- "version": "7.13.10",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.10.tgz",
- "integrity": "sha512-YV7r2YxdTUaw84EwNkyrRke/TJHR/UXGiyvACRqvdVJ2/syV2rQuJNnaRLSuYiop8cMRXOgseTGoJCWX0q2fFg==",
+ "version": "7.13.11",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz",
+ "integrity": "sha512-ays0I7XYq9xbjCSvT+EvysLgfc3tOkwCULHjrnscGT3A9qD4sk3wXnJ3of0MAWsWGjdinFvajHU2smYuqXKMrw==",
"dev": true,
"requires": {
"@babel/helper-function-name": "^7.12.13",
@@ -19387,9 +19390,9 @@
}
},
"@babel/parser": {
- "version": "7.13.10",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.10.tgz",
- "integrity": "sha512-0s7Mlrw9uTWkYua7xWr99Wpk2bnGa0ANleKfksYAES8LpWH4gW1OUr42vqKNf0us5UQNfru2wPqMqRITzq/SIQ==",
+ "version": "7.13.11",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.11.tgz",
+ "integrity": "sha512-PhuoqeHoO9fc4ffMEVk4qb/w/s2iOSWohvbHxLtxui0eBg3Lg5gN1U8wp1V1u61hOWkPQJJyJzGH6Y+grwkq8Q==",
"dev": true
},
"@babel/plugin-proposal-async-generator-functions": {
@@ -21224,9 +21227,9 @@
}
},
"@types/babel__traverse": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.0.tgz",
- "integrity": "sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==",
+ "version": "7.11.1",
+ "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.1.tgz",
+ "integrity": "sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==",
"dev": true,
"requires": {
"@babel/types": "^7.3.0"
@@ -21325,9 +21328,9 @@
"dev": true
},
"@types/node": {
- "version": "14.14.33",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.33.tgz",
- "integrity": "sha512-oJqcTrgPUF29oUP8AsUqbXGJNuPutsetaa9kTQAQce5Lx5dTYWV02ScBiT/k1BX/Z7pKeqedmvp39Wu4zR7N7g==",
+ "version": "14.14.34",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.34.tgz",
+ "integrity": "sha512-dBPaxocOK6UVyvhbnpFIj2W+S+1cBTkHQbFQfeeJhoKFbzYcVUGHvddeWPSucKATb3F0+pgDq0i6ghEaZjsugA==",
"dev": true
},
"@types/normalize-package-data": {
@@ -22225,9 +22228,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001198",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001198.tgz",
- "integrity": "sha512-r5GGgESqOPZzwvdLVER374FpQu2WluCF1Z2DSiFJ89KSmGjT0LVKjgv4NcAqHmGWF9ihNpqRI9KXO9Ex4sKsgA==",
+ "version": "1.0.30001200",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001200.tgz",
+ "integrity": "sha512-ic/jXfa6tgiPBAISWk16jRI2q8YfjxHnSG7ddSL1ptrIP8Uy11SayFrjXRAk3NumHpDb21fdTkbTxb/hOrFrnQ==",
"dev": true
},
"caporal": {
@@ -23700,9 +23703,9 @@
}
},
"electron-to-chromium": {
- "version": "1.3.684",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.684.tgz",
- "integrity": "sha512-GV/vz2EmmtRSvfGSQ5A0Lucic//IRSDijgL15IgzbBEEnp4rfbxeUSZSlBfmsj7BQvE4sBdgfsvPzLCnp6L21w==",
+ "version": "1.3.687",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.687.tgz",
+ "integrity": "sha512-IpzksdQNl3wdgkzf7dnA7/v10w0Utf1dF2L+B4+gKrloBrxCut+au+kky3PYvle3RMdSxZP+UiCZtLbcYRxSNQ==",
"dev": true
},
"emittery": {
@@ -23901,9 +23904,9 @@
}
},
"eslint": {
- "version": "7.21.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.21.0.tgz",
- "integrity": "sha512-W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg==",
+ "version": "7.22.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.22.0.tgz",
+ "integrity": "sha512-3VawOtjSJUQiiqac8MQc+w457iGLfuNGLFn8JmF051tTKbh5/x/0vlcEj8OgDCaw7Ysa2Jn8paGshV7x2abKXg==",
"dev": true,
"requires": {
"@babel/code-frame": "7.12.11",
@@ -23923,7 +23926,7 @@
"file-entry-cache": "^6.0.1",
"functional-red-black-tree": "^1.0.1",
"glob-parent": "^5.0.0",
- "globals": "^12.1.0",
+ "globals": "^13.6.0",
"ignore": "^4.0.6",
"import-fresh": "^3.0.0",
"imurmurhash": "^0.1.4",
@@ -23931,7 +23934,7 @@
"js-yaml": "^3.13.1",
"json-stable-stringify-without-jsonify": "^1.0.1",
"levn": "^0.4.1",
- "lodash": "^4.17.20",
+ "lodash": "^4.17.21",
"minimatch": "^3.0.4",
"natural-compare": "^1.4.0",
"optionator": "^0.9.1",
@@ -23998,12 +24001,12 @@
}
},
"globals": {
- "version": "12.4.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
- "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+ "version": "13.6.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.6.0.tgz",
+ "integrity": "sha512-YFKCX0SiPg7l5oKYCJ2zZGxcXprVXHcSnVuvzrT3oSENQonVLqM5pf9fN5dLGZGyCjhw8TN8Btwe/jKnZ0pjvQ==",
"dev": true,
"requires": {
- "type-fest": "^0.8.1"
+ "type-fest": "^0.20.2"
}
},
"has-flag": {
@@ -24022,9 +24025,9 @@
}
},
"type-fest": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
"dev": true
}
}
@@ -27851,9 +27854,9 @@
"dev": true
},
"jsdom": {
- "version": "16.5.0",
- "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.5.0.tgz",
- "integrity": "sha512-QxZH0nmDTnTTVI0YDm4RUlaUPl5dcyn62G5TMDNfMmTW+J1u1v9gCR8WR+WZ6UghAa7nKJjDOFaI00eMMWvJFQ==",
+ "version": "16.5.1",
+ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.5.1.tgz",
+ "integrity": "sha512-pF73EOsJgwZekbDHEY5VO/yKXUkab/DuvrQB/ANVizbr6UAHJsDdHXuotZYwkJSGQl1JM+ivXaqY+XBDDL4TiA==",
"dev": true,
"requires": {
"abab": "^2.0.5",
@@ -28929,9 +28932,9 @@
"dev": true
},
"nanoid": {
- "version": "3.1.20",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
- "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw=="
+ "version": "3.1.22",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.22.tgz",
+ "integrity": "sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ=="
},
"nanomatch": {
"version": "1.2.13",
@@ -29034,9 +29037,9 @@
"dev": true
},
"node-notifier": {
- "version": "8.0.1",
- "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.1.tgz",
- "integrity": "sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA==",
+ "version": "8.0.2",
+ "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
+ "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
"dev": true,
"optional": true,
"requires": {
@@ -33072,9 +33075,9 @@
}
},
"uglify-js": {
- "version": "3.13.0",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.0.tgz",
- "integrity": "sha512-TWYSWa9T2pPN4DIJYbU9oAjQx+5qdV5RUDxwARg8fmJZrD/V27Zj0JngW5xg1DFz42G0uDYl2XhzF6alSzD62w==",
+ "version": "3.13.1",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.1.tgz",
+ "integrity": "sha512-EWhx3fHy3M9JbaeTnO+rEqzCe1wtyQClv6q3YWq0voOj4E+bMZBErVS1GAHPDiRGONYq34M1/d8KuQMgvi6Gjw==",
"dev": true,
"optional": true
},
@@ -33321,9 +33324,9 @@
"dev": true
},
"webpack": {
- "version": "5.24.4",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.24.4.tgz",
- "integrity": "sha512-RXOdxF9hFFFhg47BryCgyFrEyyu7Y/75/uiI2DoUiTMqysK+WczVSTppvkR47oZcmI/DPaXCiCiaXBP8QjkNpA==",
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.26.0.tgz",
+ "integrity": "sha512-9kQATUOGQBkqzNKFmFON4KXZDsXnE7xk58tBxca8aCi+6/QhAbmWIvtGqBL66XIsBFpomFH0/0KyCaySo0ta2g==",
"dev": true,
"requires": {
"@types/eslint-scope": "^3.7.0",
@@ -33590,9 +33593,9 @@
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
},
"yaml": {
- "version": "1.10.0",
- "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz",
- "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==",
+ "version": "1.10.2",
+ "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+ "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
"dev": true
},
"yargs": {
@@ -33624,9 +33627,9 @@
}
},
"yargs-parser": {
- "version": "20.2.6",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.6.tgz",
- "integrity": "sha512-AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA==",
+ "version": "20.2.7",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
+ "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
"dev": true
},
"yocto-queue": {
diff --git a/package.json b/package.json
index 1503cd72..cdccbd86 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "css-loader",
- "version": "5.1.2",
+ "version": "5.1.3",
"description": "css loader module for webpack",
"license": "MIT",
"repository": "webpack-contrib/css-loader",
@@ -67,7 +67,7 @@
"del": "^6.0.0",
"del-cli": "^3.0.1",
"es-check": "^5.2.3",
- "eslint": "^7.21.0",
+ "eslint": "^7.22.0",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-import": "^2.22.1",
"file-loader": "^6.2.0",
@@ -90,7 +90,7 @@
"stylus": "^0.54.8",
"stylus-loader": "^4.3.0",
"url-loader": "^4.1.1",
- "webpack": "^5.24.4"
+ "webpack": "^5.26.0"
},
"keywords": [
"webpack",
diff --git a/src/utils.js b/src/utils.js
index 49f2a890..7bc36537 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -68,12 +68,22 @@ function defaultGetLocalIdent(
localName,
options
) {
- const { context, hashPrefix } = options;
- const { resourcePath } = loaderContext;
- const request = normalizePath(path.relative(context, resourcePath));
+ let relativeMatchResource = "";
+
+ // eslint-disable-next-line no-underscore-dangle
+ if (loaderContext._module.matchResource) {
+ relativeMatchResource = `${normalizePath(
+ // eslint-disable-next-line no-underscore-dangle
+ path.relative(options.context, loaderContext._module.matchResource)
+ )}\x00`;
+ }
+
+ const relativeResourcePath = normalizePath(
+ path.relative(options.context, loaderContext.resourcePath)
+ );
// eslint-disable-next-line no-param-reassign
- options.content = `${hashPrefix + request}\x00${localName}`;
+ options.content = `${options.hashPrefix}${relativeMatchResource}${relativeResourcePath}\x00${localName}`;
return interpolateName(loaderContext, localIdentName, options);
}
@@ -126,7 +136,10 @@ const moduleRegExp = /\.module(s)?\.\w+$/i;
const icssRegExp = /\.icss\.\w+$/i;
function getModulesOptions(rawOptions, loaderContext) {
- const { resourcePath } = loaderContext;
+ const resourcePath =
+ // eslint-disable-next-line no-underscore-dangle
+ loaderContext._module.matchResource || loaderContext.resourcePath;
+
let isIcss;
if (typeof rawOptions.modules === "undefined") {
diff --git a/test/__snapshots__/loader.test.js.snap b/test/__snapshots__/loader.test.js.snap
index 8932d2fc..e869ca17 100644
--- a/test/__snapshots__/loader.test.js.snap
+++ b/test/__snapshots__/loader.test.js.snap
@@ -665,66 +665,66 @@ exports[`loader should work with inline module syntax: result 1`] = `
Array [
Array [
"other.modules.css!=!../../src/index.js?[ident]!./index-loader-syntax.modules.css",
- "._1ZJhuRHDA53bY_Z4Qfm2b4 {
+ "._14oM7qkZ6dgC62uK5h4NI0 {
color: red;
}
-.j3CQSVq_DdDvo0Ew74yQi {
+._2NqyYysncZeLetATpl0xfW {
color: white;
}",
"",
],
Array [
- "plain.scss!=!../../src/index.js?[ident]!./index-loader-syntax-sass.css",
- ".baz {
+ "button.modules.css!=!./index-loader-syntax-sass.css",
+ "._8aapa4kQQdSsOoRODcrwe {
width: 5px;
}",
"",
],
Array [
"other.modules.scss!=!../../src/index.js?[ident]!./index-loader-syntax-sass.modules.css",
- "._1fGl5mRxLFCqIet0X3JYrB > ._2pVMnENaxk1YmKug-4EMYF {
+ "._2yVYVQfmDwKLZn9Qj6k_Q5 > ._3rHlnRnPEotX4nTkd82-aE {
color: red;
}",
"",
],
Array [
"other.modules.css!=!../../src/index.js?[ident]!./index-loader-syntax.modules.css",
- "._1ZJhuRHDA53bY_Z4Qfm2b4 {
+ "._14oM7qkZ6dgC62uK5h4NI0 {
color: red;
}
-.j3CQSVq_DdDvo0Ew74yQi {
+._2NqyYysncZeLetATpl0xfW {
color: white;
}
-.B7fdaUjwJ3YVou1v7dYEE {
+._1-Aa1c8UQML46IWY0FjGXT {
from: custom;
}",
"",
],
Array [
"other.modules.css!=!../../src/index.js?[ident]!./index-loader-syntax.modules.css",
- "._1ZJhuRHDA53bY_Z4Qfm2b4 {
+ "._14oM7qkZ6dgC62uK5h4NI0 {
color: red;
}
-.j3CQSVq_DdDvo0Ew74yQi {
+._2NqyYysncZeLetATpl0xfW {
color: white;
}
-.B7fdaUjwJ3YVou1v7dYEE {
+._1-Aa1c8UQML46IWY0FjGXT {
from: custom;
}",
"",
],
Array [
"other.modules.scss!=!../../src/index.js?[ident]!./index-loader-syntax-sass.modules.css",
- "._1fGl5mRxLFCqIet0X3JYrB > ._2pVMnENaxk1YmKug-4EMYF {
+ "._2yVYVQfmDwKLZn9Qj6k_Q5 > ._3rHlnRnPEotX4nTkd82-aE {
color: red;
}
-._1kK_VYa-N303wnLgpvL-7d {
+._2kEhhupr-6tgHnCC_d4yO8 {
from: custom;
}",
"",
@@ -733,6 +733,27 @@ Array [
"./index-loader-syntax.css",
".a {
color: red;
+}",
+ "",
+ ],
+ Array [
+ "button.modules.css!=!./index-loader-syntax-sass.css",
+ "._8aapa4kQQdSsOoRODcrwe {
+ width: 5px;
+}",
+ "",
+ ],
+ Array [
+ "button.module.scss!=!./base64-loader/index.js?[ident]!./simple.js?foo=bar",
+ "._2hfVrRfux-FOrqimHr-fzt {
+ color: red;
+}",
+ "",
+ ],
+ Array [
+ "other.module.scss!=!./base64-loader/index.js?[ident]!./simple.js?foo=baz",
+ "._2jOyhMQwdpQ85V5dDLcfoG {
+ color: red;
}",
"",
],
diff --git a/test/fixtures/base64-loader/index.js b/test/fixtures/base64-loader/index.js
new file mode 100644
index 00000000..495ed248
--- /dev/null
+++ b/test/fixtures/base64-loader/index.js
@@ -0,0 +1,3 @@
+module.exports = function loader(content) {
+ return Buffer.from(this.query.slice(1), 'base64').toString('ascii');
+};
\ No newline at end of file
diff --git a/test/fixtures/index-loader-syntax.js b/test/fixtures/index-loader-syntax.js
index d70a2840..7648acf2 100644
--- a/test/fixtures/index-loader-syntax.js
+++ b/test/fixtures/index-loader-syntax.js
@@ -1,5 +1,9 @@
-import css from './index-loader-syntax.css';
+import one from './index-loader-syntax.css';
+import two from 'button.modules.css!=!./index-loader-syntax-sass.css';
+// Hash should be different
+import three from './button.module.scss!=!./base64-loader?LmZvbyB7IGNvbG9yOiByZWQ7IH0=!./simple.js?foo=bar';
+import four from './other.module.scss!=!./base64-loader?LmZvbyB7IGNvbG9yOiByZWQ7IH0=!./simple.js?foo=baz';
-__export__ = css;
+__export__ = [...one, ...two, ...three, ...four];
-export default css;
\ No newline at end of file
+export default [...one, ...two, ...three, ...four];
\ No newline at end of file
diff --git a/test/sourceMap-option.test.js b/test/sourceMap-option.test.js
index 42c4ddd0..b025810d 100644
--- a/test/sourceMap-option.test.js
+++ b/test/sourceMap-option.test.js
@@ -501,7 +501,7 @@ describe('"sourceMap" option', () => {
expect(chunkName).toBe(
webpack.version[0] === "5"
- ? "main.89840c70616b788038a2.bundle.js"
+ ? "main.a531550ffe767c49e881.bundle.js"
: "main.19efc497c5c37fc5e355.bundle.js"
);
expect(