Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Sep 24, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72a4c4a
add failing test
ydcjeff Sep 24, 2022
7363a31
fix: replace `},` with `}`
ydcjeff Sep 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions packages/vite/src/node/plugins/workerImportMetaUrl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion playground/worker/worker/main-classic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down