From 8874b4f0ac542318775fa6f1d6a3515ad1828406 Mon Sep 17 00:00:00 2001 From: Jake Jarvis Date: Thu, 15 Jul 2021 16:46:46 -0400 Subject: [PATCH] fixed webfonts, rebumping css-loader to 6.0.0 https://github.com/webpack-contrib/css-loader/issues/1338 https://webpack.js.org/guides/asset-modules/#resource-assets --- package.json | 2 +- webpack.config.js | 13 ++++--------- yarn.lock | 10 ++++------ 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index adc4dd1e6..640ff1521 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "browser-sync": "^2.27.4", "clean-css": "^5.1.3", "copy-webpack-plugin": "^9.0.1", - "css-loader": "^5.2.7", + "css-loader": "^6.0.0", "css-minimizer-webpack-plugin": "^3.0.2", "del": "^6.0.0", "eslint": "~7.30.0", diff --git a/webpack.config.js b/webpack.config.js index 2f626e322..eca301ccc 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -125,15 +125,10 @@ export default { }, { test: /\.(woff(2)?|ttf|otf|eot)$/, - use: [ - { - loader: "file-loader", - options: { - name: "[name].[ext]", - outputPath: "fonts/", - }, - }, - ], + type: "asset/resource", + generator: { + filename: "fonts/[name][ext]", + } }, ], }, diff --git a/yarn.lock b/yarn.lock index e28d217a0..28daa366b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2991,20 +2991,18 @@ css-declaration-sorter@^6.0.3: dependencies: timsort "^0.3.0" -css-loader@^5.2.7: - version "5.2.7" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae" - integrity sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg== +css-loader@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.0.0.tgz#e3f9131229df43e081876f434dc2f4605be9d5ae" + integrity sha512-xi3iTbHekvk5dWWdqfQKNsEm2g3Vr20uRwHzfXF+pHsaFGMuxTrqR1y8PY+st5G7wqid4/pBSiaqZsO6iaGN5g== dependencies: icss-utils "^5.1.0" - loader-utils "^2.0.0" postcss "^8.2.15" postcss-modules-extract-imports "^3.0.0" postcss-modules-local-by-default "^4.0.0" postcss-modules-scope "^3.0.0" postcss-modules-values "^4.0.0" postcss-value-parser "^4.1.0" - schema-utils "^3.0.0" semver "^7.3.5" css-minimizer-webpack-plugin@^3.0.2: