Merge pull request #182 from BeAPI/fix/webpack-assets

Fix/webpack assets

Author: firestar300

config/loaders.js

@@ -58,25 +58,14 @@ const SCSSLoaderProd = {
 }
 
 const FontsLoader = {
-  test: /\.(woff2?|woff|eot|ttf|otf|mp3|wav)(\?.*)?$/,
-  use: {
-    loader: 'file-loader',
-    options: {
-      name: '[name].[ext]',
-      outputPath: './fonts/',
-    },
-  },
+  test: /\.(woff|woff2)$/,
+  type: 'asset/resource',
 }
 
 const ImagesLoader = {
   test: /\.(png|jpe?g|gif)$/,
+  type: 'asset/resource',
   use: [
-    {
-      loader: 'file-loader',
-      options: {
-        name: '[path][name].[ext]',
-      },
-    },
     {
       loader: 'image-webpack-loader',
       options: {

config/webpack.common.js

@@ -9,6 +9,7 @@ module.exports = {
     filename: '[name].js',
     path: path.resolve(__dirname, '../dist'),
     publicPath: '',
+    assetModuleFilename: 'assets/[hash][ext][query]',
   },
   module: {
     rules: [loaders.FontsLoader, loaders.ImagesLoader, loaders.JSLoader],

package.json

@@ -19,7 +19,6 @@
     "esbuild-loader": "^2.13.1",
     "eslint": "^7.24.0",
     "eslint-webpack-plugin": "^2.5.4",
-    "file-loader": "^6.2.0",
     "image-webpack-loader": "^7.0.1",
     "lazysizes": "^5.3.2",
     "mini-css-extract-plugin": "^1.5.0",

src/scss/abstract/_variables.scss

@@ -94,7 +94,7 @@ $base-border-radius: 3px;
 // Font Family
 // ----
 $primary-font-family: roboto, sans-serif;
-$secondary-font-family: sofia-pro, sans-serif;
+$secondary-font-family: roboto, sans-serif;
 
 // ----
 // Font Size

yarn.lock

@@ -2570,14 +2570,6 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-file-loader@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
-  integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==
-  dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
-
 file-type@5.2.0, file-type@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"