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.

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): worker import.meta.url should not depends on document in iife mode #12629

Merged
merged 4 commits into from Apr 2, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 13 additions & 1 deletion packages/vite/src/node/plugins/worker.ts
Expand Up @@ -64,6 +64,18 @@ export async function bundleWorkerEntry(
return promise
}

const workerPostPlugin: Plugin = {
name: 'vite:worker-post',
resolveImportMeta(property, { chunkId, format }) {
// document is undefined in the worker, so we need to avoid it in iife
if (property === 'url' && format === 'iife') {
return `new URL('${chunkId}', self.location.href).href`
}

return null
},
}

async function serialBundleWorkerEntry(
config: ResolvedConfig,
id: string,
Expand All @@ -75,7 +87,7 @@ async function serialBundleWorkerEntry(
const bundle = await rollup({
...rollupOptions,
input: cleanUrl(id),
plugins,
plugins: plugins.concat(workerPostPlugin),
sun0day marked this conversation as resolved.
Show resolved Hide resolved
onwarn(warning, warn) {
onRollupWarning(warning, warn, config)
},
Expand Down
9 changes: 7 additions & 2 deletions playground/test-utils.ts
Expand Up @@ -152,14 +152,19 @@ export function readManifest(base = ''): Manifest {
*/
export async function untilUpdated(
poll: () => string | Promise<string>,
expected: string,
expected: string | RegExp,
runInBuild = false,
): Promise<void> {
if (isBuild && !runInBuild) return
const maxTries = process.env.CI ? 200 : 50
for (let tries = 0; tries < maxTries; tries++) {
const actual = (await poll()) ?? ''
if (actual.indexOf(expected) > -1 || tries === maxTries - 1) {
if (
(typeof expected === 'string'
? actual.indexOf(expected) > -1
: actual.match(expected)) ||
tries === maxTries - 1
) {
expect(actual).toMatch(expected)
break
} else {
Expand Down
4 changes: 2 additions & 2 deletions playground/worker/__tests__/iife/iife-worker.spec.ts
Expand Up @@ -85,11 +85,11 @@ describe.runIf(isBuild)('build', () => {
test('module worker', async () => {
await untilUpdated(
() => page.textContent('.worker-import-meta-url'),
'A string',
/A\sstring.*\/iife\/.+\/url-worker\.js\?type=ignore&worker_file/,
)
await untilUpdated(
() => page.textContent('.worker-import-meta-url-resolve'),
'A string',
/A\sstring.*\/iife\/.+\/url-worker\.js\?type=ignore&worker_file/,
)
await untilUpdated(
() => page.textContent('.shared-worker-import-meta-url'),
Expand Down
9 changes: 8 additions & 1 deletion playground/worker/url-worker.js
@@ -1,4 +1,11 @@
self.postMessage('A string' + import.meta.env.BASE_URL + self.location.url)
self.postMessage(
[
'A string',
import.meta.env.BASE_URL,
self.location.url,
import.meta.url,
].join(' '),
)

// for sourcemap
console.log('url-worker.js')