diff options
20 files changed, 23 insertions, 23 deletions
diff --git a/Cargo.lock b/Cargo.lock index debd091e8..e43bfcc94 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1869,9 +1869,9 @@ dependencies = [ [[package]] name = "deno_npm" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceef28152643a021fc3487a3ec93ae83996972c087547d97f425c83e15dca932" +checksum = "96d72068f4292455d48ac3b90c644ebf3150fb78c26a480cfb235a9642afe95c" dependencies = [ "anyhow", "async-trait", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 920f0d795..c3fc704f1 100644 --- 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 index 647307bd9..6f0e6acd9 100644 --- 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 index a9397af72..ef074987e 100644 --- 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 index 6be0298d8..86db962f4 100644 --- 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 index 2b8bdfc96..6a63a01b4 100644 --- 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 index ade075744..abfbeadda 100644 --- a/tests/specs/install/future_install_node_modules/corrupted.out +++ b/tests/specs/install/future_install_node_modules/corrupted.out @@ -1,2 +1,2 @@ error: Integrity check failed for package: "npm:@denotest/esm-basic@1.0.0".[WILDCARD] -Use the --lock-write flag to regenerate the lockfile at [WILDCARD]
\ No newline at end of file +Investigate the lockfile; delete it to regenerate the lockfile at [WILDCARD]
\ No newline at end of file diff --git a/tests/specs/lockfile/auto_discover_lockfile/main.out b/tests/specs/lockfile/auto_discover_lockfile/main.out index aa24320d1..110f7e85b 100644 --- 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 index 75a34777f..6180bf55d 100644 --- 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 index 11dfc0740..69b467ef0 100644 --- 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 index 1383d945d..3043b102a 100644 --- 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 index 1383d945d..3043b102a 100644 --- 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 index 25d22490d..031ae85e6 100644 --- 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 index 1383d945d..3043b102a 100644 --- 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 index 2b8bdfc96..6a63a01b4 100644 --- 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 index 25d22490d..031ae85e6 100644 --- 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 index 1383d945d..3043b102a 100644 --- 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 index 2b8bdfc96..6a63a01b4 100644 --- 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 index 0d67cd478..14a8d19cf 100644 --- 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 index 741edd9d2..1f0fca91e 100644 --- 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". |