From f4cf334be1fb6256c1e887abc9ba660a912b372b Mon Sep 17 00:00:00 2001 From: Jason Bedard Date: Sun, 2 Jun 2024 16:36:55 -0700 Subject: [PATCH] fix(pnpm): pnpm9 transitive npm: dependenies --- e2e/pnpm_lockfiles/MODULE.bazel | 1 + e2e/pnpm_lockfiles/README.md | 6 +- e2e/pnpm_lockfiles/WORKSPACE | 4 + e2e/pnpm_lockfiles/base/aliases-test.js | 3 + e2e/pnpm_lockfiles/base/package.json | 1 + e2e/pnpm_lockfiles/cases/BUILD.bazel | 11 + .../cases/isaacs-cliui-v90.yaml | 194 ++++++++++++++++++ e2e/pnpm_lockfiles/lockfile-test.bzl | 4 + e2e/pnpm_lockfiles/v54/pnpm-lock.yaml | 114 ++++++++++ e2e/pnpm_lockfiles/v54/snapshots/defs.bzl | 164 +++++++++------ e2e/pnpm_lockfiles/v60/pnpm-lock.yaml | 115 +++++++++++ e2e/pnpm_lockfiles/v60/snapshots/defs.bzl | 170 +++++++++------ e2e/pnpm_lockfiles/v61/pnpm-lock.yaml | 115 +++++++++++ e2e/pnpm_lockfiles/v61/snapshots/defs.bzl | 170 +++++++++------ e2e/pnpm_lockfiles/v90/pnpm-lock.yaml | 132 ++++++++++++ e2e/pnpm_lockfiles/v90/snapshots/defs.bzl | 170 +++++++++------ npm/private/utils.bzl | 28 ++- 17 files changed, 1131 insertions(+), 271 deletions(-) create mode 100644 e2e/pnpm_lockfiles/cases/isaacs-cliui-v90.yaml diff --git a/e2e/pnpm_lockfiles/MODULE.bazel b/e2e/pnpm_lockfiles/MODULE.bazel index c42a61e10..4f0aea76d 100644 --- a/e2e/pnpm_lockfiles/MODULE.bazel +++ b/e2e/pnpm_lockfiles/MODULE.bazel @@ -16,6 +16,7 @@ PNPM_LOCK_VERSIONS = [ PNPM_LOCK_TEST_CASES = [ "tarball-no-url-v54.yaml", "override-with-alias-url-v9.yaml", + "isaacs-cliui-v90.yaml", ] bazel_dep(name = "aspect_bazel_lib", version = "2.7.7") diff --git a/e2e/pnpm_lockfiles/README.md b/e2e/pnpm_lockfiles/README.md index d5b4c736f..ae40b3709 100644 --- a/e2e/pnpm_lockfiles/README.md +++ b/e2e/pnpm_lockfiles/README.md @@ -2,8 +2,12 @@ See notes in lockfile-test.bzl for test cases of each package. -## pnpm lockfile edge cases +## pnpm lockfile edge cases (./cases/\*) Unique test cases hard to cover with normal pnpm workspaces + package.json. Each test case is a pnpm-lock.yaml with a unique filename, see cases/BUILD for how the test cases run on each of those lockfiles. + +- `isaacs-cliui-v*`: a transitive `npm:` dependency as an alias to use multiple versions of a single package, this is different then a direct `npm:` dependency +- `override-with-alias-url-v9` - a package overridden with a different package +- `tarball-no-url-v54` - a package with a tarball but not a full URL diff --git a/e2e/pnpm_lockfiles/WORKSPACE b/e2e/pnpm_lockfiles/WORKSPACE index 7fdb9e1b5..7d8d35c14 100644 --- a/e2e/pnpm_lockfiles/WORKSPACE +++ b/e2e/pnpm_lockfiles/WORKSPACE @@ -15,6 +15,7 @@ PNPM_LOCK_VERSIONS = [ PNPM_LOCK_TEST_CASES = [ "tarball-no-url-v54.yaml", "override-with-alias-url-v9.yaml", + "isaacs-cliui-v90.yaml", ] load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies") @@ -62,9 +63,12 @@ npm_repositories_v90() for lockfile in PNPM_LOCK_TEST_CASES ] +load("@isaacs-cliui-v90//:repositories.bzl", npm_repositories_isaacs_cliui_v90 = "npm_repositories") load("@override-with-alias-url-v9//:repositories.bzl", npm_repositories_override_with_alias_v90 = "npm_repositories") load("@tarball-no-url-v54//:repositories.bzl", npm_repositories_tarball_no_url_v54 = "npm_repositories") npm_repositories_tarball_no_url_v54() npm_repositories_override_with_alias_v90() + +npm_repositories_isaacs_cliui_v90() diff --git a/e2e/pnpm_lockfiles/base/aliases-test.js b/e2e/pnpm_lockfiles/base/aliases-test.js index be4086100..ee0883720 100644 --- a/e2e/pnpm_lockfiles/base/aliases-test.js +++ b/e2e/pnpm_lockfiles/base/aliases-test.js @@ -22,3 +22,6 @@ if ( ) { throw new Error('aliased `is-odd` as `is-odd-alt-version` are the same') } + +// `@isaacs/cliui` has transitive `npm:*` deps +require('@isaacs/cliui') diff --git a/e2e/pnpm_lockfiles/base/package.json b/e2e/pnpm_lockfiles/base/package.json index c22416d53..bc350922c 100644 --- a/e2e/pnpm_lockfiles/base/package.json +++ b/e2e/pnpm_lockfiles/base/package.json @@ -4,6 +4,7 @@ "dependencies": { "@aspect-test/a": "^5.0.2", "@aspect-test/a2": "npm:@aspect-test/a", + "@isaacs/cliui": "8.0.2", "debug": "ngokevin/debug#9742c5f383a6f8046241920156236ade8ec30d53", "hello": "https://gitpkg.vercel.app/EqualMa/gitpkg-hello/packages/hello", "jsonify": "https://github.com/aspect-build/test-packages/releases/download/0.0.0/@foo-jsonify-0.0.0.tgz", diff --git a/e2e/pnpm_lockfiles/cases/BUILD.bazel b/e2e/pnpm_lockfiles/cases/BUILD.bazel index fa2bf3511..4823d19b6 100644 --- a/e2e/pnpm_lockfiles/cases/BUILD.bazel +++ b/e2e/pnpm_lockfiles/cases/BUILD.bazel @@ -1,4 +1,5 @@ load("@bazel_skylib//rules:build_test.bzl", "build_test") +load("@isaacs-cliui-v90//:defs.bzl", isaacs_cliui_v90_link_all = "npm_link_all_packages") load("@override-with-alias-url-v9//:defs.bzl", override_with_alias_link_all = "npm_link_all_packages") load("@tarball-no-url-v54//:defs.bzl", tarball_no_url_link_all = "npm_link_all_packages") @@ -23,3 +24,13 @@ build_test( ":override-with-alias-url-v9_modules/lodash.pick", ], ) + +isaacs_cliui_v90_link_all(name = "isaacs_cliui_v90-modules") + +build_test( + name = "isaacs_cliui", + targets = [ + ":isaacs_cliui_v90-modules", + ":isaacs_cliui_v90-modules/@isaacs/cliui", + ], +) diff --git a/e2e/pnpm_lockfiles/cases/isaacs-cliui-v90.yaml b/e2e/pnpm_lockfiles/cases/isaacs-cliui-v90.yaml new file mode 100644 index 000000000..85f8abc0e --- /dev/null +++ b/e2e/pnpm_lockfiles/cases/isaacs-cliui-v90.yaml @@ -0,0 +1,194 @@ +lockfileVersion: '9.0' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + +importers: + .: + dependencies: + '@isaacs/cliui': + specifier: 8.0.2 + version: 8.0.2 + +packages: + '@isaacs/cliui@8.0.2': + resolution: + { + integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==, + } + engines: { node: '>=12' } + + ansi-regex@5.0.1: + resolution: + { + integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==, + } + engines: { node: '>=8' } + + ansi-regex@6.0.1: + resolution: + { + integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==, + } + engines: { node: '>=12' } + + ansi-styles@4.3.0: + resolution: + { + integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==, + } + engines: { node: '>=8' } + + ansi-styles@6.2.1: + resolution: + { + integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==, + } + engines: { node: '>=12' } + + color-convert@2.0.1: + resolution: + { + integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==, + } + engines: { node: '>=7.0.0' } + + color-name@1.1.4: + resolution: + { + integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==, + } + + eastasianwidth@0.2.0: + resolution: + { + integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==, + } + + emoji-regex@8.0.0: + resolution: + { + integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==, + } + + emoji-regex@9.2.2: + resolution: + { + integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==, + } + + is-fullwidth-code-point@3.0.0: + resolution: + { + integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==, + } + engines: { node: '>=8' } + + string-width@4.2.3: + resolution: + { + integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==, + } + engines: { node: '>=8' } + + string-width@5.1.2: + resolution: + { + integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==, + } + engines: { node: '>=12' } + + strip-ansi@6.0.1: + resolution: + { + integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==, + } + engines: { node: '>=8' } + + strip-ansi@7.1.0: + resolution: + { + integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==, + } + engines: { node: '>=12' } + + wrap-ansi@7.0.0: + resolution: + { + integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==, + } + engines: { node: '>=10' } + + wrap-ansi@8.1.0: + resolution: + { + integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==, + } + engines: { node: '>=12' } + +snapshots: + '@isaacs/cliui@8.0.2': + dependencies: + string-width: 5.1.2 + string-width-cjs: string-width@4.2.3 + strip-ansi: 7.1.0 + strip-ansi-cjs: strip-ansi@6.0.1 + wrap-ansi: 8.1.0 + wrap-ansi-cjs: wrap-ansi@7.0.0 + + ansi-regex@5.0.1: {} + + ansi-regex@6.0.1: {} + + ansi-styles@4.3.0: + dependencies: + color-convert: 2.0.1 + + ansi-styles@6.2.1: {} + + color-convert@2.0.1: + dependencies: + color-name: 1.1.4 + + color-name@1.1.4: {} + + eastasianwidth@0.2.0: {} + + emoji-regex@8.0.0: {} + + emoji-regex@9.2.2: {} + + is-fullwidth-code-point@3.0.0: {} + + string-width@4.2.3: + dependencies: + emoji-regex: 8.0.0 + is-fullwidth-code-point: 3.0.0 + strip-ansi: 6.0.1 + + string-width@5.1.2: + dependencies: + eastasianwidth: 0.2.0 + emoji-regex: 9.2.2 + strip-ansi: 7.1.0 + + strip-ansi@6.0.1: + dependencies: + ansi-regex: 5.0.1 + + strip-ansi@7.1.0: + dependencies: + ansi-regex: 6.0.1 + + wrap-ansi@7.0.0: + dependencies: + ansi-styles: 4.3.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 + + wrap-ansi@8.1.0: + dependencies: + ansi-styles: 6.2.1 + string-width: 5.1.2 + strip-ansi: 7.1.0 diff --git a/e2e/pnpm_lockfiles/lockfile-test.bzl b/e2e/pnpm_lockfiles/lockfile-test.bzl index f94bb1a67..4b10052de 100644 --- a/e2e/pnpm_lockfiles/lockfile-test.bzl +++ b/e2e/pnpm_lockfiles/lockfile-test.bzl @@ -64,6 +64,7 @@ def lockfile_test(name = None): ":node_modules/alias-types-node", ":node_modules/is-odd", ":node_modules/is-odd-alt-version", + ":node_modules/@isaacs/cliui", ], entry_point = "aliases-test.js", ) @@ -90,6 +91,9 @@ def lockfile_test(name = None): # uuv 'hasBin' ":node_modules/uvu", + # a package with various `npm:` cases + ":node_modules/@isaacs/cliui", + # link:, workspace:, file:, ./rel/path ":node_modules/@scoped/a", ":node_modules/@scoped/b", diff --git a/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml index afa24b881..c87d39aab 100644 --- a/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml +++ b/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml @@ -20,6 +20,7 @@ importers: '@aspect-test/a2': npm:@aspect-test/a '@aspect-test/b': 5.0.2 '@aspect-test/c': 2.0.0 + '@isaacs/cliui': 8.0.2 '@scoped/a': workspace:* '@scoped/b': link:../projects/b '@scoped/c': file:../projects/c @@ -38,6 +39,7 @@ importers: dependencies: '@aspect-test/a': 5.0.2 '@aspect-test/a2': /@aspect-test/a/5.0.2 + '@isaacs/cliui': 8.0.2 '@scoped/a': link:../projects/a '@scoped/b': link:../projects/b '@scoped/c': file:../projects/c @@ -120,11 +122,68 @@ packages: dependencies: '@aspect-test/c': 2.0.2 + /@isaacs/cliui/8.0.2: + resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} + engines: {node: '>=12'} + dependencies: + string-width: 5.1.2 + string-width-cjs: /string-width/4.2.3 + strip-ansi: 7.1.0 + strip-ansi-cjs: /strip-ansi/6.0.1 + wrap-ansi: 8.1.0 + wrap-ansi-cjs: /wrap-ansi/7.0.0 + dev: false + + /ansi-regex/5.0.1: + resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} + engines: {node: '>=8'} + dev: false + + /ansi-regex/6.0.1: + resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} + engines: {node: '>=12'} + dev: false + + /ansi-styles/4.3.0: + resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} + engines: {node: '>=8'} + dependencies: + color-convert: 2.0.1 + dev: false + + /ansi-styles/6.2.1: + resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} + engines: {node: '>=12'} + dev: false + + /color-convert/2.0.1: + resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} + engines: {node: '>=7.0.0'} + dependencies: + color-name: 1.1.4 + dev: false + + /color-name/1.1.4: + resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + dev: false + /dequal/2.0.3: resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==} engines: {node: '>=6'} dev: false + /eastasianwidth/0.2.0: + resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} + dev: false + + /emoji-regex/8.0.0: + resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} + dev: false + + /emoji-regex/9.2.2: + resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} + dev: false + /fsevents/2.3.3: resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} @@ -132,6 +191,11 @@ packages: dev: false optional: true + /is-fullwidth-code-point/3.0.0: + resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} + engines: {node: '>=8'} + dev: false + /is-odd/2.0.0: resolution: {integrity: sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==} engines: {node: '>=0.10.0'} @@ -180,6 +244,38 @@ packages: mri: 1.2.0 dev: false + /string-width/4.2.3: + resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} + engines: {node: '>=8'} + dependencies: + emoji-regex: 8.0.0 + is-fullwidth-code-point: 3.0.0 + strip-ansi: 6.0.1 + dev: false + + /string-width/5.1.2: + resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==} + engines: {node: '>=12'} + dependencies: + eastasianwidth: 0.2.0 + emoji-regex: 9.2.2 + strip-ansi: 7.1.0 + dev: false + + /strip-ansi/6.0.1: + resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} + engines: {node: '>=8'} + dependencies: + ansi-regex: 5.0.1 + dev: false + + /strip-ansi/7.1.0: + resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} + engines: {node: '>=12'} + dependencies: + ansi-regex: 6.0.1 + dev: false + /uvu/0.5.6: resolution: {integrity: sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==} engines: {node: '>=8'} @@ -191,6 +287,24 @@ packages: sade: 1.8.1 dev: false + /wrap-ansi/7.0.0: + resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} + engines: {node: '>=10'} + dependencies: + ansi-styles: 4.3.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 + dev: false + + /wrap-ansi/8.1.0: + resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} + engines: {node: '>=12'} + dependencies: + ansi-styles: 6.2.1 + string-width: 5.1.2 + strip-ansi: 7.1.0 + dev: false + '@github.com/aspect-build/test-packages/releases/download/0.0.0/@foo-jsonify-0.0.0.tgz': resolution: {tarball: https://github.com/aspect-build/test-packages/releases/download/0.0.0/@foo-jsonify-0.0.0.tgz} name: '@foo/jsonify' diff --git a/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl index a8d5b530b..6295dba8c 100644 --- a/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl @@ -4,30 +4,47 @@ load("@aspect_rules_js//js:defs.bzl", _js_library = "js_library") load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_link_package_store = "npm_link_package_store") load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_package_store = "npm_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_a__5.0.2__links//:defs.bzl", link_0 = "npm_link_imported_package_store", store_0 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_b__5.0.2__links//:defs.bzl", link_1 = "npm_link_imported_package_store", store_1 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.0__links//:defs.bzl", link_2 = "npm_link_imported_package_store", store_2 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.2__links//:defs.bzl", store_3 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0__at_aspect-test_c_2.0.2__links//:defs.bzl", store_4 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_foo_jsonify__at_github.com_aspect-build_test-packages_releases_download_0.0.0_at_foo-jsonify-0.0.0.tgz__links//:defs.bzl", link_5 = "npm_link_imported_package_store", store_5 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_archiver__5.3.1__links//:defs.bzl", link_6 = "npm_link_imported_package_store", store_6 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_glob__8.1.0__links//:defs.bzl", store_7 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_minimatch__5.1.2__links//:defs.bzl", store_8 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_node__16.18.11__links//:defs.bzl", link_9 = "npm_link_imported_package_store", store_9 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__debug__github.com_ngokevin_debug_9742c5f383a6f8046241920156236ade8ec30d53__links//:defs.bzl", link_10 = "npm_link_imported_package_store", store_10 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__dequal__2.0.3__links//:defs.bzl", store_11 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__diff__at_github.com_kpdecker_jsdiff_archive_refs_tags_v5.2.0.tar.gz__links//:defs.bzl", store_12 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__fsevents__2.3.3__links//:defs.bzl", store_13 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__hello__at_gitpkg.vercel.app_EqualMa_gitpkg-hello_packages_hello__links//:defs.bzl", link_14 = "npm_link_imported_package_store", store_14 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__is-odd__2.0.0__links//:defs.bzl", link_15 = "npm_link_imported_package_store", store_15 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__is-odd__3.0.1__links//:defs.bzl", link_16 = "npm_link_imported_package_store", store_16 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__kleur__4.1.5__links//:defs.bzl", store_17 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0__o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_18 = "npm_link_imported_package_store", store_18 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_19 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_20 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__rollup__3.2.5__links//:defs.bzl", link_21 = "npm_link_imported_package_store", store_21 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_22 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_23 = "npm_link_imported_package_store", store_23 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-regex__5.0.1__links//:defs.bzl", store_0 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-regex__6.0.1__links//:defs.bzl", store_1 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-styles__4.3.0__links//:defs.bzl", store_2 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-styles__6.2.1__links//:defs.bzl", store_3 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_a__5.0.2__links//:defs.bzl", link_4 = "npm_link_imported_package_store", store_4 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_b__5.0.2__links//:defs.bzl", link_5 = "npm_link_imported_package_store", store_5 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.0__links//:defs.bzl", link_6 = "npm_link_imported_package_store", store_6 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.2__links//:defs.bzl", store_7 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0__at_aspect-test_c_2.0.2__links//:defs.bzl", store_8 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_foo_jsonify__at_github.com_aspect-build_test-packages_releases_download_0.0.0_at_foo-jsonify-0.0.0.tgz__links//:defs.bzl", link_9 = "npm_link_imported_package_store", store_9 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_isaacs_cliui__8.0.2__links//:defs.bzl", link_10 = "npm_link_imported_package_store", store_10 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_archiver__5.3.1__links//:defs.bzl", link_11 = "npm_link_imported_package_store", store_11 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_glob__8.1.0__links//:defs.bzl", store_12 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_minimatch__5.1.2__links//:defs.bzl", store_13 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_node__16.18.11__links//:defs.bzl", link_14 = "npm_link_imported_package_store", store_14 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__color-convert__2.0.1__links//:defs.bzl", store_15 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__color-name__1.1.4__links//:defs.bzl", store_16 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__debug__github.com_ngokevin_debug_9742c5f383a6f8046241920156236ade8ec30d53__links//:defs.bzl", link_17 = "npm_link_imported_package_store", store_17 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__dequal__2.0.3__links//:defs.bzl", store_18 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__diff__at_github.com_kpdecker_jsdiff_archive_refs_tags_v5.2.0.tar.gz__links//:defs.bzl", store_19 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__eastasianwidth__0.2.0__links//:defs.bzl", store_20 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__emoji-regex__8.0.0__links//:defs.bzl", store_21 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__emoji-regex__9.2.2__links//:defs.bzl", store_22 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__fsevents__2.3.3__links//:defs.bzl", store_23 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__hello__at_gitpkg.vercel.app_EqualMa_gitpkg-hello_packages_hello__links//:defs.bzl", link_24 = "npm_link_imported_package_store", store_24 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__is-fullwidth-code-point__3.0.0__links//:defs.bzl", store_25 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__is-odd__2.0.0__links//:defs.bzl", link_26 = "npm_link_imported_package_store", store_26 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__is-odd__3.0.1__links//:defs.bzl", link_27 = "npm_link_imported_package_store", store_27 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__kleur__4.1.5__links//:defs.bzl", store_28 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0__o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_29 = "npm_link_imported_package_store", store_29 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_30 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_31 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__rollup__3.2.5__links//:defs.bzl", link_32 = "npm_link_imported_package_store", store_32 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_33 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__string-width__4.2.3__links//:defs.bzl", store_34 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__string-width__5.1.2__links//:defs.bzl", store_35 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__strip-ansi__6.0.1__links//:defs.bzl", store_36 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__strip-ansi__7.1.0__links//:defs.bzl", store_37 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_38 = "npm_link_imported_package_store", store_38 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__wrap-ansi__7.0.0__links//:defs.bzl", store_39 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__wrap-ansi__8.1.0__links//:defs.bzl", store_40 = "npm_imported_package_store") _LINK_PACKAGES = ["", "projects/a", "projects/b", "projects/c", "projects/d", "vendored/is-number"] @@ -50,67 +67,87 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets[_scope] = scope_targets[_scope] + _targets if _scope in scope_targets else _targets if is_root: - store_0(name = "{}/@aspect-test/a".format(name)) - store_1(name = "{}/@aspect-test/b".format(name)) - store_2(name = "{}/@aspect-test/c".format(name)) - store_3(name = "{}/@aspect-test/c".format(name)) - store_4(name = "{}/@aspect-test/d".format(name)) - store_5(name = "{}/@foo/jsonify".format(name)) - store_6(name = "{}/@types/archiver".format(name)) - store_7(name = "{}/@types/glob".format(name)) - store_8(name = "{}/@types/minimatch".format(name)) - store_9(name = "{}/@types/node".format(name)) - store_10(name = "{}/debug".format(name)) - store_11(name = "{}/dequal".format(name)) - store_12(name = "{}/diff".format(name)) - store_13(name = "{}/fsevents".format(name)) - store_14(name = "{}/hello".format(name)) - store_15(name = "{}/is-odd".format(name)) - store_16(name = "{}/is-odd".format(name)) - store_17(name = "{}/kleur".format(name)) - store_18(name = "{}/meaning-of-life".format(name)) - store_19(name = "{}/mri".format(name)) - store_20(name = "{}/ms".format(name)) - store_21(name = "{}/rollup".format(name)) - store_22(name = "{}/sade".format(name)) - store_23(name = "{}/uvu".format(name)) + store_0(name = "{}/ansi-regex".format(name)) + store_1(name = "{}/ansi-regex".format(name)) + store_2(name = "{}/ansi-styles".format(name)) + store_3(name = "{}/ansi-styles".format(name)) + store_4(name = "{}/@aspect-test/a".format(name)) + store_5(name = "{}/@aspect-test/b".format(name)) + store_6(name = "{}/@aspect-test/c".format(name)) + store_7(name = "{}/@aspect-test/c".format(name)) + store_8(name = "{}/@aspect-test/d".format(name)) + store_9(name = "{}/@foo/jsonify".format(name)) + store_10(name = "{}/@isaacs/cliui".format(name)) + store_11(name = "{}/@types/archiver".format(name)) + store_12(name = "{}/@types/glob".format(name)) + store_13(name = "{}/@types/minimatch".format(name)) + store_14(name = "{}/@types/node".format(name)) + store_15(name = "{}/color-convert".format(name)) + store_16(name = "{}/color-name".format(name)) + store_17(name = "{}/debug".format(name)) + store_18(name = "{}/dequal".format(name)) + store_19(name = "{}/diff".format(name)) + store_20(name = "{}/eastasianwidth".format(name)) + store_21(name = "{}/emoji-regex".format(name)) + store_22(name = "{}/emoji-regex".format(name)) + store_23(name = "{}/fsevents".format(name)) + store_24(name = "{}/hello".format(name)) + store_25(name = "{}/is-fullwidth-code-point".format(name)) + store_26(name = "{}/is-odd".format(name)) + store_27(name = "{}/is-odd".format(name)) + store_28(name = "{}/kleur".format(name)) + store_29(name = "{}/meaning-of-life".format(name)) + store_30(name = "{}/mri".format(name)) + store_31(name = "{}/ms".format(name)) + store_32(name = "{}/rollup".format(name)) + store_33(name = "{}/sade".format(name)) + store_34(name = "{}/string-width".format(name)) + store_35(name = "{}/string-width".format(name)) + store_36(name = "{}/strip-ansi".format(name)) + store_37(name = "{}/strip-ansi".format(name)) + store_38(name = "{}/uvu".format(name)) + store_39(name = "{}/wrap-ansi".format(name)) + store_40(name = "{}/wrap-ansi".format(name)) if link: if bazel_package == "": - link_0(name = "{}/@aspect-test/a".format(name)) + link_4(name = "{}/@aspect-test/a".format(name)) link_targets.append("//{}:{}/@aspect-test/a".format(bazel_package, name)) scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] - link_0(name = "{}/@aspect-test/a2".format(name)) + link_4(name = "{}/@aspect-test/a2".format(name)) link_targets.append("//{}:{}/@aspect-test/a2".format(bazel_package, name)) scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] - link_1(name = "{}/@aspect-test/b".format(name)) + link_5(name = "{}/@aspect-test/b".format(name)) link_targets.append("//{}:{}/@aspect-test/b".format(bazel_package, name)) scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] - link_2(name = "{}/@aspect-test/c".format(name)) + link_6(name = "{}/@aspect-test/c".format(name)) link_targets.append("//{}:{}/@aspect-test/c".format(bazel_package, name)) scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] - link_5(name = "{}/jsonify".format(name)) + link_9(name = "{}/jsonify".format(name)) link_targets.append("//{}:{}/jsonify".format(bazel_package, name)) - link_6(name = "{}/@types/archiver".format(name)) + link_10(name = "{}/@isaacs/cliui".format(name)) + link_targets.append("//{}:{}/@isaacs/cliui".format(bazel_package, name)) + scope_targets["@isaacs"] = scope_targets["@isaacs"] + [link_targets[-1]] if "@isaacs" in scope_targets else [link_targets[-1]] + link_11(name = "{}/@types/archiver".format(name)) link_targets.append("//{}:{}/@types/archiver".format(bazel_package, name)) scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] - link_9(name = "{}/@types/node".format(name)) + link_14(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] - link_9(name = "{}/alias-types-node".format(name)) + link_14(name = "{}/alias-types-node".format(name)) link_targets.append("//{}:{}/alias-types-node".format(bazel_package, name)) - link_10(name = "{}/debug".format(name)) + link_17(name = "{}/debug".format(name)) link_targets.append("//{}:{}/debug".format(bazel_package, name)) - link_14(name = "{}/hello".format(name)) + link_24(name = "{}/hello".format(name)) link_targets.append("//{}:{}/hello".format(bazel_package, name)) - link_15(name = "{}/is-odd-alt-version".format(name)) + link_26(name = "{}/is-odd-alt-version".format(name)) link_targets.append("//{}:{}/is-odd-alt-version".format(bazel_package, name)) - link_16(name = "{}/is-odd".format(name)) + link_27(name = "{}/is-odd".format(name)) link_targets.append("//{}:{}/is-odd".format(bazel_package, name)) - link_18(name = "{}/meaning-of-life".format(name)) + link_29(name = "{}/meaning-of-life".format(name)) link_targets.append("//{}:{}/meaning-of-life".format(bazel_package, name)) - link_21(name = "{}/rollup".format(name)) + link_32(name = "{}/rollup".format(name)) link_targets.append("//{}:{}/rollup".format(bazel_package, name)) - link_23(name = "{}/uvu".format(name)) + link_38(name = "{}/uvu".format(name)) link_targets.append("//{}:{}/uvu".format(bazel_package, name)) if is_root: @@ -291,6 +328,7 @@ def npm_link_targets(name = "node_modules", package = None): link_targets.append("//{}:{}/@aspect-test/b".format(bazel_package, name)) link_targets.append("//{}:{}/@aspect-test/c".format(bazel_package, name)) link_targets.append("//{}:{}/jsonify".format(bazel_package, name)) + link_targets.append("//{}:{}/@isaacs/cliui".format(bazel_package, name)) link_targets.append("//{}:{}/@types/archiver".format(bazel_package, name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) link_targets.append("//{}:{}/alias-types-node".format(bazel_package, name)) diff --git a/e2e/pnpm_lockfiles/v60/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v60/pnpm-lock.yaml index 6f26d5d4a..8b5ee5e38 100644 --- a/e2e/pnpm_lockfiles/v60/pnpm-lock.yaml +++ b/e2e/pnpm_lockfiles/v60/pnpm-lock.yaml @@ -25,6 +25,9 @@ importers: '@aspect-test/e': specifier: ~1.0.0 version: 1.0.0 + '@isaacs/cliui': + specifier: 8.0.2 + version: 8.0.2 '@scoped/a': specifier: workspace:* version: link:../projects/a @@ -144,11 +147,68 @@ packages: hasBin: true dev: false + /@isaacs/cliui@8.0.2: + resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} + engines: {node: '>=12'} + dependencies: + string-width: 5.1.2 + string-width-cjs: /string-width@4.2.3 + strip-ansi: 7.1.0 + strip-ansi-cjs: /strip-ansi@6.0.1 + wrap-ansi: 8.1.0 + wrap-ansi-cjs: /wrap-ansi@7.0.0 + dev: false + + /ansi-regex@5.0.1: + resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} + engines: {node: '>=8'} + dev: false + + /ansi-regex@6.0.1: + resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} + engines: {node: '>=12'} + dev: false + + /ansi-styles@4.3.0: + resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} + engines: {node: '>=8'} + dependencies: + color-convert: 2.0.1 + dev: false + + /ansi-styles@6.2.1: + resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} + engines: {node: '>=12'} + dev: false + + /color-convert@2.0.1: + resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} + engines: {node: '>=7.0.0'} + dependencies: + color-name: 1.1.4 + dev: false + + /color-name@1.1.4: + resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + dev: false + /dequal@2.0.3: resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==} engines: {node: '>=6'} dev: false + /eastasianwidth@0.2.0: + resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} + dev: false + + /emoji-regex@8.0.0: + resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} + dev: false + + /emoji-regex@9.2.2: + resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} + dev: false + /fsevents@2.3.3: resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} @@ -156,6 +216,11 @@ packages: dev: false optional: true + /is-fullwidth-code-point@3.0.0: + resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} + engines: {node: '>=8'} + dev: false + /is-odd@2.0.0: resolution: {integrity: sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==} engines: {node: '>=0.10.0'} @@ -204,6 +269,38 @@ packages: mri: 1.2.0 dev: false + /string-width@4.2.3: + resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} + engines: {node: '>=8'} + dependencies: + emoji-regex: 8.0.0 + is-fullwidth-code-point: 3.0.0 + strip-ansi: 6.0.1 + dev: false + + /string-width@5.1.2: + resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==} + engines: {node: '>=12'} + dependencies: + eastasianwidth: 0.2.0 + emoji-regex: 9.2.2 + strip-ansi: 7.1.0 + dev: false + + /strip-ansi@6.0.1: + resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} + engines: {node: '>=8'} + dependencies: + ansi-regex: 5.0.1 + dev: false + + /strip-ansi@7.1.0: + resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} + engines: {node: '>=12'} + dependencies: + ansi-regex: 6.0.1 + dev: false + /uvu@0.5.6: resolution: {integrity: sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==} engines: {node: '>=8'} @@ -215,6 +312,24 @@ packages: sade: 1.8.1 dev: false + /wrap-ansi@7.0.0: + resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} + engines: {node: '>=10'} + dependencies: + ansi-styles: 4.3.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 + dev: false + + /wrap-ansi@8.1.0: + resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} + engines: {node: '>=12'} + dependencies: + ansi-styles: 6.2.1 + string-width: 5.1.2 + strip-ansi: 7.1.0 + dev: false + '@github.com/aspect-build/test-packages/releases/download/0.0.0/@foo-jsonify-0.0.0.tgz': resolution: {tarball: https://github.com/aspect-build/test-packages/releases/download/0.0.0/@foo-jsonify-0.0.0.tgz} name: '@foo/jsonify' diff --git a/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl index 6f7ebf07a..31f63a541 100644 --- a/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl @@ -4,31 +4,48 @@ load("@aspect_rules_js//js:defs.bzl", _js_library = "js_library") load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_link_package_store = "npm_link_package_store") load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_package_store = "npm_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_a__5.0.2__links//:defs.bzl", link_0 = "npm_link_imported_package_store", store_0 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_b__5.0.2__links//:defs.bzl", link_1 = "npm_link_imported_package_store", store_1 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.0__links//:defs.bzl", link_2 = "npm_link_imported_package_store", store_2 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.2__links//:defs.bzl", store_3 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0__at_aspect-test_c_2.0.2__links//:defs.bzl", store_4 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_e__1.0.0__links//:defs.bzl", link_5 = "npm_link_imported_package_store", store_5 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_foo_jsonify__at_github.com_aspect-build_test-packages_releases_download_0.0.0_at_foo-jsonify-0.0.0.tgz__links//:defs.bzl", link_6 = "npm_link_imported_package_store", store_6 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_archiver__5.3.1__links//:defs.bzl", link_7 = "npm_link_imported_package_store", store_7 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_glob__8.1.0__links//:defs.bzl", store_8 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_minimatch__5.1.2__links//:defs.bzl", store_9 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_node__16.18.11__links//:defs.bzl", link_10 = "npm_link_imported_package_store", store_10 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__debug__github.com_ngokevin_debug_9742c5f383a6f8046241920156236ade8ec30d53__links//:defs.bzl", link_11 = "npm_link_imported_package_store", store_11 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__dequal__2.0.3__links//:defs.bzl", store_12 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__diff__at_github.com_kpdecker_jsdiff_archive_refs_tags_v5.2.0.tar.gz__links//:defs.bzl", store_13 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__fsevents__2.3.3__links//:defs.bzl", store_14 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__hello__at_gitpkg.vercel.app_EqualMa_gitpkg-hello_packages_hello__links//:defs.bzl", link_15 = "npm_link_imported_package_store", store_15 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__is-odd__2.0.0__links//:defs.bzl", link_16 = "npm_link_imported_package_store", store_16 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__is-odd__3.0.1__links//:defs.bzl", link_17 = "npm_link_imported_package_store", store_17 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__kleur__4.1.5__links//:defs.bzl", store_18 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0__o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_19 = "npm_link_imported_package_store", store_19 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_20 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_21 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__rollup__3.2.5__links//:defs.bzl", link_22 = "npm_link_imported_package_store", store_22 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_23 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_24 = "npm_link_imported_package_store", store_24 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-regex__5.0.1__links//:defs.bzl", store_0 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-regex__6.0.1__links//:defs.bzl", store_1 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-styles__4.3.0__links//:defs.bzl", store_2 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-styles__6.2.1__links//:defs.bzl", store_3 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_a__5.0.2__links//:defs.bzl", link_4 = "npm_link_imported_package_store", store_4 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_b__5.0.2__links//:defs.bzl", link_5 = "npm_link_imported_package_store", store_5 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.0__links//:defs.bzl", link_6 = "npm_link_imported_package_store", store_6 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.2__links//:defs.bzl", store_7 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0__at_aspect-test_c_2.0.2__links//:defs.bzl", store_8 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_e__1.0.0__links//:defs.bzl", link_9 = "npm_link_imported_package_store", store_9 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_foo_jsonify__at_github.com_aspect-build_test-packages_releases_download_0.0.0_at_foo-jsonify-0.0.0.tgz__links//:defs.bzl", link_10 = "npm_link_imported_package_store", store_10 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_isaacs_cliui__8.0.2__links//:defs.bzl", link_11 = "npm_link_imported_package_store", store_11 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_archiver__5.3.1__links//:defs.bzl", link_12 = "npm_link_imported_package_store", store_12 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_glob__8.1.0__links//:defs.bzl", store_13 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_minimatch__5.1.2__links//:defs.bzl", store_14 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_node__16.18.11__links//:defs.bzl", link_15 = "npm_link_imported_package_store", store_15 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__color-convert__2.0.1__links//:defs.bzl", store_16 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__color-name__1.1.4__links//:defs.bzl", store_17 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__debug__github.com_ngokevin_debug_9742c5f383a6f8046241920156236ade8ec30d53__links//:defs.bzl", link_18 = "npm_link_imported_package_store", store_18 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__dequal__2.0.3__links//:defs.bzl", store_19 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__diff__at_github.com_kpdecker_jsdiff_archive_refs_tags_v5.2.0.tar.gz__links//:defs.bzl", store_20 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__eastasianwidth__0.2.0__links//:defs.bzl", store_21 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__emoji-regex__8.0.0__links//:defs.bzl", store_22 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__emoji-regex__9.2.2__links//:defs.bzl", store_23 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__fsevents__2.3.3__links//:defs.bzl", store_24 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__hello__at_gitpkg.vercel.app_EqualMa_gitpkg-hello_packages_hello__links//:defs.bzl", link_25 = "npm_link_imported_package_store", store_25 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__is-fullwidth-code-point__3.0.0__links//:defs.bzl", store_26 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__is-odd__2.0.0__links//:defs.bzl", link_27 = "npm_link_imported_package_store", store_27 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__is-odd__3.0.1__links//:defs.bzl", link_28 = "npm_link_imported_package_store", store_28 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__kleur__4.1.5__links//:defs.bzl", store_29 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0__o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_30 = "npm_link_imported_package_store", store_30 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_31 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_32 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__rollup__3.2.5__links//:defs.bzl", link_33 = "npm_link_imported_package_store", store_33 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_34 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__string-width__4.2.3__links//:defs.bzl", store_35 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__string-width__5.1.2__links//:defs.bzl", store_36 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__strip-ansi__6.0.1__links//:defs.bzl", store_37 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__strip-ansi__7.1.0__links//:defs.bzl", store_38 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_39 = "npm_link_imported_package_store", store_39 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__wrap-ansi__7.0.0__links//:defs.bzl", store_40 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__wrap-ansi__8.1.0__links//:defs.bzl", store_41 = "npm_imported_package_store") _LINK_PACKAGES = ["", "projects/a", "projects/b", "projects/c", "projects/d", "vendored/is-number"] @@ -51,71 +68,91 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets[_scope] = scope_targets[_scope] + _targets if _scope in scope_targets else _targets if is_root: - store_0(name = "{}/@aspect-test/a".format(name)) - store_1(name = "{}/@aspect-test/b".format(name)) - store_2(name = "{}/@aspect-test/c".format(name)) - store_3(name = "{}/@aspect-test/c".format(name)) - store_4(name = "{}/@aspect-test/d".format(name)) - store_5(name = "{}/@aspect-test/e".format(name)) - store_6(name = "{}/@foo/jsonify".format(name)) - store_7(name = "{}/@types/archiver".format(name)) - store_8(name = "{}/@types/glob".format(name)) - store_9(name = "{}/@types/minimatch".format(name)) - store_10(name = "{}/@types/node".format(name)) - store_11(name = "{}/debug".format(name)) - store_12(name = "{}/dequal".format(name)) - store_13(name = "{}/diff".format(name)) - store_14(name = "{}/fsevents".format(name)) - store_15(name = "{}/hello".format(name)) - store_16(name = "{}/is-odd".format(name)) - store_17(name = "{}/is-odd".format(name)) - store_18(name = "{}/kleur".format(name)) - store_19(name = "{}/meaning-of-life".format(name)) - store_20(name = "{}/mri".format(name)) - store_21(name = "{}/ms".format(name)) - store_22(name = "{}/rollup".format(name)) - store_23(name = "{}/sade".format(name)) - store_24(name = "{}/uvu".format(name)) + store_0(name = "{}/ansi-regex".format(name)) + store_1(name = "{}/ansi-regex".format(name)) + store_2(name = "{}/ansi-styles".format(name)) + store_3(name = "{}/ansi-styles".format(name)) + store_4(name = "{}/@aspect-test/a".format(name)) + store_5(name = "{}/@aspect-test/b".format(name)) + store_6(name = "{}/@aspect-test/c".format(name)) + store_7(name = "{}/@aspect-test/c".format(name)) + store_8(name = "{}/@aspect-test/d".format(name)) + store_9(name = "{}/@aspect-test/e".format(name)) + store_10(name = "{}/@foo/jsonify".format(name)) + store_11(name = "{}/@isaacs/cliui".format(name)) + store_12(name = "{}/@types/archiver".format(name)) + store_13(name = "{}/@types/glob".format(name)) + store_14(name = "{}/@types/minimatch".format(name)) + store_15(name = "{}/@types/node".format(name)) + store_16(name = "{}/color-convert".format(name)) + store_17(name = "{}/color-name".format(name)) + store_18(name = "{}/debug".format(name)) + store_19(name = "{}/dequal".format(name)) + store_20(name = "{}/diff".format(name)) + store_21(name = "{}/eastasianwidth".format(name)) + store_22(name = "{}/emoji-regex".format(name)) + store_23(name = "{}/emoji-regex".format(name)) + store_24(name = "{}/fsevents".format(name)) + store_25(name = "{}/hello".format(name)) + store_26(name = "{}/is-fullwidth-code-point".format(name)) + store_27(name = "{}/is-odd".format(name)) + store_28(name = "{}/is-odd".format(name)) + store_29(name = "{}/kleur".format(name)) + store_30(name = "{}/meaning-of-life".format(name)) + store_31(name = "{}/mri".format(name)) + store_32(name = "{}/ms".format(name)) + store_33(name = "{}/rollup".format(name)) + store_34(name = "{}/sade".format(name)) + store_35(name = "{}/string-width".format(name)) + store_36(name = "{}/string-width".format(name)) + store_37(name = "{}/strip-ansi".format(name)) + store_38(name = "{}/strip-ansi".format(name)) + store_39(name = "{}/uvu".format(name)) + store_40(name = "{}/wrap-ansi".format(name)) + store_41(name = "{}/wrap-ansi".format(name)) if link: if bazel_package == "": - link_0(name = "{}/@aspect-test/a".format(name)) + link_4(name = "{}/@aspect-test/a".format(name)) link_targets.append("//{}:{}/@aspect-test/a".format(bazel_package, name)) scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] - link_0(name = "{}/@aspect-test/a2".format(name)) + link_4(name = "{}/@aspect-test/a2".format(name)) link_targets.append("//{}:{}/@aspect-test/a2".format(bazel_package, name)) scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] - link_1(name = "{}/@aspect-test/b".format(name)) + link_5(name = "{}/@aspect-test/b".format(name)) link_targets.append("//{}:{}/@aspect-test/b".format(bazel_package, name)) scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] - link_2(name = "{}/@aspect-test/c".format(name)) + link_6(name = "{}/@aspect-test/c".format(name)) link_targets.append("//{}:{}/@aspect-test/c".format(bazel_package, name)) scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] - link_5(name = "{}/@aspect-test/e".format(name)) + link_9(name = "{}/@aspect-test/e".format(name)) link_targets.append("//{}:{}/@aspect-test/e".format(bazel_package, name)) scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] - link_6(name = "{}/jsonify".format(name)) + link_10(name = "{}/jsonify".format(name)) link_targets.append("//{}:{}/jsonify".format(bazel_package, name)) - link_7(name = "{}/@types/archiver".format(name)) + link_11(name = "{}/@isaacs/cliui".format(name)) + link_targets.append("//{}:{}/@isaacs/cliui".format(bazel_package, name)) + scope_targets["@isaacs"] = scope_targets["@isaacs"] + [link_targets[-1]] if "@isaacs" in scope_targets else [link_targets[-1]] + link_12(name = "{}/@types/archiver".format(name)) link_targets.append("//{}:{}/@types/archiver".format(bazel_package, name)) scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] - link_10(name = "{}/@types/node".format(name)) + link_15(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] - link_10(name = "{}/alias-types-node".format(name)) + link_15(name = "{}/alias-types-node".format(name)) link_targets.append("//{}:{}/alias-types-node".format(bazel_package, name)) - link_11(name = "{}/debug".format(name)) + link_18(name = "{}/debug".format(name)) link_targets.append("//{}:{}/debug".format(bazel_package, name)) - link_15(name = "{}/hello".format(name)) + link_25(name = "{}/hello".format(name)) link_targets.append("//{}:{}/hello".format(bazel_package, name)) - link_16(name = "{}/is-odd-alt-version".format(name)) + link_27(name = "{}/is-odd-alt-version".format(name)) link_targets.append("//{}:{}/is-odd-alt-version".format(bazel_package, name)) - link_17(name = "{}/is-odd".format(name)) + link_28(name = "{}/is-odd".format(name)) link_targets.append("//{}:{}/is-odd".format(bazel_package, name)) - link_19(name = "{}/meaning-of-life".format(name)) + link_30(name = "{}/meaning-of-life".format(name)) link_targets.append("//{}:{}/meaning-of-life".format(bazel_package, name)) - link_22(name = "{}/rollup".format(name)) + link_33(name = "{}/rollup".format(name)) link_targets.append("//{}:{}/rollup".format(bazel_package, name)) - link_24(name = "{}/uvu".format(name)) + link_39(name = "{}/uvu".format(name)) link_targets.append("//{}:{}/uvu".format(bazel_package, name)) if is_root: @@ -297,6 +334,7 @@ def npm_link_targets(name = "node_modules", package = None): link_targets.append("//{}:{}/@aspect-test/c".format(bazel_package, name)) link_targets.append("//{}:{}/@aspect-test/e".format(bazel_package, name)) link_targets.append("//{}:{}/jsonify".format(bazel_package, name)) + link_targets.append("//{}:{}/@isaacs/cliui".format(bazel_package, name)) link_targets.append("//{}:{}/@types/archiver".format(bazel_package, name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) link_targets.append("//{}:{}/alias-types-node".format(bazel_package, name)) diff --git a/e2e/pnpm_lockfiles/v61/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v61/pnpm-lock.yaml index 928f692c5..c0019d45d 100644 --- a/e2e/pnpm_lockfiles/v61/pnpm-lock.yaml +++ b/e2e/pnpm_lockfiles/v61/pnpm-lock.yaml @@ -29,6 +29,9 @@ importers: '@aspect-test/e': specifier: ~1.0.0 version: 1.0.0 + '@isaacs/cliui': + specifier: 8.0.2 + version: 8.0.2 '@scoped/a': specifier: workspace:* version: link:../projects/a @@ -148,11 +151,68 @@ packages: hasBin: true dev: false + /@isaacs/cliui@8.0.2: + resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} + engines: {node: '>=12'} + dependencies: + string-width: 5.1.2 + string-width-cjs: /string-width@4.2.3 + strip-ansi: 7.1.0 + strip-ansi-cjs: /strip-ansi@6.0.1 + wrap-ansi: 8.1.0 + wrap-ansi-cjs: /wrap-ansi@7.0.0 + dev: false + + /ansi-regex@5.0.1: + resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} + engines: {node: '>=8'} + dev: false + + /ansi-regex@6.0.1: + resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} + engines: {node: '>=12'} + dev: false + + /ansi-styles@4.3.0: + resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} + engines: {node: '>=8'} + dependencies: + color-convert: 2.0.1 + dev: false + + /ansi-styles@6.2.1: + resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} + engines: {node: '>=12'} + dev: false + + /color-convert@2.0.1: + resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} + engines: {node: '>=7.0.0'} + dependencies: + color-name: 1.1.4 + dev: false + + /color-name@1.1.4: + resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + dev: false + /dequal@2.0.3: resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==} engines: {node: '>=6'} dev: false + /eastasianwidth@0.2.0: + resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} + dev: false + + /emoji-regex@8.0.0: + resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} + dev: false + + /emoji-regex@9.2.2: + resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} + dev: false + /fsevents@2.3.3: resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} @@ -160,6 +220,11 @@ packages: dev: false optional: true + /is-fullwidth-code-point@3.0.0: + resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} + engines: {node: '>=8'} + dev: false + /is-odd@2.0.0: resolution: {integrity: sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==} engines: {node: '>=0.10.0'} @@ -208,6 +273,38 @@ packages: mri: 1.2.0 dev: false + /string-width@4.2.3: + resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} + engines: {node: '>=8'} + dependencies: + emoji-regex: 8.0.0 + is-fullwidth-code-point: 3.0.0 + strip-ansi: 6.0.1 + dev: false + + /string-width@5.1.2: + resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==} + engines: {node: '>=12'} + dependencies: + eastasianwidth: 0.2.0 + emoji-regex: 9.2.2 + strip-ansi: 7.1.0 + dev: false + + /strip-ansi@6.0.1: + resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} + engines: {node: '>=8'} + dependencies: + ansi-regex: 5.0.1 + dev: false + + /strip-ansi@7.1.0: + resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} + engines: {node: '>=12'} + dependencies: + ansi-regex: 6.0.1 + dev: false + /uvu@0.5.6: resolution: {integrity: sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==} engines: {node: '>=8'} @@ -219,6 +316,24 @@ packages: sade: 1.8.1 dev: false + /wrap-ansi@7.0.0: + resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} + engines: {node: '>=10'} + dependencies: + ansi-styles: 4.3.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 + dev: false + + /wrap-ansi@8.1.0: + resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} + engines: {node: '>=12'} + dependencies: + ansi-styles: 6.2.1 + string-width: 5.1.2 + strip-ansi: 7.1.0 + dev: false + '@github.com/aspect-build/test-packages/releases/download/0.0.0/@foo-jsonify-0.0.0.tgz': resolution: {tarball: https://github.com/aspect-build/test-packages/releases/download/0.0.0/@foo-jsonify-0.0.0.tgz} name: '@foo/jsonify' diff --git a/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl index 6f7ebf07a..31f63a541 100644 --- a/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl @@ -4,31 +4,48 @@ load("@aspect_rules_js//js:defs.bzl", _js_library = "js_library") load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_link_package_store = "npm_link_package_store") load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_package_store = "npm_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_a__5.0.2__links//:defs.bzl", link_0 = "npm_link_imported_package_store", store_0 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_b__5.0.2__links//:defs.bzl", link_1 = "npm_link_imported_package_store", store_1 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.0__links//:defs.bzl", link_2 = "npm_link_imported_package_store", store_2 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.2__links//:defs.bzl", store_3 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0__at_aspect-test_c_2.0.2__links//:defs.bzl", store_4 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_e__1.0.0__links//:defs.bzl", link_5 = "npm_link_imported_package_store", store_5 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_foo_jsonify__at_github.com_aspect-build_test-packages_releases_download_0.0.0_at_foo-jsonify-0.0.0.tgz__links//:defs.bzl", link_6 = "npm_link_imported_package_store", store_6 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_archiver__5.3.1__links//:defs.bzl", link_7 = "npm_link_imported_package_store", store_7 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_glob__8.1.0__links//:defs.bzl", store_8 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_minimatch__5.1.2__links//:defs.bzl", store_9 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_node__16.18.11__links//:defs.bzl", link_10 = "npm_link_imported_package_store", store_10 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__debug__github.com_ngokevin_debug_9742c5f383a6f8046241920156236ade8ec30d53__links//:defs.bzl", link_11 = "npm_link_imported_package_store", store_11 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__dequal__2.0.3__links//:defs.bzl", store_12 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__diff__at_github.com_kpdecker_jsdiff_archive_refs_tags_v5.2.0.tar.gz__links//:defs.bzl", store_13 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__fsevents__2.3.3__links//:defs.bzl", store_14 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__hello__at_gitpkg.vercel.app_EqualMa_gitpkg-hello_packages_hello__links//:defs.bzl", link_15 = "npm_link_imported_package_store", store_15 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__is-odd__2.0.0__links//:defs.bzl", link_16 = "npm_link_imported_package_store", store_16 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__is-odd__3.0.1__links//:defs.bzl", link_17 = "npm_link_imported_package_store", store_17 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__kleur__4.1.5__links//:defs.bzl", store_18 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0__o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_19 = "npm_link_imported_package_store", store_19 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_20 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_21 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__rollup__3.2.5__links//:defs.bzl", link_22 = "npm_link_imported_package_store", store_22 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_23 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_24 = "npm_link_imported_package_store", store_24 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-regex__5.0.1__links//:defs.bzl", store_0 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-regex__6.0.1__links//:defs.bzl", store_1 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-styles__4.3.0__links//:defs.bzl", store_2 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-styles__6.2.1__links//:defs.bzl", store_3 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_a__5.0.2__links//:defs.bzl", link_4 = "npm_link_imported_package_store", store_4 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_b__5.0.2__links//:defs.bzl", link_5 = "npm_link_imported_package_store", store_5 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.0__links//:defs.bzl", link_6 = "npm_link_imported_package_store", store_6 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.2__links//:defs.bzl", store_7 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0__at_aspect-test_c_2.0.2__links//:defs.bzl", store_8 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_e__1.0.0__links//:defs.bzl", link_9 = "npm_link_imported_package_store", store_9 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_foo_jsonify__at_github.com_aspect-build_test-packages_releases_download_0.0.0_at_foo-jsonify-0.0.0.tgz__links//:defs.bzl", link_10 = "npm_link_imported_package_store", store_10 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_isaacs_cliui__8.0.2__links//:defs.bzl", link_11 = "npm_link_imported_package_store", store_11 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_archiver__5.3.1__links//:defs.bzl", link_12 = "npm_link_imported_package_store", store_12 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_glob__8.1.0__links//:defs.bzl", store_13 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_minimatch__5.1.2__links//:defs.bzl", store_14 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_node__16.18.11__links//:defs.bzl", link_15 = "npm_link_imported_package_store", store_15 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__color-convert__2.0.1__links//:defs.bzl", store_16 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__color-name__1.1.4__links//:defs.bzl", store_17 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__debug__github.com_ngokevin_debug_9742c5f383a6f8046241920156236ade8ec30d53__links//:defs.bzl", link_18 = "npm_link_imported_package_store", store_18 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__dequal__2.0.3__links//:defs.bzl", store_19 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__diff__at_github.com_kpdecker_jsdiff_archive_refs_tags_v5.2.0.tar.gz__links//:defs.bzl", store_20 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__eastasianwidth__0.2.0__links//:defs.bzl", store_21 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__emoji-regex__8.0.0__links//:defs.bzl", store_22 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__emoji-regex__9.2.2__links//:defs.bzl", store_23 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__fsevents__2.3.3__links//:defs.bzl", store_24 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__hello__at_gitpkg.vercel.app_EqualMa_gitpkg-hello_packages_hello__links//:defs.bzl", link_25 = "npm_link_imported_package_store", store_25 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__is-fullwidth-code-point__3.0.0__links//:defs.bzl", store_26 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__is-odd__2.0.0__links//:defs.bzl", link_27 = "npm_link_imported_package_store", store_27 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__is-odd__3.0.1__links//:defs.bzl", link_28 = "npm_link_imported_package_store", store_28 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__kleur__4.1.5__links//:defs.bzl", store_29 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0__o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_30 = "npm_link_imported_package_store", store_30 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_31 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_32 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__rollup__3.2.5__links//:defs.bzl", link_33 = "npm_link_imported_package_store", store_33 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_34 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__string-width__4.2.3__links//:defs.bzl", store_35 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__string-width__5.1.2__links//:defs.bzl", store_36 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__strip-ansi__6.0.1__links//:defs.bzl", store_37 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__strip-ansi__7.1.0__links//:defs.bzl", store_38 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_39 = "npm_link_imported_package_store", store_39 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__wrap-ansi__7.0.0__links//:defs.bzl", store_40 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__wrap-ansi__8.1.0__links//:defs.bzl", store_41 = "npm_imported_package_store") _LINK_PACKAGES = ["", "projects/a", "projects/b", "projects/c", "projects/d", "vendored/is-number"] @@ -51,71 +68,91 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets[_scope] = scope_targets[_scope] + _targets if _scope in scope_targets else _targets if is_root: - store_0(name = "{}/@aspect-test/a".format(name)) - store_1(name = "{}/@aspect-test/b".format(name)) - store_2(name = "{}/@aspect-test/c".format(name)) - store_3(name = "{}/@aspect-test/c".format(name)) - store_4(name = "{}/@aspect-test/d".format(name)) - store_5(name = "{}/@aspect-test/e".format(name)) - store_6(name = "{}/@foo/jsonify".format(name)) - store_7(name = "{}/@types/archiver".format(name)) - store_8(name = "{}/@types/glob".format(name)) - store_9(name = "{}/@types/minimatch".format(name)) - store_10(name = "{}/@types/node".format(name)) - store_11(name = "{}/debug".format(name)) - store_12(name = "{}/dequal".format(name)) - store_13(name = "{}/diff".format(name)) - store_14(name = "{}/fsevents".format(name)) - store_15(name = "{}/hello".format(name)) - store_16(name = "{}/is-odd".format(name)) - store_17(name = "{}/is-odd".format(name)) - store_18(name = "{}/kleur".format(name)) - store_19(name = "{}/meaning-of-life".format(name)) - store_20(name = "{}/mri".format(name)) - store_21(name = "{}/ms".format(name)) - store_22(name = "{}/rollup".format(name)) - store_23(name = "{}/sade".format(name)) - store_24(name = "{}/uvu".format(name)) + store_0(name = "{}/ansi-regex".format(name)) + store_1(name = "{}/ansi-regex".format(name)) + store_2(name = "{}/ansi-styles".format(name)) + store_3(name = "{}/ansi-styles".format(name)) + store_4(name = "{}/@aspect-test/a".format(name)) + store_5(name = "{}/@aspect-test/b".format(name)) + store_6(name = "{}/@aspect-test/c".format(name)) + store_7(name = "{}/@aspect-test/c".format(name)) + store_8(name = "{}/@aspect-test/d".format(name)) + store_9(name = "{}/@aspect-test/e".format(name)) + store_10(name = "{}/@foo/jsonify".format(name)) + store_11(name = "{}/@isaacs/cliui".format(name)) + store_12(name = "{}/@types/archiver".format(name)) + store_13(name = "{}/@types/glob".format(name)) + store_14(name = "{}/@types/minimatch".format(name)) + store_15(name = "{}/@types/node".format(name)) + store_16(name = "{}/color-convert".format(name)) + store_17(name = "{}/color-name".format(name)) + store_18(name = "{}/debug".format(name)) + store_19(name = "{}/dequal".format(name)) + store_20(name = "{}/diff".format(name)) + store_21(name = "{}/eastasianwidth".format(name)) + store_22(name = "{}/emoji-regex".format(name)) + store_23(name = "{}/emoji-regex".format(name)) + store_24(name = "{}/fsevents".format(name)) + store_25(name = "{}/hello".format(name)) + store_26(name = "{}/is-fullwidth-code-point".format(name)) + store_27(name = "{}/is-odd".format(name)) + store_28(name = "{}/is-odd".format(name)) + store_29(name = "{}/kleur".format(name)) + store_30(name = "{}/meaning-of-life".format(name)) + store_31(name = "{}/mri".format(name)) + store_32(name = "{}/ms".format(name)) + store_33(name = "{}/rollup".format(name)) + store_34(name = "{}/sade".format(name)) + store_35(name = "{}/string-width".format(name)) + store_36(name = "{}/string-width".format(name)) + store_37(name = "{}/strip-ansi".format(name)) + store_38(name = "{}/strip-ansi".format(name)) + store_39(name = "{}/uvu".format(name)) + store_40(name = "{}/wrap-ansi".format(name)) + store_41(name = "{}/wrap-ansi".format(name)) if link: if bazel_package == "": - link_0(name = "{}/@aspect-test/a".format(name)) + link_4(name = "{}/@aspect-test/a".format(name)) link_targets.append("//{}:{}/@aspect-test/a".format(bazel_package, name)) scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] - link_0(name = "{}/@aspect-test/a2".format(name)) + link_4(name = "{}/@aspect-test/a2".format(name)) link_targets.append("//{}:{}/@aspect-test/a2".format(bazel_package, name)) scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] - link_1(name = "{}/@aspect-test/b".format(name)) + link_5(name = "{}/@aspect-test/b".format(name)) link_targets.append("//{}:{}/@aspect-test/b".format(bazel_package, name)) scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] - link_2(name = "{}/@aspect-test/c".format(name)) + link_6(name = "{}/@aspect-test/c".format(name)) link_targets.append("//{}:{}/@aspect-test/c".format(bazel_package, name)) scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] - link_5(name = "{}/@aspect-test/e".format(name)) + link_9(name = "{}/@aspect-test/e".format(name)) link_targets.append("//{}:{}/@aspect-test/e".format(bazel_package, name)) scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] - link_6(name = "{}/jsonify".format(name)) + link_10(name = "{}/jsonify".format(name)) link_targets.append("//{}:{}/jsonify".format(bazel_package, name)) - link_7(name = "{}/@types/archiver".format(name)) + link_11(name = "{}/@isaacs/cliui".format(name)) + link_targets.append("//{}:{}/@isaacs/cliui".format(bazel_package, name)) + scope_targets["@isaacs"] = scope_targets["@isaacs"] + [link_targets[-1]] if "@isaacs" in scope_targets else [link_targets[-1]] + link_12(name = "{}/@types/archiver".format(name)) link_targets.append("//{}:{}/@types/archiver".format(bazel_package, name)) scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] - link_10(name = "{}/@types/node".format(name)) + link_15(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] - link_10(name = "{}/alias-types-node".format(name)) + link_15(name = "{}/alias-types-node".format(name)) link_targets.append("//{}:{}/alias-types-node".format(bazel_package, name)) - link_11(name = "{}/debug".format(name)) + link_18(name = "{}/debug".format(name)) link_targets.append("//{}:{}/debug".format(bazel_package, name)) - link_15(name = "{}/hello".format(name)) + link_25(name = "{}/hello".format(name)) link_targets.append("//{}:{}/hello".format(bazel_package, name)) - link_16(name = "{}/is-odd-alt-version".format(name)) + link_27(name = "{}/is-odd-alt-version".format(name)) link_targets.append("//{}:{}/is-odd-alt-version".format(bazel_package, name)) - link_17(name = "{}/is-odd".format(name)) + link_28(name = "{}/is-odd".format(name)) link_targets.append("//{}:{}/is-odd".format(bazel_package, name)) - link_19(name = "{}/meaning-of-life".format(name)) + link_30(name = "{}/meaning-of-life".format(name)) link_targets.append("//{}:{}/meaning-of-life".format(bazel_package, name)) - link_22(name = "{}/rollup".format(name)) + link_33(name = "{}/rollup".format(name)) link_targets.append("//{}:{}/rollup".format(bazel_package, name)) - link_24(name = "{}/uvu".format(name)) + link_39(name = "{}/uvu".format(name)) link_targets.append("//{}:{}/uvu".format(bazel_package, name)) if is_root: @@ -297,6 +334,7 @@ def npm_link_targets(name = "node_modules", package = None): link_targets.append("//{}:{}/@aspect-test/c".format(bazel_package, name)) link_targets.append("//{}:{}/@aspect-test/e".format(bazel_package, name)) link_targets.append("//{}:{}/jsonify".format(bazel_package, name)) + link_targets.append("//{}:{}/@isaacs/cliui".format(bazel_package, name)) link_targets.append("//{}:{}/@types/archiver".format(bazel_package, name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) link_targets.append("//{}:{}/alias-types-node".format(bazel_package, name)) diff --git a/e2e/pnpm_lockfiles/v90/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v90/pnpm-lock.yaml index d222d5a5b..25129c736 100644 --- a/e2e/pnpm_lockfiles/v90/pnpm-lock.yaml +++ b/e2e/pnpm_lockfiles/v90/pnpm-lock.yaml @@ -26,6 +26,9 @@ importers: '@aspect-test/e': specifier: ~1.0.0 version: 1.0.0 + '@isaacs/cliui': + specifier: 8.0.2 + version: 8.0.2 '@scoped/a': specifier: workspace:* version: link:../projects/a @@ -134,6 +137,10 @@ packages: resolution: {tarball: https://github.com/aspect-build/test-packages/releases/download/0.0.0/@foo-jsonify-0.0.0.tgz} version: 0.0.0 + '@isaacs/cliui@8.0.2': + resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} + engines: {node: '>=12'} + '@scoped/c@file:../projects/c': resolution: {directory: ../projects/c, type: directory} @@ -149,6 +156,29 @@ packages: '@types/node@16.18.11': resolution: {integrity: sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA==, tarball: https://registry.npmjs.org/@types/node/-/node-16.18.11.tgz} + ansi-regex@5.0.1: + resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} + engines: {node: '>=8'} + + ansi-regex@6.0.1: + resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} + engines: {node: '>=12'} + + ansi-styles@4.3.0: + resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} + engines: {node: '>=8'} + + ansi-styles@6.2.1: + resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} + engines: {node: '>=12'} + + color-convert@2.0.1: + resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} + engines: {node: '>=7.0.0'} + + color-name@1.1.4: + resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + debug@https://codeload.github.com/ngokevin/debug/tar.gz/9742c5f383a6f8046241920156236ade8ec30d53: resolution: {tarball: https://codeload.github.com/ngokevin/debug/tar.gz/9742c5f383a6f8046241920156236ade8ec30d53} version: 2.6.3 @@ -167,6 +197,15 @@ packages: version: 5.2.0 engines: {node: '>=0.3.1'} + eastasianwidth@0.2.0: + resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} + + emoji-regex@8.0.0: + resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} + + emoji-regex@9.2.2: + resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} + fsevents@2.3.3: resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} @@ -176,6 +215,10 @@ packages: resolution: {tarball: https://gitpkg.vercel.app/EqualMa/gitpkg-hello/packages/hello} version: 1.0.0 + is-fullwidth-code-point@3.0.0: + resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} + engines: {node: '>=8'} + is-number@file:../vendored/is-number: resolution: {directory: ../vendored/is-number, type: directory} @@ -210,11 +253,35 @@ packages: resolution: {integrity: sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==} engines: {node: '>=6'} + string-width@4.2.3: + resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} + engines: {node: '>=8'} + + string-width@5.1.2: + resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==} + engines: {node: '>=12'} + + strip-ansi@6.0.1: + resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} + engines: {node: '>=8'} + + strip-ansi@7.1.0: + resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} + engines: {node: '>=12'} + uvu@0.5.6: resolution: {integrity: sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==} engines: {node: '>=8'} hasBin: true + wrap-ansi@7.0.0: + resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} + engines: {node: '>=10'} + + wrap-ansi@8.1.0: + resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} + engines: {node: '>=12'} + snapshots: '@aspect-test/a@5.0.2': @@ -242,6 +309,15 @@ snapshots: '@foo/jsonify@https://github.com/aspect-build/test-packages/releases/download/0.0.0/@foo-jsonify-0.0.0.tgz': {} + '@isaacs/cliui@8.0.2': + dependencies: + string-width: 5.1.2 + string-width-cjs: string-width@4.2.3 + strip-ansi: 7.1.0 + strip-ansi-cjs: strip-ansi@6.0.1 + wrap-ansi: 8.1.0 + wrap-ansi-cjs: wrap-ansi@7.0.0 + '@scoped/c@file:../projects/c': dependencies: '@scoped/a': link:../a @@ -259,6 +335,22 @@ snapshots: '@types/node@16.18.11': {} + ansi-regex@5.0.1: {} + + ansi-regex@6.0.1: {} + + ansi-styles@4.3.0: + dependencies: + color-convert: 2.0.1 + + ansi-styles@6.2.1: {} + + color-convert@2.0.1: + dependencies: + color-name: 1.1.4 + + color-name@1.1.4: {} + debug@https://codeload.github.com/ngokevin/debug/tar.gz/9742c5f383a6f8046241920156236ade8ec30d53: dependencies: ms: 0.7.3 @@ -267,11 +359,19 @@ snapshots: diff@https://github.com/kpdecker/jsdiff/archive/refs/tags/v5.2.0.tar.gz: {} + eastasianwidth@0.2.0: {} + + emoji-regex@8.0.0: {} + + emoji-regex@9.2.2: {} + fsevents@2.3.3: optional: true hello@https://gitpkg.vercel.app/EqualMa/gitpkg-hello/packages/hello: {} + is-fullwidth-code-point@3.0.0: {} + is-number@file:../vendored/is-number: {} is-odd@2.0.0: @@ -298,9 +398,41 @@ snapshots: dependencies: mri: 1.2.0 + string-width@4.2.3: + dependencies: + emoji-regex: 8.0.0 + is-fullwidth-code-point: 3.0.0 + strip-ansi: 6.0.1 + + string-width@5.1.2: + dependencies: + eastasianwidth: 0.2.0 + emoji-regex: 9.2.2 + strip-ansi: 7.1.0 + + strip-ansi@6.0.1: + dependencies: + ansi-regex: 5.0.1 + + strip-ansi@7.1.0: + dependencies: + ansi-regex: 6.0.1 + uvu@0.5.6: dependencies: dequal: 2.0.3 diff: https://github.com/kpdecker/jsdiff/archive/refs/tags/v5.2.0.tar.gz kleur: 4.1.5 sade: 1.8.1 + + wrap-ansi@7.0.0: + dependencies: + ansi-styles: 4.3.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 + + wrap-ansi@8.1.0: + dependencies: + ansi-styles: 6.2.1 + string-width: 5.1.2 + strip-ansi: 7.1.0 diff --git a/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl index 6955e1aa1..885a9ed5f 100644 --- a/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl @@ -4,31 +4,48 @@ load("@aspect_rules_js//js:defs.bzl", _js_library = "js_library") load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_link_package_store = "npm_link_package_store") load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_package_store = "npm_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_a__5.0.2__links//:defs.bzl", link_0 = "npm_link_imported_package_store", store_0 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_b__5.0.2__links//:defs.bzl", link_1 = "npm_link_imported_package_store", store_1 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.0__links//:defs.bzl", link_2 = "npm_link_imported_package_store", store_2 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.2__links//:defs.bzl", store_3 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0__at_aspect-test_c_2.0.2__links//:defs.bzl", store_4 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_e__1.0.0__links//:defs.bzl", link_5 = "npm_link_imported_package_store", store_5 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_foo_jsonify__https___github.com_aspect-build_test-packages_releases_download_0.0.0_at_foo-jsonify-0.0.0.tgz__links//:defs.bzl", link_6 = "npm_link_imported_package_store", store_6 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_archiver__5.3.1__links//:defs.bzl", link_7 = "npm_link_imported_package_store", store_7 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_glob__8.1.0__links//:defs.bzl", store_8 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_minimatch__5.1.2__links//:defs.bzl", store_9 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_node__16.18.11__links//:defs.bzl", link_10 = "npm_link_imported_package_store", store_10 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__debug__https___codeload.github.com_ngokevin_debug_tar.gz_9742c5f383a6f8046241920156236ade8ec30d53__links//:defs.bzl", link_11 = "npm_link_imported_package_store", store_11 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__dequal__2.0.3__links//:defs.bzl", store_12 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__diff__https___github.com_kpdecker_jsdiff_archive_refs_tags_v5.2.0.tar.gz__links//:defs.bzl", store_13 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__fsevents__2.3.3__links//:defs.bzl", store_14 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__hello__https___gitpkg.vercel.app_EqualMa_gitpkg-hello_packages_hello__links//:defs.bzl", link_15 = "npm_link_imported_package_store", store_15 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__is-odd__2.0.0__links//:defs.bzl", link_16 = "npm_link_imported_package_store", store_16 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__is-odd__3.0.1__links//:defs.bzl", link_17 = "npm_link_imported_package_store", store_17 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__kleur__4.1.5__links//:defs.bzl", store_18 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0__o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_19 = "npm_link_imported_package_store", store_19 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_20 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_21 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__rollup__3.2.5__links//:defs.bzl", link_22 = "npm_link_imported_package_store", store_22 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_23 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_24 = "npm_link_imported_package_store", store_24 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-regex__5.0.1__links//:defs.bzl", store_0 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-regex__6.0.1__links//:defs.bzl", store_1 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-styles__4.3.0__links//:defs.bzl", store_2 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-styles__6.2.1__links//:defs.bzl", store_3 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_a__5.0.2__links//:defs.bzl", link_4 = "npm_link_imported_package_store", store_4 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_b__5.0.2__links//:defs.bzl", link_5 = "npm_link_imported_package_store", store_5 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.0__links//:defs.bzl", link_6 = "npm_link_imported_package_store", store_6 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.2__links//:defs.bzl", store_7 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0__at_aspect-test_c_2.0.2__links//:defs.bzl", store_8 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_e__1.0.0__links//:defs.bzl", link_9 = "npm_link_imported_package_store", store_9 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_foo_jsonify__https___github.com_aspect-build_test-packages_releases_download_0.0.0_at_foo-jsonify-0.0.0.tgz__links//:defs.bzl", link_10 = "npm_link_imported_package_store", store_10 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_isaacs_cliui__8.0.2__links//:defs.bzl", link_11 = "npm_link_imported_package_store", store_11 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_archiver__5.3.1__links//:defs.bzl", link_12 = "npm_link_imported_package_store", store_12 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_glob__8.1.0__links//:defs.bzl", store_13 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_minimatch__5.1.2__links//:defs.bzl", store_14 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_node__16.18.11__links//:defs.bzl", link_15 = "npm_link_imported_package_store", store_15 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__color-convert__2.0.1__links//:defs.bzl", store_16 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__color-name__1.1.4__links//:defs.bzl", store_17 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__debug__https___codeload.github.com_ngokevin_debug_tar.gz_9742c5f383a6f8046241920156236ade8ec30d53__links//:defs.bzl", link_18 = "npm_link_imported_package_store", store_18 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__dequal__2.0.3__links//:defs.bzl", store_19 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__diff__https___github.com_kpdecker_jsdiff_archive_refs_tags_v5.2.0.tar.gz__links//:defs.bzl", store_20 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__eastasianwidth__0.2.0__links//:defs.bzl", store_21 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__emoji-regex__8.0.0__links//:defs.bzl", store_22 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__emoji-regex__9.2.2__links//:defs.bzl", store_23 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__fsevents__2.3.3__links//:defs.bzl", store_24 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__hello__https___gitpkg.vercel.app_EqualMa_gitpkg-hello_packages_hello__links//:defs.bzl", link_25 = "npm_link_imported_package_store", store_25 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__is-fullwidth-code-point__3.0.0__links//:defs.bzl", store_26 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__is-odd__2.0.0__links//:defs.bzl", link_27 = "npm_link_imported_package_store", store_27 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__is-odd__3.0.1__links//:defs.bzl", link_28 = "npm_link_imported_package_store", store_28 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__kleur__4.1.5__links//:defs.bzl", store_29 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0__o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_30 = "npm_link_imported_package_store", store_30 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_31 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_32 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__rollup__3.2.5__links//:defs.bzl", link_33 = "npm_link_imported_package_store", store_33 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_34 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__string-width__4.2.3__links//:defs.bzl", store_35 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__string-width__5.1.2__links//:defs.bzl", store_36 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__strip-ansi__6.0.1__links//:defs.bzl", store_37 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__strip-ansi__7.1.0__links//:defs.bzl", store_38 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_39 = "npm_link_imported_package_store", store_39 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__wrap-ansi__7.0.0__links//:defs.bzl", store_40 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__wrap-ansi__8.1.0__links//:defs.bzl", store_41 = "npm_imported_package_store") _LINK_PACKAGES = ["", "projects/a", "projects/b", "projects/c", "projects/d", "vendored/is-number"] @@ -51,71 +68,91 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets[_scope] = scope_targets[_scope] + _targets if _scope in scope_targets else _targets if is_root: - store_0(name = "{}/@aspect-test/a".format(name)) - store_1(name = "{}/@aspect-test/b".format(name)) - store_2(name = "{}/@aspect-test/c".format(name)) - store_3(name = "{}/@aspect-test/c".format(name)) - store_4(name = "{}/@aspect-test/d".format(name)) - store_5(name = "{}/@aspect-test/e".format(name)) - store_6(name = "{}/@foo/jsonify".format(name)) - store_7(name = "{}/@types/archiver".format(name)) - store_8(name = "{}/@types/glob".format(name)) - store_9(name = "{}/@types/minimatch".format(name)) - store_10(name = "{}/@types/node".format(name)) - store_11(name = "{}/debug".format(name)) - store_12(name = "{}/dequal".format(name)) - store_13(name = "{}/diff".format(name)) - store_14(name = "{}/fsevents".format(name)) - store_15(name = "{}/hello".format(name)) - store_16(name = "{}/is-odd".format(name)) - store_17(name = "{}/is-odd".format(name)) - store_18(name = "{}/kleur".format(name)) - store_19(name = "{}/meaning-of-life".format(name)) - store_20(name = "{}/mri".format(name)) - store_21(name = "{}/ms".format(name)) - store_22(name = "{}/rollup".format(name)) - store_23(name = "{}/sade".format(name)) - store_24(name = "{}/uvu".format(name)) + store_0(name = "{}/ansi-regex".format(name)) + store_1(name = "{}/ansi-regex".format(name)) + store_2(name = "{}/ansi-styles".format(name)) + store_3(name = "{}/ansi-styles".format(name)) + store_4(name = "{}/@aspect-test/a".format(name)) + store_5(name = "{}/@aspect-test/b".format(name)) + store_6(name = "{}/@aspect-test/c".format(name)) + store_7(name = "{}/@aspect-test/c".format(name)) + store_8(name = "{}/@aspect-test/d".format(name)) + store_9(name = "{}/@aspect-test/e".format(name)) + store_10(name = "{}/@foo/jsonify".format(name)) + store_11(name = "{}/@isaacs/cliui".format(name)) + store_12(name = "{}/@types/archiver".format(name)) + store_13(name = "{}/@types/glob".format(name)) + store_14(name = "{}/@types/minimatch".format(name)) + store_15(name = "{}/@types/node".format(name)) + store_16(name = "{}/color-convert".format(name)) + store_17(name = "{}/color-name".format(name)) + store_18(name = "{}/debug".format(name)) + store_19(name = "{}/dequal".format(name)) + store_20(name = "{}/diff".format(name)) + store_21(name = "{}/eastasianwidth".format(name)) + store_22(name = "{}/emoji-regex".format(name)) + store_23(name = "{}/emoji-regex".format(name)) + store_24(name = "{}/fsevents".format(name)) + store_25(name = "{}/hello".format(name)) + store_26(name = "{}/is-fullwidth-code-point".format(name)) + store_27(name = "{}/is-odd".format(name)) + store_28(name = "{}/is-odd".format(name)) + store_29(name = "{}/kleur".format(name)) + store_30(name = "{}/meaning-of-life".format(name)) + store_31(name = "{}/mri".format(name)) + store_32(name = "{}/ms".format(name)) + store_33(name = "{}/rollup".format(name)) + store_34(name = "{}/sade".format(name)) + store_35(name = "{}/string-width".format(name)) + store_36(name = "{}/string-width".format(name)) + store_37(name = "{}/strip-ansi".format(name)) + store_38(name = "{}/strip-ansi".format(name)) + store_39(name = "{}/uvu".format(name)) + store_40(name = "{}/wrap-ansi".format(name)) + store_41(name = "{}/wrap-ansi".format(name)) if link: if bazel_package == "": - link_0(name = "{}/@aspect-test/a".format(name)) + link_4(name = "{}/@aspect-test/a".format(name)) link_targets.append("//{}:{}/@aspect-test/a".format(bazel_package, name)) scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] - link_0(name = "{}/@aspect-test/a2".format(name)) + link_4(name = "{}/@aspect-test/a2".format(name)) link_targets.append("//{}:{}/@aspect-test/a2".format(bazel_package, name)) scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] - link_1(name = "{}/@aspect-test/b".format(name)) + link_5(name = "{}/@aspect-test/b".format(name)) link_targets.append("//{}:{}/@aspect-test/b".format(bazel_package, name)) scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] - link_2(name = "{}/@aspect-test/c".format(name)) + link_6(name = "{}/@aspect-test/c".format(name)) link_targets.append("//{}:{}/@aspect-test/c".format(bazel_package, name)) scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] - link_5(name = "{}/@aspect-test/e".format(name)) + link_9(name = "{}/@aspect-test/e".format(name)) link_targets.append("//{}:{}/@aspect-test/e".format(bazel_package, name)) scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] - link_6(name = "{}/jsonify".format(name)) + link_10(name = "{}/jsonify".format(name)) link_targets.append("//{}:{}/jsonify".format(bazel_package, name)) - link_7(name = "{}/@types/archiver".format(name)) + link_11(name = "{}/@isaacs/cliui".format(name)) + link_targets.append("//{}:{}/@isaacs/cliui".format(bazel_package, name)) + scope_targets["@isaacs"] = scope_targets["@isaacs"] + [link_targets[-1]] if "@isaacs" in scope_targets else [link_targets[-1]] + link_12(name = "{}/@types/archiver".format(name)) link_targets.append("//{}:{}/@types/archiver".format(bazel_package, name)) scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] - link_10(name = "{}/@types/node".format(name)) + link_15(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] - link_10(name = "{}/alias-types-node".format(name)) + link_15(name = "{}/alias-types-node".format(name)) link_targets.append("//{}:{}/alias-types-node".format(bazel_package, name)) - link_11(name = "{}/debug".format(name)) + link_18(name = "{}/debug".format(name)) link_targets.append("//{}:{}/debug".format(bazel_package, name)) - link_15(name = "{}/hello".format(name)) + link_25(name = "{}/hello".format(name)) link_targets.append("//{}:{}/hello".format(bazel_package, name)) - link_16(name = "{}/is-odd-alt-version".format(name)) + link_27(name = "{}/is-odd-alt-version".format(name)) link_targets.append("//{}:{}/is-odd-alt-version".format(bazel_package, name)) - link_17(name = "{}/is-odd".format(name)) + link_28(name = "{}/is-odd".format(name)) link_targets.append("//{}:{}/is-odd".format(bazel_package, name)) - link_19(name = "{}/meaning-of-life".format(name)) + link_30(name = "{}/meaning-of-life".format(name)) link_targets.append("//{}:{}/meaning-of-life".format(bazel_package, name)) - link_22(name = "{}/rollup".format(name)) + link_33(name = "{}/rollup".format(name)) link_targets.append("//{}:{}/rollup".format(bazel_package, name)) - link_24(name = "{}/uvu".format(name)) + link_39(name = "{}/uvu".format(name)) link_targets.append("//{}:{}/uvu".format(bazel_package, name)) if is_root: @@ -297,6 +334,7 @@ def npm_link_targets(name = "node_modules", package = None): link_targets.append("//{}:{}/@aspect-test/c".format(bazel_package, name)) link_targets.append("//{}:{}/@aspect-test/e".format(bazel_package, name)) link_targets.append("//{}:{}/jsonify".format(bazel_package, name)) + link_targets.append("//{}:{}/@isaacs/cliui".format(bazel_package, name)) link_targets.append("//{}:{}/@types/archiver".format(bazel_package, name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) link_targets.append("//{}:{}/alias-types-node".format(bazel_package, name)) diff --git a/npm/private/utils.bzl b/npm/private/utils.bzl index 7b881fb68..de25299f1 100644 --- a/npm/private/utils.bzl +++ b/npm/private/utils.bzl @@ -154,7 +154,7 @@ def _convert_pnpm_v5_version_peer_dep(version): def _convert_pnpm_v5_package_dependency_version(name, version): # an alias to an alternate package if version.startswith("/"): - alias, version = version[1:].rsplit("@", 1) + alias, version = version[1:].rsplit("/", 1) return "npm:{}@{}".format(alias, version) # Removing the default registry+name from the version string @@ -396,16 +396,20 @@ def _convert_v6_packages(packages): return result -def _convert_pnpm_v9_package_dependency_version(name, version): +def _convert_pnpm_v9_package_dependency_version(snapshots, name, version): + # Detect when an alias is just a direct reference to another snapshot + if version in snapshots: + return "npm:{}".format(version) + # Convert peer dependency data to rules_js ~v5 format version = _convert_pnpm_v6_v9_version_peer_dep(version) return version -def _convert_pnpm_v9_package_dependency_map(deps): +def _convert_pnpm_v9_package_dependency_map(snapshots, deps): result = {} for name, version in deps.items(): - result[name] = _convert_pnpm_v9_package_dependency_version(name, version) + result[name] = _convert_pnpm_v9_package_dependency_version(snapshots, name, version) return result def _convert_pnpm_v9_importer_dependency_map(deps): @@ -459,11 +463,17 @@ def _convert_v9_packages(packages, snapshots): # peerDependencies which *might* be resolved # # snapshots: + # pkg@http://a/url + # ... + # # '@scoped/name@2.0.0(peer@2.0.2)' # dependencies: - # a-dep@1.2.3 - # peer@2.0.2 - # b-dep@3.2.1(peer-b@4.5.6) + # a-dep: 1.2.3 + # peer: 2.0.2 + # b-dep: 3.2.1(peer-b@4.5.6) + # alias: actual@1.2.3 + # l: file:../path/to/dir + # x: https://a/url/v1.2.3.tar.gz result = {} @@ -497,8 +507,8 @@ def _convert_v9_packages(packages, snapshots): name = name, version = version, friendly_version = friendly_version, - dependencies = _convert_pnpm_v9_package_dependency_map(package_snapshot.get("dependencies", {})), - optional_dependencies = _convert_pnpm_v9_package_dependency_map(package_snapshot.get("optionalDependencies", {})), + dependencies = _convert_pnpm_v9_package_dependency_map(snapshots, package_snapshot.get("dependencies", {})), + optional_dependencies = _convert_pnpm_v9_package_dependency_map(snapshots, package_snapshot.get("optionalDependencies", {})), peer_dependencies = package_data.get("peerDependencies", {}), dev = None, # TODO(pnpm9): must inspect importers.*.devDependencies? has_bin = package_data.get("hasBin", False),