From ccdbeb433b64fec409da2d541456ddf5a35ea4a4 Mon Sep 17 00:00:00 2001 From: Marvin Hagemeister Date: Thu, 10 Oct 2024 21:31:45 +0200 Subject: fix(install): duplicate dependencies in `package.json` (#26128) Fixes https://github.com/denoland/deno/issues/26120 --- .../install/install_add_dep_existing/__test__.jsonc | 16 ++++++++++++++++ tests/specs/install/install_add_dep_existing/install.out | 4 ++++ .../specs/install/install_add_dep_existing/package.json | 3 +++ .../install/install_add_dep_existing/package.json.out | 5 +++++ .../install/install_add_dev_existing/__test__.jsonc | 16 ++++++++++++++++ tests/specs/install/install_add_dev_existing/install.out | 4 ++++ .../specs/install/install_add_dev_existing/package.json | 3 +++ .../install/install_add_dev_existing/package.json.out | 5 +++++ 8 files changed, 56 insertions(+) create mode 100644 tests/specs/install/install_add_dep_existing/__test__.jsonc create mode 100644 tests/specs/install/install_add_dep_existing/install.out create mode 100644 tests/specs/install/install_add_dep_existing/package.json create mode 100644 tests/specs/install/install_add_dep_existing/package.json.out create mode 100644 tests/specs/install/install_add_dev_existing/__test__.jsonc create mode 100644 tests/specs/install/install_add_dev_existing/install.out create mode 100644 tests/specs/install/install_add_dev_existing/package.json create mode 100644 tests/specs/install/install_add_dev_existing/package.json.out (limited to 'tests') diff --git a/tests/specs/install/install_add_dep_existing/__test__.jsonc b/tests/specs/install/install_add_dep_existing/__test__.jsonc new file mode 100644 index 000000000..74c509a57 --- /dev/null +++ b/tests/specs/install/install_add_dep_existing/__test__.jsonc @@ -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" + } + ] +} diff --git a/tests/specs/install/install_add_dep_existing/install.out b/tests/specs/install/install_add_dep_existing/install.out new file mode 100644 index 000000000..42161f3ae --- /dev/null +++ b/tests/specs/install/install_add_dep_existing/install.out @@ -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 diff --git a/tests/specs/install/install_add_dep_existing/package.json b/tests/specs/install/install_add_dep_existing/package.json new file mode 100644 index 000000000..d5ca56e00 --- /dev/null +++ b/tests/specs/install/install_add_dep_existing/package.json @@ -0,0 +1,3 @@ +{ + "devDependencies": { "@denotest/esm-basic": "^1.0.0" } +} diff --git a/tests/specs/install/install_add_dep_existing/package.json.out b/tests/specs/install/install_add_dep_existing/package.json.out new file mode 100644 index 000000000..613d98636 --- /dev/null +++ b/tests/specs/install/install_add_dep_existing/package.json.out @@ -0,0 +1,5 @@ +{ + "dependencies": { + "@denotest/esm-basic": "^1.0.0" + } +} diff --git a/tests/specs/install/install_add_dev_existing/__test__.jsonc b/tests/specs/install/install_add_dev_existing/__test__.jsonc new file mode 100644 index 000000000..e4e2f8a31 --- /dev/null +++ b/tests/specs/install/install_add_dev_existing/__test__.jsonc @@ -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" + } + ] +} diff --git a/tests/specs/install/install_add_dev_existing/install.out b/tests/specs/install/install_add_dev_existing/install.out new file mode 100644 index 000000000..42161f3ae --- /dev/null +++ b/tests/specs/install/install_add_dev_existing/install.out @@ -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 diff --git a/tests/specs/install/install_add_dev_existing/package.json b/tests/specs/install/install_add_dev_existing/package.json new file mode 100644 index 000000000..ad8518e79 --- /dev/null +++ b/tests/specs/install/install_add_dev_existing/package.json @@ -0,0 +1,3 @@ +{ + "dependencies": { "@denotest/esm-basic": "^1.0.0" } +} diff --git a/tests/specs/install/install_add_dev_existing/package.json.out b/tests/specs/install/install_add_dev_existing/package.json.out new file mode 100644 index 000000000..866724397 --- /dev/null +++ b/tests/specs/install/install_add_dev_existing/package.json.out @@ -0,0 +1,5 @@ +{ + "devDependencies": { + "@denotest/esm-basic": "^1.0.0" + } +} -- cgit v1.2.3