fix: fix sourcemap

hi-ogawa · Nov 29, 2024 · 593358c · 593358c
1 parent 065b0c9
commit 593358c
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 193 deletions.
diff --git a/viteroll/examples/ssr-simple/e2e/basic.test.ts b/viteroll/examples/ssr-simple/e2e/basic.test.ts
diff --git a/viteroll/examples/ssr-simple/package.json b/viteroll/examples/ssr-simple/package.json
diff --git a/viteroll/examples/ssr-simple/playwright.config.ts b/viteroll/examples/ssr-simple/playwright.config.ts
diff --git a/viteroll/examples/ssr-simple/src/app.tsx b/viteroll/examples/ssr-simple/src/app.tsx
diff --git a/viteroll/examples/ssr-simple/src/entry-client.tsx b/viteroll/examples/ssr-simple/src/entry-client.tsx
diff --git a/viteroll/examples/ssr-simple/src/entry-server.tsx b/viteroll/examples/ssr-simple/src/entry-server.tsx
diff --git a/viteroll/examples/ssr-simple/tsconfig.json b/viteroll/examples/ssr-simple/tsconfig.json
diff --git a/viteroll/examples/ssr-simple/vite.config.ts b/viteroll/examples/ssr-simple/vite.config.ts
diff --git a/viteroll/examples/ssr/src/entry-server.tsx b/viteroll/examples/ssr/src/entry-server.tsx
@@ -2,12 +2,13 @@
 import ReactDOMServer from "react-dom/server.browser";
 import type { Connect } from "vite";
 import { App } from "./app";
+import { throwError } from "./error";
 
 const handler: Connect.SimpleHandleFunction = (req, res) => {
 	const url = new URL(req.url ?? "/", "https://vite.dev");
 	console.log(`[SSR] ${req.method} ${url.pathname}`);
 	if (url.pathname === "/crash-ssr") {
-		throw new Error("crash-ssr");
+		throwError();
 	}
 	const ssrHtml = ReactDOMServer.renderToString(<App />);
 	res.setHeader("content-type", "text/html");

diff --git a/viteroll/examples/ssr/src/error.tsx b/viteroll/examples/ssr/src/error.tsx
@@ -0,0 +1,9 @@
+//
+// random new lines
+//
+export function throwError() {
+	//
+	// and more
+	//
+	throw new Error("boom");
+}
diff --git a/viteroll/viteroll.ts b/viteroll/viteroll.ts
@@ -279,7 +279,7 @@ export class RolldownEnvironment extends DevEnvironment {
 			if (this.outputOptions.format === "app") {
 				console.time(`[rolldown:${this.name}:hmr]`);
 				const result = await this.instance.experimental_hmr_rebuild([ctx.file]);
-				this.getRunner().evaluate(result[1].toString());
+				this.getRunner().evaluate(result[1].toString(), result[0]);
 				console.timeEnd(`[rolldown:${this.name}:hmr]`);
 			} else {
 				await this.build();
@@ -301,7 +301,7 @@ export class RolldownEnvironment extends DevEnvironment {
 			const filepath = path.join(this.outDir, output.fileName);
 			this.runner = new RolldownModuleRunner();
 			const code = fs.readFileSync(filepath, "utf-8");
-			this.runner.evaluate(code);
+			this.runner.evaluate(code, filepath);
 		}
 		return this.runner;
 	}
@@ -337,12 +337,11 @@ class RolldownModuleRunner {
 		return mod.exports;
 	}
 
-	evaluate(code: string) {
+	evaluate(code: string, sourceURL: string) {
 		const context = {
 			self: this.context,
 			...this.context,
 		};
-		// TODO: sourcemap not working?
 		// extract sourcemap
 		const sourcemap = code.match(/^\/\/# sourceMappingURL=.*/m)?.[0] ?? "";
 		if (sourcemap) {
@@ -356,23 +355,11 @@ self.__toCommonJS = __toCommonJS;
 self.__export = __export;
 self.__toESM = __toESM;
 }}
-//# sourceMappingSource=rolldown-module-runner
+//# sourceURL=${sourceURL}
 ${sourcemap}
 `;
-		// as new Function
-		// code = `\
-		// ${code}
-		// // TODO: need to re-expose runtime utilities for now
-		// self.__toCommonJS = __toCommonJS;
-		// self.__export = __export;
-		// self.__toESM = __toESM;
-		// //# sourceMappingSource=rolldown-module-runner
-		// ${sourcemap}
-		// `;
-		fs.writeFileSync("dump.js", code);
-		const fn = (0, eval)(code);
-		// const fn = new Function(...Object.keys(context), code);
 		try {
+			const fn = (0, eval)(code);
 			fn(...Object.values(context));
 		} catch (e) {
 			console.error(e);