From 53b0faaafecad959ad59ceca97809406ceeca1ca Mon Sep 17 00:00:00 2001
From: Kartik Raj <karraj@microsoft.com>
Date: Fri, 17 Nov 2023 11:07:35 +0000
Subject: [PATCH] attempt to use worker loader

---
 package-lock.json                        | 51 ++++++++++++++----------
 package.json                             |  1 +
 src/client/common/process/worker/main.ts |  2 +-
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 250ba6866f28..dacf9be4e84f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -106,7 +106,6 @@
                 "typemoq": "^2.1.0",
                 "typescript": "4.5.5",
                 "uuid": "^8.3.2",
-                "vscode-debugadapter-testsupport": "^1.27.0",
                 "webpack": "^5.76.0",
                 "webpack-bundle-analyzer": "^4.5.0",
                 "webpack-cli": "^4.9.2",
@@ -114,6 +113,7 @@
                 "webpack-merge": "^5.8.0",
                 "webpack-node-externals": "^3.0.0",
                 "webpack-require-from": "^1.8.6",
+                "worker-loader": "^3.0.8",
                 "yargs": "^15.3.1"
             },
             "engines": {
@@ -14513,16 +14513,6 @@
             "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
             "dev": true
         },
-        "node_modules/vscode-debugadapter-testsupport": {
-            "version": "1.35.0",
-            "resolved": "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.35.0.tgz",
-            "integrity": "sha512-4emLt6JOk4iKqC2aWNJupOtrK6JwYAZ6KppqvKASN6B1s063VoqI18QhUB1CeoKwNaN1LIG3VPv2xM8HKOjyDA==",
-            "deprecated": "This package has been renamed to @vscode/debugadapter-testsupport, please update to the new name",
-            "dev": true,
-            "dependencies": {
-                "vscode-debugprotocol": "1.35.0"
-            }
-        },
         "node_modules/vscode-debugprotocol": {
             "version": "1.35.0",
             "resolved": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.35.0.tgz",
@@ -14970,6 +14960,26 @@
                 "wipe-node-cache": "^2.1.0"
             }
         },
+        "node_modules/worker-loader": {
+            "version": "3.0.8",
+            "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-3.0.8.tgz",
+            "integrity": "sha512-XQyQkIFeRVC7f7uRhFdNMe/iJOdO6zxAaR3EWbDp45v3mDhrTi+++oswKNxShUNjPC/1xUp5DB29YKLhFo129g==",
+            "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/workerpool": {
             "version": "6.2.0",
             "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz",
@@ -26646,15 +26656,6 @@
             "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
             "dev": true
         },
-        "vscode-debugadapter-testsupport": {
-            "version": "1.35.0",
-            "resolved": "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.35.0.tgz",
-            "integrity": "sha512-4emLt6JOk4iKqC2aWNJupOtrK6JwYAZ6KppqvKASN6B1s063VoqI18QhUB1CeoKwNaN1LIG3VPv2xM8HKOjyDA==",
-            "dev": true,
-            "requires": {
-                "vscode-debugprotocol": "1.35.0"
-            }
-        },
         "vscode-debugprotocol": {
             "version": "1.35.0",
             "resolved": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.35.0.tgz",
@@ -26980,6 +26981,16 @@
                 "wipe-node-cache": "^2.1.0"
             }
         },
+        "worker-loader": {
+            "version": "3.0.8",
+            "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-3.0.8.tgz",
+            "integrity": "sha512-XQyQkIFeRVC7f7uRhFdNMe/iJOdO6zxAaR3EWbDp45v3mDhrTi+++oswKNxShUNjPC/1xUp5DB29YKLhFo129g==",
+            "dev": true,
+            "requires": {
+                "loader-utils": "^2.0.0",
+                "schema-utils": "^3.0.0"
+            }
+        },
         "workerpool": {
             "version": "6.2.0",
             "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz",
diff --git a/package.json b/package.json
index 068f04114cae..f009f198faf0 100644
--- a/package.json
+++ b/package.json
@@ -1659,6 +1659,7 @@
         "typescript": "4.5.5",
         "uuid": "^8.3.2",
         "webpack": "^5.76.0",
+        "worker-loader": "^3.0.8",
         "webpack-bundle-analyzer": "^4.5.0",
         "webpack-cli": "^4.9.2",
         "webpack-fix-default-import-plugin": "^1.0.3",
diff --git a/src/client/common/process/worker/main.ts b/src/client/common/process/worker/main.ts
index f9ab72f1b46e..045fca9f5934 100644
--- a/src/client/common/process/worker/main.ts
+++ b/src/client/common/process/worker/main.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { Worker } from 'worker_threads';
-import { traceError, traceVerbose } from '../../../logging';
+import { traceVerbose, traceError } from '../../../logging/index';
 
 /**
  * Executes a worker file.