From 67280f8b558902729c805fd3d8f26d4c434fc211 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Tue, 22 Oct 2024 00:08:45 +0100
Subject: fix(install): update lockfile when using package.json (#26458)

This commit makes sure that `deno add`, `deno install` and `deno remove`
update the lockfile if only `package.json` file is present.

Fixes https://github.com/denoland/deno/issues/26270
---
 cli/tools/registry/pm.rs                           |  4 +++
 .../update_lockfile_if_package_json/__test__.jsonc | 31 ++++++++++++++++++++++
 .../add/update_lockfile_if_package_json/add.out    |  5 ++++
 .../lockfile_add.out                               |  7 +++++
 .../lockfile_remove.out                            |  4 +++
 .../update_lockfile_if_package_json/package.json   |  0
 .../add/update_lockfile_if_package_json/remove.out |  4 +++
 7 files changed, 55 insertions(+)
 create mode 100644 tests/specs/add/update_lockfile_if_package_json/__test__.jsonc
 create mode 100644 tests/specs/add/update_lockfile_if_package_json/add.out
 create mode 100644 tests/specs/add/update_lockfile_if_package_json/lockfile_add.out
 create mode 100644 tests/specs/add/update_lockfile_if_package_json/lockfile_remove.out
 create mode 100644 tests/specs/add/update_lockfile_if_package_json/package.json
 create mode 100644 tests/specs/add/update_lockfile_if_package_json/remove.out

diff --git a/cli/tools/registry/pm.rs b/cli/tools/registry/pm.rs
index bd5290998..2060b9a13 100644
--- a/cli/tools/registry/pm.rs
+++ b/cli/tools/registry/pm.rs
@@ -723,6 +723,10 @@ async fn npm_install_after_modification(
   // npm install
   cache_deps::cache_top_level_deps(&cli_factory, jsr_resolver).await?;
 
+  if let Some(lockfile) = cli_factory.cli_options()?.maybe_lockfile() {
+    lockfile.write_if_changed()?;
+  }
+
   Ok(())
 }
 
diff --git a/tests/specs/add/update_lockfile_if_package_json/__test__.jsonc b/tests/specs/add/update_lockfile_if_package_json/__test__.jsonc
new file mode 100644
index 000000000..80b35dc3c
--- /dev/null
+++ b/tests/specs/add/update_lockfile_if_package_json/__test__.jsonc
@@ -0,0 +1,31 @@
+{
+  "tempDir": true,
+  "tests": {
+    "updates_lockfile": {
+      "steps": [
+        {
+          "args": "add npm:@denotest/esm-basic npm:@denotest/say-hello",
+          "output": "add.out"
+        },
+        {
+          "args": [
+            "eval",
+            "console.log(Deno.readTextFileSync('deno.lock'))"
+          ],
+          "output": "lockfile_add.out"
+        },
+        {
+          "args": "remove @denotest/esm-basic @denotest/say-hello",
+          "output": "remove.out"
+        },
+        {
+          "args": [
+            "eval",
+            "console.log(Deno.readTextFileSync('deno.lock'))"
+          ],
+          "output": "lockfile_remove.out"
+        }
+      ]
+    }
+  }
+}
diff --git a/tests/specs/add/update_lockfile_if_package_json/add.out b/tests/specs/add/update_lockfile_if_package_json/add.out
new file mode 100644
index 000000000..97989b0c3
--- /dev/null
+++ b/tests/specs/add/update_lockfile_if_package_json/add.out
@@ -0,0 +1,5 @@
+[UNORDERED_START]
+Add npm:@denotest/esm-basic@1.0.0
+Add npm:@denotest/say-hello@1.0.0
+[UNORDERED_END]
+[WILDCARD]
\ No newline at end of file
diff --git a/tests/specs/add/update_lockfile_if_package_json/lockfile_add.out b/tests/specs/add/update_lockfile_if_package_json/lockfile_add.out
new file mode 100644
index 000000000..d452c2de8
--- /dev/null
+++ b/tests/specs/add/update_lockfile_if_package_json/lockfile_add.out
@@ -0,0 +1,7 @@
+{
+  "version": "4",
+  "specifiers": {
+    "npm:@denotest/esm-basic@1": "1.0.0",
+    "npm:@denotest/say-hello@1": "1.0.0"
+  },
+[WILDCARD]
diff --git a/tests/specs/add/update_lockfile_if_package_json/lockfile_remove.out b/tests/specs/add/update_lockfile_if_package_json/lockfile_remove.out
new file mode 100644
index 000000000..fdd4f1cc6
--- /dev/null
+++ b/tests/specs/add/update_lockfile_if_package_json/lockfile_remove.out
@@ -0,0 +1,4 @@
+{
+  "version": "4"
+}
+
diff --git a/tests/specs/add/update_lockfile_if_package_json/package.json b/tests/specs/add/update_lockfile_if_package_json/package.json
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/specs/add/update_lockfile_if_package_json/remove.out b/tests/specs/add/update_lockfile_if_package_json/remove.out
new file mode 100644
index 000000000..8efb0810c
--- /dev/null
+++ b/tests/specs/add/update_lockfile_if_package_json/remove.out
@@ -0,0 +1,4 @@
+[UNORDERED_START]
+Removed @denotest/esm-basic
+Removed @denotest/say-hello
+[UNORDERED_END]
-- 
cgit v1.2.3