perf: use magic-string hires boundary for sourcemaps (#13971)

vitejs · Jul 29, 2023 · b9a8d65 · b9a8d65
1 parent f8a5ffc
commit b9a8d65
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 37 deletions.
diff --git a/packages/plugin-legacy/package.json b/packages/plugin-legacy/package.json
@@ -46,7 +46,7 @@
     "@babel/preset-env": "^7.22.9",
     "browserslist": "^4.21.9",
     "core-js": "^3.31.1",
-    "magic-string": "^0.30.1",
+    "magic-string": "^0.30.2",
     "regenerator-runtime": "^0.13.11",
     "systemjs": "^6.14.1"
   },

diff --git a/packages/plugin-legacy/src/index.ts b/packages/plugin-legacy/src/index.ts
@@ -397,7 +397,7 @@ function viteLegacyPlugin(options: Options = {}): Plugin[] {
         if (config.build.sourcemap) {
           return {
             code: ms.toString(),
-            map: ms.generateMap({ hires: true }),
+            map: ms.generateMap({ hires: 'boundary' }),
           }
         }
         return {

diff --git a/packages/vite/package.json b/packages/vite/package.json
@@ -86,8 +86,8 @@
     "@rollup/plugin-node-resolve": "15.1.0",
     "@rollup/plugin-typescript": "^11.1.2",
     "@rollup/pluginutils": "^5.0.2",
-    "@types/pnpapi": "^0.0.2",
     "@types/escape-html": "^1.0.2",
+    "@types/pnpapi": "^0.0.2",
     "acorn": "^8.10.0",
     "acorn-walk": "^8.2.0",
     "cac": "^6.7.14",
@@ -110,7 +110,7 @@
     "json-stable-stringify": "^1.0.2",
     "launch-editor-middleware": "^2.6.0",
     "lightningcss": "^1.21.5",
-    "magic-string": "^0.30.1",
+    "magic-string": "^0.30.2",
     "micromatch": "^4.0.5",
     "mlly": "^1.4.0",
     "mrmime": "^1.0.1",
@@ -138,10 +138,10 @@
   "peerDependencies": {
     "@types/node": ">= 14",
     "less": "*",
+    "lightningcss": "^1.21.0",
     "sass": "*",
     "stylus": "*",
     "sugarss": "*",
-    "lightningcss": "^1.21.0",
     "terser": "^5.4.0"
   },
   "peerDependenciesMeta": {

diff --git a/packages/vite/rollup.config.ts b/packages/vite/rollup.config.ts
@@ -260,7 +260,7 @@ function shimDepsPlugin(deps: Record<string, ShimOptions>): Plugin {
 
           return {
             code: magicString.toString(),
-            map: magicString.generateMap({ hires: true }),
+            map: magicString.generateMap({ hires: 'boundary' }),
           }
         }
       }
@@ -308,7 +308,7 @@ const __require = require;
 
       return {
         code: s.toString(),
-        map: s.generateMap({ hires: true }),
+        map: s.generateMap({ hires: 'boundary' }),
       }
     },
   }

