language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-09-26 20:29:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(npm): package.json auto-discovery should respect --no-config and --no-npm (#17924)

Browse source 
Part of #17916
This commit is contained in:
David Sherret 2023-02-24 13:51:21 -05:00 • committed by GitHub
parent 6472afd12b
commit 7ad64283a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cli/args/mod.rs
View file

@ -568,7 +568,9 @@ impl CliOptions {
let maybe_config_file = ConfigFile::discover(&flags, &initial_cwd)?; let maybe_config_file = ConfigFile::discover(&flags, &initial_cwd)?;
let mut maybe_package_json = None; let mut maybe_package_json = None;
if let Some(config_file) = &maybe_config_file { if flags.config_flag == ConfigFlag::Disabled || flags.no_npm {
log::debug!("package.json auto-discovery is disabled")
} else if let Some(config_file) = &maybe_config_file {
let specifier = config_file.specifier.clone(); let specifier = config_file.specifier.clone();
if specifier.scheme() == "file" { if specifier.scheme() == "file" {
let maybe_stop_at = specifier let maybe_stop_at = specifier
@ -582,6 +584,7 @@ impl CliOptions {
} else { } else {
maybe_package_json = discover_package_json(&flags, None)?; maybe_package_json = discover_package_json(&flags, None)?;
} }
let maybe_lock_file = let maybe_lock_file =
lockfile::discover(&flags, maybe_config_file.as_ref())?; lockfile::discover(&flags, maybe_config_file.as_ref())?;
Self::new( Self::new(

17
cli/tests/integration/run_tests.rs
View file

@ -2749,9 +2749,10 @@ itest!(config_not_auto_discovered_for_remote_script {
http_server: true, http_server: true,
}); });
itest!(package_json_auto_discovered_for_local_script_log { itest!(package_json_auto_discovered_for_local_script_arg {
args: "run -L debug -A no_deno_json/main.ts", args: "run -L debug -A no_deno_json/main.ts",
output: "run/with_package_json/no_deno_json/main.out", output: "run/with_package_json/no_deno_json/main.out",
// notice this is not in no_deno_json
cwd: Some("run/with_package_json/"), cwd: Some("run/with_package_json/"),
// prevent creating a node_modules dir in the code directory // prevent creating a node_modules dir in the code directory
copy_temp_dir: Some("run/with_package_json/"), copy_temp_dir: Some("run/with_package_json/"),
@ -2762,7 +2763,7 @@ itest!(package_json_auto_discovered_for_local_script_log {
// In this case we shouldn't discover `package.json` file, because it's in a // In this case we shouldn't discover `package.json` file, because it's in a
// directory that is above the directory containing `deno.json` file. // directory that is above the directory containing `deno.json` file.
itest!( itest!(
package_json_auto_discovered_for_local_script_log_with_stop { package_json_auto_discovered_for_local_script_arg_with_stop {
args: "run -L debug with_stop/some/nested/dir/main.ts", args: "run -L debug with_stop/some/nested/dir/main.ts",
output: "run/with_package_json/with_stop/main.out", output: "run/with_package_json/with_stop/main.out",
cwd: Some("run/with_package_json/"), cwd: Some("run/with_package_json/"),
@ -2773,6 +2774,18 @@ itest!(
} }
); );
itest!(package_json_not_auto_discovered_no_config {
args: "run -L debug -A --no-config noconfig.ts",
output: "run/with_package_json/no_deno_json/noconfig.out",
cwd: Some("run/with_package_json/no_deno_json/"),
});
itest!(package_json_not_auto_discovered_no_npm {
args: "run -L debug -A --no-npm noconfig.ts",
output: "run/with_package_json/no_deno_json/noconfig.out",
cwd: Some("run/with_package_json/no_deno_json/"),
});
itest!( itest!(
package_json_auto_discovered_node_modules_relative_package_json { package_json_auto_discovered_node_modules_relative_package_json {
args: "run -A main.js", args: "run -A main.js",

3
cli/tests/testdata/run/with_package_json/no_deno_json/noconfig.out vendored Normal file
View file

@ -0,0 +1,3 @@
[WILDCARD]package.json auto-discovery is disabled
[WILDCARD]
success

8
cli/tests/testdata/run/with_package_json/no_deno_json/noconfig.ts vendored Normal file
View file

@ -0,0 +1,8 @@
// ensure the cwd is this directory
const cwd = Deno.cwd();
if (!cwd.endsWith("no_deno_json")) {
console.log(cwd);
throw "FAIL";
} else {
console.log("success");
}