foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00
Code Issues Packages 1 Wiki Activity

feat: do not require DENO_FUTURE=1 for npmrc support (#24043)

Browse source
This commit is contained in:
David Sherret 2024-05-30 00:07:57 -04:00 committed by GitHub
parent 556012320e
commit 2d3b596cf5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cli/args/mod.rs
View file

@ -558,10 +558,6 @@ pub fn discover_npmrc(
maybe_package_json_path: Option<PathBuf>,
maybe_deno_json_path: Option<PathBuf>,
) -> Result<(Arc<ResolvedNpmRc>, Option<PathBuf>), AnyError> {
if !*DENO_FUTURE {
return Ok((create_default_npmrc(), None));
}
const NPMRC_NAME: &str = ".npmrc";
fn get_env_var(var_name: &str) -> Option<String> {

1
tests/integration/lsp_tests.rs
View file

@ -8866,7 +8866,6 @@ fn lsp_npmrc() {
.use_http_server()
.use_temp_cwd()
.add_npm_env_vars()
.env("DENO_FUTURE", "1")
.build();
let temp_dir = context.temp_dir();
temp_dir.write(

10
tests/specs/npm/npmrc/__test__.jsonc
View file

@ -1,8 +1,10 @@
{
"tempDir": true,
"tests": {
"deno_install": {
"envs": {
"DENO_FUTURE": "1"
},
"tempDir": true,
"steps": [{
"args": "install",
"output": "install.out"
@ -10,4 +12,10 @@
"args": "run -A main.js",
"output": "main.out"
}]
},
"run_node_modules_dir": {
"args": "run --node-modules-dir -A --quiet main.js",
"output": "main.out"
}
}
}