chore: update magic-string to use "hires: boundary" (#4284)

vitest-dev · Oct 10, 2023 · 76607ea · 76607ea
1 parent ff93a57
commit 76607ea
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 57 deletions.
diff --git a/packages/browser/package.json b/packages/browser/package.json
@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "estree-walker": "^3.0.3",
-    "magic-string": "^0.30.1",
+    "magic-string": "^0.30.4",
     "sirv": "^2.0.3"
   },
   "devDependencies": {

diff --git a/packages/browser/src/node/esmInjector.ts b/packages/browser/src/node/esmInjector.ts
@@ -268,6 +268,6 @@ export function injectVitestModule(code: string, id: string, parse: (code: strin
   return {
     ast,
     code: s.toString(),
-    map: s.generateMap({ hires: true, source: id }),
+    map: s.generateMap({ hires: 'boundary', source: id }),
   }
 }
diff --git a/packages/coverage-v8/package.json b/packages/coverage-v8/package.json
@@ -51,7 +51,7 @@
     "istanbul-lib-report": "^3.0.1",
     "istanbul-lib-source-maps": "^4.0.1",
     "istanbul-reports": "^3.1.5",
-    "magic-string": "^0.30.1",
+    "magic-string": "^0.30.4",
     "picocolors": "^1.0.0",
     "std-env": "^3.3.3",
     "test-exclude": "^6.0.0",

diff --git a/packages/coverage-v8/src/provider.ts b/packages/coverage-v8/src/provider.ts
@@ -261,7 +261,7 @@ function removeViteHelpersFromSourceMaps(source: string | undefined, map: Encode
   sourceWithoutHelpers.replaceAll(VITE_EXPORTS_LINE_PATTERN, '\n')
 
   const mapWithoutHelpers = sourceWithoutHelpers.generateMap({
-    hires: true,
+    hires: 'boundary',
   })
 
   // A merged source map where the first one excludes helpers

diff --git a/packages/vitest/package.json b/packages/vitest/package.json
@@ -157,7 +157,7 @@
     "chai": "^4.3.10",
     "debug": "^4.3.4",
     "local-pkg": "^0.4.3",
-    "magic-string": "^0.30.1",
+    "magic-string": "^0.30.4",
     "pathe": "^1.1.1",
     "picocolors": "^1.0.0",
     "std-env": "^3.3.3",

diff --git a/packages/vitest/src/node/hoistMocks.ts b/packages/vitest/src/node/hoistMocks.ts
@@ -188,6 +188,6 @@ export function hoistMocks(code: string, id: string, parse: (code: string, optio
   return {
     ast,
     code: s.toString(),
-    map: s.generateMap({ hires: true, source: id }),
+    map: s.generateMap({ hires: 'boundary', source: id }),
   }
 }
diff --git a/packages/vitest/src/node/plugins/ssrReplacer.ts b/packages/vitest/src/node/plugins/ssrReplacer.ts
@@ -30,7 +30,7 @@ export function SsrReplacerPlugin(): Plugin {
         return {
           code: s.toString(),
           map: s.generateMap({
-            hires: true,
+            hires: 'boundary',
 
             // Remove possible query parameters, e.g. vue's "?vue&type=script&src=true&lang.ts"
             source: cleanUrl(id),

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