revert: source-map stripping (#398)

This reverts commit 0e83db7.
privatenumber · Nov 19, 2023 · a95a482 · a95a482
1 parent 5bdf022
commit a95a482
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 63 deletions.
diff --git a/src/cjs/index.ts b/src/cjs/index.ts
@@ -8,7 +8,7 @@ import {
 	createFilesMatcher,
 } from 'get-tsconfig';
 import type { TransformOptions } from 'esbuild';
-import { installSourceMapSupport, shouldStripSourceMap, stripSourceMap } from '../source-map';
+import { installSourceMapSupport } from '../source-map';
 import { transformSync } from '../utils/transform';
 import { transformDynamicImport } from '../utils/transform/transform-dynamic-import';
 import { resolveTsPath } from '../utils/resolve-ts-path';
@@ -69,11 +69,6 @@ const transformer = (
 
 	let code = fs.readFileSync(filePath, 'utf8');
 
-	// Strip source maps if originally disabled
-	if (shouldStripSourceMap) {
-		code = stripSourceMap(code);
-	}
-
 	if (filePath.endsWith('.cjs')) {
 		// Contains native ESM check
 		const transformed = transformDynamicImport(filePath, code);

diff --git a/src/esm/loaders.ts b/src/esm/loaders.ts
@@ -8,7 +8,7 @@ import type { TransformOptions } from 'esbuild';
 import { transform } from '../utils/transform';
 import { transformDynamicImport } from '../utils/transform/transform-dynamic-import';
 import { resolveTsPath } from '../utils/resolve-ts-path';
-import { installSourceMapSupport, shouldStripSourceMap, stripSourceMap } from '../source-map';
+import { installSourceMapSupport } from '../source-map';
 import { importAttributes } from '../utils/node-features';
 import {
 	tsconfigPathsMatcher,
@@ -281,12 +281,7 @@ export const load: LoadHook = async function (
 	}
 
 	const filePath = url.startsWith('file://') ? fileURLToPath(url) : url;
-	let code = loaded.source.toString();
-
-	// Strip source maps if originally disabled
-	if (shouldStripSourceMap) {
-		code = stripSourceMap(code);
-	}
+	const code = loaded.source.toString();
 
 	if (
 		// Support named imports in JSON modules

diff --git a/src/source-map.ts b/src/source-map.ts
@@ -10,26 +10,7 @@ type PortMessage = {
 	map: RawSourceMap;
 };
 
-// If Node.js has source map disabled, we should strip source maps to speed up processing
-export const shouldStripSourceMap = (
-	('sourceMapsEnabled' in process)
-	&& process.sourceMapsEnabled === false
-);
-
-const sourceMapPrefix = '\n//# sourceMappingURL=';
-
-export const stripSourceMap = (code: string) => {
-	const sourceMapIndex = code.indexOf(sourceMapPrefix);
-	if (sourceMapIndex === -1) {
-		return code;
-	}
-
-	const nextNewLine = code.indexOf('\n', sourceMapIndex + sourceMapPrefix.length);
-	const afterSourceMap = nextNewLine === -1 ? '' : code.slice(nextNewLine);
-	return code.slice(0, sourceMapIndex) + afterSourceMap;
-};
-
-const inlineSourceMapPrefix = `${sourceMapPrefix}data:application/json;base64,`;
+const inlineSourceMapPrefix = '\n//# sourceMappingURL=data:application/json;base64,';
 
 export const installSourceMapSupport = (
 	/**

diff --git a/tests/index.ts b/tests/index.ts
@@ -7,7 +7,6 @@ import { nodeVersions } from './utils/node-versions';
 		await runTestSuite(import('./specs/cli'));
 		await runTestSuite(import('./specs/watch'));
 		await runTestSuite(import('./specs/repl'));
-		await runTestSuite(import('./specs/source-map'));
 		await runTestSuite(import('./specs/transform'));
 
 		for (const nodeVersion of nodeVersions) {

diff --git a/tests/specs/smoke.ts b/tests/specs/smoke.ts
@@ -335,11 +335,9 @@ export default testSuite(async ({ describe }, { tsx }: NodeApis) => {
 						'import-from-js.js': outdent`
 						import assert from 'assert';
 						import { expectErrors } from './expect-errors';
-		
-						//# sourceMappingURL=shouldnt affect the file
 
-						// const shouldntAffectFile = \`
-						// //# sourceMappingURL=\`;
+						const shouldntAffectFile = \`
+						//# sourceMappingURL=\`;
 						//# sourceMappingURL=shouldnt affect the file
 
 						// node: prefix
@@ -466,8 +464,8 @@ export default testSuite(async ({ describe }, { tsx }: NodeApis) => {
 						import assert from 'assert';
 						import { expectErrors } from './expect-errors';
 
-						// const shouldntAffectFile = \`
-						// //# sourceMappingURL=\`;
+						const shouldntAffectFile = \`
+						//# sourceMappingURL=\`;
 						//# sourceMappingURL=shouldnt affect the file
 
 						// node: prefix

diff --git a/tests/specs/source-map.ts b/tests/specs/source-map.ts