summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2024-08-28 03:31:41 +0100
committerGitHub <noreply@github.com>2024-08-28 02:31:41 +0000
commit3dba98532a3054e4e74bb1b3304e4cb809d284dc (patch)
tree708fdc7a6f5663565fc585c74c247f1df4b671d2
parent1a6fd38f2f7b016714ec313ce234fd5356aa956a (diff)
fix: replace `npm install` hint with `deno install` hint (#25244)
Needed for https://github.com/denoland/deno/pull/25213. With Deno 2, we should suggest using `deno install` instead of `npm install`.
-rw-r--r--cli/npm/byonm.rs7
-rw-r--r--cli/resolver.rs2
-rw-r--r--tests/integration/npm_tests.rs2
-rw-r--r--tests/specs/npm/byonm/not_installed.out2
4 files changed, 4 insertions, 9 deletions
diff --git a/cli/npm/byonm.rs b/cli/npm/byonm.rs
index a0f23fc66..e62650d8a 100644
--- a/cli/npm/byonm.rs
+++ b/cli/npm/byonm.rs
@@ -307,14 +307,9 @@ impl CliNpmResolver for ByonmCliNpmResolver {
concat!(
"Could not find \"{}\" in a node_modules folder. ",
"Deno expects the node_modules/ directory to be up to date. ",
- "Did you forget to run `{}`?"
+ "Did you forget to run `deno install`?"
),
alias,
- if *crate::args::DENO_FUTURE {
- "deno install"
- } else {
- "npm install"
- }
);
}
diff --git a/cli/resolver.rs b/cli/resolver.rs
index bd88ecd9a..57c05b532 100644
--- a/cli/resolver.rs
+++ b/cli/resolver.rs
@@ -146,7 +146,7 @@ impl CliNodeResolver {
concat!(
"Could not resolve \"{}\", but found it in a package.json. ",
"Deno expects the node_modules/ directory to be up to date. ",
- "Did you forget to run `npm install`?"
+ "Did you forget to run `deno install`?"
),
specifier
));
diff --git a/tests/integration/npm_tests.rs b/tests/integration/npm_tests.rs
index d75b87689..7f5145a42 100644
--- a/tests/integration/npm_tests.rs
+++ b/tests/integration/npm_tests.rs
@@ -2404,7 +2404,7 @@ fn byonm_package_specifier_not_installed_and_invalid_subpath() {
// no npm install has been run, so this should give an informative error
let output = test_context.new_command().args("run main.ts").run();
output.assert_matches_text(
- r#"error: Could not resolve "chalk", but found it in a package.json. Deno expects the node_modules/ directory to be up to date. Did you forget to run `npm install`?
+ r#"error: Could not resolve "chalk", but found it in a package.json. Deno expects the node_modules/ directory to be up to date. Did you forget to run `deno install`?
at file:///[WILDCARD]/main.ts:1:19
"#,
);
diff --git a/tests/specs/npm/byonm/not_installed.out b/tests/specs/npm/byonm/not_installed.out
index 29f865140..2e608c37e 100644
--- a/tests/specs/npm/byonm/not_installed.out
+++ b/tests/specs/npm/byonm/not_installed.out
@@ -1,2 +1,2 @@
-error: Could not find "chalk" in a node_modules folder. Deno expects the node_modules/ directory to be up to date. Did you forget to run `npm install`?
+error: Could not find "chalk" in a node_modules folder. Deno expects the node_modules/ directory to be up to date. Did you forget to run `deno install`?
at file:///[WILDCARD]/not_installed.ts:1:19