fix: dev sourcemap (#8269)

vitejs · May 22, 2022 · 505f75e · 505f75e
1 parent a4cc80b
commit 505f75e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/packages/vite/src/node/plugins/dynamicImportVars.ts b/packages/vite/src/node/plugins/dynamicImportVars.ts
@@ -117,7 +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,10 +206,7 @@ export function dynamicImportVarsPlugin(config: ResolvedConfig): Plugin {
         }
         return {
           code: s.toString(),
-          map:
-            !isBuild || config.build.sourcemap
-              ? s.generateMap({ hires: true })
-              : null
+          map: config.build.sourcemap ? s.generateMap({ hires: true }) : null
         }
       }
     }

diff --git a/packages/vite/src/node/plugins/importMetaGlob.ts b/packages/vite/src/node/plugins/importMetaGlob.ts
@@ -75,7 +75,7 @@ export function importGlobPlugin(config: ResolvedConfig): Plugin {
         }
         return {
           code: result.s.toString(),
-          map: result.s.generateMap()
+          map: config.build.sourcemap ? result.s.generateMap() : null
         }
       }
     }

diff --git a/playground/dynamic-import/__tests__/dynamic-import.spec.ts b/playground/dynamic-import/__tests__/dynamic-import.spec.ts
@@ -71,7 +71,7 @@ test('should load dynamic import with vars', async () => {
 test('should load dynamic import with vars alias', async () => {
   await untilUpdated(
     () => page.textContent('.dynamic-import-with-vars-alias'),
-    'hello',
+    'hi',
     true
   )
 })

diff --git a/playground/dynamic-import/alias/hello.js b/playground/dynamic-import/alias/hello.js
@@ -1,3 +1,4 @@
 export function hello() {
   return 'hello'
 }
+console.log('hello.js')
diff --git a/playground/dynamic-import/alias/hi.js b/playground/dynamic-import/alias/hi.js
@@ -1,3 +1,4 @@
 export function hi() {
   return 'hi'
 }
+console.log('hi.js')
diff --git a/playground/dynamic-import/nested/index.js b/playground/dynamic-import/nested/index.js
@@ -79,16 +79,19 @@ function text(el, text) {
   document.querySelector(el).textContent = text
 }
 
-const base = 'hello'
+let base = 'hello'
 
 import(`../alias/${base}.js`).then((mod) => {
   text('.dynamic-import-with-vars', mod.hello())
 })
 
-import(`@/${base}.js`).then((mod) => {
-  text('.dynamic-import-with-vars-alias', mod.hello())
-})
-
 import(`../alias/${base}.js?raw`).then((mod) => {
   text('.dynamic-import-with-vars-raw', JSON.stringify(mod))
 })
+
+base = 'hi'
+import(`@/${base}.js`).then((mod) => {
+  text('.dynamic-import-with-vars-alias', mod.hi())
+})
+
+console.log('index.js')