From 38fe31783b88956016355328b5b92dfb7e5abd67 Mon Sep 17 00:00:00 2001 From: Ranadeep Biswas Date: Sat, 1 Feb 2025 01:29:52 +0100 Subject: [PATCH 1/2] delay import for unknown media type --- resolvers/deno/cjs.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resolvers/deno/cjs.rs b/resolvers/deno/cjs.rs index 76bc08e2bceb3b..f9f38e8b4381bf 100644 --- a/resolvers/deno/cjs.rs +++ b/resolvers/deno/cjs.rs @@ -274,7 +274,7 @@ impl self.pkg_json_resolver.get_closest_package_json(&path)? { let is_file_location_cjs = pkg_json.typ != "module"; - Ok(if is_file_location_cjs { + Ok(if is_file_location_cjs || path.extension().is_none() { ResolutionMode::Require } else { ResolutionMode::Import From 9c62f56cc4bd9a1efefef10831bbb639f732a03b Mon Sep 17 00:00:00 2001 From: Ranadeep Biswas Date: Sat, 1 Feb 2025 10:28:38 +0100 Subject: [PATCH 2/2] test from PR comment --- .../specs/node/import_cjs_file_no_ext_mjs_pkg/__test__.jsonc | 4 ++++ tests/specs/node/import_cjs_file_no_ext_mjs_pkg/main.mts | 3 +++ .../import_cjs_file_no_ext_mjs_pkg/node_modules/package/add | 1 + .../node_modules/package/internal.cjs | 1 + .../node_modules/package/package.json | 3 +++ tests/specs/node/import_cjs_file_no_ext_mjs_pkg/package.json | 1 + 6 files changed, 13 insertions(+) create mode 100644 tests/specs/node/import_cjs_file_no_ext_mjs_pkg/__test__.jsonc create mode 100644 tests/specs/node/import_cjs_file_no_ext_mjs_pkg/main.mts create mode 100644 tests/specs/node/import_cjs_file_no_ext_mjs_pkg/node_modules/package/add create mode 100644 tests/specs/node/import_cjs_file_no_ext_mjs_pkg/node_modules/package/internal.cjs create mode 100644 tests/specs/node/import_cjs_file_no_ext_mjs_pkg/node_modules/package/package.json create mode 100644 tests/specs/node/import_cjs_file_no_ext_mjs_pkg/package.json diff --git a/tests/specs/node/import_cjs_file_no_ext_mjs_pkg/__test__.jsonc b/tests/specs/node/import_cjs_file_no_ext_mjs_pkg/__test__.jsonc new file mode 100644 index 00000000000000..db0303092f79f8 --- /dev/null +++ b/tests/specs/node/import_cjs_file_no_ext_mjs_pkg/__test__.jsonc @@ -0,0 +1,4 @@ +{ + "args": "run main.mts", + "output": "3\n" +} diff --git a/tests/specs/node/import_cjs_file_no_ext_mjs_pkg/main.mts b/tests/specs/node/import_cjs_file_no_ext_mjs_pkg/main.mts new file mode 100644 index 00000000000000..7ae40ce0007e71 --- /dev/null +++ b/tests/specs/node/import_cjs_file_no_ext_mjs_pkg/main.mts @@ -0,0 +1,3 @@ +import { add } from "package/add"; + +console.log(add(1, 2)); diff --git a/tests/specs/node/import_cjs_file_no_ext_mjs_pkg/node_modules/package/add b/tests/specs/node/import_cjs_file_no_ext_mjs_pkg/node_modules/package/add new file mode 100644 index 00000000000000..674993901d8e84 --- /dev/null +++ b/tests/specs/node/import_cjs_file_no_ext_mjs_pkg/node_modules/package/add @@ -0,0 +1 @@ +module.exports.add = require("./internal.cjs").add; diff --git a/tests/specs/node/import_cjs_file_no_ext_mjs_pkg/node_modules/package/internal.cjs b/tests/specs/node/import_cjs_file_no_ext_mjs_pkg/node_modules/package/internal.cjs new file mode 100644 index 00000000000000..62c45aa26dc616 --- /dev/null +++ b/tests/specs/node/import_cjs_file_no_ext_mjs_pkg/node_modules/package/internal.cjs @@ -0,0 +1 @@ +module.exports.add = (a, b) => a + b; diff --git a/tests/specs/node/import_cjs_file_no_ext_mjs_pkg/node_modules/package/package.json b/tests/specs/node/import_cjs_file_no_ext_mjs_pkg/node_modules/package/package.json new file mode 100644 index 00000000000000..aead43de364cd1 --- /dev/null +++ b/tests/specs/node/import_cjs_file_no_ext_mjs_pkg/node_modules/package/package.json @@ -0,0 +1,3 @@ +{ + "type": "module" +} \ No newline at end of file diff --git a/tests/specs/node/import_cjs_file_no_ext_mjs_pkg/package.json b/tests/specs/node/import_cjs_file_no_ext_mjs_pkg/package.json new file mode 100644 index 00000000000000..0967ef424bce67 --- /dev/null +++ b/tests/specs/node/import_cjs_file_no_ext_mjs_pkg/package.json @@ -0,0 +1 @@ +{}