From 069c1bc8331b460275caf492450436f5e127f767 Mon Sep 17 00:00:00 2001
From: Johannes Marbach <johannesm@element.io>
Date: Sat, 11 Nov 2023 16:08:30 +0100
Subject: [PATCH] Replace worker-loader with built-in Webpack 5 support for web
 workers

---
 package.json      | 1 -
 webpack.config.js | 9 ---------
 yarn.lock         | 8 --------
 3 files changed, 18 deletions(-)

diff --git a/package.json b/package.json
index eabfaf76aa..39bb6767c4 100644
--- a/package.json
+++ b/package.json
@@ -186,7 +186,6 @@
         "webpack-bundle-analyzer": "^4.8.0",
         "webpack-cli": "^4.10.0",
         "webpack-dev-server": "^4.15.1",
-        "worker-loader": "^3.0.0",
         "yaml": "^2.3.3"
     },
     "@casualbot/jest-sonar-reporter": {
diff --git a/webpack.config.js b/webpack.config.js
index cc99a29c2f..c307627ded 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -292,15 +292,6 @@ module.exports = (env, argv) => {
                         replace: getThemesImports(),
                     },
                 },
-                {
-                    test: /\.worker\.ts$/,
-                    loader: "worker-loader",
-                    options: {
-                        // Prevent bundling workers since CSP forbids loading them
-                        // from another origin.
-                        filename: "[hash].worker.js",
-                    },
-                },
                 {
                     test: /\.(ts|js)x?$/,
                     include: (f) => {
diff --git a/yarn.lock b/yarn.lock
index 53d194e5f4..816ba8ded5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12692,14 +12692,6 @@ wildcard@^2.0.0:
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
   integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
 
-worker-loader@^3.0.0:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-3.0.8.tgz#5fc5cda4a3d3163d9c274a4e3a811ce8b60dbb37"
-  integrity sha512-XQyQkIFeRVC7f7uRhFdNMe/iJOdO6zxAaR3EWbDp45v3mDhrTi+++oswKNxShUNjPC/1xUp5DB29YKLhFo129g==
-  dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
-
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"