feat: upgrade core-utils (#22)

package.json

@@ -33,7 +33,7 @@
 		"prepack": "pnpm build && clean-pkg-json"
 	},
 	"dependencies": {
-		"@esbuild-kit/core-utils": "^2.3.2",
+		"@esbuild-kit/core-utils": "^3.0.0",
 		"get-tsconfig": "^4.2.0"
 	},
 	"devDependencies": {

src/index.ts

@@ -6,7 +6,6 @@ import {
 	installSourceMapSupport,
 	resolveTsPath,
 	transformDynamicImport,
-	applySourceMap,
 	compareNodeVersion,
 } from '@esbuild-kit/core-utils';
 import {
@@ -32,7 +31,7 @@ const tsconfig = (
 const tsconfigRaw = tsconfig?.config;
 const tsconfigPathsMatcher = tsconfig && createPathsMatcher(tsconfig);
 
-const sourcemaps = installSourceMapSupport();
+const applySourceMap = installSourceMapSupport();
 
 const nodeSupportsImport = (
 	// v13.2.0 and higher
@@ -62,9 +61,9 @@ function transformer(
 	let code = fs.readFileSync(filePath, 'utf8');
 
 	if (filePath.endsWith('.cjs') && nodeSupportsImport) {
-		const transformed = transformDynamicImport(code);
+		const transformed = transformDynamicImport(filePath, code);
 		if (transformed) {
-			code = applySourceMap(transformed, filePath, sourcemaps);
+			code = applySourceMap(transformed, filePath);
 		}
 	} else {
 		const transformed = transformSync(
@@ -75,7 +74,7 @@ function transformer(
 			},
 		);
 
-		code = applySourceMap(transformed, filePath, sourcemaps);
+		code = applySourceMap(transformed, filePath);
 	}
 
 	module._compile(code, filePath);

tests/fixtures/lib/cjs-ext-cjs/index.cjs

@@ -35,7 +35,14 @@ test(
 
 test(
 	'sourcemaps',
-	() => new Error().stack.includes(':38:'),
+	() => {
+		const { stack } = new Error();
+		return (
+			stack.includes(__filename + ':39:')
+			// TODO: Investigate why converting slashes is only needed for .cjs
+			|| stack.includes(__filename.toLowerCase().replace(/\\/g, '/') + ':39:')
+		);
+	},
 );
 
 test(

tests/fixtures/lib/cjs-ext-js/index.js

@@ -35,7 +35,13 @@ test(
 
 test(
 	'sourcemaps',
-	() => new Error().stack.includes(':38:'),
+	() => {
+		const { stack } = new Error();
+		return (
+			stack.includes(`${__filename}:39:`)
+			|| stack.includes(`${__filename.toLowerCase()}:39:`)
+		);
+	},
 );
 
 test(

tests/fixtures/lib/esm-ext-js/index.js

@@ -34,7 +34,13 @@ test(
 
 test(
 	'sourcemaps',
-	() => new Error().stack.includes(':37:'),
+	() => {
+		const { stack } = new Error();
+		return (
+			stack.includes(`${__filename}:38:`)
+			|| stack.includes(`${__filename.toLowerCase()}:38:`)
+		);
+	},
 );
 
 test(

tests/fixtures/lib/esm-ext-mjs/index.mjs

@@ -34,7 +34,14 @@ test(
 
 test(
 	'sourcemaps',
-	() => new Error().stack.includes(':37:'),
+	() => {
+		const { stack } = new Error();
+		const filePath = (typeof __filename === 'string') ? __filename : import.meta.url;
+		return (
+			stack.includes(filePath + ':38:')
+			|| stack.includes(filePath.toLowerCase() + ':38:')
+		);
+	},
 );
 
 test(

tests/fixtures/lib/ts-ext-cts/index.cts

@@ -34,7 +34,13 @@ test(
 
 test(
 	'sourcemaps',
-	() => new Error().stack!.includes(':37:'),
+	() => {
+		const { stack } = new Error();
+		return (
+			stack!.includes(`${__filename}:38:`)
+			|| stack!.includes(`${__filename.toLowerCase()}:38:`)
+		);
+	},
 );
 
 test(

tests/fixtures/lib/ts-ext-jsx/index.jsx

@@ -34,7 +34,13 @@ test(
 
 test(
 	'sourcemaps',
-	() => new Error().stack.includes(':37:'),
+	() => {
+		const { stack } = new Error();
+		return (
+			stack.includes(`${__filename}:38:`)
+			|| stack.includes(`${__filename.toLowerCase()}:38:`)
+		);
+	},
 );
 
 test(

tests/fixtures/lib/ts-ext-mts/index.mts

@@ -34,7 +34,13 @@ test(
 
 test(
 	'sourcemaps',
-	() => new Error().stack!.includes(':37:'),
+	() => {
+		const { stack } = new Error();
+		return (
+			stack!.includes(`${__filename}:38:`)
+			|| stack!.includes(`${__filename.toLowerCase()}:38:`)
+		);
+	},
 );
 
 test(

tests/fixtures/lib/ts-ext-ts/index.ts

@@ -1,55 +1,61 @@
 async function test(description: string, testFunction: () => any | Promise<any>) {
 	try {
-	   const result = await testFunction();
-	   if (!result) { throw result; }
-	   console.log(`✔ ${description}`);
-   } catch (error) {
-	   console.log(`✖ ${description}: ${error.toString().split('\n').shift()}`);
-   }
+		const result = await testFunction();
+		if (!result) { throw result; }
+		console.log(`✔ ${description}`);
+	} catch (error) {
+		console.log(`✖ ${description}: ${error.toString().split('\n').shift()}`);
+	}
 }
 
 console.log('loaded ts-ext-ts/index.ts');
 
 test(
-   'has CJS context',
-   () => typeof require !== 'undefined' || typeof module !== 'undefined',
+	'has CJS context',
+	() => typeof require !== 'undefined' || typeof module !== 'undefined',
 );
 
 test(
-   'import.meta.url',
-   () => Boolean(import.meta.url),
+	'import.meta.url',
+	() => Boolean(import.meta.url),
 );
 
 test(
-   'name in error',
-   () => {
-	   let nameInError;
-	   try {
-		   nameInError();
-	   } catch (error) {
-		   return error.message.includes('nameInError');
-	   }
-   },
+	'name in error',
+	() => {
+		let nameInError;
+		try {
+			nameInError();
+		} catch (error) {
+			return error.message.includes('nameInError');
+		}
+	},
 );
 
 test(
-   'sourcemaps',
-   () => new Error().stack!.includes(':37:'),
+	'sourcemaps',
+	() => {
+		const { stack } = new Error();
+		return (
+			stack!.includes(`${__filename}:38:`)
+			|| stack!.includes(`${__filename.toLowerCase()}:38:`)
+		);
+	},
 );
 
 test(
-   'has dynamic import',
-   () => import('fs').then(Boolean),
+	'has dynamic import',
+	() => import('fs').then(Boolean),
 );
 
 test(
-   'resolves optional node prefix',
-   () => import('node:fs').then(Boolean),
+	'resolves optional node prefix',
+	() => import('node:fs').then(Boolean),
 );
 
 test(
-   'resolves required node prefix',
-   () => import('node:test').then(Boolean),
+	'resolves required node prefix',
+	() => import('node:test').then(Boolean),
 );
 
 test(

tests/fixtures/lib/ts-ext-ts/index.tsx.ts

@@ -3,53 +3,59 @@ async function test(description: string, testFunction: () => any | Promise<any>)
 	   const result = await testFunction();
 	   if (!result) { throw result; }
 	   console.log(`✔ ${description}`);
-   } catch (error) {
+	} catch (error) {
 	   console.log(`✖ ${description}: ${error.toString().split('\n').shift()}`);
-   }
+	}
 }
 
 console.log('loaded ts-ext-ts/index.tsx.ts');
 
 test(
-   'has CJS context',
-   () => typeof require !== 'undefined' || typeof module !== 'undefined',
+	'has CJS context',
+	() => typeof require !== 'undefined' || typeof module !== 'undefined',
 );
 
 test(
-   'import.meta.url',
-   () => Boolean(import.meta.url),
+	'import.meta.url',
+	() => Boolean(import.meta.url),
 );
 
 test(
-   'name in error',
-   () => {
+	'name in error',
+	() => {
 	   let nameInError;
 	   try {
 		   nameInError();
 	   } catch (error) {
 		   return error.message.includes('nameInError');
 	   }
-   },
+	},
 );
 
 test(
-   'sourcemaps',
-   () => new Error().stack!.includes(':37:'),
+	'sourcemaps',
+	() => {
+		const { stack } = new Error();
+		return (
+			stack!.includes(`${__filename}:38:`)
+			|| stack!.includes(`${__filename.toLowerCase()}:38:`)
+		);
+	},
 );
 
 test(
-   'has dynamic import',
-   () => import('fs').then(Boolean),
+	'has dynamic import',
+	() => import('fs').then(Boolean),
 );
 
 test(
-   'resolves optional node prefix',
-   () => import('node:fs').then(Boolean),
+	'resolves optional node prefix',
+	() => import('node:fs').then(Boolean),
 );
 
 test(
-   'resolves required node prefix',
-   () => import('node:test').then(Boolean),
+	'resolves required node prefix',
+	() => import('node:test').then(Boolean),
 );
 
 test(

tests/fixtures/lib/ts-ext-tsx/index.tsx

@@ -34,7 +34,13 @@ test(
 
 test(
 	'sourcemaps',
-	() => new Error().stack!.includes(':37:'),
+	() => {
+		const { stack } = new Error();
+		return (
+			stack!.includes(`${__filename}:38:`)
+			|| stack!.includes(`${__filename.toLowerCase()}:38:`)
+		);
+	},
 );
 
 test(

tests/fixtures/tsconfig/src/index.ts

@@ -1 +1 @@
-console.log('Should not run');
+console.log('Should not run');