fix: errors in worker handling

packages/playground/worker/__tests__/worker.spec.ts

@@ -55,7 +55,7 @@ test('worker emitted', async () => {
   await untilUpdated(() => page.textContent('.nested-worker'), 'pong')
   await untilUpdated(
     () => page.textContent('.nested-worker-dynamic-import'),
-    '"msg":"pong"'
+    '{"msg":"module","msg1":"module1","msg2":"module2","msg3":"module3"}'
   )
 })
 
@@ -64,7 +64,7 @@ if (isBuild) {
   // assert correct files
   test('inlined code generation', async () => {
     const files = fs.readdirSync(assetsDir)
-    expect(files.length).toBe(11)
+    expect(files.length).toBe(14)
     const index = files.find((f) => f.includes('index'))
     const content = fs.readFileSync(path.resolve(assetsDir, index), 'utf-8')
     const worker = files.find((f) => f.includes('my-worker'))
@@ -85,7 +85,14 @@ if (isBuild) {
   })
 }
 
-test('classic worker is run', async () => {
+test('module worker', async () => {
+  expect(await page.textContent('.shared-worker-import-meta-url')).toMatch(
+    'A string'
+  )
+  expect(await page.textContent('.worker-import-meta-url')).toMatch('A string/')
+})
+
+test('classic worker', async () => {
   expect(await page.textContent('.classic-worker')).toMatch('A classic')
   expect(await page.textContent('.classic-shared-worker')).toMatch('A classic')
 })

packages/playground/worker/classic-worker.js

@@ -3,12 +3,15 @@ function text(el, text) {
   document.querySelector(el).textContent = text
 }
 
-const classicWorker = new Worker(
+let classicWorker = new Worker(
   new URL('./newUrl/classic-worker.js', import.meta.url) /* , */  ,
   // test comment
 
 )
 
+// just test for case: ') ... ,' mean no worker options parmas
+classicWorker = new Worker(new URL('./newUrl/classic-worker.js', import.meta.url))
+
 classicWorker.addEventListener('message', ({ data }) => {
   text('.classic-worker', data)
 })

packages/playground/worker/index.html

@@ -96,10 +96,7 @@
     /* @vite-ignore */ workerOptions
   )
   w.addEventListener('message', (ev) =>
-    text(
-      '.worker-import-meta-url',
-      'worker import.meta.url' + JSON.stringify(ev.data)
-    )
+    text('.worker-import-meta-url', ev.data)
   )
 
   const genWorkerName = () => 'module'
@@ -112,10 +109,7 @@
     }
   )
   w2.port.addEventListener('message', (ev) => {
-    text(
-      '.shared-worker-import-meta-url',
-      'shared-worker import.meta.url' + JSON.stringify(ev.data)
-    )
+    text('.shared-worker-import-meta-url', ev.data)
   })
   w2.port.start()
 

packages/playground/worker/modules/module.js

@@ -0,0 +1 @@
+export const msg = 'module'

packages/playground/worker/modules/module1.js

@@ -0,0 +1 @@
+export const msg1 = 'module1'

packages/playground/worker/modules/module2.js

@@ -0,0 +1,3 @@
+export * from './module'
+export * from './module1'
+export const msg2 = 'module2'

packages/playground/worker/modules/module3.js

@@ -0,0 +1,2 @@
+export * from './module'
+export const msg3 = 'module3'

packages/playground/worker/newUrl/url-worker.js

@@ -1,3 +1,3 @@
-import constant from './module'
-
-self.postMessage(constant)
+import('./module').then((module) => {
+  self.postMessage(module.default + import.meta.env.BASE_URL)
+})

packages/playground/worker/sub-worker.js

@@ -3,11 +3,10 @@ self.onmessage = (event) => {
     self.postMessage('pong')
   }
 }
-const data = import('./workerImport')
-data.then((data) => {
-  const { mode, msg } = data
-  self.postMessage({
-    mode,
-    msg
-  })
-})
+
+Promise.all([import('./modules/module2'), import('./modules/module3')]).then(
+  (data) => {
+    const _data = { ...data[0], ...data[1] }
+    self.postMessage(_data)
+  }
+)

packages/vite/src/node/build.ts

@@ -306,6 +306,7 @@ export function resolveBuildPlugins(config: ResolvedConfig): {
   post: Plugin[]
 } {
   const options = config.build
+
   return {
     pre: [
       watchPackageDataPlugin(config),

packages/vite/src/node/config.ts

@@ -248,6 +248,7 @@ export type ResolvedConfig = Readonly<
     cacheDir: string
     command: 'build' | 'serve'
     mode: string
+    isWorker: boolean
     isProduction: boolean
     env: Record<string, any>
     resolve: ResolveOptions & {
@@ -474,6 +475,7 @@ export async function resolveConfig(
     cacheDir,
     command,
     mode,
+    isWorker: false,
     isProduction,
     plugins: userPlugins,
     server,
@@ -506,7 +508,7 @@ export async function resolveConfig(
   // flat config.worker.plugin
   const [workerPrePlugins, workerNormalPlugins, workerPostPlugins] =
     sortUserPlugins(config.worker?.plugins as Plugin[])
-  const workerResolved = { ...resolved }
+  const workerResolved: ResolvedConfig = { ...resolved, isWorker: true }
   resolved.worker.plugins = await resolvePlugins(
     workerResolved,
     workerPrePlugins,

packages/vite/src/node/plugins/importAnalysisBuild.ts

@@ -86,6 +86,7 @@ function preload(baseModule: () => Promise<{}>, deps?: string[]) {
 export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
   const ssr = !!config.build.ssr
   const insertPreload = !(ssr || !!config.build.lib)
+  const isWorker = config.isWorker
 
   const scriptRel = config.build.polyfillModulePreload
     ? `'modulepreload'`
@@ -120,6 +121,11 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
         return
       }
 
+      if (isWorker) {
+        // preload method use `document` and can't run in the worker
+        return
+      }
+
       await init
 
       let imports: readonly ImportSpecifier[] = []
@@ -132,7 +138,6 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
       if (!imports.length) {
         return null
       }
-
       let s: MagicString | undefined
       const str = () => s || (s = new MagicString(source))
       let needPreloadHelper = false
@@ -238,7 +243,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
     },
 
     generateBundle({ format }, bundle) {
-      if (format !== 'es' || ssr) {
+      if (format !== 'es' || ssr || isWorker) {
         return
       }
 

packages/vite/src/node/plugins/workerImportMetaUrl.ts

@@ -31,8 +31,14 @@ function getWorkerType(
   }
   const endIndex = noCommentsCode.indexOf(')', i)
 
+  // case: ') ... ,' mean no worker options params
+  if (commaIndex > endIndex) {
+    return 'classic'
+  }
+
   // need to find in comment code
   let workerOptsString = code.substring(commaIndex + 1, endIndex)
+
   const hasViteIgnore = /\/\*\s*@vite-ignore\s*\*\//.test(workerOptsString)
   if (hasViteIgnore) {
     return 'ignore'