From 2c8a0e791732ab00907ca11c3a4918ad26ead03f Mon Sep 17 00:00:00 2001
From: Nathan Whitaker <17734409+nathanwhit@users.noreply.github.com>
Date: Fri, 1 Nov 2024 19:10:35 -0700
Subject: fix(add): only add npm deps to package.json if it's at least as close
 as deno.json (#26683)

Fixes https://github.com/denoland/deno/issues/26653
---
 .../add/package_json_and_deno_json/__test__.jsonc  | 23 ++++++++++++++++++++++
 .../package_json_and_deno_json/subdir/deno.json    |  4 ++++
 .../add/package_json_and_deno_json/subdir/mod.ts   |  0
 .../subdir/prefer_if_closer_deno.json.out          |  9 +++++++++
 4 files changed, 36 insertions(+)
 create mode 100644 tests/specs/add/package_json_and_deno_json/subdir/deno.json
 create mode 100644 tests/specs/add/package_json_and_deno_json/subdir/mod.ts
 create mode 100644 tests/specs/add/package_json_and_deno_json/subdir/prefer_if_closer_deno.json.out

(limited to 'tests')

diff --git a/tests/specs/add/package_json_and_deno_json/__test__.jsonc b/tests/specs/add/package_json_and_deno_json/__test__.jsonc
index 0beee02d1..8d67a07c8 100644
--- a/tests/specs/add/package_json_and_deno_json/__test__.jsonc
+++ b/tests/specs/add/package_json_and_deno_json/__test__.jsonc
@@ -41,6 +41,29 @@
           "output": "good\n"
         }
       ]
+    },
+    "only_prefers_package_json_if_closer": {
+      "steps": [
+        {
+          "cwd": "./subdir",
+          "args": "add npm:@denotest/esm-basic jsr:@denotest/add npm:@denotest/say-hello",
+          "output": "[WILDCARD]"
+        },
+        {
+          "args": [
+            "eval",
+            "console.log(Deno.readTextFileSync('package.json').trim())"
+          ],
+          "output": "{}\n"
+        },
+        {
+          "args": [
+            "eval",
+            "console.log(Deno.readTextFileSync('./subdir/deno.json').trim())"
+          ],
+          "output": "subdir/prefer_if_closer_deno.json.out"
+        }
+      ]
     }
   }
 }
diff --git a/tests/specs/add/package_json_and_deno_json/subdir/deno.json b/tests/specs/add/package_json_and_deno_json/subdir/deno.json
new file mode 100644
index 000000000..cc54bbd8a
--- /dev/null
+++ b/tests/specs/add/package_json_and_deno_json/subdir/deno.json
@@ -0,0 +1,4 @@
+{
+  "name": "@test/subdir",
+  "exports": "./mod.ts"
+}
diff --git a/tests/specs/add/package_json_and_deno_json/subdir/mod.ts b/tests/specs/add/package_json_and_deno_json/subdir/mod.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/specs/add/package_json_and_deno_json/subdir/prefer_if_closer_deno.json.out b/tests/specs/add/package_json_and_deno_json/subdir/prefer_if_closer_deno.json.out
new file mode 100644
index 000000000..8a5819d50
--- /dev/null
+++ b/tests/specs/add/package_json_and_deno_json/subdir/prefer_if_closer_deno.json.out
@@ -0,0 +1,9 @@
+{
+  "name": "@test/subdir",
+  "exports": "./mod.ts",
+  "imports": {
+    "@denotest/add": "jsr:@denotest/add@^1.0.0",
+    "@denotest/esm-basic": "npm:@denotest/esm-basic@^1.0.0",
+    "@denotest/say-hello": "npm:@denotest/say-hello@^1.0.0"
+  }
+}
-- 
cgit v1.2.3