From adb8809d43648ea0a64d6845bb39aa3bd0e005a6 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 17 Aug 2021 14:31:30 +0200
Subject: [PATCH] Fix webpack config

---
 client/package.json                   |  3 +--
 client/webpack/webpack.video-embed.js | 14 ++++++++------
 client/yarn.lock                      | 10 +---------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/client/package.json b/client/package.json
index 6a9529cf6..1a04106f4 100644
--- a/client/package.json
+++ b/client/package.json
@@ -75,7 +75,6 @@
     "css-loader": "^6.2.0",
     "debug": "^4.3.1",
     "dexie": "^3.0.0",
-    "file-loader": "^6.0.0",
     "focus-visible": "^5.0.2",
     "hls.js": "^1.0.7",
     "html-loader": "^2.1.2",
@@ -99,7 +98,7 @@
     "process": "^0.11.10",
     "protractor": "~7.0.0",
     "purify-css": "^1.2.5",
-    "raw-loader": "^4.0.0",
+    "raw-loader": "^4.0.2",
     "rxjs": "^7.3.0",
     "sanitize-html": "^2.1.2",
     "sass": "^1.34.0",
diff --git a/client/webpack/webpack.video-embed.js b/client/webpack/webpack.video-embed.js
index 2ecbd09af..8320d01e7 100644
--- a/client/webpack/webpack.video-embed.js
+++ b/client/webpack/webpack.video-embed.js
@@ -105,21 +105,23 @@ module.exports = function () {
 
         {
           test: /\.html$/,
-          use: 'raw-loader',
           exclude: [
             helpers.root('src/index.html'),
             helpers.root('src/standalone/videos/embed.html'),
             helpers.root('src/standalone/videos/test-embed.html')
-          ]
+          ],
+          type: 'asset/source'
         },
 
         {
-          test: /\.(jpg|png|gif)$/,
-          use: 'url-loader'
+          test: /\.(jpg|png|gif|svg)$/,
+          type: 'asset'
         },
 
-        { test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/, use: 'url-loader?limit=10000&minetype=application/font-woff' },
-        { test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, use: 'file-loader' }
+        {
+          test: /\.(ttf|eot|woff2?)$/,
+          type: 'asset'
+        }
       ]
 
     },
diff --git a/client/yarn.lock b/client/yarn.lock
index 6f087589f..b2120b31b 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -4471,14 +4471,6 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-file-loader@^6.0.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-uri-to-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
@@ -8653,7 +8645,7 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-raw-loader@^4.0.0:
+raw-loader@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6"
   integrity sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==
-- 
2.41.0