fix(worker): worker import.meta.url should not depends on document …

…in iife mode
vitejs · Mar 28, 2023 · 69f048b · 69f048b
1 parent 0f9ad68
commit 69f048b
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/packages/vite/src/node/plugins/worker.ts b/packages/vite/src/node/plugins/worker.ts
@@ -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 iife generate it
+    if (property === 'url' && format === 'iife') {
+      return `new URL('${chunkId}', self.location.href).href`
+    }
+
+    return null
+  },
+}
+
 async function serialBundleWorkerEntry(
   config: ResolvedConfig,
   id: string,
@@ -75,7 +87,7 @@ async function serialBundleWorkerEntry(
   const bundle = await rollup({
     ...rollupOptions,
     input: cleanUrl(id),
-    plugins,
+    plugins: plugins.concat(workerPostPlugin),
     onwarn(warning, warn) {
       onRollupWarning(warning, warn, config)
     },

diff --git a/playground/test-utils.ts b/playground/test-utils.ts
@@ -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 {

diff --git a/playground/worker/__tests__/iife/iife-worker.spec.ts b/playground/worker/__tests__/iife/iife-worker.spec.ts
@@ -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'),

diff --git a/playground/worker/url-worker.js b/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')