fix: adjust suggestion for lockfile regeneration (#25107)

Ref #24436 (comment)
denoland · Aug 20, 2024 · 1f47248 · 1f47248
1 parent 0704454
commit 1f47248
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -72,7 +72,7 @@ deno_emit = "=0.44.0"
 deno_graph = { version = "=0.81.2" }
 deno_lint = { version = "=0.63.1", features = ["docs"] }
 deno_lockfile.workspace = true
-deno_npm = "=0.23.0"
+deno_npm = "=0.23.1"
 deno_package_json.workspace = true
 deno_runtime = { workspace = true, features = ["include_js_files_for_snapshotting"] }
 deno_semver = "=0.5.10"

diff --git a/cli/graph_util.rs b/cli/graph_util.rs
@@ -803,7 +803,7 @@ fn enhanced_lockfile_error_message(err: &ModuleError) -> Option<String> {
           "This could be caused by:\n",
           "  * the lock file may be corrupt\n",
           "  * the source itself may be corrupt\n\n",
-          "Use the --lock-write flag to regenerate the lockfile or --reload to reload the source code from the server."
+          "Investigate the lockfile; delete it to regenerate the lockfile or --reload to reload the source code from the server."
         ),
         package_nv,
         checksum_err.actual,
@@ -824,7 +824,7 @@ fn enhanced_lockfile_error_message(err: &ModuleError) -> Option<String> {
           "This could be caused by:\n",
           "  * the lock file may be corrupt\n",
           "  * the source itself may be corrupt\n\n",
-          "Use the --lock-write flag to regenerate the lockfile or --reload to reload the source code from the server."
+          "Investigate the lockfile; delete it to regenerate the lockfile or --reload to reload the source code from the server."
         ),
         specifier,
         checksum_err.actual,

diff --git a/tests/integration/jsr_tests.rs b/tests/integration/jsr_tests.rs
@@ -282,7 +282,7 @@ This could be caused by:
   * the lock file may be corrupt
   * the source itself may be corrupt
 
-Use the --lock-write flag to regenerate the lockfile or --reload to reload the source code from the server.
+Investigate the lockfile; delete it to regenerate the lockfile or --reload to reload the source code from the server.
 ", actual_integrity);
   test_context
     .new_command()

diff --git a/tests/integration/npm_tests.rs b/tests/integration/npm_tests.rs
@@ -1200,7 +1200,7 @@ fn lock_file_missing_top_level_package() {
       "error: failed reading lockfile 'deno.lock'\n",
       "\n",
       "Caused by:\n",
-      "    0: The lockfile is corrupt. You can recreate it with --lock-write\n",
+      "    0: The lockfile is corrupt. Remove the lockfile to regenerate it.\n",
       "    1: Could not find 'cowsay@1.5.0' in the list of packages.\n"
     )
   );
@@ -1483,7 +1483,7 @@ This could be caused by:
   * the lock file may be corrupt
   * the source itself may be corrupt
 
-Use the --lock-write flag to regenerate the lockfile at "[WILDCARD]deno.lock".
+Investigate the lockfile; delete it to regenerate the lockfile at "[WILDCARD]deno.lock".
 "#)
     .assert_exit_code(10);
 }

diff --git a/tests/specs/bundle/lockfile/check_error.out b/tests/specs/bundle/lockfile/check_error.out
@@ -9,4 +9,4 @@ This could be caused by:
   * the lock file may be corrupt
   * the source itself may be corrupt
 
-Use the --lock-write flag to regenerate the lockfile or --reload to reload the source code from the server.
+Investigate the lockfile; delete it to regenerate the lockfile or --reload to reload the source code from the server.
diff --git a/tests/specs/install/future_install_node_modules/corrupted.out b/tests/specs/install/future_install_node_modules/corrupted.out
diff --git a/tests/specs/lockfile/auto_discover_lockfile/main.out b/tests/specs/lockfile/auto_discover_lockfile/main.out
@@ -10,4 +10,4 @@ This could be caused by:
   * the lock file may be corrupt
   * the source itself may be corrupt
 
-Use the --lock-write flag to regenerate the lockfile or --reload to reload the source code from the server.
+Investigate the lockfile; delete it to regenerate the lockfile or --reload to reload the source code from the server.
diff --git a/tests/specs/lockfile/checksum_at_redirect/run.out b/tests/specs/lockfile/checksum_at_redirect/run.out
@@ -9,4 +9,4 @@ This could be caused by:
   * the lock file may be corrupt
   * the source itself may be corrupt
 
-Use the --lock-write flag to regenerate the lockfile or --reload to reload the source code from the server.
+Investigate the lockfile; delete it to regenerate the lockfile or --reload to reload the source code from the server.
diff --git a/tests/specs/lockfile/config_file_lock_boolean/true.main.out b/tests/specs/lockfile/config_file_lock_boolean/true.main.out
@@ -8,4 +8,4 @@ This could be caused by:
   * the lock file may be corrupt
   * the source itself may be corrupt
 
