foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-28 16:20:57 -05:00
Code Issues Packages 1 Wiki Activity

fix(install): duplicate dependencies in package.json (#26128)

Browse source 
Fixes https://github.com/denoland/deno/issues/26120
This commit is contained in:
Marvin Hagemeister 2024-10-10 21:31:45 +02:00 committed by GitHub
parent 66929de3ba
commit ccdbeb433b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 58 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/tools/registry/pm.rs
View file

@ -130,8 +130,10 @@ impl NpmConfig {
fn add(&mut self, selected: SelectedPackage, dev: bool) { fn add(&mut self, selected: SelectedPackage, dev: bool) {
let (name, version) = package_json_dependency_entry(selected); let (name, version) = package_json_dependency_entry(selected);
if dev { if dev {
self.dependencies.swap_remove(&name);
self.dev_dependencies.insert(name, version); self.dev_dependencies.insert(name, version);
} else { } else {
self.dev_dependencies.swap_remove(&name);
self.dependencies.insert(name, version); self.dependencies.insert(name, version);
} }
} }

16
tests/specs/install/install_add_dep_existing/__test__.jsonc Normal file
View file

@ -0,0 +1,16 @@
{
"tempDir": true,
"steps": [
{
"args": "install npm:@denotest/esm-basic",
"output": "install.out"
},
{
"args": [
"eval",
"console.log(Deno.readTextFileSync('package.json').trim())"
],
"output": "package.json.out"
}
]
}

4
tests/specs/install/install_add_dep_existing/install.out Normal file
View file

@ -0,0 +1,4 @@
Add npm:@denotest/esm-basic@1.0.0
Download http://localhost:4260/@denotest/esm-basic
Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz
Initialize @denotest/esm-basic@1.0.0

3
tests/specs/install/install_add_dep_existing/package.json Normal file
View file

@ -0,0 +1,3 @@
{
"devDependencies": { "@denotest/esm-basic": "^1.0.0" }
}

5
tests/specs/install/install_add_dep_existing/package.json.out Normal file
View file

@ -0,0 +1,5 @@
{
"dependencies": {
"@denotest/esm-basic": "^1.0.0"
}
}

16
tests/specs/install/install_add_dev_existing/__test__.jsonc Normal file
View file

@ -0,0 +1,16 @@
{
"tempDir": true,
"steps": [
{
"args": "install --dev npm:@denotest/esm-basic",
"output": "install.out"
},
{
"args": [
"eval",
"console.log(Deno.readTextFileSync('package.json').trim())"
],
"output": "package.json.out"
}
]
}

4
tests/specs/install/install_add_dev_existing/install.out Normal file
View file

@ -0,0 +1,4 @@
Add npm:@denotest/esm-basic@1.0.0
Download http://localhost:4260/@denotest/esm-basic
Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz
Initialize @denotest/esm-basic@1.0.0

3
tests/specs/install/install_add_dev_existing/package.json Normal file
View file

@ -0,0 +1,3 @@
{
"dependencies": { "@denotest/esm-basic": "^1.0.0" }
}

5
tests/specs/install/install_add_dev_existing/package.json.out Normal file
View file

@ -0,0 +1,5 @@
{
"devDependencies": {
"@denotest/esm-basic": "^1.0.0"
}
}