Skip to content
This repository has been archived by the owner on Oct 18, 2023. It is now read-only.

Commit

Permalink
fix: handle extension-less files (#12)
Browse files Browse the repository at this point in the history
  • Loading branch information
privatenumber committed May 21, 2022
1 parent 59e63b1 commit 3696ed5
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 16 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"test": "node --loader @esbuild-kit/esm-loader tests"
},
"dependencies": {
"@esbuild-kit/core-utils": "^1.1.1",
"@esbuild-kit/core-utils": "^1.1.2",
"es-module-lexer": "^0.10.5",
"get-tsconfig": "^3.0.1"
},
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/loaders-deprecated.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const _getFormat: getFormat = async function (
return { format: 'module' };
}

if (tsExtensionsPattern.test(url)) {
if (url.startsWith('file:')) {
const format = getFormatFromExtension(url) ?? await getPackageType(url);
return { format };
}
Expand Down Expand Up @@ -89,7 +89,7 @@ const _transformSource: transformSource = async function (
}

const result = await defaultTransformSource(source, context, defaultTransformSource);
const dynamicImportTransformed = transformDynamicImport({ code: result.source });
const dynamicImportTransformed = transformDynamicImport({ code: result.source.toString() });
if (dynamicImportTransformed) {
result.source = dynamicImportTransformed.code;

Expand Down
19 changes: 12 additions & 7 deletions src/loaders.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,20 @@ export const resolve: resolve = async function (
};
}

if (tsExtensionsPattern.test(resolved.url)) {
const format = getFormatFromExtension(resolved.url) ?? await getPackageType(resolved.url);
return {
...resolved,
format,
};
let { format } = resolved;

if (resolved.url.startsWith('file:')) {
format = getFormatFromExtension(resolved.url) ?? format;

if (!format) {
format = await getPackageType(resolved.url);
}
}

return resolved;
return {
...resolved,
format,
};
};

type load = (
Expand Down
4 changes: 2 additions & 2 deletions src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ export const tsExtensionsPattern = /\.([cm]?ts|[tj]sx)$/;
export const getFormatFromExtension = (filePath: string): ModuleFormat | undefined => {
const extension = path.extname(filePath);

if (extension === '.mts') {
if (extension === '.mjs' || extension === '.mts') {
return 'module';
}

if (extension === '.cts') {
if (extension === '.cjs' || extension === '.cts') {
return 'commonjs';
}
};
Expand Down

0 comments on commit 3696ed5

Please sign in to comment.