diff options
| author | haturau <135221985+haturatu@users.noreply.github.com> | 2024-11-20 01:20:47 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-20 01:20:47 +0900 |
| commit | 85719a67e59c7aa45bead26e4942d7df8b1b42d4 (patch) | |
| tree | face0aecaac53e93ce2f23b53c48859bcf1a36ec /tests/specs/add/package_json_and_deno_json | |
| parent | 67697bc2e4a62a9670699fd18ad0dd8efc5bd955 (diff) | |
| parent | 186b52731c6bb326c4d32905c5e732d082e83465 (diff) | |
Merge branch 'denoland:main' into main
Diffstat (limited to 'tests/specs/add/package_json_and_deno_json')
6 files changed, 39 insertions, 3 deletions
diff --git a/tests/specs/add/package_json_and_deno_json/__test__.jsonc b/tests/specs/add/package_json_and_deno_json/__test__.jsonc index 0beee02d1..8d67a07c8 100644 --- a/tests/specs/add/package_json_and_deno_json/__test__.jsonc +++ b/tests/specs/add/package_json_and_deno_json/__test__.jsonc @@ -41,6 +41,29 @@ "output": "good\n" } ] + }, + "only_prefers_package_json_if_closer": { + "steps": [ + { + "cwd": "./subdir", + "args": "add npm:@denotest/esm-basic jsr:@denotest/add npm:@denotest/say-hello", + "output": "[WILDCARD]" + }, + { + "args": [ + "eval", + "console.log(Deno.readTextFileSync('package.json').trim())" + ], + "output": "{}\n" + }, + { + "args": [ + "eval", + "console.log(Deno.readTextFileSync('./subdir/deno.json').trim())" + ], + "output": "subdir/prefer_if_closer_deno.json.out" + } + ] } } } diff --git a/tests/specs/add/package_json_and_deno_json/add.out b/tests/specs/add/package_json_and_deno_json/add.out index 5577a55ac..4ce7bb8ee 100644 --- a/tests/specs/add/package_json_and_deno_json/add.out +++ b/tests/specs/add/package_json_and_deno_json/add.out @@ -2,9 +2,9 @@ Add npm:@denotest/esm-basic@1.0.0 Add jsr:@denotest/add@1.0.0 Add npm:@denotest/say-hello@1.0.0 -Download http://localhost:4260/@denotest/esm-basic +Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz -Download http://localhost:4260/@denotest/say-hello +Download http://localhost:4260/@denotest%2fsay-hello Download http://localhost:4260/@denotest/say-hello/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 Initialize @denotest/say-hello@1.0.0 diff --git a/tests/specs/add/package_json_and_deno_json/add_esm_basic.out b/tests/specs/add/package_json_and_deno_json/add_esm_basic.out index 42161f3ae..44bd9cac7 100644 --- a/tests/specs/add/package_json_and_deno_json/add_esm_basic.out +++ b/tests/specs/add/package_json_and_deno_json/add_esm_basic.out @@ -1,4 +1,4 @@ Add npm:@denotest/esm-basic@1.0.0 -Download http://localhost:4260/@denotest/esm-basic +Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 diff --git a/tests/specs/add/package_json_and_deno_json/subdir/deno.json b/tests/specs/add/package_json_and_deno_json/subdir/deno.json new file mode 100644 index 000000000..cc54bbd8a --- /dev/null +++ b/tests/specs/add/package_json_and_deno_json/subdir/deno.json @@ -0,0 +1,4 @@ +{ + "name": "@test/subdir", + "exports": "./mod.ts" +} diff --git a/tests/specs/add/package_json_and_deno_json/subdir/mod.ts b/tests/specs/add/package_json_and_deno_json/subdir/mod.ts new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/specs/add/package_json_and_deno_json/subdir/mod.ts diff --git a/tests/specs/add/package_json_and_deno_json/subdir/prefer_if_closer_deno.json.out b/tests/specs/add/package_json_and_deno_json/subdir/prefer_if_closer_deno.json.out new file mode 100644 index 000000000..8a5819d50 --- /dev/null +++ b/tests/specs/add/package_json_and_deno_json/subdir/prefer_if_closer_deno.json.out @@ -0,0 +1,9 @@ +{ + "name": "@test/subdir", + "exports": "./mod.ts", + "imports": { + "@denotest/add": "jsr:@denotest/add@^1.0.0", + "@denotest/esm-basic": "npm:@denotest/esm-basic@^1.0.0", + "@denotest/say-hello": "npm:@denotest/say-hello@^1.0.0" + } +} |