fix: errors in worker handling

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

@@ -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(12)
     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'))

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/newUrl/url-worker.js

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

packages/vite/src/node/build.ts

@@ -306,6 +306,7 @@ export function resolveBuildPlugins(config: ResolvedConfig): {
   post: Plugin[]
 } {
   const options = config.build
+  const isWorker = config.isWorker
   return {
     pre: [
       watchPackageDataPlugin(config),
@@ -319,14 +320,14 @@ export function resolveBuildPlugins(config: ResolvedConfig): {
         : [])
     ],
     post: [
-      buildImportAnalysisPlugin(config),
+      !isWorker && buildImportAnalysisPlugin(config),
       buildEsbuildPlugin(config),
       ...(options.minify ? [terserPlugin(config)] : []),
       ...(options.manifest ? [manifestPlugin(config)] : []),
       ...(options.ssrManifest ? [ssrManifestPlugin(config)] : []),
       buildReporterPlugin(config),
       loadFallbackPlugin()
-    ]
+    ].filter(Boolean) as Plugin[]
   }
 }
 

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/index.ts

@@ -26,6 +26,7 @@ export async function resolvePlugins(
   postPlugins: Plugin[]
 ): Promise<Plugin[]> {
   const isBuild = config.command === 'build'
+  const isWorker = config.isWorker
 
   const buildPlugins = isBuild
     ? (await import('../build')).resolveBuildPlugins(config)
@@ -73,6 +74,9 @@ export async function resolvePlugins(
     // internal server-only plugins are always applied after everything else
     ...(isBuild
       ? []
-      : [clientInjectionsPlugin(config), importAnalysisPlugin(config)])
+      : [
+          clientInjectionsPlugin(config),
+          !isWorker && importAnalysisPlugin(config)
+        ])
   ].filter(Boolean) as Plugin[]
 }

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

@@ -31,8 +31,14 @@ function getWorkerType(
   }
   const endIndex = noCommentsCode.indexOf(')', i)
 
+  // case: ') ... ,' mean no worker options parmas
+  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'