Turbopack: Fix module_resolution: "nodenext" with mjs or cjs

turbopack/crates/turbopack-core/src/resolve/mod.rs

@@ -2006,41 +2006,41 @@ async fn resolve_relative_request(
 
     if options_value.enable_typescript_with_output_extension {
         new_path.replace_final_constants(&|c: &RcStr| -> Option<Pattern> {
-            let result = match c.rsplit_once(".") {
-                Some((base, "js")) => Some((
+            let (base, replacement) = match c.rsplit_once(".") {
+                Some((base, "js")) => (
                     base,
                     vec![
                         Pattern::Constant(".ts".into()),
                         Pattern::Constant(".tsx".into()),
                         Pattern::Constant(".js".into()),
                     ],
-                )),
-                Some((base, "mjs")) => Some((
+                ),
+                Some((base, "mjs")) => (
                     base,
                     vec![
                         Pattern::Constant(".mts".into()),
-                        Pattern::Constant(".js".into()),
+                        Pattern::Constant(".mjs".into()),
                     ],
-                )),
-                Some((base, "cjs")) => Some((
+                ),
+                Some((base, "cjs")) => (
                     base,
                     vec![
                         Pattern::Constant(".cts".into()),
-                        Pattern::Constant(".js".into()),
+                        Pattern::Constant(".cjs".into()),
                     ],
-                )),
-                _ => None,
-            };
-            result.map(|(base, replacement)| {
-                if base.is_empty() {
-                    Pattern::Alternatives(replacement)
-                } else {
-                    Pattern::Concatenation(vec![
-                        Pattern::Constant(base.into()),
-                        Pattern::Alternatives(replacement),
-                    ])
+                ),
+                _ => {
+                    return None;
                 }
-            })
+            };
+            if base.is_empty() {
+                Some(Pattern::Alternatives(replacement))
+            } else {
+                Some(Pattern::Concatenation(vec![
+                    Pattern::Constant(base.into()),
+                    Pattern::Alternatives(replacement),
+                ]))
+            }
         });
         new_path.normalize();
     }

turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/tsconfig-nodenext/input/index.js

@@ -1,11 +1,21 @@
 import foo from "./src/foo.js";
-import bar from "./src/bar.js";
-import fooEsm from "./src/foo-esm.mjs";
-import fooCjs from "./src/foo-cjs.cjs";
+import fileTsx from "./src/file-tsx.js";
+import fileMts from "./src/file-mts.mjs";
+import fileCts from "./src/file-cts.cjs";
+import fileMjs from "./src/file-mjs.mjs";
+import fileCjs from "./src/file-cjs.cjs";
 
 it("should correctly resolve explicit extensions with nodenext", () => {
-  expect(foo).toBe("foo");
-  expect(bar).toBe("bar");
-  expect(fooEsm).toBe("fooEsm");
-  expect(fooCjs).toBe("fooCjs");
+  expect(foo).toBe("foo.ts");
+  expect(fileTsx).toBe("file-tsx");
+  expect(fileMts).toBe("file-mts");
+  expect(fileCts).toBe("file-cts");
+  expect(fileMjs).toBe("file-mjs");
+  expect(fileCjs).toBe("file-cjs");
 });
+
+// import fooButton from "foo/button";
+
+// it("should correctly resolve explicit extensions with nodenext", () => {
+//   expect(fooButton).toBe("button");
+// });

turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/tsconfig-nodenext/input/src/file-cjs.cjs

@@ -0,0 +1 @@
+module.exports = 'file-cjs'

turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/tsconfig-nodenext/input/src/file-cts.cts

@@ -0,0 +1 @@
+module.exports = "file-cts";

turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/tsconfig-nodenext/input/src/file-mjs.mjs

@@ -0,0 +1 @@
+export default 'file-mjs'

turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/tsconfig-nodenext/input/src/file-mts.mts

@@ -0,0 +1 @@
+export default "file-mts";

turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/tsconfig-nodenext/input/src/file-tsx.tsx

@@ -0,0 +1 @@
+export default "file-tsx";

turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/tsconfig-nodenext/input/src/foo.ts

@@ -1 +1 @@
-export default "foo";
+export default "foo.ts";

turbopack/crates/turbopack-tests/tests/execution/turbopack/resolving/tsconfig-nodenext/input/tsconfig.json

@@ -1,6 +1,9 @@
 {
   "compilerOptions": {
     "module": "NodeNext",
-    "moduleResolution": "NodeNext"
-  }
+    "moduleResolution": "NodeNext",
+    "allowJs": true,
+    "outDir": "dist"
+  },
+  "include": ["index.js"],
 }