Improve sourcemap generation and performance (#7901)

withastro · Aug 2, 2023 · 00cb28f · 00cb28f
1 parent 543d210
commit 00cb28f
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 27 deletions.
diff --git a/.changeset/wise-glasses-hang.md b/.changeset/wise-glasses-hang.md
@@ -0,0 +1,6 @@
+---
+'@astrojs/image': patch
+'astro': patch
+---
+
+Improve sourcemap generation and performance
diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -150,7 +150,7 @@
     "html-escaper": "^3.0.3",
     "js-yaml": "^4.1.0",
     "kleur": "^4.1.4",
-    "magic-string": "^0.27.0",
+    "magic-string": "^0.30.2",
     "mime": "^3.0.0",
     "network-information-types": "^0.1.1",
     "ora": "^6.3.1",

diff --git a/packages/astro/src/assets/vite-plugin-assets.ts b/packages/astro/src/assets/vite-plugin-assets.ts
@@ -150,7 +150,7 @@ export default function assets({
 				if (s) {
 					return {
 						code: s.toString(),
-						map: resolvedConfig.build.sourcemap ? s.generateMap({ hires: true }) : null,
+						map: resolvedConfig.build.sourcemap ? s.generateMap({ hires: 'boundary' }) : null,
 					};
 				} else {
 					return null;

diff --git a/packages/astro/src/vite-plugin-astro-postprocess/index.ts b/packages/astro/src/vite-plugin-astro-postprocess/index.ts
@@ -56,7 +56,7 @@ export default function astro(): Plugin {
 			if (s) {
 				return {
 					code: s.toString(),
-					map: s.generateMap({ hires: true }),
+					map: s.generateMap({ hires: 'boundary' }),
 				};
 			}
 		},

diff --git a/packages/astro/src/vite-plugin-env/index.ts b/packages/astro/src/vite-plugin-env/index.ts
@@ -141,7 +141,7 @@ export default function envVitePlugin({ settings }: EnvPluginOptions): vite.Plug
 			if (s) {
 				return {
 					code: s.toString(),
-					map: s.generateMap({ hires: true }),
+					map: s.generateMap({ hires: 'boundary' }),
 				};
 			}
 		},

diff --git a/packages/astro/src/vite-plugin-html/transform/index.ts b/packages/astro/src/vite-plugin-html/transform/index.ts
@@ -15,6 +15,6 @@ export async function transform(code: string, id: string) {
 
 	return {
 		code: s.toString(),
-		map: s.generateMap(),
+		map: s.generateMap({ hires: 'boundary' }),
 	};
 }
diff --git a/packages/astro/src/vite-plugin-scripts/page-ssr.ts b/packages/astro/src/vite-plugin-scripts/page-ssr.ts
@@ -35,7 +35,7 @@ export default function astroScriptsPostPlugin({
 
 			return {
 				code: s.toString(),
-				map: s.generateMap({ hires: true }),
+				map: s.generateMap({ hires: 'boundary' }),
 			};
 		},
 	};

diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json
@@ -45,7 +45,7 @@
     "http-cache-semantics": "^4.1.1",
     "image-size": "^1.0.2",
     "kleur": "^4.1.5",
-    "magic-string": "^0.27.0",
+    "magic-string": "^0.30.2",
     "mime": "^3.0.0"
   },
   "devDependencies": {

diff --git a/packages/integrations/image/src/vite-plugin-astro-image.ts b/packages/integrations/image/src/vite-plugin-astro-image.ts
@@ -130,7 +130,7 @@ export function createPlugin(config: AstroConfig, options: Required<IntegrationO
 			if (s) {
 				return {
 					code: s.toString(),
-					map: resolvedConfig.build.sourcemap ? s.generateMap({ hires: true }) : null,
+					map: resolvedConfig.build.sourcemap ? s.generateMap({ hires: 'boundary' }) : null,
 				};
 			} else {
 				return null;

diff --git a/packages/webapi/package.json b/packages/webapi/package.json
@@ -63,7 +63,7 @@
     "@ungap/structured-clone": "^0.3.4",
     "chai": "^4.3.7",
     "event-target-shim": "^6.0.2",
-    "magic-string": "^0.27.0",
+    "magic-string": "^0.30.2",
     "mocha": "^9.2.2",
     "rollup": "^2.79.1",
     "tslib": "^2.5.3",

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