fix: sourcemap source point to null

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

@@ -17,6 +17,8 @@ import { preloadHelperId } from './importAnalysisBuild'
  * ```
  */
 export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
+  const isBuild = config.command === 'build'
+
   return {
     name: 'vite:asset-import-meta-url',
     async transform(code, id, options) {
@@ -82,7 +84,10 @@ export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
         if (s) {
           return {
             code: s.toString(),
-            map: config.build.sourcemap ? s.generateMap({ hires: true }) : null
+            map:
+              !isBuild || config.build.sourcemap
+                ? s.generateMap({ hires: true, source: id })
+                : null
           }
         }
       }

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

@@ -117,6 +117,7 @@ export function dynamicImportVarsPlugin(config: ResolvedConfig): Plugin {
   const { include, exclude, warnOnError } =
     config.build.dynamicImportVarsOptions
   const filter = createFilter(include, exclude)
+  const isBuild = config.command === 'build'
 
   return {
     name: 'vite:dynamic-import-vars',
@@ -206,7 +207,10 @@ export function dynamicImportVarsPlugin(config: ResolvedConfig): Plugin {
         }
         return {
           code: s.toString(),
-          map: config.build.sourcemap ? s.generateMap({ hires: true }) : null
+          map:
+            !isBuild || config.build.sourcemap
+              ? s.generateMap({ hires: true, source: importer })
+              : null
         }
       }
     }

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

@@ -111,7 +111,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
   const { root, base } = config
   const clientPublicPath = path.posix.join(base, CLIENT_PUBLIC_PATH)
   let server: ViteDevServer
-
+  const isBuild = config.command === 'build'
   return {
     name: 'vite:import-analysis',
 
@@ -628,7 +628,10 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
       if (s) {
         return {
           code: s.toString(),
-          map: config.build.sourcemap ? s.generateMap({ hires: true }) : null
+          map:
+            !isBuild || config.build.sourcemap
+              ? s.generateMap({ hires: true, source: importer })
+              : null
         }
       } else {
         return source

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

@@ -47,6 +47,7 @@ export function getAffectedGlobModules(file: string, server: ViteDevServer) {
 
 export function importGlobPlugin(config: ResolvedConfig): Plugin {
   let server: ViteDevServer | undefined
+  const isBuild = config.command === 'build'
 
   return {
     name: 'vite:import-glob',
@@ -74,7 +75,10 @@ export function importGlobPlugin(config: ResolvedConfig): Plugin {
         }
         return {
           code: result.s.toString(),
-          map: config.build.sourcemap ? result.s.generateMap() : null
+          map:
+            !isBuild || config.build.sourcemap
+              ? result.s.generateMap({ hires: true, source: id })
+              : null
         }
       }
     }

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

@@ -132,7 +132,10 @@ export function workerImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
         if (s) {
           return {
             code: s.toString(),
-            map: config.build.sourcemap ? s.generateMap({ hires: true }) : null
+            map:
+              !isBuild || config.build.sourcemap
+                ? s.generateMap({ hires: true, source: id })
+                : null
           }
         }
 

playground/dynamic-import/vite.config.js

@@ -26,5 +26,8 @@ module.exports = vite.defineConfig({
     alias: {
       '@': path.resolve(__dirname, 'alias')
     }
+  },
+  build: {
+    sourcemap: true
   }
 })

playground/worker/__tests__/sourcemap/__snapshots__/sourcemap-worker.spec.ts.snap

@@ -0,0 +1,14 @@
+// Vitest Snapshot v1
+
+exports[`serve:worker-sourcemap > nested worker 1`] = `
+{
+  "mappings": "AAAA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,uCAAsB,CAAC;AAClD;AACA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AACH,CAAC;AACD;AACA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;",
+  "sources": [
+    "/root/possible-ts-output-worker.mjs?worker_file",
+  ],
+  "sourcesContent": [
+    null,
+  ],
+  "version": 3,
+}
+`;

playground/worker/__tests__/sourcemap/sourcemap-worker.spec.ts

@@ -1,6 +1,14 @@
+/* eslint-disable node/no-unsupported-features/node-builtins */
 import fs from 'fs'
 import path from 'path'
-import { isBuild, testDir } from '~utils'
+import {
+  extractSourcemap,
+  formatSourcemapForSnapshot,
+  isBuild,
+  isServe,
+  page,
+  testDir
+} from '~utils'
 
 describe.runIf(isBuild)('build', () => {
   // assert correct files
@@ -113,6 +121,16 @@ describe.runIf(isBuild)('build', () => {
   })
 })
 
+describe.runIf(isServe)('serve:worker-sourcemap', () => {
+  test('nested worker', async () => {
+    const res = await page.request.get(
+      new URL('./possible-ts-output-worker.mjs?worker_file', page.url()).href
+    )
+    const map = extractSourcemap(await res.text())
+    expect(formatSourcemapForSnapshot(map)).toMatchSnapshot()
+  })
+})
+
 function getSourceMapUrl(code: string): string {
   const regex = /\/\/[#@]\s(?:source(?:Mapping)?URL)=\s*(\S+)/g
   const results = regex.exec(code)

playground/worker/worker-nested-worker.js

@@ -1,3 +1,4 @@
+import ImportMetaGlobEagerWorker from './importMetaGlobEager.worker?worker'
 import SubWorker from './sub-worker?worker'
 
 const subWorker = new SubWorker()
@@ -27,5 +28,16 @@ classicWorker.addEventListener('message', (ev) => {
   })
 })
 
+const importMetaGlobEagerWorker = new ImportMetaGlobEagerWorker()
+
+importMetaGlobEagerWorker.postMessage('1')
+
+importMetaGlobEagerWorker.addEventListener('message', (ev) => {
+  self.postMessage({
+    type: 'importMetaGlobEager',
+    data: ev.data
+  })
+})
+
 // for sourcemap
 console.log('worker-nested-worker.js')

playground/worker/worker/main-module.js

@@ -3,7 +3,6 @@ import InlineWorker from '../my-worker?worker&inline'
 import mySharedWorker from '../my-shared-worker?sharedworker&name=shared'
 import TSOutputWorker from '../possible-ts-output-worker?worker'
 import NestedWorker from '../worker-nested-worker?worker'
-import ImportMetaGlobEagerWorker from '../importMetaGlobEager.worker?worker'
 import { mode } from '../modules/workerImport'
 
 function text(el, text) {
@@ -63,6 +62,8 @@ nestedWorker.addEventListener('message', (ev) => {
       text('.nested-worker-module', JSON.stringify(ev.data))
     } else if (data.type === 'constructor') {
       text('.nested-worker-constructor', JSON.stringify(ev.data))
+    } else if (data.type === 'importMetaGlobEager') {
+      text('.importMetaGlobEager-worker', JSON.stringify(ev.data))
     }
   }
 })
@@ -91,11 +92,3 @@ w2.port.addEventListener('message', (ev) => {
   text('.shared-worker-import-meta-url', JSON.stringify(ev.data))
 })
 w2.port.start()
-
-const importMetaGlobEagerWorker = new ImportMetaGlobEagerWorker()
-
-importMetaGlobEagerWorker.postMessage('1')
-
-importMetaGlobEagerWorker.addEventListener('message', (e) => {
-  text('.importMetaGlobEager-worker', JSON.stringify(e.data))
-})