From f950f599833172048cbbc6d64d3c2fc50b3b3e9a Mon Sep 17 00:00:00 2001 From: David Sherret Date: Thu, 11 Jul 2024 12:41:42 -0400 Subject: [PATCH] fix(npm): only warn about lifecycle scripts not being run when setting up directory (#24530) Closes #24518 --- cli/npm/managed/resolvers/local.rs | 10 +++++++--- .../specs/npm/lifecycle_scripts/__test__.jsonc | 17 +++++++++++++++++ .../npm/lifecycle_scripts/only_warns_first1.out | 14 ++++++++++++++ .../npm/lifecycle_scripts/only_warns_first2.out | 3 +++ 4 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 tests/specs/npm/lifecycle_scripts/only_warns_first1.out create mode 100644 tests/specs/npm/lifecycle_scripts/only_warns_first2.out diff --git a/cli/npm/managed/resolvers/local.rs b/cli/npm/managed/resolvers/local.rs index f73ba95ac8..90b0ed7be9 100644 --- a/cli/npm/managed/resolvers/local.rs +++ b/cli/npm/managed/resolvers/local.rs @@ -506,6 +506,7 @@ async fn sync_resolution_with_fs( if has_lifecycle_scripts(package) { let scripts_run = folder_path.join(".scripts-run"); + let has_warned = folder_path.join(".scripts-warned"); if can_run_scripts(&lifecycle_scripts.allowed, &package.id.nv) { if !scripts_run.exists() { let sub_node_modules = folder_path.join("node_modules"); @@ -517,8 +518,8 @@ async fn sync_resolution_with_fs( scripts_run, )); } - } else if !scripts_run.exists() { - packages_with_scripts_not_run.push(package.id.nv.clone()); + } else if !scripts_run.exists() && !has_warned.exists() { + packages_with_scripts_not_run.push((has_warned, package.id.nv.clone())); } } } @@ -721,12 +722,15 @@ async fn sync_resolution_with_fs( }; let packages = packages_with_scripts_not_run .iter() - .map(|p| format!("npm:{p}")) + .map(|(_, p)| format!("npm:{p}")) .collect::>() .join(", "); log::warn!("{}: Packages contained npm lifecycle scripts (preinstall/install/postinstall) that were not executed. This may cause the packages to not work correctly. To run them, use the `--allow-scripts` flag with `deno cache`{maybe_install} (e.g. `deno cache --allow-scripts=pkg1,pkg2 `{maybe_install_example}):\n {packages}", crate::colors::yellow("warning")); + for (scripts_warned_path, _) in packages_with_scripts_not_run { + let _ignore_err = fs::write(scripts_warned_path, ""); + } } setup_cache.save(); diff --git a/tests/specs/npm/lifecycle_scripts/__test__.jsonc b/tests/specs/npm/lifecycle_scripts/__test__.jsonc index fa60e79636..18a2d405ef 100644 --- a/tests/specs/npm/lifecycle_scripts/__test__.jsonc +++ b/tests/specs/npm/lifecycle_scripts/__test__.jsonc @@ -55,6 +55,23 @@ } ] }, + "only_warns_first": { + "tempDir": true, + "steps": [ + { + // without running scripts (should warn) + "args": "run all_lifecycles.js", + "output": "only_warns_first1.out", + "exitCode": 1 + }, + { + // without running scripts (does not warn) + "args": "run all_lifecycles.js", + "output": "only_warns_first2.out", + "exitCode": 1 + } + ] + }, "future_install_lifecycle_scripts": { "tempDir": true, "envs": { diff --git a/tests/specs/npm/lifecycle_scripts/only_warns_first1.out b/tests/specs/npm/lifecycle_scripts/only_warns_first1.out new file mode 100644 index 0000000000..6ebf960289 --- /dev/null +++ b/tests/specs/npm/lifecycle_scripts/only_warns_first1.out @@ -0,0 +1,14 @@ +[UNORDERED_START] +Download http://localhost:4260/@denotest/node-lifecycle-scripts +Download http://localhost:4260/@denotest/bin +Download http://localhost:4260/@denotest/node-lifecycle-scripts/1.0.0.tgz +Download http://localhost:4260/@denotest/bin/1.0.0.tgz +Initialize @denotest/node-lifecycle-scripts@1.0.0 +Initialize @denotest/bin@1.0.0 +[UNORDERED_END] +warning: Packages contained npm lifecycle scripts (preinstall/install/postinstall) that were not executed. + This may cause the packages to not work correctly. To run them, use the `--allow-scripts` flag with `deno cache` + (e.g. `deno cache --allow-scripts=pkg1,pkg2 `): + npm:@denotest/node-lifecycle-scripts@1.0.0 +error: Uncaught SyntaxError: The requested module 'npm:@denotest/node-lifecycle-scripts' does not provide an export named 'value' +[WILDCARD] diff --git a/tests/specs/npm/lifecycle_scripts/only_warns_first2.out b/tests/specs/npm/lifecycle_scripts/only_warns_first2.out new file mode 100644 index 0000000000..f6a02c7279 --- /dev/null +++ b/tests/specs/npm/lifecycle_scripts/only_warns_first2.out @@ -0,0 +1,3 @@ +[# note no warning] +error: Uncaught SyntaxError: The requested module 'npm:@denotest/node-lifecycle-scripts' does not provide an export named 'value' +[WILDCARD]