fix(worker): support comment in worker constructor option (#10226)

vitejs · Sep 24, 2022 · 66c9058 · 66c9058
1 parent 0f7353b
commit 66c9058
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/packages/vite/src/node/plugins/workerImportMetaUrl.ts b/packages/vite/src/node/plugins/workerImportMetaUrl.ts
@@ -39,11 +39,9 @@ function getWorkerType(raw: string, clean: string, i: number): WorkerType {
   }
 
   // need to find in comment code
-  let workerOptString = raw.substring(commaIndex + 1, endIndex).trim()
-  // strip trailing comma for parsing
-  if (workerOptString.endsWith(',')) {
-    workerOptString = workerOptString.slice(0, -1)
-  }
+  const workerOptString = raw
+    .substring(commaIndex + 1, endIndex)
+    .replace(/}[^]*,/g, '}') // strip trailing comma for parsing
 
   const hasViteIgnore = ignoreFlagRE.test(workerOptString)
   if (hasViteIgnore) {

diff --git a/playground/worker/worker/main-classic.js b/playground/worker/worker/main-classic.js
@@ -22,7 +22,7 @@ const classicSharedWorker = new SharedWorker(
   new URL('../classic-shared-worker.js', import.meta.url),
   {
     type: 'classic'
-  },
+  }, // test comment
 )
 classicSharedWorker.port.addEventListener('message', (ev) => {
   text('.classic-shared-worker', JSON.stringify(ev.data))