From 6e73e5571a0552cca01402f2701821c0bcb82f61 Mon Sep 17 00:00:00 2001
From: Milan <mricoul@beapi.fr>
Date: Fri, 10 Sep 2021 16:08:30 +0200
Subject: [PATCH 1/3] feat : remove file-loader from dependencies

---
 package.json | 1 -
 yarn.lock    | 8 --------
 2 files changed, 9 deletions(-)

diff --git a/package.json b/package.json
index 6f883773..426448ee 100644
--- a/package.json
+++ b/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",
diff --git a/yarn.lock b/yarn.lock
index e8171457..82ceb74a 100644
--- a/yarn.lock
+++ b/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"

From 1317cf41c7a082696b6f4f748c178f77872e3073 Mon Sep 17 00:00:00 2001
From: Milan <mricoul@beapi.fr>
Date: Fri, 10 Sep 2021 16:09:06 +0200
Subject: [PATCH 2/3] fix (loaders) : remove file-loader for images and fonts

---
 config/loaders.js        | 17 +++--------------
 config/webpack.common.js |  1 +
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/config/loaders.js b/config/loaders.js
index 26d5b6a0..91b5247f 100644
--- a/config/loaders.js
+++ b/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: {
diff --git a/config/webpack.common.js b/config/webpack.common.js
index 1792258a..a2dcfd6a 100644
--- a/config/webpack.common.js
+++ b/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],

From 76b75a7daf51d250f0cdfa81209224abbfddfc31 Mon Sep 17 00:00:00 2001
From: Paolo <ptesei@beapi.fr>
Date: Fri, 10 Sep 2021 17:33:52 +0200
Subject: [PATCH 3/3] remove sofia

---
 src/scss/abstract/_variables.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scss/abstract/_variables.scss b/src/scss/abstract/_variables.scss
index 4cb5ad64..a360f882 100644
--- a/src/scss/abstract/_variables.scss
+++ b/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