fix(worker): support trailing comma (#10211)

vitejs · Sep 23, 2022 · 0542e7c · 0542e7c
1 parent 9c7a331
commit 0542e7c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/packages/vite/src/node/plugins/workerImportMetaUrl.ts b/packages/vite/src/node/plugins/workerImportMetaUrl.ts
@@ -38,16 +38,20 @@ function getWorkerType(raw: string, clean: string, i: number): WorkerType {
   }
 
   // need to find in comment code
-  const workerOptString = raw.substring(commaIndex + 1, endIndex)
+  let workerOptString = raw.substring(commaIndex + 1, endIndex).trim()
+  // strip trailing comma for parsing
+  if (workerOptString.endsWith(',')) {
+    workerOptString = workerOptString.slice(0, -1)
+  }
 
   const hasViteIgnore = ignoreFlagRE.test(workerOptString)
   if (hasViteIgnore) {
     return 'ignore'
   }
 
   // need to find in no comment code
-  const cleanWorkerOptString = clean.substring(commaIndex + 1, endIndex)
-  if (!cleanWorkerOptString.trim().length) {
+  const cleanWorkerOptString = clean.substring(commaIndex + 1, endIndex).trim()
+  if (!cleanWorkerOptString.length) {
     return 'classic'
   }
 

diff --git a/playground/worker/worker/main-classic.js b/playground/worker/worker/main-classic.js
@@ -16,11 +16,13 @@ classicWorker.addEventListener('message', ({ data }) => {
 })
 classicWorker.postMessage('ping')
 
+// prettier-ignore
+// test trailing comma
 const classicSharedWorker = new SharedWorker(
   new URL('../classic-shared-worker.js', import.meta.url),
   {
     type: 'classic'
-  }
+  },
 )
 classicSharedWorker.port.addEventListener('message', (ev) => {
   text('.classic-shared-worker', JSON.stringify(ev.data))