From 72a4c4af9e7240c8d65dbe8ed8a382f160d74eea Mon Sep 17 00:00:00 2001 From: ydcjeff Date: Sat, 24 Sep 2022 09:13:59 +0630 Subject: [PATCH 1/2] add failing test --- playground/worker/worker/main-classic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playground/worker/worker/main-classic.js b/playground/worker/worker/main-classic.js index 1adbd45f08d3aa..39b8cbbe560ece 100644 --- 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)) From 7363a319e8db323e75ef627903607977059da0f1 Mon Sep 17 00:00:00 2001 From: ydcjeff Date: Sat, 24 Sep 2022 09:27:49 +0630 Subject: [PATCH 2/2] fix: replace `},` with `}` --- packages/vite/src/node/plugins/workerImportMetaUrl.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/vite/src/node/plugins/workerImportMetaUrl.ts b/packages/vite/src/node/plugins/workerImportMetaUrl.ts index 8867924cb093c0..b0173b6b03ca6e 100644 --- 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) {