Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 8 additions & 0 deletions packages/playground/worker/__tests__/worker.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,11 @@ if (isBuild) {
expect(content).toMatch(`window.Blob`)
})
}

test('?worker&url import', async () => {
if (isBuild) {
expect(await page.textContent('.worker-url')).toMatch('/assets/my-worker.')
} else {
expect(await page.textContent('.worker-url')).toMatch('/my-worker.ts?worker_file')
}
})
10 changes: 9 additions & 1 deletion packages/playground/worker/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,18 @@
<span class="tick-count">0</span>
</div>

<p>
?worker&url import
<code class="worker-url"></code>
</p>

<script type="module">
import Worker from './my-worker?worker'
import InlineWorker from './my-worker?worker&inline'
import SharedWorker from './my-shared-worker?sharedworker&name=shared'
import TSOutputWorker from './possible-ts-output-worker?worker'
import { mode } from './workerImport'
import WorkerUrl from './my-worker?worker&url'

document.querySelector('.mode-true').textContent = mode

Expand Down Expand Up @@ -67,7 +73,9 @@
inlineWorker.postMessage('ping')
})

text('.worker-url', WorkerUrl)

function text(el, text) {
document.querySelector(el).textContent = text
}
</script>
</script>
4 changes: 4 additions & 0 deletions packages/vite/src/node/plugins/worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ export function webWorkerPlugin(config: ResolvedConfig): Plugin {
url = injectQuery(url, WorkerFileId)
}

if (query.url != null) {
return `export default ${JSON.stringify(url)}`
}

const workerConstructor =
query.sharedworker != null ? 'SharedWorker' : 'Worker'
const workerOptions = { type: 'module' }
Expand Down