feat: Allow importing .cjs files

cli/resolver.rs

@@ -327,7 +327,9 @@ impl NpmModuleLoader {
     specifier: &ModuleSpecifier,
     maybe_referrer: Option<&ModuleSpecifier>,
   ) -> Option<Result<ModuleCodeStringSource, AnyError>> {
-    if self.node_resolver.in_npm_package(specifier) {
+    if self.node_resolver.in_npm_package(specifier)
+      || (specifier.scheme() == "file" && specifier.path().ends_with(".cjs"))
+    {
       Some(self.load(specifier, maybe_referrer).await)
     } else {
       None
@@ -376,7 +378,9 @@ impl NpmModuleLoader {
         }
       })?;
 
-    let code = if self.cjs_resolutions.contains(specifier) {
+    let code = if self.cjs_resolutions.contains(specifier)
+      || (specifier.scheme() == "file" && specifier.path().ends_with(".cjs"))
+    {
       // translate cjs to esm if it's cjs and inject node globals
       let code = match String::from_utf8_lossy(&code) {
         Cow::Owned(code) => code,

tests/integration/run_tests.rs

@@ -1926,11 +1926,6 @@ itest!(es_private_fields {
   output: "run/es_private_fields.js.out",
 });
 
-itest!(cjs_imports {
-  args: "run --quiet --reload run/cjs_imports/main.ts",
-  output: "run/cjs_imports/main.out",
-});
-
 itest!(ts_import_from_js {
   args: "run --quiet --reload run/ts_import_from_js/main.js",
   output: "run/ts_import_from_js/main.out",

tests/specs/run/import_common_js/__test__.jsonc

@@ -0,0 +1,6 @@
+{
+  "steps": [
+    { "args": "run -R index.cjs", "output": "index.out" },
+    { "args": "run -R main.ts", "output": "main.out" }
+  ]
+}

tests/specs/run/import_common_js/a.js

@@ -0,0 +1,7 @@
+function foobar() {
+  console.log("foobar");
+}
+
+module.exports = {
+  foobar,
+};

tests/specs/run/import_common_js/index.cjs

@@ -0,0 +1,9 @@
+const process = require("process");
+const a = require("./a");
+
+console.log(process.cwd());
+
+module.exports = {
+  cwd: process.cwd,
+  foobar: a.foobar,
+};

tests/specs/run/import_common_js/index.out

@@ -0,0 +1 @@
+[WILDCARD]import_common_js

tests/specs/run/import_common_js/main.out

@@ -0,0 +1,5 @@
+hello from foo node module
+[WILDCARD]import_common_js
+cjsModule.cwd() [WILDCARD]import_common_js
+foobar
+cjsModule.foobar() undefined

tests/specs/run/import_common_js/main.ts

@@ -0,0 +1,3 @@
+import foo from "foo";
+
+foo();

tests/specs/run/import_common_js/package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "foo": "*"
+  }
+}

tools/lint.js

@@ -221,7 +221,7 @@ async function ensureNoNewITests() {
     "pm_tests.rs": 0,
     "publish_tests.rs": 0,
     "repl_tests.rs": 0,
-    "run_tests.rs": 349,
+    "run_tests.rs": 348,
     "shared_library_tests.rs": 0,
     "task_tests.rs": 30,
     "test_tests.rs": 75,