refactor: remove source-map-support (#405)

privatenumber · Nov 22, 2023 · 7db0747 · 7db0747
1 parent 7a0eb7e
commit 7db0747
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 93 deletions.
diff --git a/package.json b/package.json
@@ -52,8 +52,7 @@
 	},
 	"dependencies": {
 		"esbuild": "~0.18.20",
-		"get-tsconfig": "^4.7.2",
-		"source-map-support": "^0.5.21"
+		"get-tsconfig": "^4.7.2"
 	},
 	"optionalDependencies": {
 		"fsevents": "~2.3.3"
@@ -65,7 +64,6 @@
 		"@types/node": "^20.9.4",
 		"@types/react": "^18.2.38",
 		"@types/semver": "^7.5.6",
-		"@types/source-map-support": "^0.5.10",
 		"cachedir": "^2.4.0",
 		"chokidar": "^3.5.3",
 		"clean-pkg-json": "^1.2.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/cjs/index.ts b/src/cjs/index.ts
@@ -73,7 +73,7 @@ const transformer = (
 		// Contains native ESM check
 		const transformed = transformDynamicImport(filePath, code);
 		if (transformed) {
-			code = applySourceMap(transformed, filePath);
+			code = applySourceMap(transformed);
 		}
 	} else if (
 		transformTs
@@ -89,7 +89,7 @@ const transformer = (
 			},
 		);
 
-		code = applySourceMap(transformed, filePath);
+		code = applySourceMap(transformed);
 	}
 
 	module._compile(code, filePath);

diff --git a/src/esm/loaders.ts b/src/esm/loaders.ts
@@ -1,4 +1,3 @@
-import type { MessagePort } from 'node:worker_threads';
 import path from 'path';
 import { pathToFileURL, fileURLToPath } from 'url';
 import type {
@@ -37,8 +36,6 @@ type resolve = (
 	recursiveCall?: boolean,
 ) => MaybePromise<ResolveFnOutput>;
 
-let mainThreadPort: MessagePort | undefined;
-
 type SendToParent = (data: {
 	type: 'dependency';
 	path: string;
@@ -52,7 +49,6 @@ export const initialize: InitializeHook = async (data) => {
 	}
 
 	const { port } = data;
-	mainThreadPort = port;
 	sendToParent = port.postMessage.bind(port);
 };
 
@@ -61,7 +57,6 @@ export const initialize: InitializeHook = async (data) => {
  * but it shares a closure with the new load hook
  */
 export const globalPreload: GlobalPreloadHook = ({ port }) => {
-	mainThreadPort = port;
 	sendToParent = port.postMessage.bind(port);
 
 	return `
@@ -298,18 +293,14 @@ export const load: LoadHook = async function (
 
 		return {
 			format: 'module',
-			source: applySourceMap(transformed, url, mainThreadPort),
+			source: applySourceMap(transformed),
 		};
 	}
 
 	if (loaded.format === 'module') {
 		const dynamicImportTransformed = transformDynamicImport(filePath, code);
 		if (dynamicImportTransformed) {
-			loaded.source = applySourceMap(
-				dynamicImportTransformed,
-				url,
-				mainThreadPort,
-			);
+			loaded.source = applySourceMap(dynamicImportTransformed);
 		}
 	}
 

diff --git a/src/esm/register.ts b/src/esm/register.ts
@@ -5,7 +5,7 @@ import { installSourceMapSupport } from '../source-map.js';
 export const registerLoader = () => {
 	const { port1, port2 } = new MessageChannel();
 
-	installSourceMapSupport(port1);
+	installSourceMapSupport();
 	if (process.send) {
 		port1.addListener('message', (message) => {
 			if (message.type === 'dependency') {

diff --git a/src/source-map.ts b/src/source-map.ts
@@ -1,22 +1,8 @@
-import type { MessagePort } from 'node:worker_threads';
-import sourceMapSupport, { type UrlAndMap } from 'source-map-support';
-import type { Transformed, SourceMap } from './utils/transform/apply-transformers.js';
-import { isolatedLoader } from './utils/node-features.js';
-
-type PortMessage = {
-	filePath: string;
-	map: SourceMap;
-};
+import type { Transformed } from './utils/transform/apply-transformers.js';
 
 const inlineSourceMapPrefix = '\n//# sourceMappingURL=data:application/json;base64,';
 
-export const installSourceMapSupport = (
-	/**
-	 * To support Node v20 where loaders are executed in its own thread
-	 * https://nodejs.org/docs/latest-v20.x/api/esm.html#globalpreload
-	 */
-	loaderPort?: MessagePort,
-) => {
+export const installSourceMapSupport = () => {
 	const hasNativeSourceMapSupport = (
 		/**
 		 * Check if native source maps are supported by seeing if the API is available
@@ -46,37 +32,5 @@ export const installSourceMapSupport = (
 		);
 	}
 
-	const sourcemaps = new Map<string, SourceMap>();
-
-	sourceMapSupport.install({
-		environment: 'node',
-		retrieveSourceMap(url) {
-			const map = sourcemaps.get(url);
-			return (
-				map
-					? ({ url, map } as unknown as UrlAndMap)
-					: null
-			);
-		},
-	});
-
-	if (isolatedLoader && loaderPort) {
-		loaderPort.addListener(
-			'message',
-			({ filePath, map }: PortMessage) => sourcemaps.set(filePath, map),
-		);
-	}
-
-	return (
-		{ code, map }: Transformed,
-		filePath: string,
-		mainThreadPort?: MessagePort,
-	) => {
-		if (isolatedLoader && mainThreadPort) {
-			mainThreadPort.postMessage({ filePath, map } satisfies PortMessage);
-		} else {
-			sourcemaps.set(filePath, map);
-		}
-		return code;
-	};
+	return ({ code }: Transformed) => code;
 };