From bd097107b6a528288e02dabe2a2310412d22c01b Mon Sep 17 00:00:00 2001
From: Jason Bedard <jason+github@jbedard.ca>
Date: Sun, 7 Apr 2024 20:43:29 -0700
Subject: [PATCH] refactor: remove legacy update_pnpm_lock default value
 (#1624)

---
 docs/npm_translate_lock.md         | 2 +-
 npm/private/npm_translate_lock.bzl | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/docs/npm_translate_lock.md b/docs/npm_translate_lock.md
index b5a41caa7..67126b35a 100644
--- a/docs/npm_translate_lock.md
+++ b/docs/npm_translate_lock.md
@@ -102,7 +102,7 @@ For more about how to use npm_translate_lock, read [pnpm and rules_js](/docs/pnp
 | <a id="npm_translate_lock-pnpm_lock"></a>pnpm_lock |  The <code>pnpm-lock.yaml</code> file.   |  <code>None</code> |
 | <a id="npm_translate_lock-npm_package_lock"></a>npm_package_lock |  The <code>package-lock.json</code> file written by <code>npm install</code>.<br><br>Only one of <code>npm_package_lock</code> or <code>yarn_lock</code> may be set.   |  <code>None</code> |
 | <a id="npm_translate_lock-yarn_lock"></a>yarn_lock |  The <code>yarn.lock</code> file written by <code>yarn install</code>.<br><br>Only one of <code>npm_package_lock</code> or <code>yarn_lock</code> may be set.   |  <code>None</code> |
-| <a id="npm_translate_lock-update_pnpm_lock"></a>update_pnpm_lock |  When True, the pnpm lock file will be updated automatically when any of its inputs have changed since the last update.<br><br>Defaults to True when one of <code>npm_package_lock</code> or <code>yarn_lock</code> are set. Otherwise it defaults to False.<br><br>Read more: [using update_pnpm_lock](/docs/pnpm.md#update_pnpm_lock)   |  <code>None</code> |
+| <a id="npm_translate_lock-update_pnpm_lock"></a>update_pnpm_lock |  When True, the pnpm lock file will be updated automatically when any of its inputs have changed since the last update.<br><br>Defaults to True when one of <code>npm_package_lock</code> or <code>yarn_lock</code> are set. Otherwise it defaults to False.<br><br>Read more: [using update_pnpm_lock](/docs/pnpm.md#update_pnpm_lock)   |  <code>False</code> |
 | <a id="npm_translate_lock-node_toolchain_prefix"></a>node_toolchain_prefix |  the prefix of the node toolchain to use when generating the pnpm lockfile.   |  <code>"nodejs"</code> |
 | <a id="npm_translate_lock-yq_toolchain_prefix"></a>yq_toolchain_prefix |  the prefix of the yq toolchain to use for parsing the pnpm lockfile.   |  <code>"yq"</code> |
 | <a id="npm_translate_lock-preupdate"></a>preupdate |  Node.js scripts to run in this repository rule before auto-updating the pnpm lock file.<br><br>Scripts are run sequentially in the order they are listed. The working directory is set to the root of the external repository. Make sure all files required by preupdate scripts are added to the <code>data</code> attribute.<br><br>A preupdate script could, for example, transform <code>resolutions</code> in the root <code>package.json</code> file from a format that yarn understands such as <code>@foo/**/bar</code> to the equivalent <code>@foo/*&gt;bar</code> that pnpm understands so that <code>resolutions</code> are compatible with pnpm when running <code>pnpm import</code> to update the pnpm lock file.<br><br>Only needed when <code>update_pnpm_lock</code> is True. Read more: [using update_pnpm_lock](/docs/pnpm.md#update_pnpm_lock)   |  <code>[]</code> |
diff --git a/npm/private/npm_translate_lock.bzl b/npm/private/npm_translate_lock.bzl
index be112d978..eaf893355 100644
--- a/npm/private/npm_translate_lock.bzl
+++ b/npm/private/npm_translate_lock.bzl
@@ -162,7 +162,7 @@ def npm_translate_lock(
         pnpm_lock = None,
         npm_package_lock = None,
         yarn_lock = None,
-        update_pnpm_lock = None,
+        update_pnpm_lock = False,
         node_toolchain_prefix = "nodejs",
         yq_toolchain_prefix = "yq",
         preupdate = [],
@@ -617,11 +617,6 @@ def npm_translate_lock(
         for value_key, value_value in value.items():
             bins_string_list_dict[key].append("{}={}".format(value_key, value_value))
 
-    # Default update_pnpm_lock to True if npm_package_lock or yarn_lock is set to
-    # preserve pre-update_pnpm_lock `pnpm import` behavior.
-    if update_pnpm_lock == None and (npm_package_lock or yarn_lock):
-        update_pnpm_lock = True
-
     if not update_pnpm_lock and preupdate:
         fail("expected update_pnpm_lock to be True when preupdate are specified")