update css-loader

3 files changed, 100 insertions, 43 deletions

diff --git a/package-lock.json b/package-lock.json
index 52fc441f..a42e0164 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4011,30 +4011,29 @@
 			}
 		},
 		"css-loader": {
-			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz",
-			"integrity": "sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==",
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-4.3.0.tgz",
+			"integrity": "sha512-rdezjCjScIrsL8BSYszgT4s476IcNKt6yX69t0pHjJVnPUTDpn4WfIpDQTN3wCJvUvfsz/mFjuGOekf3PY3NUg==",
 			"dev": true,
 			"requires": {
-				"camelcase": "^5.3.1",
+				"camelcase": "^6.0.0",
 				"cssesc": "^3.0.0",
 				"icss-utils": "^4.1.1",
-				"loader-utils": "^1.2.3",
-				"normalize-path": "^3.0.0",
+				"loader-utils": "^2.0.0",
 				"postcss": "^7.0.32",
 				"postcss-modules-extract-imports": "^2.0.0",
-				"postcss-modules-local-by-default": "^3.0.2",
+				"postcss-modules-local-by-default": "^3.0.3",
 				"postcss-modules-scope": "^2.2.0",
 				"postcss-modules-values": "^3.0.0",
 				"postcss-value-parser": "^4.1.0",
-				"schema-utils": "^2.7.0",
-				"semver": "^6.3.0"
+				"schema-utils": "^2.7.1",
+				"semver": "^7.3.2"
 			},
 			"dependencies": {
 				"ajv": {
-					"version": "6.12.2",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
-					"integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
+					"version": "6.12.4",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
+					"integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
 					"dev": true,
 					"requires": {
 						"fast-deep-equal": "^3.1.1",
@@ -4043,6 +4042,29 @@
 						"uri-js": "^4.2.2"
 					}
 				},
+				"ajv-keywords": {
+					"version": "3.5.2",
+					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+					"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+					"dev": true
+				},
+				"camelcase": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
+					"integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
+					"dev": true
+				},
+				"loader-utils": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+					"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+					"dev": true,
+					"requires": {
+						"big.js": "^5.2.2",
+						"emojis-list": "^3.0.0",
+						"json5": "^2.1.2"
+					}
+				},
 				"postcss": {
 					"version": "7.0.32",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
@@ -4055,20 +4077,20 @@
 					}
 				},
 				"schema-utils": {
-					"version": "2.7.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-					"integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+					"version": "2.7.1",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+					"integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
 					"dev": true,
 					"requires": {
-						"@types/json-schema": "^7.0.4",
-						"ajv": "^6.12.2",
-						"ajv-keywords": "^3.4.1"
+						"@types/json-schema": "^7.0.5",
+						"ajv": "^6.12.4",
+						"ajv-keywords": "^3.5.2"
 					}
 				},
 				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"version": "7.3.2",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+					"integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
 					"dev": true
 				},
 				"source-map": {
@@ -7971,7 +7993,8 @@
 		"normalize-path": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+			"optional": true
 		},
 		"normalize-range": {
 			"version": "0.1.2",
@@ -8484,15 +8507,43 @@
 			}
 		},
 		"postcss-modules-local-by-default": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz",
-			"integrity": "sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==",
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
+			"integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
 			"dev": true,
 			"requires": {
 				"icss-utils": "^4.1.1",
-				"postcss": "^7.0.16",
+				"postcss": "^7.0.32",
 				"postcss-selector-parser": "^6.0.2",
-				"postcss-value-parser": "^4.0.0"
+				"postcss-value-parser": "^4.1.0"
+			},
+			"dependencies": {
+				"postcss": {
+					"version": "7.0.32",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
+					"integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
+					"dev": true,
+					"requires": {
+						"chalk": "^2.4.2",
+						"source-map": "^0.6.1",
+						"supports-color": "^6.1.0"
+					}
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "6.1.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+					"integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^3.0.0"
+					}
+				}
 			}
 		},
 		"postcss-modules-scope": {
diff --git a/package.json b/package.json
index 0946d7c7..b2f39947 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
 		"babel-eslint": "^10.0.3",
 		"babel-loader": "^8.0.6",
 		"cross-env": "^7.0.0",
-		"css-loader": "^3.6.0",
+		"css-loader": "^4.3.0",
 		"eslint": "^7.8.1",
 		"eslint-config-standard": "^14.1.0",
 		"eslint-loader": "^4.0.2",
diff --git a/webpack.common.js b/webpack.common.js
index 65215a0c..8231a10f 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -22,21 +22,6 @@ module.exports = {
 				},
 			},
 			{
-				test: /\.css$/,
-				use: [
-					'vue-style-loader',
-					'css-loader',
-				],
-			},
-			{
-				test: /\.scss$/,
-				use: [
-					'vue-style-loader',
-					'css-loader',
-					'sass-loader',
-				],
-			},
-			{
 				test: /\.vue$/,
 				loader: 'vue-loader',
 				options: {
@@ -51,6 +36,27 @@ module.exports = {
 				exclude: /node_modules/,
 			},
 			{
+				test: /\.css$/,
+				use: [
+					'vue-style-loader',
+					{
+						loader: 'css-loader',
+						options: { esModule: false },
+					},
+				],
+			},
+			{
+				test: /\.scss$/,
+				use: [
+					'vue-style-loader',
+					{
+						loader: 'css-loader',
+						options: { esModule: false },
+					},
+					'sass-loader',
+				],
+			},
+			{
 				test: /\.(png|jpg|gif|svg)$/,
 				loader: 'url-loader',
 				options: {