Browse Source

Fix loading of fonts

No need to use `file-loader` anymore, using the built-in resource loading.
JC Brand 3 năm trước cách đây
mục cha
commit
ad8c250314
3 tập tin đã thay đổi với 5 bổ sung96 xóa
  1. 0 87
      package-lock.json
  2. 0 1
      package.json
  3. 5 8
      webpack/webpack.common.js

+ 0 - 87
package-lock.json

@@ -43,7 +43,6 @@
 				"css-loader": "^6.7.1",
 				"eslint": "^7.32.0",
 				"fast-text-encoding": "^1.0.3",
-				"file-loader": "^6.2.0",
 				"html-webpack-plugin": "^5.3.2",
 				"http-server": "^14.1.0",
 				"imports-loader": "^3.0.0",
@@ -7885,58 +7884,6 @@
 				"node": "^10.12.0 || >=12.0.0"
 			}
 		},
-		"node_modules/file-loader": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-			"integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
-			"dev": true,
-			"dependencies": {
-				"loader-utils": "^2.0.0",
-				"schema-utils": "^3.0.0"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "^4.0.0 || ^5.0.0"
-			}
-		},
-		"node_modules/file-loader/node_modules/loader-utils": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-			"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-			"dev": true,
-			"dependencies": {
-				"big.js": "^5.2.2",
-				"emojis-list": "^3.0.0",
-				"json5": "^2.1.2"
-			},
-			"engines": {
-				"node": ">=8.9.0"
-			}
-		},
-		"node_modules/file-loader/node_modules/schema-utils": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-			"integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-			"dev": true,
-			"dependencies": {
-				"@types/json-schema": "^7.0.8",
-				"ajv": "^6.12.5",
-				"ajv-keywords": "^3.5.2"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
 		"node_modules/filesize": {
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/filesize/-/filesize-7.0.0.tgz",
@@ -23120,40 +23067,6 @@
 				"flat-cache": "^3.0.4"
 			}
 		},
-		"file-loader": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-			"integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
-			"dev": true,
-			"requires": {
-				"loader-utils": "^2.0.0",
-				"schema-utils": "^3.0.0"
-			},
-			"dependencies": {
-				"loader-utils": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-					"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-					"dev": true,
-					"requires": {
-						"big.js": "^5.2.2",
-						"emojis-list": "^3.0.0",
-						"json5": "^2.1.2"
-					}
-				},
-				"schema-utils": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-					"integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-					"dev": true,
-					"requires": {
-						"@types/json-schema": "^7.0.8",
-						"ajv": "^6.12.5",
-						"ajv-keywords": "^3.5.2"
-					}
-				}
-			}
-		},
 		"filesize": {
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/filesize/-/filesize-7.0.0.tgz",

+ 0 - 1
package.json

@@ -77,7 +77,6 @@
     "css-loader": "^6.7.1",
     "eslint": "^7.32.0",
     "fast-text-encoding": "^1.0.3",
-    "file-loader": "^6.2.0",
     "html-webpack-plugin": "^5.3.2",
     "http-server": "^14.1.0",
     "imports-loader": "^3.0.0",

+ 5 - 8
webpack/webpack.common.js

@@ -37,15 +37,12 @@ module.exports = {
             ]
         }, {
             test: /webfonts[\\/].*\.(woff(2)?|ttf|eot|truetype|svg)(\?v=\d+\.\d+\.\d+)?$/,
-            use: [
-            {
-                loader: 'file-loader',
-                options: {
-                    name: '[name].[ext]',
-                    outputPath: 'webfonts/'
-                }
+            type: 'asset/resource',
+            generator: {
+                filename: '[name][ext]',
+                publicPath: 'webfonts/',
+                outputPath: 'webfonts/'
             }
-            ]
         }, {
             test: /\.scss$/,
             use: [