-Use the --lock-write flag to regenerate the lockfile or --reload to reload the source code from the server.
+Investigate the lockfile; delete it to regenerate the lockfile or --reload to reload the source code from the server.
diff --git a/tests/specs/lockfile/config_file_lock_path/config_file_lock_path.out b/tests/specs/lockfile/config_file_lock_path/config_file_lock_path.out
@@ -8,4 +8,4 @@ This could be caused by:
   * the lock file may be corrupt
   * the source itself may be corrupt
 
-Use the --lock-write flag to regenerate the lockfile or --reload to reload the source code from the server.
+Investigate the lockfile; delete it to regenerate the lockfile or --reload to reload the source code from the server.
diff --git a/tests/specs/lockfile/config_file_lock_path/lock_check_err2.out b/tests/specs/lockfile/config_file_lock_path/lock_check_err2.out
@@ -8,4 +8,4 @@ This could be caused by:
   * the lock file may be corrupt
   * the source itself may be corrupt
 
-Use the --lock-write flag to regenerate the lockfile or --reload to reload the source code from the server.
+Investigate the lockfile; delete it to regenerate the lockfile or --reload to reload the source code from the server.
diff --git a/tests/specs/lockfile/lock_check_err/lock_check_err.out b/tests/specs/lockfile/lock_check_err/lock_check_err.out
@@ -8,4 +8,4 @@ This could be caused by:
   * the lock file may be corrupt
   * the source itself may be corrupt
 
-Use the --lock-write flag to regenerate the lockfile or --reload to reload the source code from the server.
+Investigate the lockfile; delete it to regenerate the lockfile or --reload to reload the source code from the server.
diff --git a/tests/specs/lockfile/lock_check_err2/lock_check_err2.out b/tests/specs/lockfile/lock_check_err2/lock_check_err2.out
@@ -8,4 +8,4 @@ This could be caused by:
   * the lock file may be corrupt
   * the source itself may be corrupt
 
-Use the --lock-write flag to regenerate the lockfile or --reload to reload the source code from the server.
+Investigate the lockfile; delete it to regenerate the lockfile or --reload to reload the source code from the server.
diff --git a/tests/specs/lockfile/lock_dynamic_imports/lock_dynamic_imports.out b/tests/specs/lockfile/lock_dynamic_imports/lock_dynamic_imports.out
@@ -9,4 +9,4 @@ This could be caused by:
   * the lock file may be corrupt
   * the source itself may be corrupt
 
-Use the --lock-write flag to regenerate the lockfile or --reload to reload the source code from the server.
+Investigate the lockfile; delete it to regenerate the lockfile or --reload to reload the source code from the server.
diff --git a/tests/specs/lockfile/lock_v2_check_err/lock_v2_check_err.out b/tests/specs/lockfile/lock_v2_check_err/lock_v2_check_err.out
@@ -8,4 +8,4 @@ This could be caused by:
   * the lock file may be corrupt
   * the source itself may be corrupt
 
-Use the --lock-write flag to regenerate the lockfile or --reload to reload the source code from the server.
+Investigate the lockfile; delete it to regenerate the lockfile or --reload to reload the source code from the server.
diff --git a/tests/specs/lockfile/lock_v2_check_err2/lock_v2_check_err2.out b/tests/specs/lockfile/lock_v2_check_err2/lock_v2_check_err2.out
@@ -8,4 +8,4 @@ This could be caused by:
   * the lock file may be corrupt
   * the source itself may be corrupt
 
-Use the --lock-write flag to regenerate the lockfile or --reload to reload the source code from the server.
+Investigate the lockfile; delete it to regenerate the lockfile or --reload to reload the source code from the server.
diff --git a/tests/specs/lockfile/lock_v2_dynamic_imports/lock_v2_dynamic_imports.out b/tests/specs/lockfile/lock_v2_dynamic_imports/lock_v2_dynamic_imports.out
@@ -9,4 +9,4 @@ This could be caused by:
   * the lock file may be corrupt
   * the source itself may be corrupt
 
-Use the --lock-write flag to regenerate the lockfile or --reload to reload the source code from the server.
+Investigate the lockfile; delete it to regenerate the lockfile or --reload to reload the source code from the server.
diff --git a/tests/specs/lockfile/no_lock/fail.out b/tests/specs/lockfile/no_lock/fail.out
@@ -9,4 +9,4 @@ This could be caused by:
   * the lock file may be corrupt
   * the source itself may be corrupt
 
-Use the --lock-write flag to regenerate the lockfile or --reload to reload the source code from the server.
+Investigate the lockfile; delete it to regenerate the lockfile or --reload to reload the source code from the server.
diff --git a/tests/specs/npm/lock_file_integrity_failure/main.out b/tests/specs/npm/lock_file_integrity_failure/main.out
@@ -9,4 +9,4 @@ This could be caused by:
   * the lock file may be corrupt
   * the source itself may be corrupt
 
-Use the --lock-write flag to regenerate the lockfile at "[WILDCARD]lock.json".
+Investigate the lockfile; delete it to regenerate the lockfile at "[WILDCARD]lock.json".