fix(npm): support cjs resolution of package subpath with package.json (#15855)

8 files changed, 26 insertions, 2 deletions

diff --git a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/cjs/main.cjs b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/cjs/main.cjs
new file mode 100644
index 000000000..51d32ff89
--- /dev/null
+++ b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/cjs/main.cjs
@@ -0,0 +1,10 @@
+const root = require("../");
+const subPath = require("../subpath");
+
+module.exports.getKind = function() {
+  return root.getKind();
+};
+
+module.exports.getSubPathKind = function() {
+  return subPath.getSubPathKind();
+};
diff --git a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/cjs/package.json b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/cjs/package.json
new file mode 100644
index 000000000..73847e365
--- /dev/null
+++ b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/cjs/package.json
@@ -0,0 +1,3 @@
+{
+  "main": "./main.cjs"
+}
\ No newline at end of file
diff --git a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/index.cjs b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.cjs
index 990605527..990605527 100644
--- a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/index.cjs
+++ b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.cjs
diff --git a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/index.mjs b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.mjs
index b48b9a3a6..b48b9a3a6 100644
--- a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/index.mjs
+++ b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.mjs
diff --git a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/package.json b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/package.json
index e0315b7f6..18b72e97a 100644
--- a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/package.json
+++ b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/package.json
@@ -2,6 +2,6 @@
   "name": "@denotest/dual-cjs-esm",
   "version": "1.0.0",
   "type": "module",
-  "main": "./index.cjs",
-  "module": "./index.mjs"
+  "main": "./main.cjs",
+  "module": "./main.mjs"
 }
diff --git a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/main.cjs b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/main.cjs
new file mode 100644
index 000000000..18a22e6f1
--- /dev/null
+++ b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/main.cjs
@@ -0,0 +1,3 @@
+exports.getSubPathKind = function() {
+  return "cjs";
+};
diff --git a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/main.mjs b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/main.mjs
new file mode 100644
index 000000000..47e8cd516
--- /dev/null
+++ b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/main.mjs
@@ -0,0 +1,3 @@
+export function getSubPathKind() {
+  return "esm";
+}
diff --git a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/package.json b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/package.json
new file mode 100644
index 000000000..149ce36a3
--- /dev/null
+++ b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/package.json
@@ -0,0 +1,5 @@
+{
+  "type": "module",
+  "main": "./main.cjs",
+  "module": "./main.mjs"
+}
\ No newline at end of file