From 667b62abe970c4a6ff15151e8b5a852c027cb16b Mon Sep 17 00:00:00 2001
From: yoho <panyoho@gmail.com>
Date: Sat, 26 Mar 2022 17:20:55 +0800
Subject: [PATCH 1/8] fix: import url worker two times

---
 .../src/node/plugins/workerImportMetaUrl.ts   | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/packages/vite/src/node/plugins/workerImportMetaUrl.ts b/packages/vite/src/node/plugins/workerImportMetaUrl.ts
index 233d83d066bcb7..cc7a9eb93d15b1 100644
--- a/packages/vite/src/node/plugins/workerImportMetaUrl.ts
+++ b/packages/vite/src/node/plugins/workerImportMetaUrl.ts
@@ -75,6 +75,8 @@ function getWorkerType(
   return 'classic'
 }
 
+const workerUrlMap = new Map<string, string>()
+
 export function workerImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
   const isBuild = config.command === 'build'
   let server: ViteDevServer
@@ -152,18 +154,23 @@ export function workerImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
           const file = path.resolve(path.dirname(id), rawUrl.slice(1, -1))
           let url: string
           if (isBuild) {
-            const content = await bundleWorkerEntry(this, config, file)
-            const basename = path.parse(cleanUrl(file)).name
-            const contentHash = getAssetHash(content)
-            const fileName = path.posix.join(
-              config.build.assetsDir,
-              `${basename}.${contentHash}.js`
-            )
-            url = `__VITE_ASSET__${this.emitFile({
-              fileName,
-              type: 'asset',
-              source: content
-            })}__`
+            if (workerUrlMap.has(file)) {
+              url = workerUrlMap.get(file)!
+            } else {
+              const content = await bundleWorkerEntry(this, config, file)
+              const basename = path.parse(cleanUrl(file)).name
+              const contentHash = getAssetHash(content)
+              const fileName = path.posix.join(
+                config.build.assetsDir,
+                `${basename}.${contentHash}.js`
+              )
+              url = `__VITE_ASSET__${this.emitFile({
+                fileName,
+                type: 'asset',
+                source: content
+              })}__`
+              workerUrlMap.set(file, url)
+            }
           } else {
             url = await fileToUrl(cleanUrl(file), config, this)
             url = injectQuery(url, WORKER_FILE_ID)

From 3eb9e90d0c1e3ab6cc2d582ae8f77e867a1835a8 Mon Sep 17 00:00:00 2001
From: yoho <panyoho@gmail.com>
Date: Sat, 26 Mar 2022 19:15:23 +0800
Subject: [PATCH 2/8] feat: emit worker to chunk or assets test

---
 .../worker/__tests__/es/es-worker.spec.ts        |  4 ++--
 .../worker/emit-chunk-nested-worker.js           | 16 +++++++++++++++-
 .../playground/worker/emit-chunk-sub-worker.js   | 14 ++++++++------
 packages/playground/worker/module-and-worker.js  |  5 +++++
 .../playground/worker/worker/main-format-es.js   |  4 +++-
 5 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 packages/playground/worker/module-and-worker.js

diff --git a/packages/playground/worker/__tests__/es/es-worker.spec.ts b/packages/playground/worker/__tests__/es/es-worker.spec.ts
index 51497a0f5ebadd..14fe0c289086a9 100644
--- a/packages/playground/worker/__tests__/es/es-worker.spec.ts
+++ b/packages/playground/worker/__tests__/es/es-worker.spec.ts
@@ -60,7 +60,7 @@ if (isBuild) {
   // assert correct files
   test('inlined code generation', async () => {
     const files = fs.readdirSync(assetsDir)
-    expect(files.length).toBe(20)
+    expect(files.length).toBe(22)
     const index = files.find((f) => f.includes('main-module'))
     const content = fs.readFileSync(path.resolve(assetsDir, index), 'utf-8')
     const worker = files.find((f) => f.includes('my-worker'))
@@ -94,7 +94,7 @@ test('classic worker', async () => {
 
 test('emit chunk', async () => {
   expect(await page.textContent('.emti-chunk-worker')).toMatch(
-    '{"msg1":"module1","msg2":"module2","msg3":"module3"}'
+    '[{"type":"module-and-worker","data":"A string"},{"type":"emit-chunk-sub-worker","data":"A string"},{"type":"emit-chunk-sub-worker","data":{"module":"module and worker","msg1":"module1","msg2":"module2","msg3":"module3"}}]'
   )
   expect(await page.textContent('.emti-chunk-dynamic-import-worker')).toMatch(
     '"A string/es/"'
diff --git a/packages/playground/worker/emit-chunk-nested-worker.js b/packages/playground/worker/emit-chunk-nested-worker.js
index dff0f5bc64c5ad..7737815b51e6aa 100644
--- a/packages/playground/worker/emit-chunk-nested-worker.js
+++ b/packages/playground/worker/emit-chunk-nested-worker.js
@@ -3,5 +3,19 @@ import SubWorker from './emit-chunk-sub-worker?worker'
 const subWorker = new SubWorker()
 
 subWorker.onmessage = (event) => {
-  self.postMessage(event.data)
+  self.postMessage({
+    type: 'emit-chunk-sub-worker',
+    data: event.data
+  })
+}
+
+const moduleWorker = new Worker(
+  new URL('./module-and-worker.js', import.meta.url)
+)
+
+moduleWorker.onmessage = (event) => {
+  self.postMessage({
+    type: 'module-and-worker',
+    data: event.data
+  })
 }
diff --git a/packages/playground/worker/emit-chunk-sub-worker.js b/packages/playground/worker/emit-chunk-sub-worker.js
index bd6b1f6e4f7419..5d20becc781dd7 100644
--- a/packages/playground/worker/emit-chunk-sub-worker.js
+++ b/packages/playground/worker/emit-chunk-sub-worker.js
@@ -1,6 +1,8 @@
-Promise.all([import('./modules/module2'), import('./modules/module3')]).then(
-  (data) => {
-    const _data = { ...data[0], ...data[1] }
-    self.postMessage(_data)
-  }
-)
+Promise.all([
+  import('./module-and-worker'),
+  import('./modules/module2'),
+  import('./modules/module3')
+]).then((data) => {
+  const _data = { ...data[0], ...data[1], ...data[2] }
+  self.postMessage(_data)
+})
diff --git a/packages/playground/worker/module-and-worker.js b/packages/playground/worker/module-and-worker.js
new file mode 100644
index 00000000000000..659e556f08e4a6
--- /dev/null
+++ b/packages/playground/worker/module-and-worker.js
@@ -0,0 +1,5 @@
+import constant from './modules/module'
+
+self.postMessage(constant)
+
+export const module = 'module and worker'
diff --git a/packages/playground/worker/worker/main-format-es.js b/packages/playground/worker/worker/main-format-es.js
index aa16636c34c73a..7af3ee3d302762 100644
--- a/packages/playground/worker/worker/main-format-es.js
+++ b/packages/playground/worker/worker/main-format-es.js
@@ -8,8 +8,10 @@ function text(el, text) {
 text('.format-es', 'format es:')
 
 const nestedWorker = new NestedWorker()
+const dataList = []
 nestedWorker.addEventListener('message', (ev) => {
-  text('.emti-chunk-worker', JSON.stringify(ev.data))
+  dataList.push(ev.data)
+  text('.emti-chunk-worker', JSON.stringify(dataList.sort()))
 })
 
 const dynamicImportWorker = new Worker(

From 533aabc64276632eb2647fca761ad82212e58a99 Mon Sep 17 00:00:00 2001
From: yoho <panyoho@gmail.com>
Date: Sat, 26 Mar 2022 21:43:25 +0800
Subject: [PATCH 3/8] fix: rewrite file

---
 .../worker/__tests__/es/es-worker.spec.ts     |  2 +-
 .../worker/emit-chunk-nested-worker.js        | 13 +++--
 packages/playground/worker/index.html         | 10 +++-
 .../worker/worker/main-format-es.js           | 18 ++++++-
 .../playground/worker/worker/main-module.js   |  1 +
 packages/vite/src/node/plugins/asset.ts       |  6 ++-
 packages/vite/src/node/plugins/worker.ts      | 50 +++++++++++++++++--
 .../src/node/plugins/workerImportMetaUrl.ts   | 34 ++++++-------
 8 files changed, 102 insertions(+), 32 deletions(-)

diff --git a/packages/playground/worker/__tests__/es/es-worker.spec.ts b/packages/playground/worker/__tests__/es/es-worker.spec.ts
index 14fe0c289086a9..c7fd0d6c19e4bc 100644
--- a/packages/playground/worker/__tests__/es/es-worker.spec.ts
+++ b/packages/playground/worker/__tests__/es/es-worker.spec.ts
@@ -94,7 +94,7 @@ test('classic worker', async () => {
 
 test('emit chunk', async () => {
   expect(await page.textContent('.emti-chunk-worker')).toMatch(
-    '[{"type":"module-and-worker","data":"A string"},{"type":"emit-chunk-sub-worker","data":"A string"},{"type":"emit-chunk-sub-worker","data":{"module":"module and worker","msg1":"module1","msg2":"module2","msg3":"module3"}}]'
+    '["A string",{"type":"emit-chunk-sub-worker","data":"A string"},{"type":"module-and-worker:worker","data":"A string"},{"type":"module-and-worker:module","data":"module and worker"},{"type":"emit-chunk-sub-worker","data":{"module":"module and worker","msg1":"module1","msg2":"module2","msg3":"module3"}}]'
   )
   expect(await page.textContent('.emti-chunk-dynamic-import-worker')).toMatch(
     '"A string/es/"'
diff --git a/packages/playground/worker/emit-chunk-nested-worker.js b/packages/playground/worker/emit-chunk-nested-worker.js
index 7737815b51e6aa..6cb72b9488cfaf 100644
--- a/packages/playground/worker/emit-chunk-nested-worker.js
+++ b/packages/playground/worker/emit-chunk-nested-worker.js
@@ -1,5 +1,4 @@
 import SubWorker from './emit-chunk-sub-worker?worker'
-
 const subWorker = new SubWorker()
 
 subWorker.onmessage = (event) => {
@@ -10,12 +9,20 @@ subWorker.onmessage = (event) => {
 }
 
 const moduleWorker = new Worker(
-  new URL('./module-and-worker.js', import.meta.url)
+  new URL('./module-and-worker.js', import.meta.url),
+  { type: 'module' }
 )
 
 moduleWorker.onmessage = (event) => {
   self.postMessage({
-    type: 'module-and-worker',
+    type: 'module-and-worker:worker',
     data: event.data
   })
 }
+
+import('./module-and-worker').then((res) => {
+  self.postMessage({
+    type: 'module-and-worker:module',
+    data: res.module
+  })
+})
diff --git a/packages/playground/worker/index.html b/packages/playground/worker/index.html
index 60289ff84d6a06..a99930b59ea2be 100644
--- a/packages/playground/worker/index.html
+++ b/packages/playground/worker/index.html
@@ -57,7 +57,9 @@ <h2 class="format-iife">format iife:</h2>
 <h2 class="format-es"></h2>
 
 <p>
-  worker emit chunk
+  worker emit chunk <br />
+  module and worker:worker in worker file <br />
+  module and worker:module in worker file <br />
   <span class="classname">.emti-chunk-worker</span>
 </p>
 <code class="emti-chunk-worker"></code>
@@ -68,6 +70,12 @@ <h2 class="format-es"></h2>
 </p>
 <code class="emti-chunk-dynamic-import-worker"></code>
 
+<p>
+  module and worker:worker in simple file
+  <span class="classname">.module-and-worker-worker</span>
+</p>
+<code class="module-and-worker-worker"></code>
+
 <style>
   p {
     background: rgba(0, 0, 0, 0.1);
diff --git a/packages/playground/worker/worker/main-format-es.js b/packages/playground/worker/worker/main-format-es.js
index 7af3ee3d302762..801c13469151a3 100644
--- a/packages/playground/worker/worker/main-format-es.js
+++ b/packages/playground/worker/worker/main-format-es.js
@@ -11,7 +11,14 @@ const nestedWorker = new NestedWorker()
 const dataList = []
 nestedWorker.addEventListener('message', (ev) => {
   dataList.push(ev.data)
-  text('.emti-chunk-worker', JSON.stringify(dataList.sort()))
+  text(
+    '.emti-chunk-worker',
+    JSON.stringify(
+      dataList.sort(
+        (a, b) => JSON.stringify(a).length - JSON.stringify(b).length
+      )
+    )
+  )
 })
 
 const dynamicImportWorker = new Worker(
@@ -23,3 +30,12 @@ const dynamicImportWorker = new Worker(
 dynamicImportWorker.addEventListener('message', (ev) => {
   text('.emti-chunk-dynamic-import-worker', JSON.stringify(ev.data))
 })
+
+const moduleWorker = new Worker(
+  new URL('../module-and-worker.js', import.meta.url),
+  { type: 'module' }
+)
+
+moduleWorker.addEventListener('message', (ev) => {
+  text('.module-and-worker-worker', JSON.stringify(ev.data))
+})
diff --git a/packages/playground/worker/worker/main-module.js b/packages/playground/worker/worker/main-module.js
index b66c7299cdf690..417cf1728c4b09 100644
--- a/packages/playground/worker/worker/main-module.js
+++ b/packages/playground/worker/worker/main-module.js
@@ -28,6 +28,7 @@ inlineWorker.addEventListener('message', (e) => {
 })
 
 document.querySelector('.ping-inline').addEventListener('click', () => {
+  console.log('111')
   inlineWorker.postMessage('ping')
 })
 
diff --git a/packages/vite/src/node/plugins/asset.ts b/packages/vite/src/node/plugins/asset.ts
index 633438cf3cb0d4..28bf904b0c90c5 100644
--- a/packages/vite/src/node/plugins/asset.ts
+++ b/packages/vite/src/node/plugins/asset.ts
@@ -10,6 +10,7 @@ import type { OutputOptions, PluginContext } from 'rollup'
 import MagicString from 'magic-string'
 import { createHash } from 'crypto'
 import { normalizePath } from '../utils'
+import { getWorkerAssetFilename } from './worker'
 
 export const assetUrlRE = /__VITE_ASSET__([a-z\d]{8})__(?:\$_(.*?)__)?/g
 
@@ -97,7 +98,10 @@ export function assetPlugin(config: ResolvedConfig): Plugin {
         const [full, hash, postfix = ''] = match
         // some internal plugins may still need to emit chunks (e.g. worker) so
         // fallback to this.getFileName for that.
-        const file = getAssetFilename(hash, config) || this.getFileName(hash)
+        const file =
+          getAssetFilename(hash, config) ||
+          getWorkerAssetFilename(hash) ||
+          this.getFileName(hash)
         chunk.viteMetadata.importedAssets.add(cleanUrl(file))
         const outputFilepath = config.base + file + postfix
         s.overwrite(match.index, match.index + full.length, outputFilepath, {
diff --git a/packages/vite/src/node/plugins/worker.ts b/packages/vite/src/node/plugins/worker.ts
index 70bfd916e21cab..38d41cfd45c450 100644
--- a/packages/vite/src/node/plugins/worker.ts
+++ b/packages/vite/src/node/plugins/worker.ts
@@ -6,8 +6,49 @@ import type Rollup from 'rollup'
 import { ENV_PUBLIC_PATH } from '../constants'
 import path from 'path'
 import { onRollupWarning } from '../build'
+import type { EmittedFile } from 'rollup'
 
 const WorkerFileId = 'worker_file'
+// <id, hash>
+const workerEmittedAssets = new Map<string, string>()
+const workerEmittedChunk = new Map<string, string>()
+// <hash, id>
+const workerEmittedFile = new Map<string, string>()
+
+function emitWorker(
+  ctx: Rollup.TransformPluginContext,
+  asset: EmittedFile,
+  map: Map<string, string>
+): string {
+  const fileName = asset.fileName!
+
+  if (map.has(fileName)) {
+    return map.get(fileName)!
+  }
+  const hash = ctx.emitFile(asset)
+  map.set(fileName, hash)
+  workerEmittedFile.set(hash, fileName)
+  return hash
+}
+
+// catch output filename avoid overwrites the same file.
+export function emitWorkerAssets(
+  ctx: Rollup.TransformPluginContext,
+  asset: EmittedFile
+): string {
+  return emitWorker(ctx, asset, workerEmittedAssets)
+}
+
+export function emitWorkerChunks(
+  ctx: Rollup.TransformPluginContext,
+  asset: EmittedFile
+): string {
+  return emitWorker(ctx, asset, workerEmittedChunk)
+}
+
+export function getWorkerAssetFilename(hash: string) {
+  return workerEmittedFile.get(hash)
+}
 
 export async function bundleWorkerEntry(
   ctx: Rollup.TransformPluginContext,
@@ -37,10 +78,9 @@ export async function bundleWorkerEntry(
     code = outputCode.code
     outputChunks.forEach((outputChunk) => {
       if (outputChunk.type === 'asset') {
-        ctx.emitFile(outputChunk)
-      }
-      if (outputChunk.type === 'chunk') {
-        ctx.emitFile({
+        emitWorkerAssets(ctx, outputChunk)
+      } else if (outputChunk.type === 'chunk') {
+        emitWorkerChunks(ctx, {
           fileName: `${config.build.assetsDir}/${outputChunk.fileName}`,
           source: outputChunk.code,
           type: 'asset'
@@ -109,7 +149,7 @@ export function webWorkerPlugin(config: ResolvedConfig): Plugin {
             config.build.assetsDir,
             `${basename}.${contentHash}.js`
           )
-          url = `__VITE_ASSET__${this.emitFile({
+          url = `__VITE_ASSET__${emitWorkerChunks(this, {
             fileName,
             type: 'asset',
             source: code
diff --git a/packages/vite/src/node/plugins/workerImportMetaUrl.ts b/packages/vite/src/node/plugins/workerImportMetaUrl.ts
index cc7a9eb93d15b1..33104436dd21c7 100644
--- a/packages/vite/src/node/plugins/workerImportMetaUrl.ts
+++ b/packages/vite/src/node/plugins/workerImportMetaUrl.ts
@@ -10,7 +10,7 @@ import {
   singlelineCommentsRE
 } from '../utils'
 import path from 'path'
-import { bundleWorkerEntry } from './worker'
+import { bundleWorkerEntry, emitWorkerChunks } from './worker'
 import { parseRequest } from '../utils'
 import { ENV_ENTRY, ENV_PUBLIC_PATH } from '../constants'
 import MagicString from 'magic-string'
@@ -75,8 +75,6 @@ function getWorkerType(
   return 'classic'
 }
 
-const workerUrlMap = new Map<string, string>()
-
 export function workerImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
   const isBuild = config.command === 'build'
   let server: ViteDevServer
@@ -154,23 +152,19 @@ export function workerImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
           const file = path.resolve(path.dirname(id), rawUrl.slice(1, -1))
           let url: string
           if (isBuild) {
-            if (workerUrlMap.has(file)) {
-              url = workerUrlMap.get(file)!
-            } else {
-              const content = await bundleWorkerEntry(this, config, file)
-              const basename = path.parse(cleanUrl(file)).name
-              const contentHash = getAssetHash(content)
-              const fileName = path.posix.join(
-                config.build.assetsDir,
-                `${basename}.${contentHash}.js`
-              )
-              url = `__VITE_ASSET__${this.emitFile({
-                fileName,
-                type: 'asset',
-                source: content
-              })}__`
-              workerUrlMap.set(file, url)
-            }
+            const content = await bundleWorkerEntry(this, config, file)
+            const basename = path.parse(cleanUrl(file)).name
+            const contentHash = getAssetHash(content)
+            const fileName = path.posix.join(
+              config.build.assetsDir,
+              `${basename}.${contentHash}.js`
+            )
+
+            url = `__VITE_ASSET__${emitWorkerChunks(this, {
+              fileName,
+              type: 'asset',
+              source: content
+            })}__`
           } else {
             url = await fileToUrl(cleanUrl(file), config, this)
             url = injectQuery(url, WORKER_FILE_ID)

From 2f33a23afdb4aac8b71a307fc3b9e978947f16e5 Mon Sep 17 00:00:00 2001
From: yoho <panyoho@gmail.com>
Date: Sun, 27 Mar 2022 14:50:53 +0800
Subject: [PATCH 4/8] perf: avoid worker bundle any times

---
 packages/vite/src/node/plugins/asset.ts       |  6 +-
 packages/vite/src/node/plugins/worker.ts      | 67 ++++++++++++-------
 .../src/node/plugins/workerImportMetaUrl.ts   | 18 +----
 3 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/packages/vite/src/node/plugins/asset.ts b/packages/vite/src/node/plugins/asset.ts
index 28bf904b0c90c5..633438cf3cb0d4 100644
--- a/packages/vite/src/node/plugins/asset.ts
+++ b/packages/vite/src/node/plugins/asset.ts
@@ -10,7 +10,6 @@ import type { OutputOptions, PluginContext } from 'rollup'
 import MagicString from 'magic-string'
 import { createHash } from 'crypto'
 import { normalizePath } from '../utils'
-import { getWorkerAssetFilename } from './worker'
 
 export const assetUrlRE = /__VITE_ASSET__([a-z\d]{8})__(?:\$_(.*?)__)?/g
 
@@ -98,10 +97,7 @@ export function assetPlugin(config: ResolvedConfig): Plugin {
         const [full, hash, postfix = ''] = match
         // some internal plugins may still need to emit chunks (e.g. worker) so
         // fallback to this.getFileName for that.
-        const file =
-          getAssetFilename(hash, config) ||
-          getWorkerAssetFilename(hash) ||
-          this.getFileName(hash)
+        const file = getAssetFilename(hash, config) || this.getFileName(hash)
         chunk.viteMetadata.importedAssets.add(cleanUrl(file))
         const outputFilepath = config.base + file + postfix
         s.overwrite(match.index, match.index + full.length, outputFilepath, {
diff --git a/packages/vite/src/node/plugins/worker.ts b/packages/vite/src/node/plugins/worker.ts
index 38d41cfd45c450..8d83a19de47862 100644
--- a/packages/vite/src/node/plugins/worker.ts
+++ b/packages/vite/src/node/plugins/worker.ts
@@ -9,13 +9,23 @@ import { onRollupWarning } from '../build'
 import type { EmittedFile } from 'rollup'
 
 const WorkerFileId = 'worker_file'
-// <id, hash>
+
+// save worker bundle emitted files avoid overwrites the same file.
+// <chunk_filename, hash>
 const workerEmittedAssets = new Map<string, string>()
 const workerEmittedChunk = new Map<string, string>()
+
+// worker bundle don't deps on any more worker runtime info an id only had an result.
+// save worker bundled file id to avoid repeated execution of bundles
+// <filename, hash>
+const workerBundled = new Map<string, string>()
+
+// nested worker bundle context don't had file what emitted by outside bundle
+// save the hash to id to rewrite truth id.
 // <hash, id>
 const workerEmittedFile = new Map<string, string>()
 
-function emitWorker(
+function emitWorkerFile(
   ctx: Rollup.TransformPluginContext,
   asset: EmittedFile,
   map: Map<string, string>
@@ -31,23 +41,18 @@ function emitWorker(
   return hash
 }
 
-// catch output filename avoid overwrites the same file.
-export function emitWorkerAssets(
+function emitWorkerAssets(
   ctx: Rollup.TransformPluginContext,
   asset: EmittedFile
 ): string {
-  return emitWorker(ctx, asset, workerEmittedAssets)
+  return emitWorkerFile(ctx, asset, workerEmittedAssets)
 }
 
-export function emitWorkerChunks(
+function emitWorkerChunks(
   ctx: Rollup.TransformPluginContext,
   asset: EmittedFile
 ): string {
-  return emitWorker(ctx, asset, workerEmittedChunk)
-}
-
-export function getWorkerAssetFilename(hash: string) {
-  return workerEmittedFile.get(hash)
+  return emitWorkerFile(ctx, asset, workerEmittedChunk)
 }
 
 export async function bundleWorkerEntry(
@@ -93,6 +98,32 @@ export async function bundleWorkerEntry(
   return Buffer.from(code)
 }
 
+export async function workerFileToUrl(
+  ctx: Rollup.TransformPluginContext,
+  config: ResolvedConfig,
+  id: string
+): Promise<string> {
+  let hash = workerBundled.get(id)
+  if (hash) {
+    // rewrite truth id, no need to replace by asset plugin
+    return workerEmittedFile.get(hash)!
+  }
+  const code = await bundleWorkerEntry(ctx, config, id)
+  const basename = path.parse(cleanUrl(id)).name
+  const contentHash = getAssetHash(code)
+  const fileName = path.posix.join(
+    config.build.assetsDir,
+    `${basename}.${contentHash}.js`
+  )
+  hash = emitWorkerChunks(ctx, {
+    fileName,
+    type: 'asset',
+    source: code
+  })
+  workerBundled.set(id, hash)
+  return `__VITE_ASSET__${hash}__`
+}
+
 export function webWorkerPlugin(config: ResolvedConfig): Plugin {
   const isBuild = config.command === 'build'
 
@@ -127,8 +158,8 @@ export function webWorkerPlugin(config: ResolvedConfig): Plugin {
 
       let url: string
       if (isBuild) {
-        const code = await bundleWorkerEntry(this, config, id)
         if (query.inline != null) {
+          const code = await bundleWorkerEntry(this, config, id)
           const { format } = config.worker
           const workerOptions = format === 'es' ? '{type: "module"}' : '{}'
           // inline as blob data url
@@ -143,17 +174,7 @@ export function webWorkerPlugin(config: ResolvedConfig): Plugin {
               }
             }`
         } else {
-          const basename = path.parse(cleanUrl(id)).name
-          const contentHash = getAssetHash(code)
-          const fileName = path.posix.join(
-            config.build.assetsDir,
-            `${basename}.${contentHash}.js`
-          )
-          url = `__VITE_ASSET__${emitWorkerChunks(this, {
-            fileName,
-            type: 'asset',
-            source: code
-          })}__`
+          url = await workerFileToUrl(this, config, id)
         }
       } else {
         url = await fileToUrl(cleanUrl(id), config, this)
diff --git a/packages/vite/src/node/plugins/workerImportMetaUrl.ts b/packages/vite/src/node/plugins/workerImportMetaUrl.ts
index 33104436dd21c7..8829b7c5a8bfd0 100644
--- a/packages/vite/src/node/plugins/workerImportMetaUrl.ts
+++ b/packages/vite/src/node/plugins/workerImportMetaUrl.ts
@@ -1,7 +1,7 @@
 import JSON5 from 'json5'
 import type { ResolvedConfig } from '../config'
 import type { Plugin } from '../plugin'
-import { getAssetHash, fileToUrl } from './asset'
+import { fileToUrl } from './asset'
 import {
   blankReplacer,
   cleanUrl,
@@ -10,7 +10,7 @@ import {
   singlelineCommentsRE
 } from '../utils'
 import path from 'path'
-import { bundleWorkerEntry, emitWorkerChunks } from './worker'
+import { workerFileToUrl } from './worker'
 import { parseRequest } from '../utils'
 import { ENV_ENTRY, ENV_PUBLIC_PATH } from '../constants'
 import MagicString from 'magic-string'
@@ -152,19 +152,7 @@ export function workerImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
           const file = path.resolve(path.dirname(id), rawUrl.slice(1, -1))
           let url: string
           if (isBuild) {
-            const content = await bundleWorkerEntry(this, config, file)
-            const basename = path.parse(cleanUrl(file)).name
-            const contentHash = getAssetHash(content)
-            const fileName = path.posix.join(
-              config.build.assetsDir,
-              `${basename}.${contentHash}.js`
-            )
-
-            url = `__VITE_ASSET__${emitWorkerChunks(this, {
-              fileName,
-              type: 'asset',
-              source: content
-            })}__`
+            url = await workerFileToUrl(this, config, file)
           } else {
             url = await fileToUrl(cleanUrl(file), config, this)
             url = injectQuery(url, WORKER_FILE_ID)

From abb561d6a47bb89cef7bd8a2bdbcaab5b933f7bb Mon Sep 17 00:00:00 2001
From: yoho <panyoho@gmail.com>
Date: Sun, 27 Mar 2022 15:19:43 +0800
Subject: [PATCH 5/8] feat: output url join with baseurl

---
 packages/vite/src/node/plugins/worker.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/vite/src/node/plugins/worker.ts b/packages/vite/src/node/plugins/worker.ts
index 8d83a19de47862..448c59bf7b2d18 100644
--- a/packages/vite/src/node/plugins/worker.ts
+++ b/packages/vite/src/node/plugins/worker.ts
@@ -106,7 +106,7 @@ export async function workerFileToUrl(
   let hash = workerBundled.get(id)
   if (hash) {
     // rewrite truth id, no need to replace by asset plugin
-    return workerEmittedFile.get(hash)!
+    return config.base + workerEmittedFile.get(hash)!
   }
   const code = await bundleWorkerEntry(ctx, config, id)
   const basename = path.parse(cleanUrl(id)).name

From 385738dccf52c1ceb518ea40a9269e9a9d7e74fd Mon Sep 17 00:00:00 2001
From: yoho <panyoho@gmail.com>
Date: Tue, 29 Mar 2022 22:08:32 +0800
Subject: [PATCH 6/8] feat: build watch works correctly

---
 packages/vite/src/node/plugins/worker.ts | 79 ++++++++++++------------
 1 file changed, 38 insertions(+), 41 deletions(-)

diff --git a/packages/vite/src/node/plugins/worker.ts b/packages/vite/src/node/plugins/worker.ts
index 448c59bf7b2d18..2073139502ef1f 100644
--- a/packages/vite/src/node/plugins/worker.ts
+++ b/packages/vite/src/node/plugins/worker.ts
@@ -8,53 +8,40 @@ import path from 'path'
 import { onRollupWarning } from '../build'
 import type { EmittedFile } from 'rollup'
 
-const WorkerFileId = 'worker_file'
-
-// save worker bundle emitted files avoid overwrites the same file.
-// <chunk_filename, hash>
-const workerEmittedAssets = new Map<string, string>()
-const workerEmittedChunk = new Map<string, string>()
-
-// worker bundle don't deps on any more worker runtime info an id only had an result.
-// save worker bundled file id to avoid repeated execution of bundles
-// <filename, hash>
-const workerBundled = new Map<string, string>()
+interface WorkerCache {
+  // save worker bundle emitted files avoid overwrites the same file.
+  // <chunk_filename, hash>
+  assets: Map<string, string>
+  // worker bundle don't deps on any more worker runtime info an id only had an result.
+  // save worker bundled file id to avoid repeated execution of bundles
+  // <filename, hash>
+  bundle: Map<string, string>
+  // nested worker bundle context don't had file what emitted by outside bundle
+  // save the hash to id to rewrite truth id.
+  // <hash, id>
+  emitted: Map<string, string>
+}
 
-// nested worker bundle context don't had file what emitted by outside bundle
-// save the hash to id to rewrite truth id.
-// <hash, id>
-const workerEmittedFile = new Map<string, string>()
+const WorkerFileId = 'worker_file'
+const workerCache = new WeakMap<ResolvedConfig, WorkerCache>()
 
 function emitWorkerFile(
   ctx: Rollup.TransformPluginContext,
-  asset: EmittedFile,
-  map: Map<string, string>
+  config: ResolvedConfig,
+  asset: EmittedFile
 ): string {
   const fileName = asset.fileName!
+  const workerMap = workerCache.get(config)!
 
-  if (map.has(fileName)) {
-    return map.get(fileName)!
+  if (workerMap.assets.has(fileName)) {
+    return workerMap.assets.get(fileName)!
   }
   const hash = ctx.emitFile(asset)
-  map.set(fileName, hash)
-  workerEmittedFile.set(hash, fileName)
+  workerMap.assets.set(fileName, hash)
+  workerMap.emitted.set(hash, fileName)
   return hash
 }
 
-function emitWorkerAssets(
-  ctx: Rollup.TransformPluginContext,
-  asset: EmittedFile
-): string {
-  return emitWorkerFile(ctx, asset, workerEmittedAssets)
-}
-
-function emitWorkerChunks(
-  ctx: Rollup.TransformPluginContext,
-  asset: EmittedFile
-): string {
-  return emitWorkerFile(ctx, asset, workerEmittedChunk)
-}
-
 export async function bundleWorkerEntry(
   ctx: Rollup.TransformPluginContext,
   config: ResolvedConfig,
@@ -83,9 +70,9 @@ export async function bundleWorkerEntry(
     code = outputCode.code
     outputChunks.forEach((outputChunk) => {
       if (outputChunk.type === 'asset') {
-        emitWorkerAssets(ctx, outputChunk)
+        emitWorkerFile(ctx, config, outputChunk)
       } else if (outputChunk.type === 'chunk') {
-        emitWorkerChunks(ctx, {
+        emitWorkerFile(ctx, config, {
           fileName: `${config.build.assetsDir}/${outputChunk.fileName}`,
           source: outputChunk.code,
           type: 'asset'
@@ -103,10 +90,12 @@ export async function workerFileToUrl(
   config: ResolvedConfig,
   id: string
 ): Promise<string> {
-  let hash = workerBundled.get(id)
+  const workerMap = workerCache.get(config)!
+
+  let hash = workerMap.bundle.get(id)
   if (hash) {
     // rewrite truth id, no need to replace by asset plugin
-    return config.base + workerEmittedFile.get(hash)!
+    return config.base + workerMap.emitted.get(hash)!
   }
   const code = await bundleWorkerEntry(ctx, config, id)
   const basename = path.parse(cleanUrl(id)).name
@@ -115,12 +104,12 @@ export async function workerFileToUrl(
     config.build.assetsDir,
     `${basename}.${contentHash}.js`
   )
-  hash = emitWorkerChunks(ctx, {
+  hash = emitWorkerFile(ctx, config, {
     fileName,
     type: 'asset',
     source: code
   })
-  workerBundled.set(id, hash)
+  workerMap.bundle.set(id, hash)
   return `__VITE_ASSET__${hash}__`
 }
 
@@ -130,6 +119,14 @@ export function webWorkerPlugin(config: ResolvedConfig): Plugin {
   return {
     name: 'vite:worker',
 
+    buildStart() {
+      workerCache.set(config, {
+        assets: new Map(),
+        bundle: new Map(),
+        emitted: new Map()
+      })
+    },
+
     load(id) {
       if (isBuild) {
         const parsedQuery = parseRequest(id)

From 6bd37180ead6c83bbe4ef91f406b8aa351515e0d Mon Sep 17 00:00:00 2001
From: yoho <panyoho@gmail.com>
Date: Tue, 29 Mar 2022 23:52:58 +0800
Subject: [PATCH 7/8] fix: import.meta.url in worker and emit worker asset save
 in two map

---
 packages/vite/src/node/plugins/define.ts | 14 +++----
 packages/vite/src/node/plugins/worker.ts | 51 ++++++++++++++++++++----
 2 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/packages/vite/src/node/plugins/define.ts b/packages/vite/src/node/plugins/define.ts
index 024cf32d41f72a..f57957d28b445a 100644
--- a/packages/vite/src/node/plugins/define.ts
+++ b/packages/vite/src/node/plugins/define.ts
@@ -10,7 +10,7 @@ const isNonJsRequest = (request: string): boolean => nonJsRe.test(request)
 
 export function definePlugin(config: ResolvedConfig): Plugin {
   const isBuild = config.command === 'build'
-  const isWorker = config.isWorker
+  // const isWorker = config.isWorker
 
   const processNodeEnv: Record<string, string> = {
     'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || config.mode),
@@ -41,12 +41,12 @@ export function definePlugin(config: ResolvedConfig): Plugin {
     Object.assign(importMetaKeys, {
       'import.meta.env.': `({}).`,
       'import.meta.env': JSON.stringify(config.env),
-      'import.meta.hot': `false`,
-      ...(isWorker
-        ? {
-            'import.meta.url': 'self.location.href'
-          }
-        : {})
+      'import.meta.hot': `false`
+      // ...(isWorker
+      //   ? {
+      //       'import.meta.url': 'self.location.href'
+      //     }
+      //   : {})
     })
   }
 
diff --git a/packages/vite/src/node/plugins/worker.ts b/packages/vite/src/node/plugins/worker.ts
index 2073139502ef1f..1e122d141f4898 100644
--- a/packages/vite/src/node/plugins/worker.ts
+++ b/packages/vite/src/node/plugins/worker.ts
@@ -12,6 +12,7 @@ interface WorkerCache {
   // save worker bundle emitted files avoid overwrites the same file.
   // <chunk_filename, hash>
   assets: Map<string, string>
+  chunks: Map<string, string>
   // worker bundle don't deps on any more worker runtime info an id only had an result.
   // save worker bundled file id to avoid repeated execution of bundles
   // <filename, hash>
@@ -28,20 +29,43 @@ const workerCache = new WeakMap<ResolvedConfig, WorkerCache>()
 function emitWorkerFile(
   ctx: Rollup.TransformPluginContext,
   config: ResolvedConfig,
-  asset: EmittedFile
+  asset: EmittedFile,
+  type: 'assets' | 'chunks'
 ): string {
   const fileName = asset.fileName!
   const workerMap = workerCache.get(config)!
 
-  if (workerMap.assets.has(fileName)) {
-    return workerMap.assets.get(fileName)!
+  if (workerMap[type].has(fileName)) {
+    return workerMap[type].get(fileName)!
   }
   const hash = ctx.emitFile(asset)
-  workerMap.assets.set(fileName, hash)
+  workerMap[type].set(fileName, hash)
   workerMap.emitted.set(hash, fileName)
   return hash
 }
 
+function emitWorkerAssets(
+  ctx: Rollup.TransformPluginContext,
+  config: ResolvedConfig,
+  asset: EmittedFile
+) {
+  const { format } = config.worker
+  return emitWorkerFile(
+    ctx,
+    config,
+    asset,
+    format === 'es' ? 'chunks' : 'assets'
+  )
+}
+
+function emitWorkerChunks(
+  ctx: Rollup.TransformPluginContext,
+  config: ResolvedConfig,
+  asset: EmittedFile
+) {
+  return emitWorkerFile(ctx, config, asset, 'chunks')
+}
+
 export async function bundleWorkerEntry(
   ctx: Rollup.TransformPluginContext,
   config: ResolvedConfig,
@@ -70,10 +94,13 @@ export async function bundleWorkerEntry(
     code = outputCode.code
     outputChunks.forEach((outputChunk) => {
       if (outputChunk.type === 'asset') {
-        emitWorkerFile(ctx, config, outputChunk)
+        emitWorkerAssets(ctx, config, outputChunk)
       } else if (outputChunk.type === 'chunk') {
-        emitWorkerFile(ctx, config, {
-          fileName: `${config.build.assetsDir}/${outputChunk.fileName}`,
+        emitWorkerChunks(ctx, config, {
+          fileName: path.posix.join(
+            config.build.assetsDir,
+            outputChunk.fileName
+          ),
           source: outputChunk.code,
           type: 'asset'
         })
@@ -104,7 +131,7 @@ export async function workerFileToUrl(
     config.build.assetsDir,
     `${basename}.${contentHash}.js`
   )
-  hash = emitWorkerFile(ctx, config, {
+  hash = emitWorkerAssets(ctx, config, {
     fileName,
     type: 'asset',
     source: code
@@ -115,6 +142,7 @@ export async function workerFileToUrl(
 
 export function webWorkerPlugin(config: ResolvedConfig): Plugin {
   const isBuild = config.command === 'build'
+  const isWorker = config.isWorker
 
   return {
     name: 'vite:worker',
@@ -122,6 +150,7 @@ export function webWorkerPlugin(config: ResolvedConfig): Plugin {
     buildStart() {
       workerCache.set(config, {
         assets: new Map(),
+        chunks: new Map(),
         bundle: new Map(),
         emitted: new Map()
       })
@@ -187,6 +216,12 @@ export function webWorkerPlugin(config: ResolvedConfig): Plugin {
         url
       )}, ${JSON.stringify(workerOptions, null, 2)})
       }`
+    },
+
+    renderChunk(code) {
+      if (isWorker && code.includes('import.meta.url')) {
+        return code.replace('import.meta.url', 'self.location.href')
+      }
     }
   }
 }

From 63fbe7140e1bb42249938411f8174f21310aba0b Mon Sep 17 00:00:00 2001
From: yoho <panyoho@gmail.com>
Date: Wed, 30 Mar 2022 00:00:06 +0800
Subject: [PATCH 8/8] chore: clean code

---
 packages/vite/src/node/plugins/define.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/vite/src/node/plugins/define.ts b/packages/vite/src/node/plugins/define.ts
index f57957d28b445a..19ca28b34433a0 100644
--- a/packages/vite/src/node/plugins/define.ts
+++ b/packages/vite/src/node/plugins/define.ts
@@ -10,7 +10,6 @@ const isNonJsRequest = (request: string): boolean => nonJsRe.test(request)
 
 export function definePlugin(config: ResolvedConfig): Plugin {
   const isBuild = config.command === 'build'
-  // const isWorker = config.isWorker
 
   const processNodeEnv: Record<string, string> = {
     'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || config.mode),
@@ -42,11 +41,6 @@ export function definePlugin(config: ResolvedConfig): Plugin {
       'import.meta.env.': `({}).`,
       'import.meta.env': JSON.stringify(config.env),
       'import.meta.hot': `false`
-      // ...(isWorker
-      //   ? {
-      //       'import.meta.url': 'self.location.href'
-      //     }
-      //   : {})
     })
   }