diff --git a/packages/vite/src/node/plugins/asset.ts b/packages/vite/src/node/plugins/asset.ts
@@ -189,7 +189,9 @@ export function assetPlugin(config: ResolvedConfig): Plugin {
       if (s) {
         return {
           code: s.toString(),
-          map: config.build.sourcemap ? s.generateMap({ hires: true }) : null,
+          map: config.build.sourcemap
+            ? s.generateMap({ hires: 'boundary' })
+            : null,
         }
       } else {
         return null

diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts
@@ -697,7 +697,7 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
             // resolve public URL from CSS paths, we need to use absolute paths
             return {
               code: s.toString(),
-              map: s.generateMap({ hires: true }),
+              map: s.generateMap({ hires: 'boundary' }),
             }
           } else {
             return { code: s.toString() }
@@ -2130,7 +2130,7 @@ async function getSource(
   ms.appendLeft(0, sep)
   ms.appendLeft(0, additionalData)
 
-  const map = ms.generateMap({ hires: true })
+  const map = ms.generateMap({ hires: 'boundary' })
   map.file = filename
   map.sources = [filename]
 

diff --git a/packages/vite/src/node/plugins/importAnalysisBuild.ts b/packages/vite/src/node/plugins/importAnalysisBuild.ts
@@ -418,7 +418,9 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
       if (s) {
         return {
           code: s.toString(),
-          map: config.build.sourcemap ? s.generateMap({ hires: true }) : null,
+          map: config.build.sourcemap
+            ? s.generateMap({ hires: 'boundary' })
+            : null,
         }
       }
     },
@@ -436,7 +438,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
           }
           return {
             code: s.toString(),
-            map: s.generateMap({ hires: true }),
+            map: s.generateMap({ hires: 'boundary' }),
           }
         } else {
           return code.replace(re, isModern)
@@ -651,7 +653,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
             if (config.build.sourcemap && chunk.map) {
               const nextMap = s.generateMap({
                 source: chunk.fileName,
-                hires: true,
+                hires: 'boundary',
               })
               const map = combineSourcemaps(chunk.fileName, [
                 nextMap as RawSourceMap,

diff --git a/packages/vite/src/node/plugins/worker.ts b/packages/vite/src/node/plugins/worker.ts
@@ -365,7 +365,9 @@ export function webWorkerPlugin(config: ResolvedConfig): Plugin {
         return (
           s && {
             code: s.toString(),
-            map: config.build.sourcemap ? s.generateMap({ hires: true }) : null,
+            map: config.build.sourcemap
+              ? s.generateMap({ hires: 'boundary' })
+              : null,
           }
         )
       }

diff --git a/packages/vite/src/node/server/middlewares/indexHtml.ts b/packages/vite/src/node/server/middlewares/indexHtml.ts
@@ -195,7 +195,7 @@ const devHtmlHook: IndexHtmlTransformHook = async (
           contentNode.sourceCodeLocation!.startOffset,
           contentNode.sourceCodeLocation!.endOffset,
         )
-        .generateMap({ hires: true })
+        .generateMap({ hires: 'boundary' })
       map.sources = [filename]
       map.file = filename
     }

diff --git a/packages/vite/src/node/server/pluginContainer.ts b/packages/vite/src/node/server/pluginContainer.ts
@@ -574,7 +574,7 @@ export async function createPluginContainer(
         return createIfNull
           ? new MagicString(this.originalCode).generateMap({
               includeContent: true,
-              hires: true,
+              hires: 'boundary',
               source: cleanUrl(this.filename),
             })
           : null

diff --git a/packages/vite/src/node/ssr/ssrTransform.ts b/packages/vite/src/node/ssr/ssrTransform.ts
@@ -274,7 +274,7 @@ async function ssrTransformScript(
     },
   })
 
-  let map = s.generateMap({ hires: true })
+  let map = s.generateMap({ hires: 'boundary' })
   if (inMap && inMap.mappings && inMap.sources.length > 0) {
     map = combineSourcemaps(url, [
       {

diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
@@ -1142,7 +1142,7 @@ export function transformStableResult(
     code: s.toString(),
     map:
       config.command === 'build' && config.build.sourcemap
-        ? s.generateMap({ hires: true, source: id })
+        ? s.generateMap({ hires: 'boundary', source: id })
         : null,
   }
 }

diff --git a/playground/css-sourcemap/__tests__/css-sourcemap.spec.ts b/playground/css-sourcemap/__tests__/css-sourcemap.spec.ts
@@ -92,7 +92,7 @@ describe.runIf(isServe)('serve', () => {
     const map = extractSourcemap(css)
     expect(formatSourcemapForSnapshot(map)).toMatchInlineSnapshot(`
       {
-        "mappings": "AAAA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACX,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACb,CAAC;",
+        "mappings": "AAAA,CAAC,QAAQ,CAAC,CAAC;AACX,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC;AACb,CAAC;",
         "sources": [
           "/root/imported.css",
         ],

diff --git a/playground/css-sourcemap/package.json b/playground/css-sourcemap/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "less": "^4.1.3",
-    "magic-string": "^0.30.1",
+    "magic-string": "^0.30.2",
     "sass": "^1.63.6",
     "stylus": "^0.59.0",
     "sugarss": "^4.0.1"

diff --git a/playground/css-sourcemap/vite.config.js b/playground/css-sourcemap/vite.config.js
@@ -21,7 +21,7 @@ export default defineConfig({
           const start = content.indexOf(willBeReplaced)
           ms.overwrite(start, start + willBeReplaced.length, 'purple')
 
-          const map = ms.generateMap({ hires: true })
+          const map = ms.generateMap({ hires: 'boundary' })
           map.file = filename
           map.sources = [filename]
 

diff --git a/playground/js-sourcemap/__tests__/js-sourcemap.spec.ts b/playground/js-sourcemap/__tests__/js-sourcemap.spec.ts
@@ -54,7 +54,7 @@ describe.runIf(isBuild)('build tests', () => {
     const map = findAssetFile(/after-preload-dynamic.*\.js\.map/)
     expect(formatSourcemapForSnapshot(JSON.parse(map))).toMatchInlineSnapshot(`
       {
-        "mappings": "41BAAAA,EAAA,WAAO,2BAAuB,EAAC,sEAE/B,QAAQ,IAAI,uBAAuB",
+        "mappings": "k2BAAA,OAAO,2BAAuB,EAAC,sEAE/B,QAAQ,IAAI,uBAAuB",
         "sources": [
           "../../after-preload-dynamic.js",
         ],

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml