fix(worker): force rollup to build workerImportMetaUrl under watch mo…

…de (#14712)
vitejs · Oct 30, 2023 · 8db40ee · 8db40ee
1 parent 7234021
commit 8db40ee
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/packages/vite/src/node/plugins/worker.ts b/packages/vite/src/node/plugins/worker.ts
@@ -218,7 +218,7 @@ export function webWorkerPlugin(config: ResolvedConfig): Plugin {
     },
 
     shouldTransformCachedModule({ id }) {
-      if (isBuild && isWorkerQueryId(id) && config.build.watch) {
+      if (isBuild && config.build.watch && isWorkerQueryId(id)) {
         return true
       }
     },

diff --git a/packages/vite/src/node/plugins/workerImportMetaUrl.ts b/packages/vite/src/node/plugins/workerImportMetaUrl.ts
@@ -96,6 +96,17 @@ function getWorkerType(raw: string, clean: string, i: number): WorkerType {
   return 'classic'
 }
 
+function isIncludeWorkerImportMetaUrl(code: string): boolean {
+  if (
+    (code.includes('new Worker') || code.includes('new SharedWorker')) &&
+    code.includes('new URL') &&
+    code.includes(`import.meta.url`)
+  ) {
+    return true
+  }
+  return false
+}
+
 export function workerImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
   const isBuild = config.command === 'build'
   let workerResolver: ResolveFn
@@ -113,14 +124,15 @@ export function workerImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
   return {
     name: 'vite:worker-import-meta-url',
 
+    shouldTransformCachedModule({ code }) {
+      if (isBuild && config.build.watch && isIncludeWorkerImportMetaUrl(code)) {
+        return true
+      }
+    },
+
     async transform(code, id, options) {
       const ssr = options?.ssr === true
-      if (
-        !options?.ssr &&
-        (code.includes('new Worker') || code.includes('new SharedWorker')) &&
-        code.includes('new URL') &&
-        code.includes(`import.meta.url`)
-      ) {
+      if (!options?.ssr && isIncludeWorkerImportMetaUrl(code)) {
         const query = parseRequest(id)
         let s: MagicString | undefined
         const cleanString = stripLiteral(code)