From 72f025c74320ffd6df9758ac53c74db68e0a3e10 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Mon, 9 Sep 2024 16:19:29 -0400 Subject: fix: remove recently added deno.json node_modules aliasing (#25542) This was initially added in #25399 in order to make transitioning over from package.json to deno.json more easy, but it causes some problems that are shown in the issue and it also means that the output of `deno install` would have different resolution than `npm install`. Overall, I think it's too much complexity to be smarter about this and it's probably best to not do it. If someone needs an aliased folder then they should keep using a package.json Closes #25538 --- tests/specs/install/alias_deno_json/__test__.jsonc | 10 ---------- tests/specs/install/alias_deno_json/deno.json | 5 ----- tests/specs/install/alias_deno_json/package.json | 2 -- tests/specs/install/alias_deno_json/verify.ts | 2 -- tests/specs/install/alias_invalid_path_char/__test__.jsonc | 10 ---------- tests/specs/install/alias_invalid_path_char/deno.jsonc | 7 ------- tests/specs/install/alias_invalid_path_char/package.json | 2 -- tests/specs/install/alias_invalid_path_char/verify.ts | 10 ---------- .../install/alias_pkg_json_and_deno_json_npm_pkg/verify.out | 2 +- 9 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 tests/specs/install/alias_deno_json/__test__.jsonc delete mode 100644 tests/specs/install/alias_deno_json/deno.json delete mode 100644 tests/specs/install/alias_deno_json/package.json delete mode 100644 tests/specs/install/alias_deno_json/verify.ts delete mode 100644 tests/specs/install/alias_invalid_path_char/__test__.jsonc delete mode 100644 tests/specs/install/alias_invalid_path_char/deno.jsonc delete mode 100644 tests/specs/install/alias_invalid_path_char/package.json delete mode 100644 tests/specs/install/alias_invalid_path_char/verify.ts (limited to 'tests/specs/install') diff --git a/tests/specs/install/alias_deno_json/__test__.jsonc b/tests/specs/install/alias_deno_json/__test__.jsonc deleted file mode 100644 index 0398e2eeb..000000000 --- a/tests/specs/install/alias_deno_json/__test__.jsonc +++ /dev/null @@ -1,10 +0,0 @@ -{ - "tempDir": true, - "steps": [{ - "args": "install", - "output": "[WILDCARD]" - }, { - "args": "run --allow-read=. verify.ts", - "output": "true\n" - }] -} diff --git a/tests/specs/install/alias_deno_json/deno.json b/tests/specs/install/alias_deno_json/deno.json deleted file mode 100644 index a1adfb35e..000000000 --- a/tests/specs/install/alias_deno_json/deno.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "imports": { - "alias": "npm:@denotest/add" - } -} diff --git a/tests/specs/install/alias_deno_json/package.json b/tests/specs/install/alias_deno_json/package.json deleted file mode 100644 index 2c63c0851..000000000 --- a/tests/specs/install/alias_deno_json/package.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} diff --git a/tests/specs/install/alias_deno_json/verify.ts b/tests/specs/install/alias_deno_json/verify.ts deleted file mode 100644 index ea6cadb70..000000000 --- a/tests/specs/install/alias_deno_json/verify.ts +++ /dev/null @@ -1,2 +0,0 @@ -const stat = Deno.statSync(new URL("./node_modules/alias", import.meta.url)); -console.log(stat.isDirectory); diff --git a/tests/specs/install/alias_invalid_path_char/__test__.jsonc b/tests/specs/install/alias_invalid_path_char/__test__.jsonc deleted file mode 100644 index 4a3058635..000000000 --- a/tests/specs/install/alias_invalid_path_char/__test__.jsonc +++ /dev/null @@ -1,10 +0,0 @@ -{ - "tempDir": true, - "steps": [{ - "args": "install", - "output": "[WILDCARD]" - }, { - "args": "run --allow-read=. verify.ts", - "output": ".bin\n.deno\n@denotest\n" - }] -} diff --git a/tests/specs/install/alias_invalid_path_char/deno.jsonc b/tests/specs/install/alias_invalid_path_char/deno.jsonc deleted file mode 100644 index 85befb55e..000000000 --- a/tests/specs/install/alias_invalid_path_char/deno.jsonc +++ /dev/null @@ -1,7 +0,0 @@ -{ - "imports": { - // alias*test is an invalid path char on windows, so - // don't create an alias for this - "alias*test": "npm:@denotest/add" - } -} diff --git a/tests/specs/install/alias_invalid_path_char/package.json b/tests/specs/install/alias_invalid_path_char/package.json deleted file mode 100644 index 2c63c0851..000000000 --- a/tests/specs/install/alias_invalid_path_char/package.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} diff --git a/tests/specs/install/alias_invalid_path_char/verify.ts b/tests/specs/install/alias_invalid_path_char/verify.ts deleted file mode 100644 index 497e1d8dd..000000000 --- a/tests/specs/install/alias_invalid_path_char/verify.ts +++ /dev/null @@ -1,10 +0,0 @@ -const entries = Array.from( - Deno.readDirSync(new URL("./node_modules", import.meta.url)), -); -const names = entries.map((entry) => entry.name); -names.sort(); - -// won't have the invalid path alias -for (const name of names) { - console.log(name); -} diff --git a/tests/specs/install/alias_pkg_json_and_deno_json_npm_pkg/verify.out b/tests/specs/install/alias_pkg_json_and_deno_json_npm_pkg/verify.out index bc6cb31f7..8c989abd4 100644 --- a/tests/specs/install/alias_pkg_json_and_deno_json_npm_pkg/verify.out +++ b/tests/specs/install/alias_pkg_json_and_deno_json_npm_pkg/verify.out @@ -1,4 +1,4 @@ -@denotest/add +@denotest/esm-basic [Module: null prototype] { add: [Function (anonymous)], default: { add: [Function (anonymous)] } -- cgit v1.2.3