From 7eb34c7a36ac065d169e3645fc8a3da3e71431d7 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Mon, 6 Nov 2023 08:35:26 -0500 Subject: fix(byonm): correct resolution for scoped packages (#21083) --- cli/tests/testdata/npm/different_nested_dep/main.js | 5 +++++ cli/tests/testdata/npm/different_nested_dep/main.out | 2 ++ cli/tests/testdata/npm/different_nested_dep/package.json | 6 ++++++ .../registry/@denotest/different-nested-dep-child/1.0.0/index.js | 1 + .../@denotest/different-nested-dep-child/1.0.0/package.json | 5 +++++ .../registry/@denotest/different-nested-dep-child/2.0.0/index.js | 1 + .../@denotest/different-nested-dep-child/2.0.0/package.json | 5 +++++ .../npm/registry/@denotest/different-nested-dep/1.0.0/index.js | 2 ++ .../registry/@denotest/different-nested-dep/1.0.0/package.json | 8 ++++++++ 9 files changed, 35 insertions(+) create mode 100644 cli/tests/testdata/npm/different_nested_dep/main.js create mode 100644 cli/tests/testdata/npm/different_nested_dep/main.out create mode 100644 cli/tests/testdata/npm/different_nested_dep/package.json create mode 100644 cli/tests/testdata/npm/registry/@denotest/different-nested-dep-child/1.0.0/index.js create mode 100644 cli/tests/testdata/npm/registry/@denotest/different-nested-dep-child/1.0.0/package.json create mode 100644 cli/tests/testdata/npm/registry/@denotest/different-nested-dep-child/2.0.0/index.js create mode 100644 cli/tests/testdata/npm/registry/@denotest/different-nested-dep-child/2.0.0/package.json create mode 100644 cli/tests/testdata/npm/registry/@denotest/different-nested-dep/1.0.0/index.js create mode 100644 cli/tests/testdata/npm/registry/@denotest/different-nested-dep/1.0.0/package.json (limited to 'cli/tests/testdata/npm') diff --git a/cli/tests/testdata/npm/different_nested_dep/main.js b/cli/tests/testdata/npm/different_nested_dep/main.js new file mode 100644 index 000000000..5677eb094 --- /dev/null +++ b/cli/tests/testdata/npm/different_nested_dep/main.js @@ -0,0 +1,5 @@ +import dep from "@denotest/different-nested-dep"; +import childDep from "@denotest/different-nested-dep-child"; + +console.log(dep); +console.log(childDep); diff --git a/cli/tests/testdata/npm/different_nested_dep/main.out b/cli/tests/testdata/npm/different_nested_dep/main.out new file mode 100644 index 000000000..1191247b6 --- /dev/null +++ b/cli/tests/testdata/npm/different_nested_dep/main.out @@ -0,0 +1,2 @@ +1 +2 diff --git a/cli/tests/testdata/npm/different_nested_dep/package.json b/cli/tests/testdata/npm/different_nested_dep/package.json new file mode 100644 index 000000000..c20425851 --- /dev/null +++ b/cli/tests/testdata/npm/different_nested_dep/package.json @@ -0,0 +1,6 @@ +{ + "dependencies": { + "@denotest/different-nested-dep": "1.0.0", + "@denotest/different-nested-dep-child": "2.0.0" + } +} diff --git a/cli/tests/testdata/npm/registry/@denotest/different-nested-dep-child/1.0.0/index.js b/cli/tests/testdata/npm/registry/@denotest/different-nested-dep-child/1.0.0/index.js new file mode 100644 index 000000000..aef22247d --- /dev/null +++ b/cli/tests/testdata/npm/registry/@denotest/different-nested-dep-child/1.0.0/index.js @@ -0,0 +1 @@ +export default 1; diff --git a/cli/tests/testdata/npm/registry/@denotest/different-nested-dep-child/1.0.0/package.json b/cli/tests/testdata/npm/registry/@denotest/different-nested-dep-child/1.0.0/package.json new file mode 100644 index 000000000..ca58520a4 --- /dev/null +++ b/cli/tests/testdata/npm/registry/@denotest/different-nested-dep-child/1.0.0/package.json @@ -0,0 +1,5 @@ +{ + "name": "@denotest/different-nested-dep-child", + "type": "module", + "version": "1.0.0" +} diff --git a/cli/tests/testdata/npm/registry/@denotest/different-nested-dep-child/2.0.0/index.js b/cli/tests/testdata/npm/registry/@denotest/different-nested-dep-child/2.0.0/index.js new file mode 100644 index 000000000..842e368a0 --- /dev/null +++ b/cli/tests/testdata/npm/registry/@denotest/different-nested-dep-child/2.0.0/index.js @@ -0,0 +1 @@ +export default 2; diff --git a/cli/tests/testdata/npm/registry/@denotest/different-nested-dep-child/2.0.0/package.json b/cli/tests/testdata/npm/registry/@denotest/different-nested-dep-child/2.0.0/package.json new file mode 100644 index 000000000..9d2e56975 --- /dev/null +++ b/cli/tests/testdata/npm/registry/@denotest/different-nested-dep-child/2.0.0/package.json @@ -0,0 +1,5 @@ +{ + "name": "@denotest/different-nested-dep-child", + "type": "module", + "version": "2.0.0" +} diff --git a/cli/tests/testdata/npm/registry/@denotest/different-nested-dep/1.0.0/index.js b/cli/tests/testdata/npm/registry/@denotest/different-nested-dep/1.0.0/index.js new file mode 100644 index 000000000..dee5330b7 --- /dev/null +++ b/cli/tests/testdata/npm/registry/@denotest/different-nested-dep/1.0.0/index.js @@ -0,0 +1,2 @@ +import version from "@denotest/different-nested-dep-child"; +export default version; diff --git a/cli/tests/testdata/npm/registry/@denotest/different-nested-dep/1.0.0/package.json b/cli/tests/testdata/npm/registry/@denotest/different-nested-dep/1.0.0/package.json new file mode 100644 index 000000000..879a4e012 --- /dev/null +++ b/cli/tests/testdata/npm/registry/@denotest/different-nested-dep/1.0.0/package.json @@ -0,0 +1,8 @@ +{ + "name": "@denotest/different-nested-dep", + "version": "1.0.0", + "type": "module", + "dependencies": { + "@denotest/different-nested-dep-child": "1.0.0" + } +} -- cgit v1.2.3