diff --git a/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= b/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= index ecfa049c4..1c9dd4f8a 100755 --- a/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= +++ b/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= @@ -24,13 +24,13 @@ examples/webpack_cli/package.json=1911342006 js/private/coverage/bundle/package.json=-1582937149 js/private/test/image/package.json=1430754959 js/private/test/js_run_devserver/package.json=-381403605 -js/private/worker/src/package.json=1450373252 +js/private/worker/src/package.json=251852959 npm/private/test/npm_package/package.json=-1991705133 npm/private/test/npm_package_publish/package.json=-646566766 npm/private/test/package.json=606610593 npm/private/test/vendored/is-odd/package.json=1041695223 npm/private/test/vendored/lodash-4.17.21.tgz=-1206623349 npm/private/test/vendored/semver-max/package.json=578664053 -package.json=1510979981 -pnpm-lock.yaml=-1402096931 +package.json=-724085359 +pnpm-lock.yaml=-463011088 pnpm-workspace.yaml=854106668 diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index f53a6f3ec..1870360a9 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -9,18 +9,19 @@ on: required: true type: string secrets: - publish_token: + BCR_PUBLISH_TOKEN: required: true # In case of problems, let release engineers retry by manually dispatching # the workflow from the GitHub UI workflow_dispatch: inputs: tag_name: + description: The tag name of the release required: true type: string jobs: publish: - uses: bazel-contrib/publish-to-bcr/.github/workflows/publish.yaml@v0.2.1 + uses: bazel-contrib/publish-to-bcr/.github/workflows/publish.yaml@v1.0.0 with: draft: false tag_name: ${{ inputs.tag_name }} @@ -32,4 +33,4 @@ jobs: id-token: write secrets: # Necessary to push to the BCR fork, and to open a pull request against a registry - publish_token: ${{ secrets.publish_token || secrets.BCR_PUBLISH_TOKEN }} + publish_token: ${{ secrets.BCR_PUBLISH_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yaml similarity index 50% rename from .github/workflows/release.yml rename to .github/workflows/release.yaml index 9b61ddad2..f522d0935 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yaml @@ -1,7 +1,16 @@ # Cut a release whenever a new tag is pushed to the repo. name: Release - on: + # Can be triggered from the tag.yaml workflow + workflow_call: + inputs: + tag_name: + required: true + type: string + secrets: + BCR_PUBLISH_TOKEN: + required: true + # Or, developers can manually push a tag from their clone push: tags: - 'v*.*.*' @@ -15,11 +24,11 @@ jobs: with: release_files: rules_js-*.tar.gz prerelease: false - tag_name: ${{ github.ref_name }} + tag_name: ${{ inputs.tag_name || github.ref_name }} publish: needs: release uses: ./.github/workflows/publish.yaml with: - tag_name: ${{ github.ref_name }} + tag_name: ${{ inputs.tag_name || github.ref_name }} secrets: - publish_token: ${{ secrets.BCR_PUBLISH_TOKEN }} + BCR_PUBLISH_TOKEN: ${{ secrets.BCR_PUBLISH_TOKEN }} diff --git a/.github/workflows/release_prep.sh b/.github/workflows/release_prep.sh index 35abdb700..549662913 100755 --- a/.github/workflows/release_prep.sh +++ b/.github/workflows/release_prep.sh @@ -10,9 +10,9 @@ echo >>.git/info/attributes "js/private/test/image/non_ascii export-ignore" # shellcheck disable=2010 ls e2e | grep -v bzlmod | awk 'NF{print "e2e/" $0 " export-ignore"}' >>.git/info/attributes -# Set by GH actions, see -# https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables -TAG=${GITHUB_REF_NAME} +# Argument provided by reusable workflow caller, see +# https://github.com/bazel-contrib/.github/blob/d197a6427c5435ac22e56e33340dff912bc9334e/.github/workflows/release_ruleset.yaml#L72 +TAG=$1 # The prefix is chosen to match what GitHub generates for source archives PREFIX="rules_js-${TAG:1}" ARCHIVE="rules_js-$TAG.tar.gz" diff --git a/.github/workflows/tag.yaml b/.github/workflows/tag.yaml new file mode 100644 index 000000000..075e9306d --- /dev/null +++ b/.github/workflows/tag.yaml @@ -0,0 +1,45 @@ +# Tag a new release using https://github.com/marketplace/actions/conventional-commits-versioner-action +# +# This is easier than having to run manual `git` operations on a local clone. +# It also runs on a schedule so we don't leave commits unreleased indefinitely +# (avoiding users having to ping "hey could someone cut a release"). + +name: Tag a Release +on: + # Allow devs to tag manually through the GitHub UI. + # For example after landing a fix that customers are waiting for. + workflow_dispatch: + # Run twice a month, on the 4th and 18th at 2PM UTC (7AM PST) + # This is a trade-off between making too many releases, + # which overwhelms BCR maintainers and over-notifies users, + # and releasing too infrequently which delays delivery of bugfixes and features. + schedule: + - cron: '0 14 4,18 * *' +jobs: + tag: + permissions: + contents: write # allow create tag + runs-on: ubuntu-latest + outputs: + new-tag: ${{ steps.ccv.outputs.new-tag }} + new-tag-version: ${{steps.ccv.outputs.new-tag-version}} + steps: + - uses: actions/checkout@v5 + with: + # Need enough history to find the prior release tag + fetch-depth: 0 + - name: Bump tag if necessary + id: ccv + uses: smlx/ccv@7318e2f25a52dcd550e75384b84983973251a1f8 # v0.10.0 + release: + needs: tag + uses: ./.github/workflows/release.yaml + with: + tag_name: ${{ needs.tag.outputs.new-tag-version }} + secrets: + BCR_PUBLISH_TOKEN: ${{ secrets.BCR_PUBLISH_TOKEN }} + if: needs.tag.outputs.new-tag == 'true' && needs.tag.outputs.new-tag-version-type != 'major' + permissions: + id-token: write + attestations: write + contents: write diff --git a/MODULE.bazel b/MODULE.bazel index 9627ae4b5..e641bec24 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -50,7 +50,7 @@ use_repo(bazel_lib_toolchains, "bsd_tar_toolchains") ####### Dev dependencies ######## -bazel_dep(name = "bazelrc-preset.bzl", version = "1.0.1", dev_dependency = True) +bazel_dep(name = "bazelrc-preset.bzl", version = "1.3.0", dev_dependency = True) bazel_dep(name = "aspect_rules_lint", version = "1.1.0", dev_dependency = True) bazel_dep(name = "buildifier_prebuilt", version = "8.0.1", dev_dependency = True) diff --git a/README.md b/README.md index 136f2a50f..d163c59bb 100644 --- a/README.md +++ b/README.md @@ -30,16 +30,6 @@ rules_js is just a part Aspect's monorepo developer platform: - [rules_cypress](https://github.com/aspect-build/rules_cypress) - Bazel rules to run tests using [Cypress](https://cypress.io) - [rules_lint](https://github.com/aspect-build/rules_lint) includes [eslint support](https://github.com/aspect-build/rules_lint/blob/main/docs/eslint.md). -## Bazel compatibility - -The ruleset is known to work with: - -- Bazel 7 using WORKSPACE and Bzlmod _(tested on CI)_ -- Bazel 6 using WORKSPACE and Bzlmod _(tested on CI)_ - -> [!NOTE] -> Remote Execution (RBE) requires at least Bazel [6.0](https://blog.bazel.build/2022/12/19/bazel-6.0.html). - ## Known issues - ESM imports escape the runfiles tree and the sandbox due to https://github.com/aspect-build/rules_js/issues/362 diff --git a/docs/README.md b/docs/README.md index 2381729b6..09643ceab 100644 --- a/docs/README.md +++ b/docs/README.md @@ -243,7 +243,7 @@ bzl_library( name = "typescript_bzl_library", visibility = ["//visibility:public"], srcs = ["@npm//:typescript/package_json.bzl"], - deps = ["@npm__typescript__4.9.5//:typescript_bzl_library"], + deps = ["@npm__typescript__5.8.2//:typescript_bzl_library"], ) ``` diff --git a/e2e/bzlmod/MODULE.bazel b/e2e/bzlmod/MODULE.bazel index 9f04be97f..d2733d691 100644 --- a/e2e/bzlmod/MODULE.bazel +++ b/e2e/bzlmod/MODULE.bazel @@ -63,9 +63,13 @@ pnpm = use_extension("@aspect_rules_js//npm:extensions.bzl", "pnpm") # not some transitive dependency. pnpm.pnpm( name = "pnpm", - pnpm_version = "8.15.2", + pnpm_version_from = "//:package.json", +) +pnpm.pnpm( + name = "other_pnpm", + pnpm_version = "9.15.9", ) # Allows developers to run the identical version of pnpm for local workflows like # bazel run -- @pnpm --dir $PWD install -use_repo(pnpm, "pnpm") +use_repo(pnpm, "other_pnpm", "pnpm") diff --git a/e2e/bzlmod/package.json b/e2e/bzlmod/package.json index 3a8254296..00f42fead 100644 --- a/e2e/bzlmod/package.json +++ b/e2e/bzlmod/package.json @@ -1,6 +1,7 @@ { "private": true, "type": "module", + "packageManager": "pnpm@10.13.1", "dependencies": { "chalk": "5.3.0", "less": "4.1.3", diff --git a/e2e/pnpm_lockfiles/.bazelignore b/e2e/pnpm_lockfiles/.bazelignore index ee2fe295e..f16d4c345 100644 --- a/e2e/pnpm_lockfiles/.bazelignore +++ b/e2e/pnpm_lockfiles/.bazelignore @@ -7,6 +7,7 @@ cases/docusaurus-direct-peer-v6/node_modules cases/tarball-no-url-v54/node_modules projects/a/node_modules projects/a-types/node_modules +projects/alts/node_modules projects/b/node_modules projects/c/node_modules projects/d/node_modules diff --git a/e2e/pnpm_lockfiles/MODULE.bazel b/e2e/pnpm_lockfiles/MODULE.bazel index c2e1d06d2..1951a22ed 100644 --- a/e2e/pnpm_lockfiles/MODULE.bazel +++ b/e2e/pnpm_lockfiles/MODULE.bazel @@ -76,6 +76,13 @@ npm = use_extension( "lock-%s__at_types_sizzle__2.3.9" % version, "lock-%s__at_types_sizzle__2.3.9__links" % version, + # Deps with circles + "lock-%s__at_aspect-test_a__5.0.2__links" % version, + "lock-%s__at_aspect-test_b__5.0.2__links" % version, + + # Dep with lifecycle hooks + "lock-%s__at_aspect-test_c__2.0.0__links" % version, + # Dep with peers "lock-%s__at_aspect-test_d__2.0.0_at_aspect-test_c_2.0.2" % version, "lock-%s__at_aspect-test_d__2.0.0_at_aspect-test_c_2.0.2__links" % version, diff --git a/e2e/pnpm_lockfiles/lockfile-test.bzl b/e2e/pnpm_lockfiles/lockfile-test.bzl index 6a729e31f..b107f9571 100644 --- a/e2e/pnpm_lockfiles/lockfile-test.bzl +++ b/e2e/pnpm_lockfiles/lockfile-test.bzl @@ -23,6 +23,11 @@ BZLMOD_FILES = { "is-odd_resolved.json": "@REPO_NAME//VERSION:is-odd/resolved.json", "is-odd-v0_resolved.json": "@REPO_NAME//VERSION:is-odd-v0/resolved.json", + # Circular deps, lifecycle hooks + "aspect_test_a_links_defs.bzl": "@REPO_NAME__at_aspect-test_a__5.0.2__links//:defs.bzl", + "aspect_test_b_links_defs.bzl": "@REPO_NAME__at_aspect-test_b__5.0.2__links//:defs.bzl", + "aspect_test_c_links_defs.bzl": "@REPO_NAME__at_aspect-test_c__2.0.0__links//:defs.bzl", + # hasBin, optional deps, deps and across versions "rollup_links_defs.bzl": "@REPO_NAME__rollup__2.14.0__links//:defs.bzl", "rollup_package_json.bzl": "@REPO_NAME__rollup__2.14.0//VERSION:package_json.bzl", diff --git a/e2e/pnpm_lockfiles/projects/alts/BUILD.bazel b/e2e/pnpm_lockfiles/projects/alts/BUILD.bazel new file mode 100644 index 000000000..e482f2a54 --- /dev/null +++ b/e2e/pnpm_lockfiles/projects/alts/BUILD.bazel @@ -0,0 +1,7 @@ +load("@aspect_rules_js//js:defs.bzl", "js_library") + +js_library( + name = "pkg", + srcs = ["package.json"], + visibility = ["//visibility:public"], +) diff --git a/e2e/pnpm_lockfiles/projects/alts/package.json b/e2e/pnpm_lockfiles/projects/alts/package.json new file mode 100644 index 000000000..71b1ce5e3 --- /dev/null +++ b/e2e/pnpm_lockfiles/projects/alts/package.json @@ -0,0 +1,8 @@ +{ + "name": "alternate-versions", + "dependencies": { + "lodash": "4.17.21", + "lodash-dupe": "npm:lodash@4.17.21", + "lodash-file": "file:../../vendored/lodash-4.17.21.tgz" + } +} diff --git a/e2e/pnpm_lockfiles/v101/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v101/pnpm-lock.yaml index 3a5712a58..8a79e0946 100644 --- a/e2e/pnpm_lockfiles/v101/pnpm-lock.yaml +++ b/e2e/pnpm_lockfiles/v101/pnpm-lock.yaml @@ -160,6 +160,18 @@ importers: specifier: 16.18.11 version: 16.18.11 + ../projects/alts: + dependencies: + lodash: + specifier: 4.17.21 + version: 4.17.21 + lodash-dupe: + specifier: npm:lodash@4.17.21 + version: lodash@4.17.21 + lodash-file: + specifier: file:../../vendored/lodash-4.17.21.tgz + version: lodash@file:../vendored/lodash-4.17.21.tgz + ../projects/b: dependencies: '@scoped/a': @@ -314,8 +326,8 @@ packages: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} - ansi-regex@6.1.0: - resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==} + ansi-regex@6.2.0: + resolution: {integrity: sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==} engines: {node: '>=12'} ansi-styles@4.3.0: @@ -422,6 +434,9 @@ packages: resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==} engines: {node: '>=6'} + lodash@4.17.21: + resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} + lodash@file:../vendored/lodash-4.17.21.tgz: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==, tarball: file:../vendored/lodash-4.17.21.tgz} version: 4.17.21 @@ -590,7 +605,7 @@ snapshots: ansi-regex@5.0.1: {} - ansi-regex@6.1.0: {} + ansi-regex@6.2.0: {} ansi-styles@4.3.0: dependencies: @@ -665,6 +680,8 @@ snapshots: kleur@4.1.5: {} + lodash@4.17.21: {} + lodash@file:../vendored/lodash-4.17.21.tgz: {} meaning-of-life@1.0.0(patch_hash=33610921243aecf4fa5a23dc8080659f436ccda15f41ce4f53c687039a305ee0): {} @@ -713,7 +730,7 @@ snapshots: strip-ansi@7.1.0: dependencies: - ansi-regex: 6.1.0 + ansi-regex: 6.2.0 supports-preserve-symlinks-flag@1.0.0: {} diff --git a/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_a_links_defs.bzl b/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_a_links_defs.bzl new file mode 100644 index 000000000..d16035ed0 --- /dev/null +++ b/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_a_links_defs.bzl @@ -0,0 +1,86 @@ +"@generated by @aspect_rules_js//npm/private:npm_import.bzl for npm package @aspect-test/a@5.0.2" + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_import.bzl", + _npm_imported_package_store = "npm_imported_package_store_internal", + _npm_link_imported_package = "npm_link_imported_package_internal", + _npm_link_imported_package_store = "npm_link_imported_package_store_internal") + +PACKAGE = "@aspect-test/a" +VERSION = "5.0.2" +_ROOT_PACKAGE = "" +_PACKAGE_STORE_NAME = "@aspect-test+a@5.0.2" + +# Generated npm_package_store targets for npm package @aspect-test/a@5.0.2 +# buildifier: disable=function-docstring +def npm_imported_package_store(link_root_name): + _npm_imported_package_store( + link_root_name = link_root_name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + ref_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/ref": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/ref": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/ref": "@aspect-test/d", + }, + lc_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg_pre_lc_lite": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + dev = False, + has_lifecycle_build_target = False, + transitive_closure_pattern = True, + npm_package_target = "@@aspect_rules_js~~npm~lock-__at_aspect-test_a__5.0.2//:pkg", + package_store_name = _PACKAGE_STORE_NAME, + lifecycle_hooks_env = {}, + lifecycle_hooks_execution_requirements = {}, + use_default_shell_env = False, + exclude_package_contents = [], + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/a@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package_store(name, link_root_name, link_alias): + return _npm_link_imported_package_store( + name, + link_root_name, + link_alias, + root_package = _ROOT_PACKAGE, + link_visibility = ["//visibility:public"], + bins = {}, + package_store_name = _PACKAGE_STORE_NAME, + public_visibility = True, + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/a@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package( + name = "node_modules", + link = None, + fail_if_no_link = True): + return _npm_link_imported_package( + name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + link = link, + link_packages = { + "": ["@aspect-test-a-bad-scope", "@aspect-test-custom-scope/a", "@aspect-test/a", "@aspect-test/a2", "aspect-test-a-no-scope", "aspect-test-a/no-at"], + }, + public_visibility = True, + npm_link_imported_package_store_macro = npm_link_imported_package_store, + npm_imported_package_store_macro = npm_imported_package_store, + fail_if_no_link = fail_if_no_link, + ) diff --git a/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_b_links_defs.bzl b/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_b_links_defs.bzl new file mode 100644 index 000000000..c9f92fc62 --- /dev/null +++ b/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_b_links_defs.bzl @@ -0,0 +1,86 @@ +"@generated by @aspect_rules_js//npm/private:npm_import.bzl for npm package @aspect-test/b@5.0.2" + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_import.bzl", + _npm_imported_package_store = "npm_imported_package_store_internal", + _npm_link_imported_package = "npm_link_imported_package_internal", + _npm_link_imported_package_store = "npm_link_imported_package_store_internal") + +PACKAGE = "@aspect-test/b" +VERSION = "5.0.2" +_ROOT_PACKAGE = "" +_PACKAGE_STORE_NAME = "@aspect-test+b@5.0.2" + +# Generated npm_package_store targets for npm package @aspect-test/b@5.0.2 +# buildifier: disable=function-docstring +def npm_imported_package_store(link_root_name): + _npm_imported_package_store( + link_root_name = link_root_name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + ref_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/ref": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/ref": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/ref": "@aspect-test/d", + }, + lc_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg_pre_lc_lite": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + dev = False, + has_lifecycle_build_target = False, + transitive_closure_pattern = True, + npm_package_target = "@@aspect_rules_js~~npm~lock-__at_aspect-test_b__5.0.2//:pkg", + package_store_name = _PACKAGE_STORE_NAME, + lifecycle_hooks_env = {}, + lifecycle_hooks_execution_requirements = {}, + use_default_shell_env = False, + exclude_package_contents = [], + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/b@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package_store(name, link_root_name, link_alias): + return _npm_link_imported_package_store( + name, + link_root_name, + link_alias, + root_package = _ROOT_PACKAGE, + link_visibility = ["//visibility:public"], + bins = {}, + package_store_name = _PACKAGE_STORE_NAME, + public_visibility = True, + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/b@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package( + name = "node_modules", + link = None, + fail_if_no_link = True): + return _npm_link_imported_package( + name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + link = link, + link_packages = { + "": [PACKAGE], + }, + public_visibility = True, + npm_link_imported_package_store_macro = npm_link_imported_package_store, + npm_imported_package_store_macro = npm_imported_package_store, + fail_if_no_link = fail_if_no_link, + ) diff --git a/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_c_links_defs.bzl b/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_c_links_defs.bzl new file mode 100644 index 000000000..67e6e0ef5 --- /dev/null +++ b/e2e/pnpm_lockfiles/v101/snapshots/aspect_test_c_links_defs.bzl @@ -0,0 +1,79 @@ +"@generated by @aspect_rules_js//npm/private:npm_import.bzl for npm package @aspect-test/c@2.0.0" + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_import.bzl", + _npm_imported_package_store = "npm_imported_package_store_internal", + _npm_link_imported_package = "npm_link_imported_package_internal", + _npm_link_imported_package_store = "npm_link_imported_package_store_internal") + +PACKAGE = "@aspect-test/c" +VERSION = "2.0.0" +_ROOT_PACKAGE = "" +_PACKAGE_STORE_NAME = "@aspect-test+c@2.0.0" + +# Generated npm_package_store targets for npm package @aspect-test/c@2.0.0 +# buildifier: disable=function-docstring +def npm_imported_package_store(link_root_name): + _npm_imported_package_store( + link_root_name = link_root_name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.0/pkg": "@aspect-test/c", + }, + ref_deps = {}, + lc_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.0/pkg_pre_lc_lite": "@aspect-test/c", + }, + dev = False, + has_lifecycle_build_target = True, + transitive_closure_pattern = True, + npm_package_target = "@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.0//:pkg", + package_store_name = _PACKAGE_STORE_NAME, + lifecycle_hooks_env = {}, + lifecycle_hooks_execution_requirements = { + "no-sandbox": "1", + }, + use_default_shell_env = False, + exclude_package_contents = [], + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/c@2.0.0 +# buildifier: disable=function-docstring +def npm_link_imported_package_store(name, link_root_name, link_alias): + return _npm_link_imported_package_store( + name, + link_root_name, + link_alias, + root_package = _ROOT_PACKAGE, + link_visibility = ["//visibility:public"], + bins = {}, + package_store_name = _PACKAGE_STORE_NAME, + public_visibility = True, + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/c@2.0.0 +# buildifier: disable=function-docstring +def npm_link_imported_package( + name = "node_modules", + link = None, + fail_if_no_link = True): + return _npm_link_imported_package( + name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + link = link, + link_packages = { + "": [PACKAGE], + "projects/peers-combo-2": [PACKAGE], + }, + public_visibility = True, + npm_link_imported_package_store_macro = npm_link_imported_package_store, + npm_imported_package_store_macro = npm_imported_package_store, + fail_if_no_link = fail_if_no_link, + ) diff --git a/e2e/pnpm_lockfiles/v101/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v101/snapshots/defs.bzl index b8dfa8f8d..24648843a 100644 --- a/e2e/pnpm_lockfiles/v101/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v101/snapshots/defs.bzl @@ -1,7 +1,7 @@ """@generated by npm_translate_lock(name = "lock-", pnpm_lock = "@@//:pnpm-lock.yaml")""" 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.1.0__links//:defs.bzl", store_1 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-regex__6.2.0__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") @@ -48,25 +48,26 @@ load("@@aspect_rules_js~~npm~lock-__jquery__https___codeload.github load("@@aspect_rules_js~~npm~lock-__jquery__https___codeload.github.com_jquery_jquery_tar.gz_e61fccb9d736235b4b011f89cba6866bc0b8997d__links//:defs.bzl", link_45 = "npm_link_imported_package_store", store_45 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__kleur__4.1.5__links//:defs.bzl", store_46 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__lodash__4.17.21__links//:defs.bzl", link_47 = "npm_link_imported_package_store", store_47 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0_1541309197__links//:defs.bzl", link_48 = "npm_link_imported_package_store", store_48 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_49 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_50 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__path-parse__1.0.7__links//:defs.bzl", store_51 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__picomatch__2.3.1__links//:defs.bzl", store_52 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__resolve__1.22.10__links//:defs.bzl", store_53 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__rollup__2.14.0__links//:defs.bzl", link_54 = "npm_link_imported_package_store", store_54 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__rollup__3.29.4__links//:defs.bzl", link_55 = "npm_link_imported_package_store", store_55 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_56 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__string-width__4.2.3__links//:defs.bzl", store_57 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__string-width__5.1.2__links//:defs.bzl", store_58 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__strip-ansi__6.0.1__links//:defs.bzl", store_59 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__strip-ansi__7.1.0__links//:defs.bzl", store_60 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__supports-preserve-symlinks-flag__1.0.0__links//:defs.bzl", store_61 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__tslib__2.8.1__links//:defs.bzl", link_62 = "npm_link_imported_package_store", store_62 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__typescript__5.5.2__links//:defs.bzl", link_63 = "npm_link_imported_package_store", store_63 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_64 = "npm_link_imported_package_store", store_64 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__wrap-ansi__7.0.0__links//:defs.bzl", store_65 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__wrap-ansi__8.1.0__links//:defs.bzl", store_66 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__lodash__file_.._vendored_lodash-4.17.21.tgz__links//:defs.bzl", link_48 = "npm_link_imported_package_store", store_48 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0_1541309197__links//:defs.bzl", link_49 = "npm_link_imported_package_store", store_49 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_50 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_51 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__path-parse__1.0.7__links//:defs.bzl", store_52 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__picomatch__2.3.1__links//:defs.bzl", store_53 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__resolve__1.22.10__links//:defs.bzl", store_54 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__rollup__2.14.0__links//:defs.bzl", link_55 = "npm_link_imported_package_store", store_55 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__rollup__3.29.4__links//:defs.bzl", link_56 = "npm_link_imported_package_store", store_56 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_57 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__string-width__4.2.3__links//:defs.bzl", store_58 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__string-width__5.1.2__links//:defs.bzl", store_59 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__strip-ansi__6.0.1__links//:defs.bzl", store_60 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__strip-ansi__7.1.0__links//:defs.bzl", store_61 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__supports-preserve-symlinks-flag__1.0.0__links//:defs.bzl", store_62 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__tslib__2.8.1__links//:defs.bzl", link_63 = "npm_link_imported_package_store", store_63 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__typescript__5.5.2__links//:defs.bzl", link_64 = "npm_link_imported_package_store", store_64 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_65 = "npm_link_imported_package_store", store_65 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__wrap-ansi__7.0.0__links//:defs.bzl", store_66 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__wrap-ansi__8.1.0__links//:defs.bzl", store_67 = "npm_imported_package_store") # buildifier: disable=bzl-visibility load("@aspect_rules_js//js:defs.bzl", _js_library = "js_library") @@ -77,7 +78,7 @@ load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_link_packa # buildifier: disable=bzl-visibility load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_package_store = "npm_package_store", _npm_local_package_store = "npm_local_package_store_internal") -_LINK_PACKAGES = ["", "projects/a", "projects/a-types", "projects/b", "projects/c", "projects/d", "projects/peer-types", "projects/peers-combo-1", "projects/peers-combo-2", "vendored/is-number"] +_LINK_PACKAGES = ["", "projects/a", "projects/a-types", "projects/alts", "projects/b", "projects/c", "projects/d", "projects/peer-types", "projects/peers-combo-1", "projects/peers-combo-2", "vendored/is-number"] # buildifier: disable=function-docstring def npm_link_all_packages(name = "node_modules", imported_links = []): @@ -167,6 +168,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): store_64(name) store_65(name) store_66(name) + store_67(name) if link: if bazel_package == "": link_4("{}/@aspect-test-a-bad-scope".format(name), link_root_name = name, link_alias = "@aspect-test-a-bad-scope") @@ -267,19 +269,19 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): link_targets.append(":{}/jquery-git-ssh-399b201".format(name)) link_45("{}/jquery-git-ssh-e61fccb".format(name), link_root_name = name, link_alias = "jquery-git-ssh-e61fccb") link_targets.append(":{}/jquery-git-ssh-e61fccb".format(name)) - link_47("{}/lodash".format(name), link_root_name = name, link_alias = "lodash") + link_48("{}/lodash".format(name), link_root_name = name, link_alias = "lodash") link_targets.append(":{}/lodash".format(name)) - link_48("{}/meaning-of-life".format(name), link_root_name = name, link_alias = "meaning-of-life") + link_49("{}/meaning-of-life".format(name), link_root_name = name, link_alias = "meaning-of-life") link_targets.append(":{}/meaning-of-life".format(name)) - link_54("{}/rollup".format(name), link_root_name = name, link_alias = "rollup") + link_55("{}/rollup".format(name), link_root_name = name, link_alias = "rollup") link_targets.append(":{}/rollup".format(name)) - link_55("{}/rollup3".format(name), link_root_name = name, link_alias = "rollup3") + link_56("{}/rollup3".format(name), link_root_name = name, link_alias = "rollup3") link_targets.append(":{}/rollup3".format(name)) - link_62("{}/tslib".format(name), link_root_name = name, link_alias = "tslib") + link_63("{}/tslib".format(name), link_root_name = name, link_alias = "tslib") link_targets.append(":{}/tslib".format(name)) - link_63("{}/typescript".format(name), link_root_name = name, link_alias = "typescript") + link_64("{}/typescript".format(name), link_root_name = name, link_alias = "typescript") link_targets.append(":{}/typescript".format(name)) - link_64("{}/uvu".format(name), link_root_name = name, link_alias = "uvu") + link_65("{}/uvu".format(name), link_root_name = name, link_alias = "uvu") link_targets.append(":{}/uvu".format(name)) elif bazel_package == "projects/peers-combo-2": link_6("{}/@aspect-test/c".format(name), link_root_name = name, link_alias = "@aspect-test/c") @@ -326,6 +328,13 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@types"] = [link_targets[-1]] else: scope_targets["@types"].append(link_targets[-1]) + elif bazel_package == "projects/alts": + link_47("{}/lodash-dupe".format(name), link_root_name = name, link_alias = "lodash-dupe") + link_targets.append(":{}/lodash-dupe".format(name)) + link_48("{}/lodash".format(name), link_root_name = name, link_alias = "lodash") + link_targets.append(":{}/lodash".format(name)) + link_48("{}/lodash-file".format(name), link_root_name = name, link_alias = "lodash-file") + link_targets.append(":{}/lodash-file".format(name)) if is_root: _npm_local_package_store( @@ -764,6 +773,10 @@ def npm_link_targets(name = "node_modules", package = None): link_targets.append(":{}/@types/node".format(name)) elif bazel_package == "projects/b": link_targets.append(":{}/@types/node".format(name)) + elif bazel_package == "projects/alts": + link_targets.append(":{}/lodash-dupe".format(name)) + link_targets.append(":{}/lodash".format(name)) + link_targets.append(":{}/lodash-file".format(name)) if bazel_package in ["", "projects/peer-types"]: link_targets.append(":{}/@scoped/c".format(name)) diff --git a/e2e/pnpm_lockfiles/v101/snapshots/repositories.bzl b/e2e/pnpm_lockfiles/v101/snapshots/repositories.bzl index 8bea5f379..d7811bac2 100644 --- a/e2e/pnpm_lockfiles/v101/snapshots/repositories.bzl +++ b/e2e/pnpm_lockfiles/v101/snapshots/repositories.bzl @@ -22,18 +22,18 @@ def npm_repositories(): ) npm_import( - name = "lock-__ansi-regex__6.1.0", + name = "lock-__ansi-regex__6.2.0", root_package = "", link_workspace = "", link_packages = {}, package = "ansi-regex", - version = "6.1.0", - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + version = "6.2.0", + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + integrity = "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==", transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], }, ) @@ -326,7 +326,7 @@ def npm_repositories(): }, transitive_closure = { "@isaacs/cliui": ["8.0.2"], - "ansi-regex": ["5.0.1", "6.1.0"], + "ansi-regex": ["5.0.1", "6.2.0"], "ansi-styles": ["4.3.0", "6.2.1"], "color-convert": ["2.0.1"], "color-name": ["1.1.4"], @@ -945,11 +945,11 @@ def npm_repositories(): root_package = "", link_workspace = "", link_packages = { - "": ["lodash"], + "projects/alts": ["lodash-dupe"], }, package = "lodash", version = "4.17.21", - url = "file:vendored/lodash-4.17.21.tgz", + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", system_tar = "", package_visibility = ["//visibility:public"], integrity = "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", @@ -958,6 +958,25 @@ def npm_repositories(): }, ) + npm_import( + name = "lock-__lodash__file_.._vendored_lodash-4.17.21.tgz", + root_package = "", + link_workspace = "", + link_packages = { + "": ["lodash"], + "projects/alts": ["lodash", "lodash-file"], + }, + package = "lodash", + version = "file:../vendored/lodash-4.17.21.tgz", + url = "file:vendored/lodash-4.17.21.tgz", + system_tar = "", + package_visibility = ["//visibility:public"], + integrity = "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + transitive_closure = { + "lodash": ["file:../vendored/lodash-4.17.21.tgz"], + }, + ) + npm_import( name = "lock-__meaning-of-life__1.0.0_1541309197", root_package = "", @@ -1174,7 +1193,7 @@ def npm_repositories(): "strip-ansi": "7.1.0", }, transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], "eastasianwidth": ["0.2.0"], "emoji-regex": ["9.2.2"], "string-width": ["5.1.2"], @@ -1214,10 +1233,10 @@ def npm_repositories(): package_visibility = ["//visibility:public"], integrity = "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", deps = { - "ansi-regex": "6.1.0", + "ansi-regex": "6.2.0", }, transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], "strip-ansi": ["7.1.0"], }, ) @@ -1349,7 +1368,7 @@ def npm_repositories(): "strip-ansi": "7.1.0", }, transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], "ansi-styles": ["6.2.1"], "eastasianwidth": ["0.2.0"], "emoji-regex": ["9.2.2"], diff --git a/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml index 60059a5e7..df8dde4e1 100644 --- a/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml +++ b/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml @@ -116,6 +116,16 @@ importers: dependencies: '@types/node': registry.npmjs.org/@types/node/16.18.11 + ../projects/alts: + specifiers: + lodash: 4.17.21 + lodash-dupe: npm:lodash@4.17.21 + lodash-file: file:../../vendored/lodash-4.17.21.tgz + dependencies: + lodash: 4.17.21 + lodash-dupe: /lodash/4.17.21 + lodash-file: file:../vendored/lodash-4.17.21.tgz + ../projects/b: specifiers: '@scoped/a': workspace:* @@ -283,8 +293,8 @@ packages: engines: {node: '>=8'} dev: false - /ansi-regex/6.1.0: - resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==} + /ansi-regex/6.2.0: + resolution: {integrity: sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==} engines: {node: '>=12'} dev: false @@ -402,6 +412,10 @@ packages: engines: {node: '>=6'} dev: false + /lodash/4.17.21: + resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} + dev: false + /meaning-of-life/1.0.0_o3deharooos255qt5xdujc3cuq: resolution: {integrity: sha512-fVA4xSydqtK9owabGcYw1r4EKEsMOVVeYQLeCXPu77Z+8Y2j2B2I16UqZlKIOHnYkJ4RSvpJ00ywy9IWjmuxYw==} dev: false @@ -487,7 +501,7 @@ packages: resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} engines: {node: '>=12'} dependencies: - ansi-regex: 6.1.0 + ansi-regex: 6.2.0 dev: false /supports-preserve-symlinks-flag/1.0.0: diff --git a/e2e/pnpm_lockfiles/v54/snapshots/aspect_test_a_links_defs.bzl b/e2e/pnpm_lockfiles/v54/snapshots/aspect_test_a_links_defs.bzl new file mode 100644 index 000000000..d16035ed0 --- /dev/null +++ b/e2e/pnpm_lockfiles/v54/snapshots/aspect_test_a_links_defs.bzl @@ -0,0 +1,86 @@ +"@generated by @aspect_rules_js//npm/private:npm_import.bzl for npm package @aspect-test/a@5.0.2" + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_import.bzl", + _npm_imported_package_store = "npm_imported_package_store_internal", + _npm_link_imported_package = "npm_link_imported_package_internal", + _npm_link_imported_package_store = "npm_link_imported_package_store_internal") + +PACKAGE = "@aspect-test/a" +VERSION = "5.0.2" +_ROOT_PACKAGE = "" +_PACKAGE_STORE_NAME = "@aspect-test+a@5.0.2" + +# Generated npm_package_store targets for npm package @aspect-test/a@5.0.2 +# buildifier: disable=function-docstring +def npm_imported_package_store(link_root_name): + _npm_imported_package_store( + link_root_name = link_root_name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + ref_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/ref": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/ref": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/ref": "@aspect-test/d", + }, + lc_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg_pre_lc_lite": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + dev = False, + has_lifecycle_build_target = False, + transitive_closure_pattern = True, + npm_package_target = "@@aspect_rules_js~~npm~lock-__at_aspect-test_a__5.0.2//:pkg", + package_store_name = _PACKAGE_STORE_NAME, + lifecycle_hooks_env = {}, + lifecycle_hooks_execution_requirements = {}, + use_default_shell_env = False, + exclude_package_contents = [], + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/a@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package_store(name, link_root_name, link_alias): + return _npm_link_imported_package_store( + name, + link_root_name, + link_alias, + root_package = _ROOT_PACKAGE, + link_visibility = ["//visibility:public"], + bins = {}, + package_store_name = _PACKAGE_STORE_NAME, + public_visibility = True, + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/a@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package( + name = "node_modules", + link = None, + fail_if_no_link = True): + return _npm_link_imported_package( + name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + link = link, + link_packages = { + "": ["@aspect-test-a-bad-scope", "@aspect-test-custom-scope/a", "@aspect-test/a", "@aspect-test/a2", "aspect-test-a-no-scope", "aspect-test-a/no-at"], + }, + public_visibility = True, + npm_link_imported_package_store_macro = npm_link_imported_package_store, + npm_imported_package_store_macro = npm_imported_package_store, + fail_if_no_link = fail_if_no_link, + ) diff --git a/e2e/pnpm_lockfiles/v54/snapshots/aspect_test_b_links_defs.bzl b/e2e/pnpm_lockfiles/v54/snapshots/aspect_test_b_links_defs.bzl new file mode 100644 index 000000000..c9f92fc62 --- /dev/null +++ b/e2e/pnpm_lockfiles/v54/snapshots/aspect_test_b_links_defs.bzl @@ -0,0 +1,86 @@ +"@generated by @aspect_rules_js//npm/private:npm_import.bzl for npm package @aspect-test/b@5.0.2" + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_import.bzl", + _npm_imported_package_store = "npm_imported_package_store_internal", + _npm_link_imported_package = "npm_link_imported_package_internal", + _npm_link_imported_package_store = "npm_link_imported_package_store_internal") + +PACKAGE = "@aspect-test/b" +VERSION = "5.0.2" +_ROOT_PACKAGE = "" +_PACKAGE_STORE_NAME = "@aspect-test+b@5.0.2" + +# Generated npm_package_store targets for npm package @aspect-test/b@5.0.2 +# buildifier: disable=function-docstring +def npm_imported_package_store(link_root_name): + _npm_imported_package_store( + link_root_name = link_root_name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + ref_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/ref": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/ref": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/ref": "@aspect-test/d", + }, + lc_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg_pre_lc_lite": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + dev = False, + has_lifecycle_build_target = False, + transitive_closure_pattern = True, + npm_package_target = "@@aspect_rules_js~~npm~lock-__at_aspect-test_b__5.0.2//:pkg", + package_store_name = _PACKAGE_STORE_NAME, + lifecycle_hooks_env = {}, + lifecycle_hooks_execution_requirements = {}, + use_default_shell_env = False, + exclude_package_contents = [], + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/b@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package_store(name, link_root_name, link_alias): + return _npm_link_imported_package_store( + name, + link_root_name, + link_alias, + root_package = _ROOT_PACKAGE, + link_visibility = ["//visibility:public"], + bins = {}, + package_store_name = _PACKAGE_STORE_NAME, + public_visibility = True, + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/b@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package( + name = "node_modules", + link = None, + fail_if_no_link = True): + return _npm_link_imported_package( + name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + link = link, + link_packages = { + "": [PACKAGE], + }, + public_visibility = True, + npm_link_imported_package_store_macro = npm_link_imported_package_store, + npm_imported_package_store_macro = npm_imported_package_store, + fail_if_no_link = fail_if_no_link, + ) diff --git a/e2e/pnpm_lockfiles/v54/snapshots/aspect_test_c_links_defs.bzl b/e2e/pnpm_lockfiles/v54/snapshots/aspect_test_c_links_defs.bzl new file mode 100644 index 000000000..67e6e0ef5 --- /dev/null +++ b/e2e/pnpm_lockfiles/v54/snapshots/aspect_test_c_links_defs.bzl @@ -0,0 +1,79 @@ +"@generated by @aspect_rules_js//npm/private:npm_import.bzl for npm package @aspect-test/c@2.0.0" + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_import.bzl", + _npm_imported_package_store = "npm_imported_package_store_internal", + _npm_link_imported_package = "npm_link_imported_package_internal", + _npm_link_imported_package_store = "npm_link_imported_package_store_internal") + +PACKAGE = "@aspect-test/c" +VERSION = "2.0.0" +_ROOT_PACKAGE = "" +_PACKAGE_STORE_NAME = "@aspect-test+c@2.0.0" + +# Generated npm_package_store targets for npm package @aspect-test/c@2.0.0 +# buildifier: disable=function-docstring +def npm_imported_package_store(link_root_name): + _npm_imported_package_store( + link_root_name = link_root_name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.0/pkg": "@aspect-test/c", + }, + ref_deps = {}, + lc_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.0/pkg_pre_lc_lite": "@aspect-test/c", + }, + dev = False, + has_lifecycle_build_target = True, + transitive_closure_pattern = True, + npm_package_target = "@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.0//:pkg", + package_store_name = _PACKAGE_STORE_NAME, + lifecycle_hooks_env = {}, + lifecycle_hooks_execution_requirements = { + "no-sandbox": "1", + }, + use_default_shell_env = False, + exclude_package_contents = [], + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/c@2.0.0 +# buildifier: disable=function-docstring +def npm_link_imported_package_store(name, link_root_name, link_alias): + return _npm_link_imported_package_store( + name, + link_root_name, + link_alias, + root_package = _ROOT_PACKAGE, + link_visibility = ["//visibility:public"], + bins = {}, + package_store_name = _PACKAGE_STORE_NAME, + public_visibility = True, + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/c@2.0.0 +# buildifier: disable=function-docstring +def npm_link_imported_package( + name = "node_modules", + link = None, + fail_if_no_link = True): + return _npm_link_imported_package( + name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + link = link, + link_packages = { + "": [PACKAGE], + "projects/peers-combo-2": [PACKAGE], + }, + public_visibility = True, + npm_link_imported_package_store_macro = npm_link_imported_package_store, + npm_imported_package_store_macro = npm_imported_package_store, + fail_if_no_link = fail_if_no_link, + ) diff --git a/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl index 2e8b3895c..46254ae90 100644 --- a/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl @@ -1,7 +1,7 @@ """@generated by npm_translate_lock(name = "lock-", pnpm_lock = "@@//:pnpm-lock.yaml")""" 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.1.0__links//:defs.bzl", store_1 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-regex__6.2.0__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") @@ -47,25 +47,26 @@ load("@@aspect_rules_js~~npm~lock-__jquery__github.com_jquery_jquer load("@@aspect_rules_js~~npm~lock-__jquery__github.com_jquery_jquery_e61fccb9d736235b4b011f89cba6866bc0b8997d__links//:defs.bzl", link_44 = "npm_link_imported_package_store", store_44 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__kleur__4.1.5__links//:defs.bzl", store_45 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__lodash__4.17.21__links//:defs.bzl", link_46 = "npm_link_imported_package_store", store_46 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_47 = "npm_link_imported_package_store", store_47 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_48 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_49 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__path-parse__1.0.7__links//:defs.bzl", store_50 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__picomatch__2.3.1__links//:defs.bzl", store_51 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__resolve__1.22.10__links//:defs.bzl", store_52 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__rollup__2.14.0__links//:defs.bzl", link_53 = "npm_link_imported_package_store", store_53 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__rollup__3.29.4__links//:defs.bzl", link_54 = "npm_link_imported_package_store", store_54 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_55 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__string-width__4.2.3__links//:defs.bzl", store_56 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__string-width__5.1.2__links//:defs.bzl", store_57 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__strip-ansi__6.0.1__links//:defs.bzl", store_58 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__strip-ansi__7.1.0__links//:defs.bzl", store_59 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__supports-preserve-symlinks-flag__1.0.0__links//:defs.bzl", store_60 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__tslib__2.8.1__links//:defs.bzl", link_61 = "npm_link_imported_package_store", store_61 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__typescript__5.5.2__links//:defs.bzl", link_62 = "npm_link_imported_package_store", store_62 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_63 = "npm_link_imported_package_store", store_63 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__wrap-ansi__7.0.0__links//:defs.bzl", store_64 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__wrap-ansi__8.1.0__links//:defs.bzl", store_65 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__lodash__file_.._vendored_lodash-4.17.21.tgz__links//:defs.bzl", link_47 = "npm_link_imported_package_store", store_47 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_48 = "npm_link_imported_package_store", store_48 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_49 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_50 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__path-parse__1.0.7__links//:defs.bzl", store_51 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__picomatch__2.3.1__links//:defs.bzl", store_52 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__resolve__1.22.10__links//:defs.bzl", store_53 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__rollup__2.14.0__links//:defs.bzl", link_54 = "npm_link_imported_package_store", store_54 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__rollup__3.29.4__links//:defs.bzl", link_55 = "npm_link_imported_package_store", store_55 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_56 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__string-width__4.2.3__links//:defs.bzl", store_57 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__string-width__5.1.2__links//:defs.bzl", store_58 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__strip-ansi__6.0.1__links//:defs.bzl", store_59 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__strip-ansi__7.1.0__links//:defs.bzl", store_60 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__supports-preserve-symlinks-flag__1.0.0__links//:defs.bzl", store_61 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__tslib__2.8.1__links//:defs.bzl", link_62 = "npm_link_imported_package_store", store_62 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__typescript__5.5.2__links//:defs.bzl", link_63 = "npm_link_imported_package_store", store_63 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_64 = "npm_link_imported_package_store", store_64 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__wrap-ansi__7.0.0__links//:defs.bzl", store_65 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__wrap-ansi__8.1.0__links//:defs.bzl", store_66 = "npm_imported_package_store") # buildifier: disable=bzl-visibility load("@aspect_rules_js//js:defs.bzl", _js_library = "js_library") @@ -76,7 +77,7 @@ load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_link_packa # buildifier: disable=bzl-visibility load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_package_store = "npm_package_store", _npm_local_package_store = "npm_local_package_store_internal") -_LINK_PACKAGES = ["", "projects/a", "projects/a-types", "projects/b", "projects/c", "projects/d", "projects/peer-types", "projects/peers-combo-1", "projects/peers-combo-2", "vendored/is-number"] +_LINK_PACKAGES = ["", "projects/a", "projects/a-types", "projects/alts", "projects/b", "projects/c", "projects/d", "projects/peer-types", "projects/peers-combo-1", "projects/peers-combo-2", "vendored/is-number"] # buildifier: disable=function-docstring def npm_link_all_packages(name = "node_modules", imported_links = []): @@ -165,6 +166,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): store_63(name) store_64(name) store_65(name) + store_66(name) if link: if bazel_package == "": link_4("{}/@aspect-test-a-bad-scope".format(name), link_root_name = name, link_alias = "@aspect-test-a-bad-scope") @@ -259,19 +261,19 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): link_targets.append(":{}/jquery-git-ssh-399b201".format(name)) link_44("{}/jquery-git-ssh-e61fccb".format(name), link_root_name = name, link_alias = "jquery-git-ssh-e61fccb") link_targets.append(":{}/jquery-git-ssh-e61fccb".format(name)) - link_46("{}/lodash".format(name), link_root_name = name, link_alias = "lodash") + link_47("{}/lodash".format(name), link_root_name = name, link_alias = "lodash") link_targets.append(":{}/lodash".format(name)) - link_47("{}/meaning-of-life".format(name), link_root_name = name, link_alias = "meaning-of-life") + link_48("{}/meaning-of-life".format(name), link_root_name = name, link_alias = "meaning-of-life") link_targets.append(":{}/meaning-of-life".format(name)) - link_53("{}/rollup".format(name), link_root_name = name, link_alias = "rollup") + link_54("{}/rollup".format(name), link_root_name = name, link_alias = "rollup") link_targets.append(":{}/rollup".format(name)) - link_54("{}/rollup3".format(name), link_root_name = name, link_alias = "rollup3") + link_55("{}/rollup3".format(name), link_root_name = name, link_alias = "rollup3") link_targets.append(":{}/rollup3".format(name)) - link_61("{}/tslib".format(name), link_root_name = name, link_alias = "tslib") + link_62("{}/tslib".format(name), link_root_name = name, link_alias = "tslib") link_targets.append(":{}/tslib".format(name)) - link_62("{}/typescript".format(name), link_root_name = name, link_alias = "typescript") + link_63("{}/typescript".format(name), link_root_name = name, link_alias = "typescript") link_targets.append(":{}/typescript".format(name)) - link_63("{}/uvu".format(name), link_root_name = name, link_alias = "uvu") + link_64("{}/uvu".format(name), link_root_name = name, link_alias = "uvu") link_targets.append(":{}/uvu".format(name)) elif bazel_package == "projects/peers-combo-2": link_6("{}/@aspect-test/c".format(name), link_root_name = name, link_alias = "@aspect-test/c") @@ -318,6 +320,13 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@types"] = [link_targets[-1]] else: scope_targets["@types"].append(link_targets[-1]) + elif bazel_package == "projects/alts": + link_46("{}/lodash-dupe".format(name), link_root_name = name, link_alias = "lodash-dupe") + link_targets.append(":{}/lodash-dupe".format(name)) + link_47("{}/lodash".format(name), link_root_name = name, link_alias = "lodash") + link_targets.append(":{}/lodash".format(name)) + link_47("{}/lodash-file".format(name), link_root_name = name, link_alias = "lodash-file") + link_targets.append(":{}/lodash-file".format(name)) if is_root: _npm_local_package_store( @@ -754,6 +763,10 @@ def npm_link_targets(name = "node_modules", package = None): link_targets.append(":{}/@types/node".format(name)) elif bazel_package == "projects/b": link_targets.append(":{}/@types/node".format(name)) + elif bazel_package == "projects/alts": + link_targets.append(":{}/lodash-dupe".format(name)) + link_targets.append(":{}/lodash".format(name)) + link_targets.append(":{}/lodash-file".format(name)) if bazel_package in ["", "projects/peer-types"]: link_targets.append(":{}/@scoped/c".format(name)) diff --git a/e2e/pnpm_lockfiles/v54/snapshots/repositories.bzl b/e2e/pnpm_lockfiles/v54/snapshots/repositories.bzl index 414650049..9e92ef51e 100644 --- a/e2e/pnpm_lockfiles/v54/snapshots/repositories.bzl +++ b/e2e/pnpm_lockfiles/v54/snapshots/repositories.bzl @@ -22,18 +22,18 @@ def npm_repositories(): ) npm_import( - name = "lock-__ansi-regex__6.1.0", + name = "lock-__ansi-regex__6.2.0", root_package = "", link_workspace = "", link_packages = {}, package = "ansi-regex", - version = "6.1.0", - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + version = "6.2.0", + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + integrity = "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==", transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], }, ) @@ -308,7 +308,7 @@ def npm_repositories(): }, transitive_closure = { "@isaacs/cliui": ["8.0.2"], - "ansi-regex": ["5.0.1", "6.1.0"], + "ansi-regex": ["5.0.1", "6.2.0"], "ansi-styles": ["4.3.0", "6.2.1"], "color-convert": ["2.0.1"], "color-name": ["1.1.4"], @@ -931,11 +931,11 @@ def npm_repositories(): root_package = "", link_workspace = "", link_packages = { - "": ["lodash"], + "projects/alts": ["lodash-dupe"], }, package = "lodash", version = "4.17.21", - url = "file:vendored/lodash-4.17.21.tgz", + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", system_tar = "", package_visibility = ["//visibility:public"], integrity = "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", @@ -944,6 +944,25 @@ def npm_repositories(): }, ) + npm_import( + name = "lock-__lodash__file_.._vendored_lodash-4.17.21.tgz", + root_package = "", + link_workspace = "", + link_packages = { + "": ["lodash"], + "projects/alts": ["lodash", "lodash-file"], + }, + package = "lodash", + version = "file:../vendored/lodash-4.17.21.tgz", + url = "file:vendored/lodash-4.17.21.tgz", + system_tar = "", + package_visibility = ["//visibility:public"], + integrity = "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + transitive_closure = { + "lodash": ["file:../vendored/lodash-4.17.21.tgz"], + }, + ) + npm_import( name = "lock-__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq", root_package = "", @@ -1160,7 +1179,7 @@ def npm_repositories(): "strip-ansi": "7.1.0", }, transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], "eastasianwidth": ["0.2.0"], "emoji-regex": ["9.2.2"], "string-width": ["5.1.2"], @@ -1200,10 +1219,10 @@ def npm_repositories(): package_visibility = ["//visibility:public"], integrity = "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", deps = { - "ansi-regex": "6.1.0", + "ansi-regex": "6.2.0", }, transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], "strip-ansi": ["7.1.0"], }, ) @@ -1335,7 +1354,7 @@ def npm_repositories(): "strip-ansi": "7.1.0", }, transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], "ansi-styles": ["6.2.1"], "eastasianwidth": ["0.2.0"], "emoji-regex": ["9.2.2"], diff --git a/e2e/pnpm_lockfiles/v60/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v60/pnpm-lock.yaml index db0c9a3b7..df8d6e3e8 100644 --- a/e2e/pnpm_lockfiles/v60/pnpm-lock.yaml +++ b/e2e/pnpm_lockfiles/v60/pnpm-lock.yaml @@ -159,6 +159,18 @@ importers: specifier: 16.18.11 version: registry.npmjs.org/@types/node@16.18.11 + ../projects/alts: + dependencies: + lodash: + specifier: 4.17.21 + version: 4.17.21 + lodash-dupe: + specifier: npm:lodash@4.17.21 + version: /lodash@4.17.21 + lodash-file: + specifier: file:../../vendored/lodash-4.17.21.tgz + version: file:../vendored/lodash-4.17.21.tgz + ../projects/b: dependencies: '@scoped/a': @@ -344,8 +356,8 @@ packages: engines: {node: '>=8'} dev: false - /ansi-regex@6.1.0: - resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==} + /ansi-regex@6.2.0: + resolution: {integrity: sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==} engines: {node: '>=12'} dev: false @@ -463,6 +475,10 @@ packages: engines: {node: '>=6'} dev: false + /lodash@4.17.21: + resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} + dev: false + /meaning-of-life@1.0.0(patch_hash=o3deharooos255qt5xdujc3cuq): resolution: {integrity: sha512-fVA4xSydqtK9owabGcYw1r4EKEsMOVVeYQLeCXPu77Z+8Y2j2B2I16UqZlKIOHnYkJ4RSvpJ00ywy9IWjmuxYw==} dev: false @@ -548,7 +564,7 @@ packages: resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} engines: {node: '>=12'} dependencies: - ansi-regex: 6.1.0 + ansi-regex: 6.2.0 dev: false /supports-preserve-symlinks-flag@1.0.0: diff --git a/e2e/pnpm_lockfiles/v60/snapshots/aspect_test_a_links_defs.bzl b/e2e/pnpm_lockfiles/v60/snapshots/aspect_test_a_links_defs.bzl new file mode 100644 index 000000000..d16035ed0 --- /dev/null +++ b/e2e/pnpm_lockfiles/v60/snapshots/aspect_test_a_links_defs.bzl @@ -0,0 +1,86 @@ +"@generated by @aspect_rules_js//npm/private:npm_import.bzl for npm package @aspect-test/a@5.0.2" + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_import.bzl", + _npm_imported_package_store = "npm_imported_package_store_internal", + _npm_link_imported_package = "npm_link_imported_package_internal", + _npm_link_imported_package_store = "npm_link_imported_package_store_internal") + +PACKAGE = "@aspect-test/a" +VERSION = "5.0.2" +_ROOT_PACKAGE = "" +_PACKAGE_STORE_NAME = "@aspect-test+a@5.0.2" + +# Generated npm_package_store targets for npm package @aspect-test/a@5.0.2 +# buildifier: disable=function-docstring +def npm_imported_package_store(link_root_name): + _npm_imported_package_store( + link_root_name = link_root_name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + ref_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/ref": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/ref": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/ref": "@aspect-test/d", + }, + lc_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg_pre_lc_lite": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + dev = False, + has_lifecycle_build_target = False, + transitive_closure_pattern = True, + npm_package_target = "@@aspect_rules_js~~npm~lock-__at_aspect-test_a__5.0.2//:pkg", + package_store_name = _PACKAGE_STORE_NAME, + lifecycle_hooks_env = {}, + lifecycle_hooks_execution_requirements = {}, + use_default_shell_env = False, + exclude_package_contents = [], + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/a@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package_store(name, link_root_name, link_alias): + return _npm_link_imported_package_store( + name, + link_root_name, + link_alias, + root_package = _ROOT_PACKAGE, + link_visibility = ["//visibility:public"], + bins = {}, + package_store_name = _PACKAGE_STORE_NAME, + public_visibility = True, + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/a@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package( + name = "node_modules", + link = None, + fail_if_no_link = True): + return _npm_link_imported_package( + name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + link = link, + link_packages = { + "": ["@aspect-test-a-bad-scope", "@aspect-test-custom-scope/a", "@aspect-test/a", "@aspect-test/a2", "aspect-test-a-no-scope", "aspect-test-a/no-at"], + }, + public_visibility = True, + npm_link_imported_package_store_macro = npm_link_imported_package_store, + npm_imported_package_store_macro = npm_imported_package_store, + fail_if_no_link = fail_if_no_link, + ) diff --git a/e2e/pnpm_lockfiles/v60/snapshots/aspect_test_b_links_defs.bzl b/e2e/pnpm_lockfiles/v60/snapshots/aspect_test_b_links_defs.bzl new file mode 100644 index 000000000..c9f92fc62 --- /dev/null +++ b/e2e/pnpm_lockfiles/v60/snapshots/aspect_test_b_links_defs.bzl @@ -0,0 +1,86 @@ +"@generated by @aspect_rules_js//npm/private:npm_import.bzl for npm package @aspect-test/b@5.0.2" + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_import.bzl", + _npm_imported_package_store = "npm_imported_package_store_internal", + _npm_link_imported_package = "npm_link_imported_package_internal", + _npm_link_imported_package_store = "npm_link_imported_package_store_internal") + +PACKAGE = "@aspect-test/b" +VERSION = "5.0.2" +_ROOT_PACKAGE = "" +_PACKAGE_STORE_NAME = "@aspect-test+b@5.0.2" + +# Generated npm_package_store targets for npm package @aspect-test/b@5.0.2 +# buildifier: disable=function-docstring +def npm_imported_package_store(link_root_name): + _npm_imported_package_store( + link_root_name = link_root_name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + ref_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/ref": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/ref": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/ref": "@aspect-test/d", + }, + lc_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg_pre_lc_lite": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + dev = False, + has_lifecycle_build_target = False, + transitive_closure_pattern = True, + npm_package_target = "@@aspect_rules_js~~npm~lock-__at_aspect-test_b__5.0.2//:pkg", + package_store_name = _PACKAGE_STORE_NAME, + lifecycle_hooks_env = {}, + lifecycle_hooks_execution_requirements = {}, + use_default_shell_env = False, + exclude_package_contents = [], + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/b@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package_store(name, link_root_name, link_alias): + return _npm_link_imported_package_store( + name, + link_root_name, + link_alias, + root_package = _ROOT_PACKAGE, + link_visibility = ["//visibility:public"], + bins = {}, + package_store_name = _PACKAGE_STORE_NAME, + public_visibility = True, + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/b@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package( + name = "node_modules", + link = None, + fail_if_no_link = True): + return _npm_link_imported_package( + name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + link = link, + link_packages = { + "": [PACKAGE], + }, + public_visibility = True, + npm_link_imported_package_store_macro = npm_link_imported_package_store, + npm_imported_package_store_macro = npm_imported_package_store, + fail_if_no_link = fail_if_no_link, + ) diff --git a/e2e/pnpm_lockfiles/v60/snapshots/aspect_test_c_links_defs.bzl b/e2e/pnpm_lockfiles/v60/snapshots/aspect_test_c_links_defs.bzl new file mode 100644 index 000000000..67e6e0ef5 --- /dev/null +++ b/e2e/pnpm_lockfiles/v60/snapshots/aspect_test_c_links_defs.bzl @@ -0,0 +1,79 @@ +"@generated by @aspect_rules_js//npm/private:npm_import.bzl for npm package @aspect-test/c@2.0.0" + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_import.bzl", + _npm_imported_package_store = "npm_imported_package_store_internal", + _npm_link_imported_package = "npm_link_imported_package_internal", + _npm_link_imported_package_store = "npm_link_imported_package_store_internal") + +PACKAGE = "@aspect-test/c" +VERSION = "2.0.0" +_ROOT_PACKAGE = "" +_PACKAGE_STORE_NAME = "@aspect-test+c@2.0.0" + +# Generated npm_package_store targets for npm package @aspect-test/c@2.0.0 +# buildifier: disable=function-docstring +def npm_imported_package_store(link_root_name): + _npm_imported_package_store( + link_root_name = link_root_name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.0/pkg": "@aspect-test/c", + }, + ref_deps = {}, + lc_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.0/pkg_pre_lc_lite": "@aspect-test/c", + }, + dev = False, + has_lifecycle_build_target = True, + transitive_closure_pattern = True, + npm_package_target = "@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.0//:pkg", + package_store_name = _PACKAGE_STORE_NAME, + lifecycle_hooks_env = {}, + lifecycle_hooks_execution_requirements = { + "no-sandbox": "1", + }, + use_default_shell_env = False, + exclude_package_contents = [], + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/c@2.0.0 +# buildifier: disable=function-docstring +def npm_link_imported_package_store(name, link_root_name, link_alias): + return _npm_link_imported_package_store( + name, + link_root_name, + link_alias, + root_package = _ROOT_PACKAGE, + link_visibility = ["//visibility:public"], + bins = {}, + package_store_name = _PACKAGE_STORE_NAME, + public_visibility = True, + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/c@2.0.0 +# buildifier: disable=function-docstring +def npm_link_imported_package( + name = "node_modules", + link = None, + fail_if_no_link = True): + return _npm_link_imported_package( + name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + link = link, + link_packages = { + "": [PACKAGE], + "projects/peers-combo-2": [PACKAGE], + }, + public_visibility = True, + npm_link_imported_package_store_macro = npm_link_imported_package_store, + npm_imported_package_store_macro = npm_imported_package_store, + fail_if_no_link = fail_if_no_link, + ) diff --git a/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl index e6d59f713..f6673a274 100644 --- a/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl @@ -1,7 +1,7 @@ """@generated by npm_translate_lock(name = "lock-", pnpm_lock = "@@//:pnpm-lock.yaml")""" 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.1.0__links//:defs.bzl", store_1 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-regex__6.2.0__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") @@ -48,25 +48,26 @@ load("@@aspect_rules_js~~npm~lock-__jquery__github.com_jquery_jquer load("@@aspect_rules_js~~npm~lock-__jquery__github.com_jquery_jquery_e61fccb9d736235b4b011f89cba6866bc0b8997d__links//:defs.bzl", link_45 = "npm_link_imported_package_store", store_45 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__kleur__4.1.5__links//:defs.bzl", store_46 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__lodash__4.17.21__links//:defs.bzl", link_47 = "npm_link_imported_package_store", store_47 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_48 = "npm_link_imported_package_store", store_48 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_49 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_50 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__path-parse__1.0.7__links//:defs.bzl", store_51 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__picomatch__2.3.1__links//:defs.bzl", store_52 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__resolve__1.22.10__links//:defs.bzl", store_53 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__rollup__2.14.0__links//:defs.bzl", link_54 = "npm_link_imported_package_store", store_54 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__rollup__3.29.4__links//:defs.bzl", link_55 = "npm_link_imported_package_store", store_55 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_56 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__string-width__4.2.3__links//:defs.bzl", store_57 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__string-width__5.1.2__links//:defs.bzl", store_58 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__strip-ansi__6.0.1__links//:defs.bzl", store_59 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__strip-ansi__7.1.0__links//:defs.bzl", store_60 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__supports-preserve-symlinks-flag__1.0.0__links//:defs.bzl", store_61 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__tslib__2.6.3__links//:defs.bzl", link_62 = "npm_link_imported_package_store", store_62 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__typescript__5.5.2__links//:defs.bzl", link_63 = "npm_link_imported_package_store", store_63 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_64 = "npm_link_imported_package_store", store_64 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__wrap-ansi__7.0.0__links//:defs.bzl", store_65 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__wrap-ansi__8.1.0__links//:defs.bzl", store_66 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__lodash__file_.._vendored_lodash-4.17.21.tgz__links//:defs.bzl", link_48 = "npm_link_imported_package_store", store_48 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_49 = "npm_link_imported_package_store", store_49 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_50 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_51 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__path-parse__1.0.7__links//:defs.bzl", store_52 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__picomatch__2.3.1__links//:defs.bzl", store_53 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__resolve__1.22.10__links//:defs.bzl", store_54 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__rollup__2.14.0__links//:defs.bzl", link_55 = "npm_link_imported_package_store", store_55 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__rollup__3.29.4__links//:defs.bzl", link_56 = "npm_link_imported_package_store", store_56 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_57 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__string-width__4.2.3__links//:defs.bzl", store_58 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__string-width__5.1.2__links//:defs.bzl", store_59 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__strip-ansi__6.0.1__links//:defs.bzl", store_60 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__strip-ansi__7.1.0__links//:defs.bzl", store_61 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__supports-preserve-symlinks-flag__1.0.0__links//:defs.bzl", store_62 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__tslib__2.6.3__links//:defs.bzl", link_63 = "npm_link_imported_package_store", store_63 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__typescript__5.5.2__links//:defs.bzl", link_64 = "npm_link_imported_package_store", store_64 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_65 = "npm_link_imported_package_store", store_65 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__wrap-ansi__7.0.0__links//:defs.bzl", store_66 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__wrap-ansi__8.1.0__links//:defs.bzl", store_67 = "npm_imported_package_store") # buildifier: disable=bzl-visibility load("@aspect_rules_js//js:defs.bzl", _js_library = "js_library") @@ -77,7 +78,7 @@ load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_link_packa # buildifier: disable=bzl-visibility load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_package_store = "npm_package_store", _npm_local_package_store = "npm_local_package_store_internal") -_LINK_PACKAGES = ["", "projects/a", "projects/a-types", "projects/b", "projects/c", "projects/d", "projects/peer-types", "projects/peers-combo-1", "projects/peers-combo-2", "vendored/is-number"] +_LINK_PACKAGES = ["", "projects/a", "projects/a-types", "projects/alts", "projects/b", "projects/c", "projects/d", "projects/peer-types", "projects/peers-combo-1", "projects/peers-combo-2", "vendored/is-number"] # buildifier: disable=function-docstring def npm_link_all_packages(name = "node_modules", imported_links = []): @@ -167,6 +168,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): store_64(name) store_65(name) store_66(name) + store_67(name) if link: if bazel_package == "": link_4("{}/@aspect-test-a-bad-scope".format(name), link_root_name = name, link_alias = "@aspect-test-a-bad-scope") @@ -267,19 +269,19 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): link_targets.append(":{}/jquery-git-ssh-399b201".format(name)) link_45("{}/jquery-git-ssh-e61fccb".format(name), link_root_name = name, link_alias = "jquery-git-ssh-e61fccb") link_targets.append(":{}/jquery-git-ssh-e61fccb".format(name)) - link_47("{}/lodash".format(name), link_root_name = name, link_alias = "lodash") + link_48("{}/lodash".format(name), link_root_name = name, link_alias = "lodash") link_targets.append(":{}/lodash".format(name)) - link_48("{}/meaning-of-life".format(name), link_root_name = name, link_alias = "meaning-of-life") + link_49("{}/meaning-of-life".format(name), link_root_name = name, link_alias = "meaning-of-life") link_targets.append(":{}/meaning-of-life".format(name)) - link_54("{}/rollup".format(name), link_root_name = name, link_alias = "rollup") + link_55("{}/rollup".format(name), link_root_name = name, link_alias = "rollup") link_targets.append(":{}/rollup".format(name)) - link_55("{}/rollup3".format(name), link_root_name = name, link_alias = "rollup3") + link_56("{}/rollup3".format(name), link_root_name = name, link_alias = "rollup3") link_targets.append(":{}/rollup3".format(name)) - link_62("{}/tslib".format(name), link_root_name = name, link_alias = "tslib") + link_63("{}/tslib".format(name), link_root_name = name, link_alias = "tslib") link_targets.append(":{}/tslib".format(name)) - link_63("{}/typescript".format(name), link_root_name = name, link_alias = "typescript") + link_64("{}/typescript".format(name), link_root_name = name, link_alias = "typescript") link_targets.append(":{}/typescript".format(name)) - link_64("{}/uvu".format(name), link_root_name = name, link_alias = "uvu") + link_65("{}/uvu".format(name), link_root_name = name, link_alias = "uvu") link_targets.append(":{}/uvu".format(name)) elif bazel_package == "projects/peers-combo-2": link_6("{}/@aspect-test/c".format(name), link_root_name = name, link_alias = "@aspect-test/c") @@ -326,6 +328,13 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@types"] = [link_targets[-1]] else: scope_targets["@types"].append(link_targets[-1]) + elif bazel_package == "projects/alts": + link_47("{}/lodash-dupe".format(name), link_root_name = name, link_alias = "lodash-dupe") + link_targets.append(":{}/lodash-dupe".format(name)) + link_48("{}/lodash".format(name), link_root_name = name, link_alias = "lodash") + link_targets.append(":{}/lodash".format(name)) + link_48("{}/lodash-file".format(name), link_root_name = name, link_alias = "lodash-file") + link_targets.append(":{}/lodash-file".format(name)) if is_root: _npm_local_package_store( @@ -764,6 +773,10 @@ def npm_link_targets(name = "node_modules", package = None): link_targets.append(":{}/@types/node".format(name)) elif bazel_package == "projects/b": link_targets.append(":{}/@types/node".format(name)) + elif bazel_package == "projects/alts": + link_targets.append(":{}/lodash-dupe".format(name)) + link_targets.append(":{}/lodash".format(name)) + link_targets.append(":{}/lodash-file".format(name)) if bazel_package in ["", "projects/peer-types"]: link_targets.append(":{}/@scoped/c".format(name)) diff --git a/e2e/pnpm_lockfiles/v60/snapshots/repositories.bzl b/e2e/pnpm_lockfiles/v60/snapshots/repositories.bzl index 2d9b7a344..1c208ce30 100644 --- a/e2e/pnpm_lockfiles/v60/snapshots/repositories.bzl +++ b/e2e/pnpm_lockfiles/v60/snapshots/repositories.bzl @@ -22,18 +22,18 @@ def npm_repositories(): ) npm_import( - name = "lock-__ansi-regex__6.1.0", + name = "lock-__ansi-regex__6.2.0", root_package = "", link_workspace = "", link_packages = {}, package = "ansi-regex", - version = "6.1.0", - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + version = "6.2.0", + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + integrity = "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==", transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], }, ) @@ -326,7 +326,7 @@ def npm_repositories(): }, transitive_closure = { "@isaacs/cliui": ["8.0.2"], - "ansi-regex": ["5.0.1", "6.1.0"], + "ansi-regex": ["5.0.1", "6.2.0"], "ansi-styles": ["4.3.0", "6.2.1"], "color-convert": ["2.0.1"], "color-name": ["1.1.4"], @@ -949,11 +949,11 @@ def npm_repositories(): root_package = "", link_workspace = "", link_packages = { - "": ["lodash"], + "projects/alts": ["lodash-dupe"], }, package = "lodash", version = "4.17.21", - url = "file:vendored/lodash-4.17.21.tgz", + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", system_tar = "", package_visibility = ["//visibility:public"], integrity = "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", @@ -962,6 +962,25 @@ def npm_repositories(): }, ) + npm_import( + name = "lock-__lodash__file_.._vendored_lodash-4.17.21.tgz", + root_package = "", + link_workspace = "", + link_packages = { + "": ["lodash"], + "projects/alts": ["lodash", "lodash-file"], + }, + package = "lodash", + version = "file:../vendored/lodash-4.17.21.tgz", + url = "file:vendored/lodash-4.17.21.tgz", + system_tar = "", + package_visibility = ["//visibility:public"], + integrity = "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + transitive_closure = { + "lodash": ["file:../vendored/lodash-4.17.21.tgz"], + }, + ) + npm_import( name = "lock-__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq", root_package = "", @@ -1178,7 +1197,7 @@ def npm_repositories(): "strip-ansi": "7.1.0", }, transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], "eastasianwidth": ["0.2.0"], "emoji-regex": ["9.2.2"], "string-width": ["5.1.2"], @@ -1218,10 +1237,10 @@ def npm_repositories(): package_visibility = ["//visibility:public"], integrity = "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", deps = { - "ansi-regex": "6.1.0", + "ansi-regex": "6.2.0", }, transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], "strip-ansi": ["7.1.0"], }, ) @@ -1353,7 +1372,7 @@ def npm_repositories(): "strip-ansi": "7.1.0", }, transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], "ansi-styles": ["6.2.1"], "eastasianwidth": ["0.2.0"], "emoji-regex": ["9.2.2"], diff --git a/e2e/pnpm_lockfiles/v61/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v61/pnpm-lock.yaml index a012caad5..9e56ad255 100644 --- a/e2e/pnpm_lockfiles/v61/pnpm-lock.yaml +++ b/e2e/pnpm_lockfiles/v61/pnpm-lock.yaml @@ -163,6 +163,18 @@ importers: specifier: 16.18.11 version: registry.npmjs.org/@types/node@16.18.11 + ../projects/alts: + dependencies: + lodash: + specifier: 4.17.21 + version: 4.17.21 + lodash-dupe: + specifier: npm:lodash@4.17.21 + version: /lodash@4.17.21 + lodash-file: + specifier: file:../../vendored/lodash-4.17.21.tgz + version: file:../vendored/lodash-4.17.21.tgz + ../projects/b: dependencies: '@scoped/a': @@ -348,8 +360,8 @@ packages: engines: {node: '>=8'} dev: false - /ansi-regex@6.1.0: - resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==} + /ansi-regex@6.2.0: + resolution: {integrity: sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==} engines: {node: '>=12'} dev: false @@ -467,6 +479,10 @@ packages: engines: {node: '>=6'} dev: false + /lodash@4.17.21: + resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} + dev: false + /meaning-of-life@1.0.0(patch_hash=o3deharooos255qt5xdujc3cuq): resolution: {integrity: sha512-fVA4xSydqtK9owabGcYw1r4EKEsMOVVeYQLeCXPu77Z+8Y2j2B2I16UqZlKIOHnYkJ4RSvpJ00ywy9IWjmuxYw==} dev: false @@ -552,7 +568,7 @@ packages: resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} engines: {node: '>=12'} dependencies: - ansi-regex: 6.1.0 + ansi-regex: 6.2.0 dev: false /supports-preserve-symlinks-flag@1.0.0: diff --git a/e2e/pnpm_lockfiles/v61/snapshots/aspect_test_a_links_defs.bzl b/e2e/pnpm_lockfiles/v61/snapshots/aspect_test_a_links_defs.bzl new file mode 100644 index 000000000..d16035ed0 --- /dev/null +++ b/e2e/pnpm_lockfiles/v61/snapshots/aspect_test_a_links_defs.bzl @@ -0,0 +1,86 @@ +"@generated by @aspect_rules_js//npm/private:npm_import.bzl for npm package @aspect-test/a@5.0.2" + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_import.bzl", + _npm_imported_package_store = "npm_imported_package_store_internal", + _npm_link_imported_package = "npm_link_imported_package_internal", + _npm_link_imported_package_store = "npm_link_imported_package_store_internal") + +PACKAGE = "@aspect-test/a" +VERSION = "5.0.2" +_ROOT_PACKAGE = "" +_PACKAGE_STORE_NAME = "@aspect-test+a@5.0.2" + +# Generated npm_package_store targets for npm package @aspect-test/a@5.0.2 +# buildifier: disable=function-docstring +def npm_imported_package_store(link_root_name): + _npm_imported_package_store( + link_root_name = link_root_name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + ref_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/ref": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/ref": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/ref": "@aspect-test/d", + }, + lc_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg_pre_lc_lite": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + dev = False, + has_lifecycle_build_target = False, + transitive_closure_pattern = True, + npm_package_target = "@@aspect_rules_js~~npm~lock-__at_aspect-test_a__5.0.2//:pkg", + package_store_name = _PACKAGE_STORE_NAME, + lifecycle_hooks_env = {}, + lifecycle_hooks_execution_requirements = {}, + use_default_shell_env = False, + exclude_package_contents = [], + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/a@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package_store(name, link_root_name, link_alias): + return _npm_link_imported_package_store( + name, + link_root_name, + link_alias, + root_package = _ROOT_PACKAGE, + link_visibility = ["//visibility:public"], + bins = {}, + package_store_name = _PACKAGE_STORE_NAME, + public_visibility = True, + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/a@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package( + name = "node_modules", + link = None, + fail_if_no_link = True): + return _npm_link_imported_package( + name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + link = link, + link_packages = { + "": ["@aspect-test-a-bad-scope", "@aspect-test-custom-scope/a", "@aspect-test/a", "@aspect-test/a2", "aspect-test-a-no-scope", "aspect-test-a/no-at"], + }, + public_visibility = True, + npm_link_imported_package_store_macro = npm_link_imported_package_store, + npm_imported_package_store_macro = npm_imported_package_store, + fail_if_no_link = fail_if_no_link, + ) diff --git a/e2e/pnpm_lockfiles/v61/snapshots/aspect_test_b_links_defs.bzl b/e2e/pnpm_lockfiles/v61/snapshots/aspect_test_b_links_defs.bzl new file mode 100644 index 000000000..c9f92fc62 --- /dev/null +++ b/e2e/pnpm_lockfiles/v61/snapshots/aspect_test_b_links_defs.bzl @@ -0,0 +1,86 @@ +"@generated by @aspect_rules_js//npm/private:npm_import.bzl for npm package @aspect-test/b@5.0.2" + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_import.bzl", + _npm_imported_package_store = "npm_imported_package_store_internal", + _npm_link_imported_package = "npm_link_imported_package_internal", + _npm_link_imported_package_store = "npm_link_imported_package_store_internal") + +PACKAGE = "@aspect-test/b" +VERSION = "5.0.2" +_ROOT_PACKAGE = "" +_PACKAGE_STORE_NAME = "@aspect-test+b@5.0.2" + +# Generated npm_package_store targets for npm package @aspect-test/b@5.0.2 +# buildifier: disable=function-docstring +def npm_imported_package_store(link_root_name): + _npm_imported_package_store( + link_root_name = link_root_name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + ref_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/ref": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/ref": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/ref": "@aspect-test/d", + }, + lc_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg_pre_lc_lite": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + dev = False, + has_lifecycle_build_target = False, + transitive_closure_pattern = True, + npm_package_target = "@@aspect_rules_js~~npm~lock-__at_aspect-test_b__5.0.2//:pkg", + package_store_name = _PACKAGE_STORE_NAME, + lifecycle_hooks_env = {}, + lifecycle_hooks_execution_requirements = {}, + use_default_shell_env = False, + exclude_package_contents = [], + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/b@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package_store(name, link_root_name, link_alias): + return _npm_link_imported_package_store( + name, + link_root_name, + link_alias, + root_package = _ROOT_PACKAGE, + link_visibility = ["//visibility:public"], + bins = {}, + package_store_name = _PACKAGE_STORE_NAME, + public_visibility = True, + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/b@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package( + name = "node_modules", + link = None, + fail_if_no_link = True): + return _npm_link_imported_package( + name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + link = link, + link_packages = { + "": [PACKAGE], + }, + public_visibility = True, + npm_link_imported_package_store_macro = npm_link_imported_package_store, + npm_imported_package_store_macro = npm_imported_package_store, + fail_if_no_link = fail_if_no_link, + ) diff --git a/e2e/pnpm_lockfiles/v61/snapshots/aspect_test_c_links_defs.bzl b/e2e/pnpm_lockfiles/v61/snapshots/aspect_test_c_links_defs.bzl new file mode 100644 index 000000000..67e6e0ef5 --- /dev/null +++ b/e2e/pnpm_lockfiles/v61/snapshots/aspect_test_c_links_defs.bzl @@ -0,0 +1,79 @@ +"@generated by @aspect_rules_js//npm/private:npm_import.bzl for npm package @aspect-test/c@2.0.0" + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_import.bzl", + _npm_imported_package_store = "npm_imported_package_store_internal", + _npm_link_imported_package = "npm_link_imported_package_internal", + _npm_link_imported_package_store = "npm_link_imported_package_store_internal") + +PACKAGE = "@aspect-test/c" +VERSION = "2.0.0" +_ROOT_PACKAGE = "" +_PACKAGE_STORE_NAME = "@aspect-test+c@2.0.0" + +# Generated npm_package_store targets for npm package @aspect-test/c@2.0.0 +# buildifier: disable=function-docstring +def npm_imported_package_store(link_root_name): + _npm_imported_package_store( + link_root_name = link_root_name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.0/pkg": "@aspect-test/c", + }, + ref_deps = {}, + lc_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.0/pkg_pre_lc_lite": "@aspect-test/c", + }, + dev = False, + has_lifecycle_build_target = True, + transitive_closure_pattern = True, + npm_package_target = "@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.0//:pkg", + package_store_name = _PACKAGE_STORE_NAME, + lifecycle_hooks_env = {}, + lifecycle_hooks_execution_requirements = { + "no-sandbox": "1", + }, + use_default_shell_env = False, + exclude_package_contents = [], + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/c@2.0.0 +# buildifier: disable=function-docstring +def npm_link_imported_package_store(name, link_root_name, link_alias): + return _npm_link_imported_package_store( + name, + link_root_name, + link_alias, + root_package = _ROOT_PACKAGE, + link_visibility = ["//visibility:public"], + bins = {}, + package_store_name = _PACKAGE_STORE_NAME, + public_visibility = True, + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/c@2.0.0 +# buildifier: disable=function-docstring +def npm_link_imported_package( + name = "node_modules", + link = None, + fail_if_no_link = True): + return _npm_link_imported_package( + name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + link = link, + link_packages = { + "": [PACKAGE], + "projects/peers-combo-2": [PACKAGE], + }, + public_visibility = True, + npm_link_imported_package_store_macro = npm_link_imported_package_store, + npm_imported_package_store_macro = npm_imported_package_store, + fail_if_no_link = fail_if_no_link, + ) diff --git a/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl index e6d59f713..f6673a274 100644 --- a/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl @@ -1,7 +1,7 @@ """@generated by npm_translate_lock(name = "lock-", pnpm_lock = "@@//:pnpm-lock.yaml")""" 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.1.0__links//:defs.bzl", store_1 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-regex__6.2.0__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") @@ -48,25 +48,26 @@ load("@@aspect_rules_js~~npm~lock-__jquery__github.com_jquery_jquer load("@@aspect_rules_js~~npm~lock-__jquery__github.com_jquery_jquery_e61fccb9d736235b4b011f89cba6866bc0b8997d__links//:defs.bzl", link_45 = "npm_link_imported_package_store", store_45 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__kleur__4.1.5__links//:defs.bzl", store_46 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__lodash__4.17.21__links//:defs.bzl", link_47 = "npm_link_imported_package_store", store_47 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_48 = "npm_link_imported_package_store", store_48 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_49 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_50 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__path-parse__1.0.7__links//:defs.bzl", store_51 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__picomatch__2.3.1__links//:defs.bzl", store_52 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__resolve__1.22.10__links//:defs.bzl", store_53 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__rollup__2.14.0__links//:defs.bzl", link_54 = "npm_link_imported_package_store", store_54 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__rollup__3.29.4__links//:defs.bzl", link_55 = "npm_link_imported_package_store", store_55 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_56 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__string-width__4.2.3__links//:defs.bzl", store_57 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__string-width__5.1.2__links//:defs.bzl", store_58 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__strip-ansi__6.0.1__links//:defs.bzl", store_59 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__strip-ansi__7.1.0__links//:defs.bzl", store_60 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__supports-preserve-symlinks-flag__1.0.0__links//:defs.bzl", store_61 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__tslib__2.6.3__links//:defs.bzl", link_62 = "npm_link_imported_package_store", store_62 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__typescript__5.5.2__links//:defs.bzl", link_63 = "npm_link_imported_package_store", store_63 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_64 = "npm_link_imported_package_store", store_64 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__wrap-ansi__7.0.0__links//:defs.bzl", store_65 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__wrap-ansi__8.1.0__links//:defs.bzl", store_66 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__lodash__file_.._vendored_lodash-4.17.21.tgz__links//:defs.bzl", link_48 = "npm_link_imported_package_store", store_48 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_49 = "npm_link_imported_package_store", store_49 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_50 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_51 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__path-parse__1.0.7__links//:defs.bzl", store_52 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__picomatch__2.3.1__links//:defs.bzl", store_53 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__resolve__1.22.10__links//:defs.bzl", store_54 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__rollup__2.14.0__links//:defs.bzl", link_55 = "npm_link_imported_package_store", store_55 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__rollup__3.29.4__links//:defs.bzl", link_56 = "npm_link_imported_package_store", store_56 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_57 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__string-width__4.2.3__links//:defs.bzl", store_58 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__string-width__5.1.2__links//:defs.bzl", store_59 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__strip-ansi__6.0.1__links//:defs.bzl", store_60 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__strip-ansi__7.1.0__links//:defs.bzl", store_61 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__supports-preserve-symlinks-flag__1.0.0__links//:defs.bzl", store_62 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__tslib__2.6.3__links//:defs.bzl", link_63 = "npm_link_imported_package_store", store_63 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__typescript__5.5.2__links//:defs.bzl", link_64 = "npm_link_imported_package_store", store_64 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_65 = "npm_link_imported_package_store", store_65 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__wrap-ansi__7.0.0__links//:defs.bzl", store_66 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__wrap-ansi__8.1.0__links//:defs.bzl", store_67 = "npm_imported_package_store") # buildifier: disable=bzl-visibility load("@aspect_rules_js//js:defs.bzl", _js_library = "js_library") @@ -77,7 +78,7 @@ load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_link_packa # buildifier: disable=bzl-visibility load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_package_store = "npm_package_store", _npm_local_package_store = "npm_local_package_store_internal") -_LINK_PACKAGES = ["", "projects/a", "projects/a-types", "projects/b", "projects/c", "projects/d", "projects/peer-types", "projects/peers-combo-1", "projects/peers-combo-2", "vendored/is-number"] +_LINK_PACKAGES = ["", "projects/a", "projects/a-types", "projects/alts", "projects/b", "projects/c", "projects/d", "projects/peer-types", "projects/peers-combo-1", "projects/peers-combo-2", "vendored/is-number"] # buildifier: disable=function-docstring def npm_link_all_packages(name = "node_modules", imported_links = []): @@ -167,6 +168,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): store_64(name) store_65(name) store_66(name) + store_67(name) if link: if bazel_package == "": link_4("{}/@aspect-test-a-bad-scope".format(name), link_root_name = name, link_alias = "@aspect-test-a-bad-scope") @@ -267,19 +269,19 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): link_targets.append(":{}/jquery-git-ssh-399b201".format(name)) link_45("{}/jquery-git-ssh-e61fccb".format(name), link_root_name = name, link_alias = "jquery-git-ssh-e61fccb") link_targets.append(":{}/jquery-git-ssh-e61fccb".format(name)) - link_47("{}/lodash".format(name), link_root_name = name, link_alias = "lodash") + link_48("{}/lodash".format(name), link_root_name = name, link_alias = "lodash") link_targets.append(":{}/lodash".format(name)) - link_48("{}/meaning-of-life".format(name), link_root_name = name, link_alias = "meaning-of-life") + link_49("{}/meaning-of-life".format(name), link_root_name = name, link_alias = "meaning-of-life") link_targets.append(":{}/meaning-of-life".format(name)) - link_54("{}/rollup".format(name), link_root_name = name, link_alias = "rollup") + link_55("{}/rollup".format(name), link_root_name = name, link_alias = "rollup") link_targets.append(":{}/rollup".format(name)) - link_55("{}/rollup3".format(name), link_root_name = name, link_alias = "rollup3") + link_56("{}/rollup3".format(name), link_root_name = name, link_alias = "rollup3") link_targets.append(":{}/rollup3".format(name)) - link_62("{}/tslib".format(name), link_root_name = name, link_alias = "tslib") + link_63("{}/tslib".format(name), link_root_name = name, link_alias = "tslib") link_targets.append(":{}/tslib".format(name)) - link_63("{}/typescript".format(name), link_root_name = name, link_alias = "typescript") + link_64("{}/typescript".format(name), link_root_name = name, link_alias = "typescript") link_targets.append(":{}/typescript".format(name)) - link_64("{}/uvu".format(name), link_root_name = name, link_alias = "uvu") + link_65("{}/uvu".format(name), link_root_name = name, link_alias = "uvu") link_targets.append(":{}/uvu".format(name)) elif bazel_package == "projects/peers-combo-2": link_6("{}/@aspect-test/c".format(name), link_root_name = name, link_alias = "@aspect-test/c") @@ -326,6 +328,13 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@types"] = [link_targets[-1]] else: scope_targets["@types"].append(link_targets[-1]) + elif bazel_package == "projects/alts": + link_47("{}/lodash-dupe".format(name), link_root_name = name, link_alias = "lodash-dupe") + link_targets.append(":{}/lodash-dupe".format(name)) + link_48("{}/lodash".format(name), link_root_name = name, link_alias = "lodash") + link_targets.append(":{}/lodash".format(name)) + link_48("{}/lodash-file".format(name), link_root_name = name, link_alias = "lodash-file") + link_targets.append(":{}/lodash-file".format(name)) if is_root: _npm_local_package_store( @@ -764,6 +773,10 @@ def npm_link_targets(name = "node_modules", package = None): link_targets.append(":{}/@types/node".format(name)) elif bazel_package == "projects/b": link_targets.append(":{}/@types/node".format(name)) + elif bazel_package == "projects/alts": + link_targets.append(":{}/lodash-dupe".format(name)) + link_targets.append(":{}/lodash".format(name)) + link_targets.append(":{}/lodash-file".format(name)) if bazel_package in ["", "projects/peer-types"]: link_targets.append(":{}/@scoped/c".format(name)) diff --git a/e2e/pnpm_lockfiles/v61/snapshots/repositories.bzl b/e2e/pnpm_lockfiles/v61/snapshots/repositories.bzl index 2d9b7a344..1c208ce30 100644 --- a/e2e/pnpm_lockfiles/v61/snapshots/repositories.bzl +++ b/e2e/pnpm_lockfiles/v61/snapshots/repositories.bzl @@ -22,18 +22,18 @@ def npm_repositories(): ) npm_import( - name = "lock-__ansi-regex__6.1.0", + name = "lock-__ansi-regex__6.2.0", root_package = "", link_workspace = "", link_packages = {}, package = "ansi-regex", - version = "6.1.0", - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + version = "6.2.0", + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + integrity = "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==", transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], }, ) @@ -326,7 +326,7 @@ def npm_repositories(): }, transitive_closure = { "@isaacs/cliui": ["8.0.2"], - "ansi-regex": ["5.0.1", "6.1.0"], + "ansi-regex": ["5.0.1", "6.2.0"], "ansi-styles": ["4.3.0", "6.2.1"], "color-convert": ["2.0.1"], "color-name": ["1.1.4"], @@ -949,11 +949,11 @@ def npm_repositories(): root_package = "", link_workspace = "", link_packages = { - "": ["lodash"], + "projects/alts": ["lodash-dupe"], }, package = "lodash", version = "4.17.21", - url = "file:vendored/lodash-4.17.21.tgz", + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", system_tar = "", package_visibility = ["//visibility:public"], integrity = "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", @@ -962,6 +962,25 @@ def npm_repositories(): }, ) + npm_import( + name = "lock-__lodash__file_.._vendored_lodash-4.17.21.tgz", + root_package = "", + link_workspace = "", + link_packages = { + "": ["lodash"], + "projects/alts": ["lodash", "lodash-file"], + }, + package = "lodash", + version = "file:../vendored/lodash-4.17.21.tgz", + url = "file:vendored/lodash-4.17.21.tgz", + system_tar = "", + package_visibility = ["//visibility:public"], + integrity = "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + transitive_closure = { + "lodash": ["file:../vendored/lodash-4.17.21.tgz"], + }, + ) + npm_import( name = "lock-__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq", root_package = "", @@ -1178,7 +1197,7 @@ def npm_repositories(): "strip-ansi": "7.1.0", }, transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], "eastasianwidth": ["0.2.0"], "emoji-regex": ["9.2.2"], "string-width": ["5.1.2"], @@ -1218,10 +1237,10 @@ def npm_repositories(): package_visibility = ["//visibility:public"], integrity = "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", deps = { - "ansi-regex": "6.1.0", + "ansi-regex": "6.2.0", }, transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], "strip-ansi": ["7.1.0"], }, ) @@ -1353,7 +1372,7 @@ def npm_repositories(): "strip-ansi": "7.1.0", }, transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], "ansi-styles": ["6.2.1"], "eastasianwidth": ["0.2.0"], "emoji-regex": ["9.2.2"], diff --git a/e2e/pnpm_lockfiles/v90/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v90/pnpm-lock.yaml index 4a0a01482..ae17a909a 100644 --- a/e2e/pnpm_lockfiles/v90/pnpm-lock.yaml +++ b/e2e/pnpm_lockfiles/v90/pnpm-lock.yaml @@ -160,6 +160,18 @@ importers: specifier: 16.18.11 version: 16.18.11 + ../projects/alts: + dependencies: + lodash: + specifier: 4.17.21 + version: 4.17.21 + lodash-dupe: + specifier: npm:lodash@4.17.21 + version: lodash@4.17.21 + lodash-file: + specifier: file:../../vendored/lodash-4.17.21.tgz + version: lodash@file:../vendored/lodash-4.17.21.tgz + ../projects/b: dependencies: '@scoped/a': @@ -314,8 +326,8 @@ packages: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} - ansi-regex@6.1.0: - resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==} + ansi-regex@6.2.0: + resolution: {integrity: sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==} engines: {node: '>=12'} ansi-styles@4.3.0: @@ -422,6 +434,9 @@ packages: resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==} engines: {node: '>=6'} + lodash@4.17.21: + resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} + lodash@file:../vendored/lodash-4.17.21.tgz: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==, tarball: file:../vendored/lodash-4.17.21.tgz} version: 4.17.21 @@ -590,7 +605,7 @@ snapshots: ansi-regex@5.0.1: {} - ansi-regex@6.1.0: {} + ansi-regex@6.2.0: {} ansi-styles@4.3.0: dependencies: @@ -665,6 +680,8 @@ snapshots: kleur@4.1.5: {} + lodash@4.17.21: {} + lodash@file:../vendored/lodash-4.17.21.tgz: {} meaning-of-life@1.0.0(patch_hash=o3deharooos255qt5xdujc3cuq): {} @@ -713,7 +730,7 @@ snapshots: strip-ansi@7.1.0: dependencies: - ansi-regex: 6.1.0 + ansi-regex: 6.2.0 supports-preserve-symlinks-flag@1.0.0: {} diff --git a/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_a_links_defs.bzl b/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_a_links_defs.bzl new file mode 100644 index 000000000..d16035ed0 --- /dev/null +++ b/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_a_links_defs.bzl @@ -0,0 +1,86 @@ +"@generated by @aspect_rules_js//npm/private:npm_import.bzl for npm package @aspect-test/a@5.0.2" + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_import.bzl", + _npm_imported_package_store = "npm_imported_package_store_internal", + _npm_link_imported_package = "npm_link_imported_package_internal", + _npm_link_imported_package_store = "npm_link_imported_package_store_internal") + +PACKAGE = "@aspect-test/a" +VERSION = "5.0.2" +_ROOT_PACKAGE = "" +_PACKAGE_STORE_NAME = "@aspect-test+a@5.0.2" + +# Generated npm_package_store targets for npm package @aspect-test/a@5.0.2 +# buildifier: disable=function-docstring +def npm_imported_package_store(link_root_name): + _npm_imported_package_store( + link_root_name = link_root_name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + ref_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/ref": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/ref": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/ref": "@aspect-test/d", + }, + lc_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg_pre_lc_lite": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + dev = False, + has_lifecycle_build_target = False, + transitive_closure_pattern = True, + npm_package_target = "@@aspect_rules_js~~npm~lock-__at_aspect-test_a__5.0.2//:pkg", + package_store_name = _PACKAGE_STORE_NAME, + lifecycle_hooks_env = {}, + lifecycle_hooks_execution_requirements = {}, + use_default_shell_env = False, + exclude_package_contents = [], + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/a@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package_store(name, link_root_name, link_alias): + return _npm_link_imported_package_store( + name, + link_root_name, + link_alias, + root_package = _ROOT_PACKAGE, + link_visibility = ["//visibility:public"], + bins = {}, + package_store_name = _PACKAGE_STORE_NAME, + public_visibility = True, + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/a@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package( + name = "node_modules", + link = None, + fail_if_no_link = True): + return _npm_link_imported_package( + name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + link = link, + link_packages = { + "": ["@aspect-test-a-bad-scope", "@aspect-test-custom-scope/a", "@aspect-test/a", "@aspect-test/a2", "aspect-test-a-no-scope", "aspect-test-a/no-at"], + }, + public_visibility = True, + npm_link_imported_package_store_macro = npm_link_imported_package_store, + npm_imported_package_store_macro = npm_imported_package_store, + fail_if_no_link = fail_if_no_link, + ) diff --git a/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_b_links_defs.bzl b/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_b_links_defs.bzl new file mode 100644 index 000000000..c9f92fc62 --- /dev/null +++ b/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_b_links_defs.bzl @@ -0,0 +1,86 @@ +"@generated by @aspect_rules_js//npm/private:npm_import.bzl for npm package @aspect-test/b@5.0.2" + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_import.bzl", + _npm_imported_package_store = "npm_imported_package_store_internal", + _npm_link_imported_package = "npm_link_imported_package_internal", + _npm_link_imported_package_store = "npm_link_imported_package_store_internal") + +PACKAGE = "@aspect-test/b" +VERSION = "5.0.2" +_ROOT_PACKAGE = "" +_PACKAGE_STORE_NAME = "@aspect-test+b@5.0.2" + +# Generated npm_package_store targets for npm package @aspect-test/b@5.0.2 +# buildifier: disable=function-docstring +def npm_imported_package_store(link_root_name): + _npm_imported_package_store( + link_root_name = link_root_name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + ref_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/ref": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/ref": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/ref": "@aspect-test/d", + }, + lc_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+a@5.0.2/pkg": "@aspect-test/a", + ":.aspect_rules_js/{link_root_name}/@aspect-test+b@5.0.2/pkg_pre_lc_lite": "@aspect-test/b", + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.2/pkg": "@aspect-test/c", + ":.aspect_rules_js/{link_root_name}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2/pkg": "@aspect-test/d", + }, + dev = False, + has_lifecycle_build_target = False, + transitive_closure_pattern = True, + npm_package_target = "@@aspect_rules_js~~npm~lock-__at_aspect-test_b__5.0.2//:pkg", + package_store_name = _PACKAGE_STORE_NAME, + lifecycle_hooks_env = {}, + lifecycle_hooks_execution_requirements = {}, + use_default_shell_env = False, + exclude_package_contents = [], + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/b@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package_store(name, link_root_name, link_alias): + return _npm_link_imported_package_store( + name, + link_root_name, + link_alias, + root_package = _ROOT_PACKAGE, + link_visibility = ["//visibility:public"], + bins = {}, + package_store_name = _PACKAGE_STORE_NAME, + public_visibility = True, + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/b@5.0.2 +# buildifier: disable=function-docstring +def npm_link_imported_package( + name = "node_modules", + link = None, + fail_if_no_link = True): + return _npm_link_imported_package( + name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + link = link, + link_packages = { + "": [PACKAGE], + }, + public_visibility = True, + npm_link_imported_package_store_macro = npm_link_imported_package_store, + npm_imported_package_store_macro = npm_imported_package_store, + fail_if_no_link = fail_if_no_link, + ) diff --git a/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_c_links_defs.bzl b/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_c_links_defs.bzl new file mode 100644 index 000000000..67e6e0ef5 --- /dev/null +++ b/e2e/pnpm_lockfiles/v90/snapshots/aspect_test_c_links_defs.bzl @@ -0,0 +1,79 @@ +"@generated by @aspect_rules_js//npm/private:npm_import.bzl for npm package @aspect-test/c@2.0.0" + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") + +# buildifier: disable=bzl-visibility +load("@aspect_rules_js//npm/private:npm_import.bzl", + _npm_imported_package_store = "npm_imported_package_store_internal", + _npm_link_imported_package = "npm_link_imported_package_internal", + _npm_link_imported_package_store = "npm_link_imported_package_store_internal") + +PACKAGE = "@aspect-test/c" +VERSION = "2.0.0" +_ROOT_PACKAGE = "" +_PACKAGE_STORE_NAME = "@aspect-test+c@2.0.0" + +# Generated npm_package_store targets for npm package @aspect-test/c@2.0.0 +# buildifier: disable=function-docstring +def npm_imported_package_store(link_root_name): + _npm_imported_package_store( + link_root_name = link_root_name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.0/pkg": "@aspect-test/c", + }, + ref_deps = {}, + lc_deps = { + ":.aspect_rules_js/{link_root_name}/@aspect-test+c@2.0.0/pkg_pre_lc_lite": "@aspect-test/c", + }, + dev = False, + has_lifecycle_build_target = True, + transitive_closure_pattern = True, + npm_package_target = "@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.0//:pkg", + package_store_name = _PACKAGE_STORE_NAME, + lifecycle_hooks_env = {}, + lifecycle_hooks_execution_requirements = { + "no-sandbox": "1", + }, + use_default_shell_env = False, + exclude_package_contents = [], + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/c@2.0.0 +# buildifier: disable=function-docstring +def npm_link_imported_package_store(name, link_root_name, link_alias): + return _npm_link_imported_package_store( + name, + link_root_name, + link_alias, + root_package = _ROOT_PACKAGE, + link_visibility = ["//visibility:public"], + bins = {}, + package_store_name = _PACKAGE_STORE_NAME, + public_visibility = True, + ) + +# Generated npm_package_store and npm_link_package_store targets for npm package @aspect-test/c@2.0.0 +# buildifier: disable=function-docstring +def npm_link_imported_package( + name = "node_modules", + link = None, + fail_if_no_link = True): + return _npm_link_imported_package( + name, + package = PACKAGE, + version = VERSION, + root_package = _ROOT_PACKAGE, + link = link, + link_packages = { + "": [PACKAGE], + "projects/peers-combo-2": [PACKAGE], + }, + public_visibility = True, + npm_link_imported_package_store_macro = npm_link_imported_package_store, + npm_imported_package_store_macro = npm_imported_package_store, + fail_if_no_link = fail_if_no_link, + ) diff --git a/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl index 57e7f5b50..e0bd0ded1 100644 --- a/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl @@ -1,7 +1,7 @@ """@generated by npm_translate_lock(name = "lock-", pnpm_lock = "@@//:pnpm-lock.yaml")""" 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.1.0__links//:defs.bzl", store_1 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ansi-regex__6.2.0__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") @@ -48,25 +48,26 @@ load("@@aspect_rules_js~~npm~lock-__jquery__https___codeload.github load("@@aspect_rules_js~~npm~lock-__jquery__https___codeload.github.com_jquery_jquery_tar.gz_e61fccb9d736235b4b011f89cba6866bc0b8997d__links//:defs.bzl", link_45 = "npm_link_imported_package_store", store_45 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__kleur__4.1.5__links//:defs.bzl", store_46 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__lodash__4.17.21__links//:defs.bzl", link_47 = "npm_link_imported_package_store", store_47 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_48 = "npm_link_imported_package_store", store_48 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_49 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_50 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__path-parse__1.0.7__links//:defs.bzl", store_51 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__picomatch__2.3.1__links//:defs.bzl", store_52 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__resolve__1.22.10__links//:defs.bzl", store_53 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__rollup__2.14.0__links//:defs.bzl", link_54 = "npm_link_imported_package_store", store_54 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__rollup__3.29.4__links//:defs.bzl", link_55 = "npm_link_imported_package_store", store_55 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_56 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__string-width__4.2.3__links//:defs.bzl", store_57 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__string-width__5.1.2__links//:defs.bzl", store_58 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__strip-ansi__6.0.1__links//:defs.bzl", store_59 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__strip-ansi__7.1.0__links//:defs.bzl", store_60 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__supports-preserve-symlinks-flag__1.0.0__links//:defs.bzl", store_61 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__tslib__2.8.1__links//:defs.bzl", link_62 = "npm_link_imported_package_store", store_62 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__typescript__5.5.2__links//:defs.bzl", link_63 = "npm_link_imported_package_store", store_63 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_64 = "npm_link_imported_package_store", store_64 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__wrap-ansi__7.0.0__links//:defs.bzl", store_65 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__wrap-ansi__8.1.0__links//:defs.bzl", store_66 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__lodash__file_.._vendored_lodash-4.17.21.tgz__links//:defs.bzl", link_48 = "npm_link_imported_package_store", store_48 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_49 = "npm_link_imported_package_store", store_49 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_50 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_51 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__path-parse__1.0.7__links//:defs.bzl", store_52 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__picomatch__2.3.1__links//:defs.bzl", store_53 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__resolve__1.22.10__links//:defs.bzl", store_54 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__rollup__2.14.0__links//:defs.bzl", link_55 = "npm_link_imported_package_store", store_55 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__rollup__3.29.4__links//:defs.bzl", link_56 = "npm_link_imported_package_store", store_56 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_57 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__string-width__4.2.3__links//:defs.bzl", store_58 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__string-width__5.1.2__links//:defs.bzl", store_59 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__strip-ansi__6.0.1__links//:defs.bzl", store_60 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__strip-ansi__7.1.0__links//:defs.bzl", store_61 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__supports-preserve-symlinks-flag__1.0.0__links//:defs.bzl", store_62 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__tslib__2.8.1__links//:defs.bzl", link_63 = "npm_link_imported_package_store", store_63 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__typescript__5.5.2__links//:defs.bzl", link_64 = "npm_link_imported_package_store", store_64 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_65 = "npm_link_imported_package_store", store_65 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__wrap-ansi__7.0.0__links//:defs.bzl", store_66 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__wrap-ansi__8.1.0__links//:defs.bzl", store_67 = "npm_imported_package_store") # buildifier: disable=bzl-visibility load("@aspect_rules_js//js:defs.bzl", _js_library = "js_library") @@ -77,7 +78,7 @@ load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_link_packa # buildifier: disable=bzl-visibility load("@aspect_rules_js//npm/private:npm_package_store.bzl", _npm_package_store = "npm_package_store", _npm_local_package_store = "npm_local_package_store_internal") -_LINK_PACKAGES = ["", "projects/a", "projects/a-types", "projects/b", "projects/c", "projects/d", "projects/peer-types", "projects/peers-combo-1", "projects/peers-combo-2", "vendored/is-number"] +_LINK_PACKAGES = ["", "projects/a", "projects/a-types", "projects/alts", "projects/b", "projects/c", "projects/d", "projects/peer-types", "projects/peers-combo-1", "projects/peers-combo-2", "vendored/is-number"] # buildifier: disable=function-docstring def npm_link_all_packages(name = "node_modules", imported_links = []): @@ -167,6 +168,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): store_64(name) store_65(name) store_66(name) + store_67(name) if link: if bazel_package == "": link_4("{}/@aspect-test-a-bad-scope".format(name), link_root_name = name, link_alias = "@aspect-test-a-bad-scope") @@ -267,19 +269,19 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): link_targets.append(":{}/jquery-git-ssh-399b201".format(name)) link_45("{}/jquery-git-ssh-e61fccb".format(name), link_root_name = name, link_alias = "jquery-git-ssh-e61fccb") link_targets.append(":{}/jquery-git-ssh-e61fccb".format(name)) - link_47("{}/lodash".format(name), link_root_name = name, link_alias = "lodash") + link_48("{}/lodash".format(name), link_root_name = name, link_alias = "lodash") link_targets.append(":{}/lodash".format(name)) - link_48("{}/meaning-of-life".format(name), link_root_name = name, link_alias = "meaning-of-life") + link_49("{}/meaning-of-life".format(name), link_root_name = name, link_alias = "meaning-of-life") link_targets.append(":{}/meaning-of-life".format(name)) - link_54("{}/rollup".format(name), link_root_name = name, link_alias = "rollup") + link_55("{}/rollup".format(name), link_root_name = name, link_alias = "rollup") link_targets.append(":{}/rollup".format(name)) - link_55("{}/rollup3".format(name), link_root_name = name, link_alias = "rollup3") + link_56("{}/rollup3".format(name), link_root_name = name, link_alias = "rollup3") link_targets.append(":{}/rollup3".format(name)) - link_62("{}/tslib".format(name), link_root_name = name, link_alias = "tslib") + link_63("{}/tslib".format(name), link_root_name = name, link_alias = "tslib") link_targets.append(":{}/tslib".format(name)) - link_63("{}/typescript".format(name), link_root_name = name, link_alias = "typescript") + link_64("{}/typescript".format(name), link_root_name = name, link_alias = "typescript") link_targets.append(":{}/typescript".format(name)) - link_64("{}/uvu".format(name), link_root_name = name, link_alias = "uvu") + link_65("{}/uvu".format(name), link_root_name = name, link_alias = "uvu") link_targets.append(":{}/uvu".format(name)) elif bazel_package == "projects/peers-combo-2": link_6("{}/@aspect-test/c".format(name), link_root_name = name, link_alias = "@aspect-test/c") @@ -326,6 +328,13 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@types"] = [link_targets[-1]] else: scope_targets["@types"].append(link_targets[-1]) + elif bazel_package == "projects/alts": + link_47("{}/lodash-dupe".format(name), link_root_name = name, link_alias = "lodash-dupe") + link_targets.append(":{}/lodash-dupe".format(name)) + link_48("{}/lodash".format(name), link_root_name = name, link_alias = "lodash") + link_targets.append(":{}/lodash".format(name)) + link_48("{}/lodash-file".format(name), link_root_name = name, link_alias = "lodash-file") + link_targets.append(":{}/lodash-file".format(name)) if is_root: _npm_local_package_store( @@ -764,6 +773,10 @@ def npm_link_targets(name = "node_modules", package = None): link_targets.append(":{}/@types/node".format(name)) elif bazel_package == "projects/b": link_targets.append(":{}/@types/node".format(name)) + elif bazel_package == "projects/alts": + link_targets.append(":{}/lodash-dupe".format(name)) + link_targets.append(":{}/lodash".format(name)) + link_targets.append(":{}/lodash-file".format(name)) if bazel_package in ["", "projects/peer-types"]: link_targets.append(":{}/@scoped/c".format(name)) diff --git a/e2e/pnpm_lockfiles/v90/snapshots/repositories.bzl b/e2e/pnpm_lockfiles/v90/snapshots/repositories.bzl index 7d48b9c10..b2b0ebc39 100644 --- a/e2e/pnpm_lockfiles/v90/snapshots/repositories.bzl +++ b/e2e/pnpm_lockfiles/v90/snapshots/repositories.bzl @@ -22,18 +22,18 @@ def npm_repositories(): ) npm_import( - name = "lock-__ansi-regex__6.1.0", + name = "lock-__ansi-regex__6.2.0", root_package = "", link_workspace = "", link_packages = {}, package = "ansi-regex", - version = "6.1.0", - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + version = "6.2.0", + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + integrity = "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==", transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], }, ) @@ -326,7 +326,7 @@ def npm_repositories(): }, transitive_closure = { "@isaacs/cliui": ["8.0.2"], - "ansi-regex": ["5.0.1", "6.1.0"], + "ansi-regex": ["5.0.1", "6.2.0"], "ansi-styles": ["4.3.0", "6.2.1"], "color-convert": ["2.0.1"], "color-name": ["1.1.4"], @@ -945,11 +945,11 @@ def npm_repositories(): root_package = "", link_workspace = "", link_packages = { - "": ["lodash"], + "projects/alts": ["lodash-dupe"], }, package = "lodash", version = "4.17.21", - url = "file:vendored/lodash-4.17.21.tgz", + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", system_tar = "", package_visibility = ["//visibility:public"], integrity = "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", @@ -958,6 +958,25 @@ def npm_repositories(): }, ) + npm_import( + name = "lock-__lodash__file_.._vendored_lodash-4.17.21.tgz", + root_package = "", + link_workspace = "", + link_packages = { + "": ["lodash"], + "projects/alts": ["lodash", "lodash-file"], + }, + package = "lodash", + version = "file:../vendored/lodash-4.17.21.tgz", + url = "file:vendored/lodash-4.17.21.tgz", + system_tar = "", + package_visibility = ["//visibility:public"], + integrity = "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + transitive_closure = { + "lodash": ["file:../vendored/lodash-4.17.21.tgz"], + }, + ) + npm_import( name = "lock-__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq", root_package = "", @@ -1174,7 +1193,7 @@ def npm_repositories(): "strip-ansi": "7.1.0", }, transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], "eastasianwidth": ["0.2.0"], "emoji-regex": ["9.2.2"], "string-width": ["5.1.2"], @@ -1214,10 +1233,10 @@ def npm_repositories(): package_visibility = ["//visibility:public"], integrity = "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", deps = { - "ansi-regex": "6.1.0", + "ansi-regex": "6.2.0", }, transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], "strip-ansi": ["7.1.0"], }, ) @@ -1349,7 +1368,7 @@ def npm_repositories(): "strip-ansi": "7.1.0", }, transitive_closure = { - "ansi-regex": ["6.1.0"], + "ansi-regex": ["6.2.0"], "ansi-styles": ["6.2.1"], "eastasianwidth": ["0.2.0"], "emoji-regex": ["9.2.2"], diff --git a/e2e/pnpm_workspace/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= b/e2e/pnpm_workspace/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= index 4ed4a20e1..42b4355bd 100755 --- a/e2e/pnpm_workspace/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= +++ b/e2e/pnpm_workspace/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= @@ -10,8 +10,8 @@ lib/a/package.json=1162557353 lib/b/package.json=1612905941 lib/c/package.json=1015268365 lib/d/package.json=476969669 -package.json=-1094473262 -pnpm-lock.yaml=1580699702 +package.json=-2026631885 +pnpm-lock.yaml=348030320 pnpm-workspace.yaml=-67685769 vendored/a/package.json=-174142441 vendored/b/package.json=536664170 diff --git a/e2e/pnpm_workspace/package.json b/e2e/pnpm_workspace/package.json index a93abd4f4..4607bfbe1 100644 --- a/e2e/pnpm_workspace/package.json +++ b/e2e/pnpm_workspace/package.json @@ -1,7 +1,7 @@ { "private": true, "dependencies": { - "typescript": "4.9.5", + "typescript": "^5.8.2", "@aspect-test/a": "5.0.2", "lodash": "file:vendored/lodash-4.17.19.tgz" }, diff --git a/e2e/pnpm_workspace/pnpm-lock.yaml b/e2e/pnpm_workspace/pnpm-lock.yaml index c2b31eca3..7952c8e3c 100644 --- a/e2e/pnpm_workspace/pnpm-lock.yaml +++ b/e2e/pnpm_workspace/pnpm-lock.yaml @@ -15,8 +15,8 @@ importers: specifier: file:vendored/lodash-4.17.19.tgz version: file:vendored/lodash-4.17.19.tgz typescript: - specifier: 4.9.5 - version: 4.9.5 + specifier: ^5.8.2 + version: 5.9.2 optionalDependencies: '@aspect-test/c': specifier: 2.0.2 @@ -169,9 +169,9 @@ packages: resolution: {integrity: sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==} dev: false - /typescript@4.9.5: - resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==} - engines: {node: '>=4.2.0'} + /typescript@5.9.2: + resolution: {integrity: sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==} + engines: {node: '>=14.17'} hasBin: true dev: false diff --git a/e2e/pnpm_workspace/snapshots/defs.bzl b/e2e/pnpm_workspace/snapshots/defs.bzl index 221c26bc2..cc5293155 100644 --- a/e2e/pnpm_workspace/snapshots/defs.bzl +++ b/e2e/pnpm_workspace/snapshots/defs.bzl @@ -10,8 +10,8 @@ load("@@aspect_rules_js~~npm~npm__at_aspect-test_g__1.0.0__links//:defs.bzl", li load("@@aspect_rules_js~~npm~npm__at_aspect-test_h__1.0.0__links//:defs.bzl", link_7 = "npm_link_imported_package_store", store_7 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~npm__at_types_node__16.18.11__links//:defs.bzl", link_8 = "npm_link_imported_package_store", store_8 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~npm__at_types_sizzle__2.3.8__links//:defs.bzl", link_9 = "npm_link_imported_package_store", store_9 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~npm__lodash__4.17.19__links//:defs.bzl", link_10 = "npm_link_imported_package_store", store_10 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~npm__typescript__4.9.5__links//:defs.bzl", link_11 = "npm_link_imported_package_store", store_11 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~npm__lodash__file_vendored_lodash-4.17.19.tgz__links//:defs.bzl", link_10 = "npm_link_imported_package_store", store_10 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~npm__typescript__5.9.2__links//:defs.bzl", link_11 = "npm_link_imported_package_store", store_11 = "npm_imported_package_store") # buildifier: disable=bzl-visibility load("@aspect_rules_js//js:defs.bzl", _js_library = "js_library") diff --git a/e2e/pnpm_workspace_rerooted/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE1MzU4OTk= b/e2e/pnpm_workspace_rerooted/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE1MzU4OTk= index af6ae00ec..4e0e96197 100755 --- a/e2e/pnpm_workspace_rerooted/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE1MzU4OTk= +++ b/e2e/pnpm_workspace_rerooted/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE1MzU4OTk= @@ -10,8 +10,8 @@ lib/a/package.json=1162557353 lib/b/package.json=1612905941 lib/c/package.json=1015268365 lib/d/package.json=476969669 -package.json=-1094473262 -root/pnpm-lock.yaml=294643168 +package.json=-2026631885 +root/pnpm-lock.yaml=-2075468506 root/pnpm-workspace.yaml=1861018878 vendored/a/package.json=-174142441 vendored/b/package.json=536664170 diff --git a/e2e/pnpm_workspace_rerooted/package.json b/e2e/pnpm_workspace_rerooted/package.json index a93abd4f4..4607bfbe1 100644 --- a/e2e/pnpm_workspace_rerooted/package.json +++ b/e2e/pnpm_workspace_rerooted/package.json @@ -1,7 +1,7 @@ { "private": true, "dependencies": { - "typescript": "4.9.5", + "typescript": "^5.8.2", "@aspect-test/a": "5.0.2", "lodash": "file:vendored/lodash-4.17.19.tgz" }, diff --git a/e2e/pnpm_workspace_rerooted/root/pnpm-lock.yaml b/e2e/pnpm_workspace_rerooted/root/pnpm-lock.yaml index 0bf367914..388c70b4a 100644 --- a/e2e/pnpm_workspace_rerooted/root/pnpm-lock.yaml +++ b/e2e/pnpm_workspace_rerooted/root/pnpm-lock.yaml @@ -15,8 +15,8 @@ importers: specifier: file:vendored/lodash-4.17.19.tgz version: file:../vendored/lodash-4.17.19.tgz typescript: - specifier: 4.9.5 - version: 4.9.5 + specifier: ^5.8.2 + version: 5.9.2 optionalDependencies: '@aspect-test/c': specifier: 2.0.2 @@ -169,9 +169,9 @@ packages: resolution: {integrity: sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==} dev: false - /typescript@4.9.5: - resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==} - engines: {node: '>=4.2.0'} + /typescript@5.9.2: + resolution: {integrity: sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==} + engines: {node: '>=14.17'} hasBin: true dev: false diff --git a/e2e/pnpm_workspace_rerooted/snapshots/defs.bzl b/e2e/pnpm_workspace_rerooted/snapshots/defs.bzl index 107f75779..db7e259ee 100644 --- a/e2e/pnpm_workspace_rerooted/snapshots/defs.bzl +++ b/e2e/pnpm_workspace_rerooted/snapshots/defs.bzl @@ -10,8 +10,8 @@ load("@@aspect_rules_js~~npm~npm__at_aspect-test_g__1.0.0__links//:defs.bzl", li load("@@aspect_rules_js~~npm~npm__at_aspect-test_h__1.0.0__links//:defs.bzl", link_7 = "npm_link_imported_package_store", store_7 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~npm__at_types_node__16.18.11__links//:defs.bzl", link_8 = "npm_link_imported_package_store", store_8 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~npm__at_types_sizzle__2.3.8__links//:defs.bzl", link_9 = "npm_link_imported_package_store", store_9 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~npm__lodash__4.17.19__links//:defs.bzl", link_10 = "npm_link_imported_package_store", store_10 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~npm__typescript__4.9.5__links//:defs.bzl", link_11 = "npm_link_imported_package_store", store_11 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~npm__lodash__file_.._vendored_lodash-4.17.19.tgz__links//:defs.bzl", link_10 = "npm_link_imported_package_store", store_10 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~npm__typescript__5.9.2__links//:defs.bzl", link_11 = "npm_link_imported_package_store", store_11 = "npm_imported_package_store") # buildifier: disable=bzl-visibility load("@aspect_rules_js//js:defs.bzl", _js_library = "js_library") diff --git a/js/private/node-patches/fs.cjs b/js/private/node-patches/fs.cjs index acf3f797e..af980844d 100644 --- a/js/private/node-patches/fs.cjs +++ b/js/private/node-patches/fs.cjs @@ -27,8 +27,9 @@ var __await = (this && this.__await) || function (v) { return this instanceof __ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) { if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined."); var g = generator.apply(thisArg, _arguments || []), i, q = []; - return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i; - function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; } + return i = Object.create((typeof AsyncIterator === "function" ? AsyncIterator : Object).prototype), verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i; + function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; } + function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } } function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } } function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); } function fulfill(value) { resume("next", value); } @@ -36,7 +37,9 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); } }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.escapeFunction = exports.isSubPath = exports.patcher = void 0; +exports.patcher = patcher; +exports.isSubPath = isSubPath; +exports.escapeFunction = escapeFunction; const path = require("path"); const util = require("util"); // using require here on purpose so we can override methods with any @@ -400,17 +403,12 @@ function patcher(fs = _fs, roots) { return __asyncGenerator(this, arguments, function* () { var _a, e_1, _b, _c; try { - for (var _d = true, _f = __asyncValues(origIterator()), _g; _g = yield __await(_f.next()), _a = _g.done, !_a;) { + for (var _d = true, _f = __asyncValues(origIterator()), _g; _g = yield __await(_f.next()), _a = _g.done, !_a; _d = true) { _c = _g.value; _d = false; - try { - const entry = _c; - yield __await(handleDirent(p, entry)); - yield yield __await(entry); - } - finally { - _d = true; - } + const entry = _c; + yield __await(handleDirent(p, entry)); + yield yield __await(entry); } } catch (e_1_1) { e_1 = { error: e_1_1 }; } @@ -724,7 +722,6 @@ function patcher(fs = _fs, roots) { } } } -exports.patcher = patcher; // ========================================================================= // generic helper functions // ========================================================================= @@ -732,7 +729,6 @@ function isSubPath(parent, child) { return (parent === child || (child[parent.length] === path.sep && child.startsWith(parent))); } -exports.isSubPath = isSubPath; function stringifyPathLike(p) { if (p instanceof URL) { return url.fileURLToPath(p); @@ -789,7 +785,6 @@ function escapeFunction(_roots) { canEscape: fs_canEscape, }; } -exports.escapeFunction = escapeFunction; function once(fn) { let called = false; return function callOnce(...args) { diff --git a/js/private/test/image/checksum_test.expected b/js/private/test/image/checksum_test.expected index da91c16fc..8dabca35a 100644 --- a/js/private/test/image/checksum_test.expected +++ b/js/private/test/image/checksum_test.expected @@ -1,4 +1,4 @@ -48f7e6341dc9737351581dc18c58544747dc77f9f11312881e83fc4f31d2538f js/private/test/image/cksum_node +4eb14eccaddd42844503a520b131b739a2003a9e9209a364fc3f8ab44a5edba0 js/private/test/image/cksum_node 52836a988c8ac815b4a3b70fa3a3acec67b851699fa989694cef4cc1fa53de96 js/private/test/image/cksum_package_store_3p 642b308a0561fb51dfd96d08d74a4ec419c9d2ca501cfa1002a49c8e25fbe4c2 js/private/test/image/cksum_package_store_1p 5d45f32dacf0b83e26c33d4e1017c694e79eaff29b8ecc336f9ea8fdee870d45 js/private/test/image/cksum_node_modules diff --git a/js/private/worker/src/package.json b/js/private/worker/src/package.json index 60d8ac7b9..4a531f3c9 100644 --- a/js/private/worker/src/package.json +++ b/js/private/worker/src/package.json @@ -10,7 +10,7 @@ "@types/google-protobuf": "3.15.12", "@rollup/plugin-typescript": "12.1.2", "@types/node": "18.19.54", - "typescript": "4.9.5", + "typescript": "^5.8.0", "tslib": "2.8.1", "abortcontroller-polyfill": "1.7.5" } diff --git a/js/private/worker/worker.js b/js/private/worker/worker.js index 38eec074f..4cc9184cb 100644 --- a/js/private/worker/worker.js +++ b/js/private/worker/worker.js @@ -1136,10 +1136,10 @@ var blaze; })(blaze || (blaze = {})); function enterWorkerLoop(implementation) { - var _a, e_1, _b, _c; - var _d; return __awaiter(this, void 0, void 0, function () { - var abortionMap, prev, _loop_1, _e, _f, _g, e_1_1; + var abortionMap, prev, _loop_1, _a, _b, _c, e_1_1; + var _d, e_1, _e, _f; + var _g; return __generator(this, function (_h) { switch (_h.label) { case 0: @@ -1149,85 +1149,84 @@ function enterWorkerLoop(implementation) { case 1: _h.trys.push([1, 6, 7, 12]); _loop_1 = function () { - _c = _g.value; - _e = false; - try { - var buffer = _c; - var chunk = Buffer.concat([prev, buffer]); - var current = void 0; - var size = readWorkRequestSize(chunk); - if (size.size <= chunk.length + size.headerSize) { - chunk = chunk.slice(size.headerSize); - current = chunk.slice(0, size.size); - prev = chunk.slice(size.size); + _f = _c.value; + _a = false; + var buffer = _f; + var chunk = Buffer.concat([prev, buffer]); + var current = void 0; + var size = readWorkRequestSize(chunk); + if (size.size <= chunk.length + size.headerSize) { + chunk = chunk.slice(size.headerSize); + current = chunk.slice(0, size.size); + prev = chunk.slice(size.size); + } + else { + prev = chunk; + return "continue"; + } + var request = blaze.worker.WorkRequest.deserialize(current); + if (request.cancel) { + (_g = abortionMap.get(request.request_id)) === null || _g === void 0 ? void 0 : _g.abort(); + return "continue"; + } + var abortController = new AbortController(); + abortionMap.set(request.request_id, abortController); + var response = new blaze.worker.WorkResponse({ + request_id: request.request_id, + }); + var outputChunks = new Array(); + var outputStream = new stream.Writable({ + write: function (chunk, encoding, callback) { + outputChunks.push(Buffer.from(chunk, encoding)); + callback === null || callback === void 0 ? void 0 : callback(undefined); + }, + defaultEncoding: 'utf-8', + }); + implementation({ + arguments: request.arguments, + inputs: request.inputs, + request_id: request.request_id, + verbosity: request.verbosity, + sandbox_dir: request.sandbox_dir, + signal: abortController.signal, + output: outputStream, + }) + .then(function (exitCode) { + response.exit_code = exitCode; + }) + .catch(function (reason) { + response.exit_code = 1; + var error; + if (typeof reason == 'object' && 'stack' in reason) { + error = String(reason.stack); } else { - prev = chunk; - return "continue"; + error = String(reason); } - var request = blaze.worker.WorkRequest.deserialize(current); - if (request.cancel) { - (_d = abortionMap.get(request.request_id)) === null || _d === void 0 ? void 0 : _d.abort(); - return "continue"; - } - var abortController = new AbortController(); - abortionMap.set(request.request_id, abortController); - var response = new blaze.worker.WorkResponse({ - request_id: request.request_id - }); - var outputChunks = new Array(); - var outputStream = new stream.Writable({ - write: function (chunk, encoding, callback) { - outputChunks.push(Buffer.from(chunk, encoding)); - callback === null || callback === void 0 ? void 0 : callback(undefined); - }, - defaultEncoding: 'utf-8' - }); - implementation({ - arguments: request.arguments, - inputs: request.inputs, - request_id: request.request_id, - verbosity: request.verbosity, - sandbox_dir: request.sandbox_dir, - signal: abortController.signal, - output: outputStream - }) - .then(function (exitCode) { - response.exit_code = exitCode; - })["catch"](function (reason) { - response.exit_code = 1; - var error; - if (typeof reason == 'object' && 'stack' in reason) { - error = String(reason.stack); - } - else { - error = String(reason); - } - outputStream.write(error); - // also output worker log if verbose. - request.verbosity > 0 && console.error(error); - })["finally"](function () { - abortionMap["delete"](request.request_id); - outputStream.end(); - response.was_cancelled = abortController.signal.aborted; - response.output = Buffer.concat(outputChunks).toString('utf-8'); - var responseBytes = response.serialize(); - var responseSizeBytes = writeWorkResponseSize(responseBytes.byteLength); - process.stdout.write(Buffer.concat([responseSizeBytes, responseBytes])); - }); - } - finally { - _e = true; - } + outputStream.write(error); + // also output worker log if verbose. + request.verbosity > 0 && console.error(error); + }) + .finally(function () { + abortionMap.delete(request.request_id); + outputStream.end(); + response.was_cancelled = abortController.signal.aborted; + response.output = Buffer.concat(outputChunks).toString('utf-8'); + var responseBytes = response.serialize(); + var responseSizeBytes = writeWorkResponseSize(responseBytes.byteLength); + process.stdout.write(Buffer.concat([responseSizeBytes, responseBytes])); + }); }; - _e = true, _f = __asyncValues(process.stdin); + _a = true, _b = __asyncValues(process.stdin); _h.label = 2; - case 2: return [4 /*yield*/, _f.next()]; + case 2: return [4 /*yield*/, _b.next()]; case 3: - if (!(_g = _h.sent(), _a = _g.done, !_a)) return [3 /*break*/, 5]; + if (!(_c = _h.sent(), _d = _c.done, !_d)) return [3 /*break*/, 5]; _loop_1(); _h.label = 4; - case 4: return [3 /*break*/, 2]; + case 4: + _a = true; + return [3 /*break*/, 2]; case 5: return [3 /*break*/, 12]; case 6: e_1_1 = _h.sent(); @@ -1235,8 +1234,8 @@ function enterWorkerLoop(implementation) { return [3 /*break*/, 12]; case 7: _h.trys.push([7, , 10, 11]); - if (!(!_e && !_a && (_b = _f["return"]))) return [3 /*break*/, 9]; - return [4 /*yield*/, _b.call(_f)]; + if (!(!_a && !_d && (_e = _b.return))) return [3 /*break*/, 9]; + return [4 /*yield*/, _e.call(_b)]; case 8: _h.sent(); _h.label = 9; diff --git a/js/repositories.bzl b/js/repositories.bzl index 24cd46e8e..9159f42e1 100644 --- a/js/repositories.bzl +++ b/js/repositories.bzl @@ -14,22 +14,22 @@ def http_archive(**kwargs): def rules_js_dependencies(): http_archive( name = "bazel_skylib", - sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f", - urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz"], + sha256 = "51b5105a760b353773f904d2bbc5e664d0987fbaf22265164de65d43e910d8ac", + urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.8.1/bazel-skylib-1.8.1.tar.gz"], ) http_archive( name = "rules_nodejs", - sha256 = "164f1bd7e2a67ab3f6caf5b49b53c7dd625d293513154fa720e30d39eaa8285f", - strip_prefix = "rules_nodejs-6.3.5", - url = "https://github.com/bazel-contrib/rules_nodejs/releases/download/v6.3.5/rules_nodejs-v6.3.5.tar.gz", + sha256 = "37eaae51158b99d444c6ff277c212874aafa45302feb7dc58659113d23446165", + strip_prefix = "rules_nodejs-6.5.0", + url = "https://github.com/bazel-contrib/rules_nodejs/releases/download/v6.5.0/rules_nodejs-v6.5.0.tar.gz", ) http_archive( name = "aspect_bazel_lib", - sha256 = "fc8fe1be58ae39f84a8613d554534760c7f0819d407afcc98bbcbd990523bfed", - strip_prefix = "bazel-lib-2.16.0", - url = "https://github.com/bazel-contrib/bazel-lib/releases/download/v2.16.0/bazel-lib-v2.16.0.tar.gz", + sha256 = "f525668442e4b19ae10d77e0b5ad15de5807025f321954dfb7065c0fe2429ec1", + strip_prefix = "bazel-lib-2.21.1", + url = "https://github.com/bazel-contrib/bazel-lib/releases/download/v2.21.1/bazel-lib-v2.21.1.tar.gz", ) http_archive( diff --git a/npm/extensions.bzl b/npm/extensions.bzl index 9ed27fa4d..e06b3153e 100644 --- a/npm/extensions.bzl +++ b/npm/extensions.bzl @@ -292,7 +292,7 @@ npm = module_extension( ) def _pnpm_extension_impl(module_ctx): - resolved = resolve_pnpm_repositories(module_ctx.modules) + resolved = resolve_pnpm_repositories(module_ctx) for note in resolved.notes: # buildifier: disable=print @@ -318,6 +318,10 @@ pnpm = module_extension( doc = "pnpm version to use. The string `latest` will be resolved to LATEST_PNPM_VERSION.", default = DEFAULT_PNPM_VERSION, ), + "pnpm_version_from": attr.label( + doc = "Label to a package.json file to read the pnpm version from. It should be in the packageManager attribute.", + default = None, + ), "pnpm_version_integrity": attr.string(), }, ), diff --git a/npm/private/npm_translate_lock_generate.bzl b/npm/private/npm_translate_lock_generate.bzl index cddf272b5..95e83c4f7 100644 --- a/npm/private/npm_translate_lock_generate.bzl +++ b/npm/private/npm_translate_lock_generate.bzl @@ -165,6 +165,15 @@ sh_binary( if dep_version.startswith("file:"): dep_key = "{}+{}".format(dep_package, dep_version) if not dep_key in fp_links.keys(): + # Ignore file: dependencies on packages such as file: tarballs + # TODO(3.0): remove with pnpm =v9 where packages always have name@version + if "{}@{}".format(dep_package, dep_version) in packages: + continue + msg = "Expected to file: referenced package {} in first-party links {}".format(dep_key, fp_links.keys()) fail(msg) fp_links[dep_key]["link_packages"][link_package] = True diff --git a/npm/private/pnpm.bzl b/npm/private/pnpm.bzl index bada92646..d30d9d0b3 100644 --- a/npm/private/pnpm.bzl +++ b/npm/private/pnpm.bzl @@ -4,11 +4,6 @@ load("@bazel_skylib//lib:paths.bzl", "paths") load("@bazel_skylib//lib:types.bzl", "types") load(":utils.bzl", "DEFAULT_REGISTRY_DOMAIN_SLASH", "utils") -def _is_vendored_tarfile(package_snapshot): - if "resolution" in package_snapshot: - return "tarball" in package_snapshot["resolution"] - return False - def _to_package_key(name, version): if not version[0].isdigit(): return version @@ -84,30 +79,10 @@ def _convert_v5_v6_file_package(package_path, package_snapshot): name = package_snapshot["name"] version = package_path - if _is_vendored_tarfile(package_snapshot): - if "version" in package_snapshot: - version = package_snapshot["version"] - friendly_version = version - else: - friendly_version = package_snapshot["version"] if "version" in package_snapshot else version + friendly_version = package_snapshot["version"] if "version" in package_snapshot else version return name, version, friendly_version -def _convert_v9_file_package_version(version, package_snapshot): - if _is_vendored_tarfile(package_snapshot): - if "version" in package_snapshot: - version = package_snapshot["version"] - friendly_version = version - else: - friendly_version = package_snapshot["version"] if "version" in package_snapshot else version - - peer_index = friendly_version.find("(") - if peer_index != -1: - # Remove the peer dependency data from the version string - friendly_version = friendly_version[:peer_index] - - return version, friendly_version - def _strip_v5_peer_dep_or_patched_version(version): "Remove peer dependency or patched syntax from version string" @@ -527,22 +502,13 @@ def _convert_v9_packages(packages, snapshots): version_index = static_key.index("@", 1) name = static_key[:version_index] - # Extract the version including peerDeps+patch from the key - version = package_key[package_key.index("@", 1) + 1:] - package_key = _convert_pnpm_v6_v9_version_peer_dep(package_key) - if version.startswith("file:"): - version, friendly_version = _convert_v9_file_package_version(version, package_data) - version = _convert_pnpm_v6_v9_version_peer_dep(version) - - # Update the `package_key` to always equal name@version since `version` may have changed - package_key = _to_package_key(name, version) - else: - version = _convert_pnpm_v6_v9_version_peer_dep(version) + # Extract the version including peerDeps+patch from the key + version = _convert_pnpm_v6_v9_version_peer_dep(package_key[package_key.index("@", 1) + 1:]) - # package_data can have the resolved "version" for things like https:// deps - friendly_version = package_data["version"] if "version" in package_data else static_key[version_index + 1:] + # package_data can have the resolved "version" for things like https:// deps + friendly_version = package_data["version"] if "version" in package_data else static_key[version_index + 1:] package_info = _new_package_info( name = name, diff --git a/npm/private/pnpm_extension.bzl b/npm/private/pnpm_extension.bzl index b818b14b2..f07b18990 100644 --- a/npm/private/pnpm_extension.bzl +++ b/npm/private/pnpm_extension.bzl @@ -1,6 +1,7 @@ """pnpm extension logic (the extension itself is in npm/extensions.bzl).""" -load(":pnpm_repository.bzl", "LATEST_PNPM_VERSION") +load("@aspect_bazel_lib//lib:lists.bzl", "unique") +load(":pnpm_repository.bzl", "DEFAULT_PNPM_VERSION", "LATEST_PNPM_VERSION") DEFAULT_PNPM_REPO_NAME = "pnpm" @@ -9,11 +10,11 @@ DEFAULT_PNPM_REPO_NAME = "pnpm" def _parse_version(version): return tuple([int(n) for n in version.split(".")]) -def resolve_pnpm_repositories(modules): +def resolve_pnpm_repositories(mctx): """Resolves pnpm tags in all `modules` Args: - modules: module_ctx.modules + mctx: module context Returns: A struct with the following fields: @@ -29,7 +30,7 @@ def resolve_pnpm_repositories(modules): repositories = {}, ) - for mod in modules: + for mod in mctx.modules: for attr in mod.tags.pnpm: if attr.name != DEFAULT_PNPM_REPO_NAME and not mod.is_root: fail("""\ @@ -39,14 +40,39 @@ def resolve_pnpm_repositories(modules): if not registrations.get(attr.name, False): registrations[attr.name] = [] - v = attr.pnpm_version - if v == "latest": + if attr.pnpm_version_from and attr.pnpm_version and attr.pnpm_version != DEFAULT_PNPM_VERSION: + fail("Cannot specify both pnpm_version = {} and pnpm_version_from = {}".format(attr.pnpm_version, attr.pnpm_version_from)) + + # Handle pnpm_version_from by reading package.json + if attr.pnpm_version_from != None: + # Read package.json and extract packageManager field + package_json_content = mctx.read(attr.pnpm_version_from) + package_json = json.decode(package_json_content) + + if "packageManager" not in package_json: + fail("packageManager field not found in package.json file: " + str(attr.pnpm_version_from)) + + package_manager = package_json["packageManager"] + if not package_manager.startswith("pnpm@"): + fail("packageManager field must specify pnpm, got: " + package_manager) + + # Extract version from "pnpm@8.15.9" format + v = package_manager[5:] # Remove "pnpm@" prefix + elif attr.pnpm_version == "latest": v = LATEST_PNPM_VERSION + else: + v = attr.pnpm_version - registrations[attr.name].append(v) + # Avoid inserting the default version from a non-root module + # (likely rules_js itself) if the root module already has a version. + if mod.is_root or len(registrations[attr.name]) == 0: + registrations[attr.name].append(v) if attr.pnpm_version_integrity: integrity[attr.pnpm_version] = attr.pnpm_version_integrity - for name, versions in registrations.items(): + for name, version_list in registrations.items(): + # Disregard repeated version numbers + versions = unique(version_list) + # Use "Minimal Version Selection" like bzlmod does for resolving module conflicts # Note, the 'sorted(list)' function in starlark doesn't allow us to provide a custom comparator if len(versions) > 1: diff --git a/npm/private/test/parse_pnpm_lock_tests.bzl b/npm/private/test/parse_pnpm_lock_tests.bzl index 771ffb44e..624dc9c55 100644 --- a/npm/private/test/parse_pnpm_lock_tests.bzl +++ b/npm/private/test/parse_pnpm_lock_tests.bzl @@ -40,7 +40,7 @@ expected_packages = { "integrity": "sha512-t/lwpVXG/jmxTotGEsmjwuihC2Lvz/Iqt63o78SI3O5XallxtFp5j2WM2M6HwkFiii9I42KdlAF8B3plZMz0Fw==", }, }, - "lodash@4.17.21": { + "file:lodash-4.17.21.tgz": { "name": "lodash", "dependencies": {}, "optional_dependencies": {}, @@ -48,7 +48,7 @@ expected_packages = { "has_bin": False, "optional": False, "requires_build": False, - "version": "4.17.21", + "version": "file:lodash-4.17.21.tgz", "friendly_version": "4.17.21", "resolution": { "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", @@ -208,9 +208,10 @@ def _parse_lockfile_v9_test_impl(ctx): v9_expected_packages["@aspect-test/a@5.0.0"] = dict(v9_expected_packages["@aspect-test/a@5.0.0"]) v9_expected_packages["@aspect-test/a@5.0.0"]["dev_only"] = None v9_expected_packages["@aspect-test/a@5.0.0"]["requires_build"] = None - v9_expected_packages["lodash@4.17.21"] = dict(v9_expected_packages["lodash@4.17.21"]) - v9_expected_packages["lodash@4.17.21"]["dev_only"] = None - v9_expected_packages["lodash@4.17.21"]["requires_build"] = None + v9_expected_packages["lodash@file:lodash-4.17.21.tgz"] = dict(v9_expected_packages["file:lodash-4.17.21.tgz"]) + v9_expected_packages["lodash@file:lodash-4.17.21.tgz"]["dev_only"] = None + v9_expected_packages["lodash@file:lodash-4.17.21.tgz"]["requires_build"] = None + v9_expected_packages.pop("file:lodash-4.17.21.tgz") # renamed with lodash@ in v9 expected = ( expected_importers, diff --git a/npm/private/test/pnpm_test.bzl b/npm/private/test/pnpm_test.bzl index 1903c85ae..c4c196bd2 100644 --- a/npm/private/test/pnpm_test.bzl +++ b/npm/private/test/pnpm_test.bzl @@ -4,10 +4,11 @@ load("@bazel_skylib//lib:unittest.bzl", "asserts", "unittest") load("//npm/private:pnpm_extension.bzl", "DEFAULT_PNPM_REPO_NAME", "resolve_pnpm_repositories") load("//npm/private:pnpm_repository.bzl", "LATEST_PNPM_VERSION") -def _fake_pnpm_tag(version, name = DEFAULT_PNPM_REPO_NAME, integrity = None): +def _fake_pnpm_tag(version = None, name = DEFAULT_PNPM_REPO_NAME, integrity = None, pnpm_version_from = None): return struct( name = name, pnpm_version = version, + pnpm_version_from = pnpm_version_from, pnpm_version_integrity = integrity, ) @@ -17,7 +18,7 @@ def _fake_mod(is_root, *pnpm_tags): tags = struct(pnpm = pnpm_tags), ) -def _resolve_test(ctx, repositories = [], notes = [], modules = []): +def _resolve_test(ctx, repositories = [], notes = [], modules = [], package_json_content = None): env = unittest.begin(ctx) expected = struct( @@ -25,7 +26,7 @@ def _resolve_test(ctx, repositories = [], notes = [], modules = []): notes = notes, ) - result = resolve_pnpm_repositories(modules) + result = resolve_pnpm_repositories(struct(modules = modules, read = lambda f: package_json_content)) asserts.equals(env, expected, result) return unittest.end(env) @@ -46,14 +47,22 @@ def _basic(ctx): ], ) +def _from_package_json(ctx): + return _resolve_test( + ctx, + repositories = {"pnpm": "1.2.3"}, + modules = [ + _fake_mod(True, _fake_pnpm_tag(pnpm_version_from = "//:package.json")), + ], + package_json_content = json.encode({"packageManager": "pnpm@1.2.3"}), + ) + def _override(ctx): # What happens when the root overrides the pnpm version. return _resolve_test( ctx, repositories = {"pnpm": "9.1.0"}, - notes = [ - """NOTE: repo 'pnpm' has multiple versions ["9.1.0", "8.6.7"]; selected 9.1.0""", - ], + notes = [], modules = [ _fake_mod( True, @@ -106,17 +115,12 @@ def _custom_name(ctx): def _integrity_conflict(ctx): # What happens if two modules define the same version with conflicting integrity parameters. - # @gzm0, 2024-10-04: The behavior here is probably not intended and merely an implementation artifact. - # I've added a test anyways to capture the existing behavior. - + # Currently we print nothing to indicate this, we trust whichever integrity wins. return _resolve_test( ctx, repositories = { "pnpm": ("8.6.7", "dep-integrity"), }, - notes = [ - """NOTE: repo 'pnpm' has multiple versions ["8.6.7", "8.6.7"]; selected 8.6.7""", - ], # Modules are *BFS* from root: # https://bazel.build/rules/lib/builtins/module_ctx#modules modules = [ @@ -136,6 +140,7 @@ override_test = unittest.make(_override) latest_test = unittest.make(_latest) custom_name_test = unittest.make(_custom_name) integrity_conflict_test = unittest.make(_integrity_conflict) +from_package_json_test = unittest.make(_from_package_json) def pnpm_tests(name): unittest.suite( @@ -145,4 +150,5 @@ def pnpm_tests(name): latest_test, custom_name_test, integrity_conflict_test, + from_package_json_test, ) diff --git a/npm/private/test/snapshots/npm_defs.bzl b/npm/private/test/snapshots/npm_defs.bzl index c22c482dd..9b4325dd8 100644 --- a/npm/private/test/snapshots/npm_defs.bzl +++ b/npm/private/test/snapshots/npm_defs.bzl @@ -198,7 +198,7 @@ load("@@_main~npm~npm__at_rollup_plugin-commonjs__21.1.0_rollup_2.70.2__links//: load("@@_main~npm~npm__at_rollup_plugin-commonjs__28.0.3_rollup_4.39.0__links//:defs.bzl", link_195 = "npm_link_imported_package_store", store_195 = "npm_imported_package_store") load("@@_main~npm~npm__at_rollup_plugin-json__6.1.0_rollup_4.39.0__links//:defs.bzl", link_196 = "npm_link_imported_package_store", store_196 = "npm_imported_package_store") load("@@_main~npm~npm__at_rollup_plugin-node-resolve__16.0.1_rollup_4.39.0__links//:defs.bzl", link_197 = "npm_link_imported_package_store", store_197 = "npm_imported_package_store") -load("@@_main~npm~npm__at_rollup_plugin-typescript__12.1.2_2040925509__links//:defs.bzl", link_198 = "npm_link_imported_package_store", store_198 = "npm_imported_package_store") +load("@@_main~npm~npm__at_rollup_plugin-typescript__12.1.2_2012326242__links//:defs.bzl", link_198 = "npm_link_imported_package_store", store_198 = "npm_imported_package_store") load("@@_main~npm~npm__at_rollup_pluginutils__3.1.0_rollup_2.70.2__links//:defs.bzl", store_199 = "npm_imported_package_store") load("@@_main~npm~npm__at_rollup_pluginutils__5.0.2_rollup_4.39.0__links//:defs.bzl", store_200 = "npm_imported_package_store") load("@@_main~npm~npm__at_rollup_pluginutils__5.1.4_rollup_4.39.0__links//:defs.bzl", store_201 = "npm_imported_package_store") @@ -692,407 +692,410 @@ load("@@_main~npm~npm__loader-utils__2.0.4__links//:defs.bzl", store_688 = "npm_ load("@@_main~npm~npm__locate-path__5.0.0__links//:defs.bzl", store_689 = "npm_imported_package_store") load("@@_main~npm~npm__locate-path__6.0.0__links//:defs.bzl", store_690 = "npm_imported_package_store") load("@@_main~npm~npm__lodash.merge__4.6.2__links//:defs.bzl", store_691 = "npm_imported_package_store") -load("@@_main~npm~npm__lodash__4.17.21__links//:defs.bzl", link_692 = "npm_link_imported_package_store", store_692 = "npm_imported_package_store") -load("@@_main~npm~npm__log-symbols__4.1.0__links//:defs.bzl", store_693 = "npm_imported_package_store") -load("@@_main~npm~npm__loose-envify__1.4.0__links//:defs.bzl", store_694 = "npm_imported_package_store") -load("@@_main~npm~npm__lowercase-keys__2.0.0__links//:defs.bzl", store_695 = "npm_imported_package_store") -load("@@_main~npm~npm__lru-cache__10.4.3__links//:defs.bzl", store_696 = "npm_imported_package_store") -load("@@_main~npm~npm__lru-cache__5.1.1__links//:defs.bzl", store_697 = "npm_imported_package_store") -load("@@_main~npm~npm__lru-cache__6.0.0__links//:defs.bzl", store_698 = "npm_imported_package_store") -load("@@_main~npm~npm__lru-cache__7.17.0__links//:defs.bzl", store_699 = "npm_imported_package_store") -load("@@_main~npm~npm__magic-string__0.25.9__links//:defs.bzl", store_700 = "npm_imported_package_store") -load("@@_main~npm~npm__magic-string__0.30.17__links//:defs.bzl", store_701 = "npm_imported_package_store") -load("@@_main~npm~npm__make-dir__2.1.0__links//:defs.bzl", store_702 = "npm_imported_package_store") -load("@@_main~npm~npm__make-dir__3.1.0__links//:defs.bzl", store_703 = "npm_imported_package_store") -load("@@_main~npm~npm__make-dir__4.0.0__links//:defs.bzl", store_704 = "npm_imported_package_store") -load("@@_main~npm~npm__make-fetch-happen__10.2.1__links//:defs.bzl", store_705 = "npm_imported_package_store") -load("@@_main~npm~npm__map-limit__0.0.1__links//:defs.bzl", store_706 = "npm_imported_package_store") -load("@@_main~npm~npm__mapbox-gl__1.10.1__links//:defs.bzl", store_707 = "npm_imported_package_store") -load("@@_main~npm~npm__math-log2__1.0.1__links//:defs.bzl", store_708 = "npm_imported_package_store") -load("@@_main~npm~npm__mathjs__11.4.0__links//:defs.bzl", link_709 = "npm_link_imported_package_store", store_709 = "npm_imported_package_store") -load("@@_main~npm~npm__md5__2.3.0__links//:defs.bzl", store_710 = "npm_imported_package_store") -load("@@_main~npm~npm__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_711 = "npm_link_imported_package_store", store_711 = "npm_imported_package_store") -load("@@_main~npm~npm__media-query-parser__2.0.2__links//:defs.bzl", store_712 = "npm_imported_package_store") -load("@@_main~npm~npm__merge-stream__2.0.0__links//:defs.bzl", store_713 = "npm_imported_package_store") -load("@@_main~npm~npm__mime-db__1.52.0__links//:defs.bzl", store_714 = "npm_imported_package_store") -load("@@_main~npm~npm__mime-types__2.1.35__links//:defs.bzl", store_715 = "npm_imported_package_store") -load("@@_main~npm~npm__mime__3.0.0__links//:defs.bzl", store_716 = "npm_imported_package_store") -load("@@_main~npm~npm__mimic-response__1.0.1__links//:defs.bzl", store_717 = "npm_imported_package_store") -load("@@_main~npm~npm__mimic-response__2.1.0__links//:defs.bzl", store_718 = "npm_imported_package_store") -load("@@_main~npm~npm__mini-css-extract-plugin__2.7.5_webpack_5.76.3__links//:defs.bzl", link_719 = "npm_link_imported_package_store", store_719 = "npm_imported_package_store") -load("@@_main~npm~npm__minimatch__3.1.2__links//:defs.bzl", store_720 = "npm_imported_package_store") -load("@@_main~npm~npm__minimatch__5.0.1__links//:defs.bzl", store_721 = "npm_imported_package_store") -load("@@_main~npm~npm__minimatch__5.1.6__links//:defs.bzl", store_722 = "npm_imported_package_store") -load("@@_main~npm~npm__minimatch__6.2.0__links//:defs.bzl", store_723 = "npm_imported_package_store") -load("@@_main~npm~npm__minimatch__9.0.5__links//:defs.bzl", store_724 = "npm_imported_package_store") -load("@@_main~npm~npm__minimist__0.0.10__links//:defs.bzl", store_725 = "npm_imported_package_store") -load("@@_main~npm~npm__minimist__1.2.8__links//:defs.bzl", store_726 = "npm_imported_package_store") -load("@@_main~npm~npm__minipass-collect__1.0.2__links//:defs.bzl", store_727 = "npm_imported_package_store") -load("@@_main~npm~npm__minipass-fetch__2.1.2__links//:defs.bzl", store_728 = "npm_imported_package_store") -load("@@_main~npm~npm__minipass-flush__1.0.5__links//:defs.bzl", store_729 = "npm_imported_package_store") -load("@@_main~npm~npm__minipass-pipeline__1.2.4__links//:defs.bzl", store_730 = "npm_imported_package_store") -load("@@_main~npm~npm__minipass-sized__1.0.3__links//:defs.bzl", store_731 = "npm_imported_package_store") -load("@@_main~npm~npm__minipass__2.9.0__links//:defs.bzl", store_732 = "npm_imported_package_store") -load("@@_main~npm~npm__minipass__3.3.6__links//:defs.bzl", store_733 = "npm_imported_package_store") -load("@@_main~npm~npm__minipass__4.2.4__links//:defs.bzl", store_734 = "npm_imported_package_store") -load("@@_main~npm~npm__minipass__7.1.2__links//:defs.bzl", store_735 = "npm_imported_package_store") -load("@@_main~npm~npm__minizlib__1.3.3__links//:defs.bzl", store_736 = "npm_imported_package_store") -load("@@_main~npm~npm__minizlib__2.1.2__links//:defs.bzl", store_737 = "npm_imported_package_store") -load("@@_main~npm~npm__minizlib__3.0.1__links//:defs.bzl", store_738 = "npm_imported_package_store") -load("@@_main~npm~npm__mitt__3.0.0__links//:defs.bzl", store_739 = "npm_imported_package_store") -load("@@_main~npm~npm__mkdirp-classic__0.5.3__links//:defs.bzl", store_740 = "npm_imported_package_store") -load("@@_main~npm~npm__mkdirp__0.5.6__links//:defs.bzl", store_741 = "npm_imported_package_store") -load("@@_main~npm~npm__mkdirp__1.0.4__links//:defs.bzl", store_742 = "npm_imported_package_store") -load("@@_main~npm~npm__mkdirp__3.0.1__links//:defs.bzl", store_743 = "npm_imported_package_store") -load("@@_main~npm~npm__mlly__1.1.1__links//:defs.bzl", store_744 = "npm_imported_package_store") -load("@@_main~npm~npm__mobx-react-lite__3.4.0_mobx_6.3.0_react_17.0.2__links//:defs.bzl", store_745 = "npm_imported_package_store") -load("@@_main~npm~npm__mobx-react__7.3.0_mobx_6.3.0_react_17.0.2__links//:defs.bzl", link_746 = "npm_link_imported_package_store", store_746 = "npm_imported_package_store") -load("@@_main~npm~npm__mobx__6.3.0__links//:defs.bzl", link_747 = "npm_link_imported_package_store", store_747 = "npm_imported_package_store") -load("@@_main~npm~npm__mocha-junit-reporter__2.2.0_mocha_10.2.0__links//:defs.bzl", link_748 = "npm_link_imported_package_store", store_748 = "npm_imported_package_store") -load("@@_main~npm~npm__mocha-multi-reporters__1.5.1_181752652__links//:defs.bzl", link_749 = "npm_link_imported_package_store", store_749 = "npm_imported_package_store") -load("@@_main~npm~npm__mocha__10.2.0_mocha-multi-reporters_1.5.1__links//:defs.bzl", link_750 = "npm_link_imported_package_store", store_750 = "npm_imported_package_store") -load("@@_main~npm~npm__moment-timezone__0.5.41__links//:defs.bzl", store_751 = "npm_imported_package_store") -load("@@_main~npm~npm__moment__2.29.4__links//:defs.bzl", store_752 = "npm_imported_package_store") -load("@@_main~npm~npm__mouse-change__1.4.0__links//:defs.bzl", store_753 = "npm_imported_package_store") -load("@@_main~npm~npm__mouse-event-offset__3.0.2__links//:defs.bzl", store_754 = "npm_imported_package_store") -load("@@_main~npm~npm__mouse-event__1.0.5__links//:defs.bzl", store_755 = "npm_imported_package_store") -load("@@_main~npm~npm__mouse-wheel__1.2.0__links//:defs.bzl", store_756 = "npm_imported_package_store") -load("@@_main~npm~npm__mri__1.2.0__links//:defs.bzl", store_757 = "npm_imported_package_store") -load("@@_main~npm~npm__mrmime__1.0.1__links//:defs.bzl", store_758 = "npm_imported_package_store") -load("@@_main~npm~npm__ms__0.7.3__links//:defs.bzl", store_759 = "npm_imported_package_store") -load("@@_main~npm~npm__ms__2.0.0__links//:defs.bzl", store_760 = "npm_imported_package_store") -load("@@_main~npm~npm__ms__2.1.2__links//:defs.bzl", store_761 = "npm_imported_package_store") -load("@@_main~npm~npm__ms__2.1.3__links//:defs.bzl", link_762 = "npm_link_imported_package_store", store_762 = "npm_imported_package_store") -load("@@_main~npm~npm__mumath__3.3.4__links//:defs.bzl", store_763 = "npm_imported_package_store") -load("@@_main~npm~npm__murmurhash-js__1.0.0__links//:defs.bzl", store_764 = "npm_imported_package_store") -load("@@_main~npm~npm__nan__2.17.0__links//:defs.bzl", store_765 = "npm_imported_package_store") -load("@@_main~npm~npm__nanoid__3.3.11__links//:defs.bzl", store_766 = "npm_imported_package_store") -load("@@_main~npm~npm__nanoid__3.3.3__links//:defs.bzl", store_767 = "npm_imported_package_store") -load("@@_main~npm~npm__nanoid__3.3.4__links//:defs.bzl", store_768 = "npm_imported_package_store") -load("@@_main~npm~npm__native-promise-only__0.8.1__links//:defs.bzl", store_769 = "npm_imported_package_store") -load("@@_main~npm~npm__needle__2.9.1__links//:defs.bzl", store_770 = "npm_imported_package_store") -load("@@_main~npm~npm__negotiator__0.6.3__links//:defs.bzl", store_771 = "npm_imported_package_store") -load("@@_main~npm~npm__neo-async__2.6.2__links//:defs.bzl", store_772 = "npm_imported_package_store") -load("@@_main~npm~npm__next-tick__1.1.0__links//:defs.bzl", store_773 = "npm_imported_package_store") -load("@@_main~npm~npm__next__15.2.4_react-dom_19.1.0_react_19.1.0__links//:defs.bzl", link_774 = "npm_link_imported_package_store", store_774 = "npm_imported_package_store") -load("@@_main~npm~npm__node-fetch__2.6.12__links//:defs.bzl", store_775 = "npm_imported_package_store") -load("@@_main~npm~npm__node-fetch__2.6.7__links//:defs.bzl", store_776 = "npm_imported_package_store") -load("@@_main~npm~npm__node-gyp-build__4.6.0__links//:defs.bzl", store_777 = "npm_imported_package_store") -load("@@_main~npm~npm__node-gyp__7.1.2__links//:defs.bzl", store_778 = "npm_imported_package_store") -load("@@_main~npm~npm__node-gyp__9.3.0__links//:defs.bzl", link_779 = "npm_link_imported_package_store", store_779 = "npm_imported_package_store") -load("@@_main~npm~npm__node-pre-gyp__0.13.0__links//:defs.bzl", store_780 = "npm_imported_package_store") -load("@@_main~npm~npm__node-releases__2.0.10__links//:defs.bzl", store_781 = "npm_imported_package_store") -load("@@_main~npm~npm__nopt__4.0.3__links//:defs.bzl", store_782 = "npm_imported_package_store") -load("@@_main~npm~npm__nopt__5.0.0__links//:defs.bzl", store_783 = "npm_imported_package_store") -load("@@_main~npm~npm__nopt__6.0.0__links//:defs.bzl", store_784 = "npm_imported_package_store") -load("@@_main~npm~npm__normalize-path__3.0.0__links//:defs.bzl", store_785 = "npm_imported_package_store") -load("@@_main~npm~npm__normalize-svg-path__0.1.0__links//:defs.bzl", store_786 = "npm_imported_package_store") -load("@@_main~npm~npm__normalize-svg-path__1.1.0__links//:defs.bzl", store_787 = "npm_imported_package_store") -load("@@_main~npm~npm__normalize-url__6.1.0__links//:defs.bzl", store_788 = "npm_imported_package_store") -load("@@_main~npm~npm__npm-bundled__1.1.2__links//:defs.bzl", store_789 = "npm_imported_package_store") -load("@@_main~npm~npm__npm-normalize-package-bin__1.0.1__links//:defs.bzl", store_790 = "npm_imported_package_store") -load("@@_main~npm~npm__npm-packlist__1.4.8__links//:defs.bzl", store_791 = "npm_imported_package_store") -load("@@_main~npm~npm__npmlog__4.1.2__links//:defs.bzl", store_792 = "npm_imported_package_store") -load("@@_main~npm~npm__npmlog__5.0.1__links//:defs.bzl", store_793 = "npm_imported_package_store") -load("@@_main~npm~npm__npmlog__6.0.2__links//:defs.bzl", store_794 = "npm_imported_package_store") -load("@@_main~npm~npm__number-is-integer__1.0.1__links//:defs.bzl", store_795 = "npm_imported_package_store") -load("@@_main~npm~npm__number-is-nan__1.0.1__links//:defs.bzl", store_796 = "npm_imported_package_store") -load("@@_main~npm~npm__oauth-sign__0.9.0__links//:defs.bzl", store_797 = "npm_imported_package_store") -load("@@_main~npm~npm__object-assign__4.1.1__links//:defs.bzl", store_798 = "npm_imported_package_store") -load("@@_main~npm~npm__object-hash__2.2.0__links//:defs.bzl", store_799 = "npm_imported_package_store") -load("@@_main~npm~npm__oidc-token-hash__5.0.1__links//:defs.bzl", store_800 = "npm_imported_package_store") -load("@@_main~npm~npm__once__1.3.3__links//:defs.bzl", store_801 = "npm_imported_package_store") -load("@@_main~npm~npm__once__1.4.0__links//:defs.bzl", store_802 = "npm_imported_package_store") -load("@@_main~npm~npm__opener__1.5.2__links//:defs.bzl", store_803 = "npm_imported_package_store") -load("@@_main~npm~npm__openid-client__5.4.0__links//:defs.bzl", store_804 = "npm_imported_package_store") -load("@@_main~npm~npm__optimist__0.6.0__links//:defs.bzl", store_805 = "npm_imported_package_store") -load("@@_main~npm~npm__optionator__0.8.3__links//:defs.bzl", store_806 = "npm_imported_package_store") -load("@@_main~npm~npm__os-homedir__1.0.2__links//:defs.bzl", store_807 = "npm_imported_package_store") -load("@@_main~npm~npm__os-tmpdir__1.0.2__links//:defs.bzl", store_808 = "npm_imported_package_store") -load("@@_main~npm~npm__osenv__0.1.5__links//:defs.bzl", store_809 = "npm_imported_package_store") -load("@@_main~npm~npm__outdent__0.8.0__links//:defs.bzl", store_810 = "npm_imported_package_store") -load("@@_main~npm~npm__p-cancelable__2.1.1__links//:defs.bzl", store_811 = "npm_imported_package_store") -load("@@_main~npm~npm__p-event__4.2.0__links//:defs.bzl", store_812 = "npm_imported_package_store") -load("@@_main~npm~npm__p-finally__1.0.0__links//:defs.bzl", store_813 = "npm_imported_package_store") -load("@@_main~npm~npm__p-limit__2.3.0__links//:defs.bzl", store_814 = "npm_imported_package_store") -load("@@_main~npm~npm__p-limit__3.1.0__links//:defs.bzl", store_815 = "npm_imported_package_store") -load("@@_main~npm~npm__p-locate__4.1.0__links//:defs.bzl", store_816 = "npm_imported_package_store") -load("@@_main~npm~npm__p-locate__5.0.0__links//:defs.bzl", store_817 = "npm_imported_package_store") -load("@@_main~npm~npm__p-map__4.0.0__links//:defs.bzl", store_818 = "npm_imported_package_store") -load("@@_main~npm~npm__p-timeout__3.2.0__links//:defs.bzl", store_819 = "npm_imported_package_store") -load("@@_main~npm~npm__p-try__2.2.0__links//:defs.bzl", store_820 = "npm_imported_package_store") -load("@@_main~npm~npm__package-json-from-dist__1.0.1__links//:defs.bzl", store_821 = "npm_imported_package_store") -load("@@_main~npm~npm__parent-module__1.0.1__links//:defs.bzl", store_822 = "npm_imported_package_store") -load("@@_main~npm~npm__parenthesis__3.1.8__links//:defs.bzl", store_823 = "npm_imported_package_store") -load("@@_main~npm~npm__parse-json__5.2.0__links//:defs.bzl", store_824 = "npm_imported_package_store") -load("@@_main~npm~npm__parse-rect__1.2.0__links//:defs.bzl", store_825 = "npm_imported_package_store") -load("@@_main~npm~npm__parse-svg-path__0.1.2__links//:defs.bzl", store_826 = "npm_imported_package_store") -load("@@_main~npm~npm__parse-unit__1.0.1__links//:defs.bzl", store_827 = "npm_imported_package_store") -load("@@_main~npm~npm__path-exists__4.0.0__links//:defs.bzl", store_828 = "npm_imported_package_store") -load("@@_main~npm~npm__path-is-absolute__1.0.1__links//:defs.bzl", store_829 = "npm_imported_package_store") -load("@@_main~npm~npm__path-key__3.1.1__links//:defs.bzl", store_830 = "npm_imported_package_store") -load("@@_main~npm~npm__path-parse__1.0.7__links//:defs.bzl", store_831 = "npm_imported_package_store") -load("@@_main~npm~npm__path-scurry__1.10.1__links//:defs.bzl", store_832 = "npm_imported_package_store") -load("@@_main~npm~npm__path-scurry__1.11.1__links//:defs.bzl", store_833 = "npm_imported_package_store") -load("@@_main~npm~npm__path-type__4.0.0__links//:defs.bzl", store_834 = "npm_imported_package_store") -load("@@_main~npm~npm__pathe__1.1.0__links//:defs.bzl", store_835 = "npm_imported_package_store") -load("@@_main~npm~npm__pbf__3.2.1__links//:defs.bzl", store_836 = "npm_imported_package_store") -load("@@_main~npm~npm__pend__1.2.0__links//:defs.bzl", store_837 = "npm_imported_package_store") -load("@@_main~npm~npm__performance-now__2.1.0__links//:defs.bzl", store_838 = "npm_imported_package_store") -load("@@_main~npm~npm__pick-by-alias__1.2.0__links//:defs.bzl", store_839 = "npm_imported_package_store") -load("@@_main~npm~npm__picocolors__1.0.0__links//:defs.bzl", store_840 = "npm_imported_package_store") -load("@@_main~npm~npm__picocolors__1.1.1__links//:defs.bzl", store_841 = "npm_imported_package_store") -load("@@_main~npm~npm__picomatch__2.3.1__links//:defs.bzl", store_842 = "npm_imported_package_store") -load("@@_main~npm~npm__picomatch__4.0.2__links//:defs.bzl", store_843 = "npm_imported_package_store") -load("@@_main~npm~npm__pify__4.0.1__links//:defs.bzl", store_844 = "npm_imported_package_store") -load("@@_main~npm~npm__pkg-dir__4.2.0__links//:defs.bzl", store_845 = "npm_imported_package_store") -load("@@_main~npm~npm__pkg-types__1.0.2__links//:defs.bzl", store_846 = "npm_imported_package_store") -load("@@_main~npm~npm__plotly.js__2.25.2__links//:defs.bzl", link_847 = "npm_link_imported_package_store", store_847 = "npm_imported_package_store") -load("@@_main~npm~npm__pngjs__5.0.0__links//:defs.bzl", link_848 = "npm_link_imported_package_store", store_848 = "npm_imported_package_store") -load("@@_main~npm~npm__point-in-polygon__1.1.0__links//:defs.bzl", store_849 = "npm_imported_package_store") -load("@@_main~npm~npm__polybooljs__1.2.0__links//:defs.bzl", store_850 = "npm_imported_package_store") -load("@@_main~npm~npm__postcss-modules-extract-imports__3.0.0_postcss_8.4.21__links//:defs.bzl", store_851 = "npm_imported_package_store") -load("@@_main~npm~npm__postcss-modules-local-by-default__4.0.0_postcss_8.4.21__links//:defs.bzl", store_852 = "npm_imported_package_store") -load("@@_main~npm~npm__postcss-modules-scope__3.0.0_postcss_8.4.21__links//:defs.bzl", store_853 = "npm_imported_package_store") -load("@@_main~npm~npm__postcss-modules-values__4.0.0_postcss_8.4.21__links//:defs.bzl", store_854 = "npm_imported_package_store") -load("@@_main~npm~npm__postcss-selector-parser__6.0.11__links//:defs.bzl", store_855 = "npm_imported_package_store") -load("@@_main~npm~npm__postcss-value-parser__4.2.0__links//:defs.bzl", store_856 = "npm_imported_package_store") -load("@@_main~npm~npm__postcss__8.4.21__links//:defs.bzl", store_857 = "npm_imported_package_store") -load("@@_main~npm~npm__postcss__8.4.31__links//:defs.bzl", store_858 = "npm_imported_package_store") -load("@@_main~npm~npm__postcss__8.5.3__links//:defs.bzl", store_859 = "npm_imported_package_store") -load("@@_main~npm~npm__potpack__1.0.2__links//:defs.bzl", store_860 = "npm_imported_package_store") -load("@@_main~npm~npm__prelude-ls__1.1.2__links//:defs.bzl", store_861 = "npm_imported_package_store") -load("@@_main~npm~npm__probe-image-size__7.2.3__links//:defs.bzl", store_862 = "npm_imported_package_store") -load("@@_main~npm~npm__process-nextick-args__2.0.1__links//:defs.bzl", store_863 = "npm_imported_package_store") -load("@@_main~npm~npm__progress__2.0.3__links//:defs.bzl", store_864 = "npm_imported_package_store") -load("@@_main~npm~npm__promise-inflight__1.0.1__links//:defs.bzl", store_865 = "npm_imported_package_store") -load("@@_main~npm~npm__promise-retry__2.0.1__links//:defs.bzl", store_866 = "npm_imported_package_store") -load("@@_main~npm~npm__protoc-gen-grpc__github.com_gregmagolan-codaio_protoc-gen-grpc-ts_be5580b06348d3eb9b4610a4a94065154a0df41f__links//:defs.bzl", link_867 = "npm_link_imported_package_store", store_867 = "npm_imported_package_store") -load("@@_main~npm~npm__protocol-buffers-schema__3.6.0__links//:defs.bzl", store_868 = "npm_imported_package_store") -load("@@_main~npm~npm__proxy-from-env__1.1.0__links//:defs.bzl", store_869 = "npm_imported_package_store") -load("@@_main~npm~npm__psl__1.9.0__links//:defs.bzl", store_870 = "npm_imported_package_store") -load("@@_main~npm~npm__pump__1.0.3__links//:defs.bzl", store_871 = "npm_imported_package_store") -load("@@_main~npm~npm__pump__3.0.0__links//:defs.bzl", store_872 = "npm_imported_package_store") -load("@@_main~npm~npm__punycode__2.3.0__links//:defs.bzl", store_873 = "npm_imported_package_store") -load("@@_main~npm~npm__puppeteer-core__19.11.1_777974123__links//:defs.bzl", store_874 = "npm_imported_package_store") -load("@@_main~npm~npm__puppeteer__19.11.1_777974123__links//:defs.bzl", link_875 = "npm_link_imported_package_store", store_875 = "npm_imported_package_store") -load("@@_main~npm~npm__qs__6.5.3__links//:defs.bzl", store_876 = "npm_imported_package_store") -load("@@_main~npm~npm__quickselect__2.0.0__links//:defs.bzl", store_877 = "npm_imported_package_store") -load("@@_main~npm~npm__raf__3.4.1__links//:defs.bzl", store_878 = "npm_imported_package_store") -load("@@_main~npm~npm__ramda__0.25.0__links//:defs.bzl", store_879 = "npm_imported_package_store") -load("@@_main~npm~npm__randombytes__2.1.0__links//:defs.bzl", store_880 = "npm_imported_package_store") -load("@@_main~npm~npm__rc__1.2.8__links//:defs.bzl", store_881 = "npm_imported_package_store") -load("@@_main~npm~npm__react-dom__19.1.0_react_19.1.0__links//:defs.bzl", link_882 = "npm_link_imported_package_store", store_882 = "npm_imported_package_store") -load("@@_main~npm~npm__react__17.0.2__links//:defs.bzl", link_883 = "npm_link_imported_package_store", store_883 = "npm_imported_package_store") -load("@@_main~npm~npm__react__19.1.0__links//:defs.bzl", link_884 = "npm_link_imported_package_store", store_884 = "npm_imported_package_store") -load("@@_main~npm~npm__read-yaml-file__2.1.0__links//:defs.bzl", store_885 = "npm_imported_package_store") -load("@@_main~npm~npm__readable-stream__1.0.34__links//:defs.bzl", store_886 = "npm_imported_package_store") -load("@@_main~npm~npm__readable-stream__2.3.8__links//:defs.bzl", store_887 = "npm_imported_package_store") -load("@@_main~npm~npm__readable-stream__3.6.1__links//:defs.bzl", store_888 = "npm_imported_package_store") -load("@@_main~npm~npm__readdirp__3.6.0__links//:defs.bzl", store_889 = "npm_imported_package_store") -load("@@_main~npm~npm__rechoir__0.8.0__links//:defs.bzl", store_890 = "npm_imported_package_store") -load("@@_main~npm~npm__regenerator-runtime__0.13.11__links//:defs.bzl", store_891 = "npm_imported_package_store") -load("@@_main~npm~npm__regl-error2d__2.0.12__links//:defs.bzl", store_892 = "npm_imported_package_store") -load("@@_main~npm~npm__regl-line2d__3.1.2__links//:defs.bzl", store_893 = "npm_imported_package_store") -load("@@_main~npm~npm__regl-scatter2d__3.3.1__links//:defs.bzl", store_894 = "npm_imported_package_store") -load("@@_main~npm~npm__regl-splom__1.0.14__links//:defs.bzl", store_895 = "npm_imported_package_store") -load("@@_main~npm~npm__regl__2.1.0__links//:defs.bzl", store_896 = "npm_imported_package_store") -load("@@_main~npm~npm__request__2.88.2__links//:defs.bzl", store_897 = "npm_imported_package_store") -load("@@_main~npm~npm__require-directory__2.1.1__links//:defs.bzl", store_898 = "npm_imported_package_store") -load("@@_main~npm~npm__require-from-string__2.0.2__links//:defs.bzl", store_899 = "npm_imported_package_store") -load("@@_main~npm~npm__require-like__0.1.2__links//:defs.bzl", store_900 = "npm_imported_package_store") -load("@@_main~npm~npm__resolve-cwd__3.0.0__links//:defs.bzl", store_901 = "npm_imported_package_store") -load("@@_main~npm~npm__resolve-from__4.0.0__links//:defs.bzl", store_902 = "npm_imported_package_store") -load("@@_main~npm~npm__resolve-from__5.0.0__links//:defs.bzl", store_903 = "npm_imported_package_store") -load("@@_main~npm~npm__resolve-protobuf-schema__2.1.0__links//:defs.bzl", store_904 = "npm_imported_package_store") -load("@@_main~npm~npm__resolve__0.6.3__links//:defs.bzl", store_905 = "npm_imported_package_store") -load("@@_main~npm~npm__resolve__1.22.1__links//:defs.bzl", store_906 = "npm_imported_package_store") -load("@@_main~npm~npm__responselike__2.0.1__links//:defs.bzl", store_907 = "npm_imported_package_store") -load("@@_main~npm~npm__retry__0.12.0__links//:defs.bzl", store_908 = "npm_imported_package_store") -load("@@_main~npm~npm__rfc4648__1.5.2__links//:defs.bzl", store_909 = "npm_imported_package_store") -load("@@_main~npm~npm__right-now__1.0.0__links//:defs.bzl", store_910 = "npm_imported_package_store") -load("@@_main~npm~npm__rimraf__2.7.1__links//:defs.bzl", store_911 = "npm_imported_package_store") -load("@@_main~npm~npm__rimraf__3.0.2__links//:defs.bzl", store_912 = "npm_imported_package_store") -load("@@_main~npm~npm__rimraf__5.0.10__links//:defs.bzl", store_913 = "npm_imported_package_store") -load("@@_main~npm~npm__rollup__2.70.2__links//:defs.bzl", link_914 = "npm_link_imported_package_store", store_914 = "npm_imported_package_store") -load("@@_main~npm~npm__rollup__4.39.0__links//:defs.bzl", link_915 = "npm_link_imported_package_store", store_915 = "npm_imported_package_store") -load("@@_main~npm~npm__rw__1.3.3__links//:defs.bzl", store_916 = "npm_imported_package_store") -load("@@_main~npm~npm__sade__1.8.1__links//:defs.bzl", store_917 = "npm_imported_package_store") -load("@@_main~npm~npm__safe-buffer__5.1.2__links//:defs.bzl", store_918 = "npm_imported_package_store") -load("@@_main~npm~npm__safe-buffer__5.2.1__links//:defs.bzl", store_919 = "npm_imported_package_store") -load("@@_main~npm~npm__safer-buffer__2.1.2__links//:defs.bzl", store_920 = "npm_imported_package_store") -load("@@_main~npm~npm__sax__1.2.4__links//:defs.bzl", store_921 = "npm_imported_package_store") -load("@@_main~npm~npm__scheduler__0.26.0__links//:defs.bzl", store_922 = "npm_imported_package_store") -load("@@_main~npm~npm__schema-utils__3.1.1__links//:defs.bzl", store_923 = "npm_imported_package_store") -load("@@_main~npm~npm__schema-utils__4.0.0__links//:defs.bzl", store_924 = "npm_imported_package_store") -load("@@_main~npm~npm__seedrandom__3.0.5__links//:defs.bzl", store_925 = "npm_imported_package_store") -load("@@_main~npm~npm__segfault-handler__1.3.0__links//:defs.bzl", link_926 = "npm_link_imported_package_store", store_926 = "npm_imported_package_store") -load("@@_main~npm~npm__semver-first-satisfied__1.1.0__links//:defs.bzl", link_927 = "npm_link_imported_package_store", store_927 = "npm_imported_package_store") -load("@@_main~npm~npm__semver__5.7.1__links//:defs.bzl", store_928 = "npm_imported_package_store") -load("@@_main~npm~npm__semver__6.3.0__links//:defs.bzl", store_929 = "npm_imported_package_store") -load("@@_main~npm~npm__semver__7.3.8__links//:defs.bzl", store_930 = "npm_imported_package_store") -load("@@_main~npm~npm__semver__7.5.0__links//:defs.bzl", store_931 = "npm_imported_package_store") -load("@@_main~npm~npm__semver__7.7.1__links//:defs.bzl", store_932 = "npm_imported_package_store") -load("@@_main~npm~npm__serialize-javascript__6.0.0__links//:defs.bzl", store_933 = "npm_imported_package_store") -load("@@_main~npm~npm__serialize-javascript__6.0.1__links//:defs.bzl", store_934 = "npm_imported_package_store") -load("@@_main~npm~npm__set-blocking__2.0.0__links//:defs.bzl", store_935 = "npm_imported_package_store") -load("@@_main~npm~npm__setprototypeof__1.2.0__links//:defs.bzl", store_936 = "npm_imported_package_store") -load("@@_main~npm~npm__shallow-clone__3.0.1__links//:defs.bzl", store_937 = "npm_imported_package_store") -load("@@_main~npm~npm__shallow-copy__0.0.1__links//:defs.bzl", store_938 = "npm_imported_package_store") -load("@@_main~npm~npm__sharp__0.33.5__links//:defs.bzl", store_939 = "npm_imported_package_store") -load("@@_main~npm~npm__shebang-command__2.0.0__links//:defs.bzl", store_940 = "npm_imported_package_store") -load("@@_main~npm~npm__shebang-regex__3.0.0__links//:defs.bzl", store_941 = "npm_imported_package_store") -load("@@_main~npm~npm__signal-exit__3.0.7__links//:defs.bzl", store_942 = "npm_imported_package_store") -load("@@_main~npm~npm__signal-exit__4.1.0__links//:defs.bzl", store_943 = "npm_imported_package_store") -load("@@_main~npm~npm__signum__1.0.0__links//:defs.bzl", store_944 = "npm_imported_package_store") -load("@@_main~npm~npm__simple-swizzle__0.2.2__links//:defs.bzl", store_945 = "npm_imported_package_store") -load("@@_main~npm~npm__sirv__1.0.19__links//:defs.bzl", store_946 = "npm_imported_package_store") -load("@@_main~npm~npm__smart-buffer__4.2.0__links//:defs.bzl", store_947 = "npm_imported_package_store") -load("@@_main~npm~npm__socks-proxy-agent__7.0.0__links//:defs.bzl", store_948 = "npm_imported_package_store") -load("@@_main~npm~npm__socks__2.7.1__links//:defs.bzl", store_949 = "npm_imported_package_store") -load("@@_main~npm~npm__source-map-js__1.0.2__links//:defs.bzl", store_950 = "npm_imported_package_store") -load("@@_main~npm~npm__source-map-js__1.2.1__links//:defs.bzl", store_951 = "npm_imported_package_store") -load("@@_main~npm~npm__source-map-support__0.5.21__links//:defs.bzl", link_952 = "npm_link_imported_package_store", store_952 = "npm_imported_package_store") -load("@@_main~npm~npm__source-map__0.6.1__links//:defs.bzl", store_953 = "npm_imported_package_store") -load("@@_main~npm~npm__sourcemap-codec__1.4.8__links//:defs.bzl", store_954 = "npm_imported_package_store") -load("@@_main~npm~npm__sshpk__1.17.0__links//:defs.bzl", store_955 = "npm_imported_package_store") -load("@@_main~npm~npm__ssri__9.0.1__links//:defs.bzl", store_956 = "npm_imported_package_store") -load("@@_main~npm~npm__stack-trace__0.0.9__links//:defs.bzl", store_957 = "npm_imported_package_store") -load("@@_main~npm~npm__static-eval__2.1.0__links//:defs.bzl", store_958 = "npm_imported_package_store") -load("@@_main~npm~npm__statuses__2.0.1__links//:defs.bzl", store_959 = "npm_imported_package_store") -load("@@_main~npm~npm__stream-buffers__3.0.2__links//:defs.bzl", store_960 = "npm_imported_package_store") -load("@@_main~npm~npm__stream-parser__0.3.1__links//:defs.bzl", store_961 = "npm_imported_package_store") -load("@@_main~npm~npm__stream-shift__1.0.1__links//:defs.bzl", store_962 = "npm_imported_package_store") -load("@@_main~npm~npm__streamsearch__1.1.0__links//:defs.bzl", store_963 = "npm_imported_package_store") -load("@@_main~npm~npm__string-split-by__1.0.0__links//:defs.bzl", store_964 = "npm_imported_package_store") -load("@@_main~npm~npm__string-width__1.0.2__links//:defs.bzl", store_965 = "npm_imported_package_store") -load("@@_main~npm~npm__string-width__4.2.3__links//:defs.bzl", store_966 = "npm_imported_package_store") -load("@@_main~npm~npm__string-width__5.1.2__links//:defs.bzl", store_967 = "npm_imported_package_store") -load("@@_main~npm~npm__string_decoder__0.10.31__links//:defs.bzl", store_968 = "npm_imported_package_store") -load("@@_main~npm~npm__string_decoder__1.1.1__links//:defs.bzl", store_969 = "npm_imported_package_store") -load("@@_main~npm~npm__string_decoder__1.3.0__links//:defs.bzl", store_970 = "npm_imported_package_store") -load("@@_main~npm~npm__strip-ansi__3.0.1__links//:defs.bzl", store_971 = "npm_imported_package_store") -load("@@_main~npm~npm__strip-ansi__6.0.1__links//:defs.bzl", store_972 = "npm_imported_package_store") -load("@@_main~npm~npm__strip-ansi__7.1.0__links//:defs.bzl", store_973 = "npm_imported_package_store") -load("@@_main~npm~npm__strip-bom__4.0.0__links//:defs.bzl", store_974 = "npm_imported_package_store") -load("@@_main~npm~npm__strip-json-comments__2.0.1__links//:defs.bzl", store_975 = "npm_imported_package_store") -load("@@_main~npm~npm__strip-json-comments__3.1.1__links//:defs.bzl", store_976 = "npm_imported_package_store") -load("@@_main~npm~npm__strongly-connected-components__1.0.1__links//:defs.bzl", store_977 = "npm_imported_package_store") -load("@@_main~npm~npm__styled-jsx__5.1.6_react_19.1.0__links//:defs.bzl", store_978 = "npm_imported_package_store") -load("@@_main~npm~npm__supercluster__7.1.5__links//:defs.bzl", store_979 = "npm_imported_package_store") -load("@@_main~npm~npm__superscript-text__1.0.0__links//:defs.bzl", store_980 = "npm_imported_package_store") -load("@@_main~npm~npm__supports-color__5.5.0__links//:defs.bzl", store_981 = "npm_imported_package_store") -load("@@_main~npm~npm__supports-color__7.2.0__links//:defs.bzl", store_982 = "npm_imported_package_store") -load("@@_main~npm~npm__supports-color__8.1.1__links//:defs.bzl", store_983 = "npm_imported_package_store") -load("@@_main~npm~npm__supports-preserve-symlinks-flag__1.0.0__links//:defs.bzl", store_984 = "npm_imported_package_store") -load("@@_main~npm~npm__svg-arc-to-cubic-bezier__3.2.0__links//:defs.bzl", store_985 = "npm_imported_package_store") -load("@@_main~npm~npm__svg-path-bounds__1.0.2__links//:defs.bzl", store_986 = "npm_imported_package_store") -load("@@_main~npm~npm__svg-path-sdf__1.1.3__links//:defs.bzl", store_987 = "npm_imported_package_store") -load("@@_main~npm~npm__syncpack__github.com_JamieMason_syncpack_c245af8ea73ce3345d92bbda6c684092a841e262__links//:defs.bzl", link_988 = "npm_link_imported_package_store", store_988 = "npm_imported_package_store") -load("@@_main~npm~npm__tailwindcss__4.1.0__links//:defs.bzl", link_989 = "npm_link_imported_package_store", store_989 = "npm_imported_package_store") -load("@@_main~npm~npm__tapable__2.2.1__links//:defs.bzl", store_990 = "npm_imported_package_store") -load("@@_main~npm~npm__tar-fs__1.16.3__links//:defs.bzl", store_991 = "npm_imported_package_store") -load("@@_main~npm~npm__tar-fs__2.1.1__links//:defs.bzl", store_992 = "npm_imported_package_store") -load("@@_main~npm~npm__tar-stream__1.6.2__links//:defs.bzl", store_993 = "npm_imported_package_store") -load("@@_main~npm~npm__tar-stream__2.2.0__links//:defs.bzl", store_994 = "npm_imported_package_store") -load("@@_main~npm~npm__tar__4.4.19__links//:defs.bzl", store_995 = "npm_imported_package_store") -load("@@_main~npm~npm__tar__6.1.13__links//:defs.bzl", store_996 = "npm_imported_package_store") -load("@@_main~npm~npm__tar__7.4.3__links//:defs.bzl", store_997 = "npm_imported_package_store") -load("@@_main~npm~npm__terser-webpack-plugin__5.3.6_webpack_5.76.3__links//:defs.bzl", store_998 = "npm_imported_package_store") -load("@@_main~npm~npm__terser__5.16.5__links//:defs.bzl", store_999 = "npm_imported_package_store") -load("@@_main~npm~npm__test-exclude__7.0.1__links//:defs.bzl", store_1000 = "npm_imported_package_store") -load("@@_main~npm~npm__through2__0.6.5__links//:defs.bzl", store_1001 = "npm_imported_package_store") -load("@@_main~npm~npm__through2__2.0.5__links//:defs.bzl", store_1002 = "npm_imported_package_store") -load("@@_main~npm~npm__through__2.3.8__links//:defs.bzl", store_1003 = "npm_imported_package_store") -load("@@_main~npm~npm__tightrope__0.1.0__links//:defs.bzl", store_1004 = "npm_imported_package_store") -load("@@_main~npm~npm__tiny-emitter__2.1.0__links//:defs.bzl", store_1005 = "npm_imported_package_store") -load("@@_main~npm~npm__tinycolor2__1.6.0__links//:defs.bzl", store_1006 = "npm_imported_package_store") -load("@@_main~npm~npm__tinyqueue__2.0.3__links//:defs.bzl", store_1007 = "npm_imported_package_store") -load("@@_main~npm~npm__tmp__0.0.33__links//:defs.bzl", store_1008 = "npm_imported_package_store") -load("@@_main~npm~npm__to-buffer__1.1.1__links//:defs.bzl", store_1009 = "npm_imported_package_store") -load("@@_main~npm~npm__to-fast-properties__2.0.0__links//:defs.bzl", store_1010 = "npm_imported_package_store") -load("@@_main~npm~npm__to-float32__1.1.0__links//:defs.bzl", store_1011 = "npm_imported_package_store") -load("@@_main~npm~npm__to-px__1.0.1__links//:defs.bzl", store_1012 = "npm_imported_package_store") -load("@@_main~npm~npm__to-readable-stream__2.1.0__links//:defs.bzl", store_1013 = "npm_imported_package_store") -load("@@_main~npm~npm__to-regex-range__5.0.1__links//:defs.bzl", store_1014 = "npm_imported_package_store") -load("@@_main~npm~npm__toidentifier__1.0.1__links//:defs.bzl", store_1015 = "npm_imported_package_store") -load("@@_main~npm~npm__topojson-client__3.1.0__links//:defs.bzl", store_1016 = "npm_imported_package_store") -load("@@_main~npm~npm__totalist__1.1.0__links//:defs.bzl", store_1017 = "npm_imported_package_store") -load("@@_main~npm~npm__tough-cookie__2.5.0__links//:defs.bzl", store_1018 = "npm_imported_package_store") -load("@@_main~npm~npm__tr46__0.0.3__links//:defs.bzl", store_1019 = "npm_imported_package_store") -load("@@_main~npm~npm__tslib__2.8.1__links//:defs.bzl", link_1020 = "npm_link_imported_package_store", store_1020 = "npm_imported_package_store") -load("@@_main~npm~npm__tunnel-agent__0.6.0__links//:defs.bzl", store_1021 = "npm_imported_package_store") -load("@@_main~npm~npm__tweetnacl__0.14.5__links//:defs.bzl", store_1022 = "npm_imported_package_store") -load("@@_main~npm~npm__type-check__0.3.2__links//:defs.bzl", store_1023 = "npm_imported_package_store") -load("@@_main~npm~npm__type-fest__0.10.0__links//:defs.bzl", store_1024 = "npm_imported_package_store") -load("@@_main~npm~npm__type__1.2.0__links//:defs.bzl", store_1025 = "npm_imported_package_store") -load("@@_main~npm~npm__type__2.7.2__links//:defs.bzl", store_1026 = "npm_imported_package_store") -load("@@_main~npm~npm__typed-function__4.1.0__links//:defs.bzl", store_1027 = "npm_imported_package_store") -load("@@_main~npm~npm__typedarray-pool__1.2.0__links//:defs.bzl", store_1028 = "npm_imported_package_store") -load("@@_main~npm~npm__typedarray__0.0.6__links//:defs.bzl", store_1029 = "npm_imported_package_store") -load("@@_main~npm~npm__typeof-article__0.1.1__links//:defs.bzl", store_1030 = "npm_imported_package_store") -load("@@_main~npm~npm__typescript__4.9.5__links//:defs.bzl", link_1031 = "npm_link_imported_package_store", store_1031 = "npm_imported_package_store") -load("@@_main~npm~npm__ufo__1.1.0__links//:defs.bzl", store_1032 = "npm_imported_package_store") -load("@@_main~npm~npm__unbzip2-stream__1.4.3__links//:defs.bzl", store_1033 = "npm_imported_package_store") -load("@@_main~npm~npm__undici-types__5.26.5__links//:defs.bzl", store_1034 = "npm_imported_package_store") -load("@@_main~npm~npm__undici-types__6.19.8__links//:defs.bzl", store_1035 = "npm_imported_package_store") -load("@@_main~npm~npm__unique-filename__2.0.1__links//:defs.bzl", store_1036 = "npm_imported_package_store") -load("@@_main~npm~npm__unique-slug__3.0.0__links//:defs.bzl", store_1037 = "npm_imported_package_store") -load("@@_main~npm~npm__universalify__0.1.2__links//:defs.bzl", store_1038 = "npm_imported_package_store") -load("@@_main~npm~npm__universalify__2.0.0__links//:defs.bzl", store_1039 = "npm_imported_package_store") -load("@@_main~npm~npm__unix-dgram__2.0.6__links//:defs.bzl", store_1040 = "npm_imported_package_store") -load("@@_main~npm~npm__unquote__1.1.1__links//:defs.bzl", store_1041 = "npm_imported_package_store") -load("@@_main~npm~npm__unused__0.2.2__links//:defs.bzl", link_1042 = "npm_link_imported_package_store", store_1042 = "npm_imported_package_store") -load("@@_main~npm~npm__update-browserslist-db__1.0.10_browserslist_4.21.5__links//:defs.bzl", store_1043 = "npm_imported_package_store") -load("@@_main~npm~npm__update-diff__1.1.0__links//:defs.bzl", store_1044 = "npm_imported_package_store") -load("@@_main~npm~npm__uri-js__4.4.1__links//:defs.bzl", store_1045 = "npm_imported_package_store") -load("@@_main~npm~npm__util-deprecate__1.0.2__links//:defs.bzl", store_1046 = "npm_imported_package_store") -load("@@_main~npm~npm__uuid__3.4.0__links//:defs.bzl", store_1047 = "npm_imported_package_store") -load("@@_main~npm~npm__uuid__8.3.2__links//:defs.bzl", link_1048 = "npm_link_imported_package_store", store_1048 = "npm_imported_package_store") -load("@@_main~npm~npm__uvu__0.5.3__links//:defs.bzl", link_1049 = "npm_link_imported_package_store", store_1049 = "npm_imported_package_store") -load("@@_main~npm~npm__v8-to-istanbul__9.1.0__links//:defs.bzl", store_1050 = "npm_imported_package_store") -load("@@_main~npm~npm__verror__1.10.0__links//:defs.bzl", store_1051 = "npm_imported_package_store") -load("@@_main~npm~npm__vt-pbf__3.1.3__links//:defs.bzl", store_1052 = "npm_imported_package_store") -load("@@_main~npm~npm__watchpack__2.4.0__links//:defs.bzl", store_1053 = "npm_imported_package_store") -load("@@_main~npm~npm__weak-map__1.0.8__links//:defs.bzl", store_1054 = "npm_imported_package_store") -load("@@_main~npm~npm__webgl-context__2.2.0__links//:defs.bzl", store_1055 = "npm_imported_package_store") -load("@@_main~npm~npm__webidl-conversions__3.0.1__links//:defs.bzl", store_1056 = "npm_imported_package_store") -load("@@_main~npm~npm__webpack-bundle-analyzer__4.5.0_bufferutil_4.0.8__links//:defs.bzl", link_1057 = "npm_link_imported_package_store", store_1057 = "npm_imported_package_store") -load("@@_main~npm~npm__webpack-cli__5.0.1_webpack_5.76.3__links//:defs.bzl", link_1058 = "npm_link_imported_package_store", store_1058 = "npm_imported_package_store") -load("@@_main~npm~npm__webpack-merge__5.8.0__links//:defs.bzl", store_1059 = "npm_imported_package_store") -load("@@_main~npm~npm__webpack-sources__3.2.3__links//:defs.bzl", store_1060 = "npm_imported_package_store") -load("@@_main~npm~npm__webpack__5.76.3_webpack-cli_5.0.1__links//:defs.bzl", link_1061 = "npm_link_imported_package_store", store_1061 = "npm_imported_package_store") -load("@@_main~npm~npm__whatwg-url__5.0.0__links//:defs.bzl", store_1062 = "npm_imported_package_store") -load("@@_main~npm~npm__which__2.0.2__links//:defs.bzl", store_1063 = "npm_imported_package_store") -load("@@_main~npm~npm__wide-align__1.1.5__links//:defs.bzl", store_1064 = "npm_imported_package_store") -load("@@_main~npm~npm__wildcard__2.0.0__links//:defs.bzl", store_1065 = "npm_imported_package_store") -load("@@_main~npm~npm__word-wrap__1.2.3__links//:defs.bzl", store_1066 = "npm_imported_package_store") -load("@@_main~npm~npm__wordwrap__0.0.3__links//:defs.bzl", store_1067 = "npm_imported_package_store") -load("@@_main~npm~npm__workerpool__6.2.1__links//:defs.bzl", store_1068 = "npm_imported_package_store") -load("@@_main~npm~npm__world-calendars__1.0.3__links//:defs.bzl", store_1069 = "npm_imported_package_store") -load("@@_main~npm~npm__wrap-ansi__7.0.0__links//:defs.bzl", store_1070 = "npm_imported_package_store") -load("@@_main~npm~npm__wrap-ansi__8.1.0__links//:defs.bzl", store_1071 = "npm_imported_package_store") -load("@@_main~npm~npm__wrappy__1.0.2__links//:defs.bzl", store_1072 = "npm_imported_package_store") -load("@@_main~npm~npm__ws__7.5.9_bufferutil_4.0.8__links//:defs.bzl", store_1073 = "npm_imported_package_store") -load("@@_main~npm~npm__ws__8.13.0_bufferutil_4.0.8__links//:defs.bzl", store_1074 = "npm_imported_package_store") -load("@@_main~npm~npm__ws__8.18.0_bufferutil_4.0.8__links//:defs.bzl", store_1075 = "npm_imported_package_store") -load("@@_main~npm~npm__xml__1.0.1__links//:defs.bzl", store_1076 = "npm_imported_package_store") -load("@@_main~npm~npm__xtend__2.2.0__links//:defs.bzl", store_1077 = "npm_imported_package_store") -load("@@_main~npm~npm__xtend__4.0.2__links//:defs.bzl", store_1078 = "npm_imported_package_store") -load("@@_main~npm~npm__y18n__5.0.8__links//:defs.bzl", store_1079 = "npm_imported_package_store") -load("@@_main~npm~npm__yallist__3.1.1__links//:defs.bzl", store_1080 = "npm_imported_package_store") -load("@@_main~npm~npm__yallist__4.0.0__links//:defs.bzl", store_1081 = "npm_imported_package_store") -load("@@_main~npm~npm__yallist__5.0.0__links//:defs.bzl", store_1082 = "npm_imported_package_store") -load("@@_main~npm~npm__yargs-parser__20.2.4__links//:defs.bzl", store_1083 = "npm_imported_package_store") -load("@@_main~npm~npm__yargs-parser__20.2.9__links//:defs.bzl", store_1084 = "npm_imported_package_store") -load("@@_main~npm~npm__yargs-parser__21.1.1__links//:defs.bzl", store_1085 = "npm_imported_package_store") -load("@@_main~npm~npm__yargs-unparser__2.0.0__links//:defs.bzl", store_1086 = "npm_imported_package_store") -load("@@_main~npm~npm__yargs__16.2.0__links//:defs.bzl", store_1087 = "npm_imported_package_store") -load("@@_main~npm~npm__yargs__17.7.1__links//:defs.bzl", store_1088 = "npm_imported_package_store") -load("@@_main~npm~npm__yargs__17.7.2__links//:defs.bzl", store_1089 = "npm_imported_package_store") -load("@@_main~npm~npm__yauzl__2.10.0__links//:defs.bzl", store_1090 = "npm_imported_package_store") -load("@@_main~npm~npm__yocto-queue__0.1.0__links//:defs.bzl", store_1091 = "npm_imported_package_store") -load("@@_main~npm~npm__zod__3.21.4__links//:defs.bzl", store_1092 = "npm_imported_package_store") +load("@@_main~npm~npm__lodash__4.17.21__links//:defs.bzl", store_692 = "npm_imported_package_store") +load("@@_main~npm~npm__lodash__file_npm_private_test_vendored_lodash-4.17.21.tgz__links//:defs.bzl", link_693 = "npm_link_imported_package_store", store_693 = "npm_imported_package_store") +load("@@_main~npm~npm__log-symbols__4.1.0__links//:defs.bzl", store_694 = "npm_imported_package_store") +load("@@_main~npm~npm__loose-envify__1.4.0__links//:defs.bzl", store_695 = "npm_imported_package_store") +load("@@_main~npm~npm__lowercase-keys__2.0.0__links//:defs.bzl", store_696 = "npm_imported_package_store") +load("@@_main~npm~npm__lru-cache__10.4.3__links//:defs.bzl", store_697 = "npm_imported_package_store") +load("@@_main~npm~npm__lru-cache__5.1.1__links//:defs.bzl", store_698 = "npm_imported_package_store") +load("@@_main~npm~npm__lru-cache__6.0.0__links//:defs.bzl", store_699 = "npm_imported_package_store") +load("@@_main~npm~npm__lru-cache__7.17.0__links//:defs.bzl", store_700 = "npm_imported_package_store") +load("@@_main~npm~npm__magic-string__0.25.9__links//:defs.bzl", store_701 = "npm_imported_package_store") +load("@@_main~npm~npm__magic-string__0.30.17__links//:defs.bzl", store_702 = "npm_imported_package_store") +load("@@_main~npm~npm__make-dir__2.1.0__links//:defs.bzl", store_703 = "npm_imported_package_store") +load("@@_main~npm~npm__make-dir__3.1.0__links//:defs.bzl", store_704 = "npm_imported_package_store") +load("@@_main~npm~npm__make-dir__4.0.0__links//:defs.bzl", store_705 = "npm_imported_package_store") +load("@@_main~npm~npm__make-fetch-happen__10.2.1__links//:defs.bzl", store_706 = "npm_imported_package_store") +load("@@_main~npm~npm__map-limit__0.0.1__links//:defs.bzl", store_707 = "npm_imported_package_store") +load("@@_main~npm~npm__mapbox-gl__1.10.1__links//:defs.bzl", store_708 = "npm_imported_package_store") +load("@@_main~npm~npm__math-log2__1.0.1__links//:defs.bzl", store_709 = "npm_imported_package_store") +load("@@_main~npm~npm__mathjs__11.4.0__links//:defs.bzl", link_710 = "npm_link_imported_package_store", store_710 = "npm_imported_package_store") +load("@@_main~npm~npm__md5__2.3.0__links//:defs.bzl", store_711 = "npm_imported_package_store") +load("@@_main~npm~npm__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_712 = "npm_link_imported_package_store", store_712 = "npm_imported_package_store") +load("@@_main~npm~npm__media-query-parser__2.0.2__links//:defs.bzl", store_713 = "npm_imported_package_store") +load("@@_main~npm~npm__merge-stream__2.0.0__links//:defs.bzl", store_714 = "npm_imported_package_store") +load("@@_main~npm~npm__mime-db__1.52.0__links//:defs.bzl", store_715 = "npm_imported_package_store") +load("@@_main~npm~npm__mime-types__2.1.35__links//:defs.bzl", store_716 = "npm_imported_package_store") +load("@@_main~npm~npm__mime__3.0.0__links//:defs.bzl", store_717 = "npm_imported_package_store") +load("@@_main~npm~npm__mimic-response__1.0.1__links//:defs.bzl", store_718 = "npm_imported_package_store") +load("@@_main~npm~npm__mimic-response__2.1.0__links//:defs.bzl", store_719 = "npm_imported_package_store") +load("@@_main~npm~npm__mini-css-extract-plugin__2.7.5_webpack_5.76.3__links//:defs.bzl", link_720 = "npm_link_imported_package_store", store_720 = "npm_imported_package_store") +load("@@_main~npm~npm__minimatch__3.1.2__links//:defs.bzl", store_721 = "npm_imported_package_store") +load("@@_main~npm~npm__minimatch__5.0.1__links//:defs.bzl", store_722 = "npm_imported_package_store") +load("@@_main~npm~npm__minimatch__5.1.6__links//:defs.bzl", store_723 = "npm_imported_package_store") +load("@@_main~npm~npm__minimatch__6.2.0__links//:defs.bzl", store_724 = "npm_imported_package_store") +load("@@_main~npm~npm__minimatch__9.0.5__links//:defs.bzl", store_725 = "npm_imported_package_store") +load("@@_main~npm~npm__minimist__0.0.10__links//:defs.bzl", store_726 = "npm_imported_package_store") +load("@@_main~npm~npm__minimist__1.2.8__links//:defs.bzl", store_727 = "npm_imported_package_store") +load("@@_main~npm~npm__minipass-collect__1.0.2__links//:defs.bzl", store_728 = "npm_imported_package_store") +load("@@_main~npm~npm__minipass-fetch__2.1.2__links//:defs.bzl", store_729 = "npm_imported_package_store") +load("@@_main~npm~npm__minipass-flush__1.0.5__links//:defs.bzl", store_730 = "npm_imported_package_store") +load("@@_main~npm~npm__minipass-pipeline__1.2.4__links//:defs.bzl", store_731 = "npm_imported_package_store") +load("@@_main~npm~npm__minipass-sized__1.0.3__links//:defs.bzl", store_732 = "npm_imported_package_store") +load("@@_main~npm~npm__minipass__2.9.0__links//:defs.bzl", store_733 = "npm_imported_package_store") +load("@@_main~npm~npm__minipass__3.3.6__links//:defs.bzl", store_734 = "npm_imported_package_store") +load("@@_main~npm~npm__minipass__4.2.4__links//:defs.bzl", store_735 = "npm_imported_package_store") +load("@@_main~npm~npm__minipass__7.1.2__links//:defs.bzl", store_736 = "npm_imported_package_store") +load("@@_main~npm~npm__minizlib__1.3.3__links//:defs.bzl", store_737 = "npm_imported_package_store") +load("@@_main~npm~npm__minizlib__2.1.2__links//:defs.bzl", store_738 = "npm_imported_package_store") +load("@@_main~npm~npm__minizlib__3.0.1__links//:defs.bzl", store_739 = "npm_imported_package_store") +load("@@_main~npm~npm__mitt__3.0.0__links//:defs.bzl", store_740 = "npm_imported_package_store") +load("@@_main~npm~npm__mkdirp-classic__0.5.3__links//:defs.bzl", store_741 = "npm_imported_package_store") +load("@@_main~npm~npm__mkdirp__0.5.6__links//:defs.bzl", store_742 = "npm_imported_package_store") +load("@@_main~npm~npm__mkdirp__1.0.4__links//:defs.bzl", store_743 = "npm_imported_package_store") +load("@@_main~npm~npm__mkdirp__3.0.1__links//:defs.bzl", store_744 = "npm_imported_package_store") +load("@@_main~npm~npm__mlly__1.1.1__links//:defs.bzl", store_745 = "npm_imported_package_store") +load("@@_main~npm~npm__mobx-react-lite__3.4.0_mobx_6.3.0_react_17.0.2__links//:defs.bzl", store_746 = "npm_imported_package_store") +load("@@_main~npm~npm__mobx-react__7.3.0_mobx_6.3.0_react_17.0.2__links//:defs.bzl", link_747 = "npm_link_imported_package_store", store_747 = "npm_imported_package_store") +load("@@_main~npm~npm__mobx__6.3.0__links//:defs.bzl", link_748 = "npm_link_imported_package_store", store_748 = "npm_imported_package_store") +load("@@_main~npm~npm__mocha-junit-reporter__2.2.0_mocha_10.2.0__links//:defs.bzl", link_749 = "npm_link_imported_package_store", store_749 = "npm_imported_package_store") +load("@@_main~npm~npm__mocha-multi-reporters__1.5.1_181752652__links//:defs.bzl", link_750 = "npm_link_imported_package_store", store_750 = "npm_imported_package_store") +load("@@_main~npm~npm__mocha__10.2.0_mocha-multi-reporters_1.5.1__links//:defs.bzl", link_751 = "npm_link_imported_package_store", store_751 = "npm_imported_package_store") +load("@@_main~npm~npm__moment-timezone__0.5.41__links//:defs.bzl", store_752 = "npm_imported_package_store") +load("@@_main~npm~npm__moment__2.29.4__links//:defs.bzl", store_753 = "npm_imported_package_store") +load("@@_main~npm~npm__mouse-change__1.4.0__links//:defs.bzl", store_754 = "npm_imported_package_store") +load("@@_main~npm~npm__mouse-event-offset__3.0.2__links//:defs.bzl", store_755 = "npm_imported_package_store") +load("@@_main~npm~npm__mouse-event__1.0.5__links//:defs.bzl", store_756 = "npm_imported_package_store") +load("@@_main~npm~npm__mouse-wheel__1.2.0__links//:defs.bzl", store_757 = "npm_imported_package_store") +load("@@_main~npm~npm__mri__1.2.0__links//:defs.bzl", store_758 = "npm_imported_package_store") +load("@@_main~npm~npm__mrmime__1.0.1__links//:defs.bzl", store_759 = "npm_imported_package_store") +load("@@_main~npm~npm__ms__0.7.3__links//:defs.bzl", store_760 = "npm_imported_package_store") +load("@@_main~npm~npm__ms__2.0.0__links//:defs.bzl", store_761 = "npm_imported_package_store") +load("@@_main~npm~npm__ms__2.1.2__links//:defs.bzl", store_762 = "npm_imported_package_store") +load("@@_main~npm~npm__ms__2.1.3__links//:defs.bzl", link_763 = "npm_link_imported_package_store", store_763 = "npm_imported_package_store") +load("@@_main~npm~npm__mumath__3.3.4__links//:defs.bzl", store_764 = "npm_imported_package_store") +load("@@_main~npm~npm__murmurhash-js__1.0.0__links//:defs.bzl", store_765 = "npm_imported_package_store") +load("@@_main~npm~npm__nan__2.17.0__links//:defs.bzl", store_766 = "npm_imported_package_store") +load("@@_main~npm~npm__nanoid__3.3.11__links//:defs.bzl", store_767 = "npm_imported_package_store") +load("@@_main~npm~npm__nanoid__3.3.3__links//:defs.bzl", store_768 = "npm_imported_package_store") +load("@@_main~npm~npm__nanoid__3.3.4__links//:defs.bzl", store_769 = "npm_imported_package_store") +load("@@_main~npm~npm__native-promise-only__0.8.1__links//:defs.bzl", store_770 = "npm_imported_package_store") +load("@@_main~npm~npm__needle__2.9.1__links//:defs.bzl", store_771 = "npm_imported_package_store") +load("@@_main~npm~npm__negotiator__0.6.3__links//:defs.bzl", store_772 = "npm_imported_package_store") +load("@@_main~npm~npm__neo-async__2.6.2__links//:defs.bzl", store_773 = "npm_imported_package_store") +load("@@_main~npm~npm__next-tick__1.1.0__links//:defs.bzl", store_774 = "npm_imported_package_store") +load("@@_main~npm~npm__next__15.2.4_react-dom_19.1.0_react_19.1.0__links//:defs.bzl", link_775 = "npm_link_imported_package_store", store_775 = "npm_imported_package_store") +load("@@_main~npm~npm__node-fetch__2.6.12__links//:defs.bzl", store_776 = "npm_imported_package_store") +load("@@_main~npm~npm__node-fetch__2.6.7__links//:defs.bzl", store_777 = "npm_imported_package_store") +load("@@_main~npm~npm__node-gyp-build__4.6.0__links//:defs.bzl", store_778 = "npm_imported_package_store") +load("@@_main~npm~npm__node-gyp__7.1.2__links//:defs.bzl", store_779 = "npm_imported_package_store") +load("@@_main~npm~npm__node-gyp__9.3.0__links//:defs.bzl", link_780 = "npm_link_imported_package_store", store_780 = "npm_imported_package_store") +load("@@_main~npm~npm__node-pre-gyp__0.13.0__links//:defs.bzl", store_781 = "npm_imported_package_store") +load("@@_main~npm~npm__node-releases__2.0.10__links//:defs.bzl", store_782 = "npm_imported_package_store") +load("@@_main~npm~npm__nopt__4.0.3__links//:defs.bzl", store_783 = "npm_imported_package_store") +load("@@_main~npm~npm__nopt__5.0.0__links//:defs.bzl", store_784 = "npm_imported_package_store") +load("@@_main~npm~npm__nopt__6.0.0__links//:defs.bzl", store_785 = "npm_imported_package_store") +load("@@_main~npm~npm__normalize-path__3.0.0__links//:defs.bzl", store_786 = "npm_imported_package_store") +load("@@_main~npm~npm__normalize-svg-path__0.1.0__links//:defs.bzl", store_787 = "npm_imported_package_store") +load("@@_main~npm~npm__normalize-svg-path__1.1.0__links//:defs.bzl", store_788 = "npm_imported_package_store") +load("@@_main~npm~npm__normalize-url__6.1.0__links//:defs.bzl", store_789 = "npm_imported_package_store") +load("@@_main~npm~npm__npm-bundled__1.1.2__links//:defs.bzl", store_790 = "npm_imported_package_store") +load("@@_main~npm~npm__npm-normalize-package-bin__1.0.1__links//:defs.bzl", store_791 = "npm_imported_package_store") +load("@@_main~npm~npm__npm-packlist__1.4.8__links//:defs.bzl", store_792 = "npm_imported_package_store") +load("@@_main~npm~npm__npmlog__4.1.2__links//:defs.bzl", store_793 = "npm_imported_package_store") +load("@@_main~npm~npm__npmlog__5.0.1__links//:defs.bzl", store_794 = "npm_imported_package_store") +load("@@_main~npm~npm__npmlog__6.0.2__links//:defs.bzl", store_795 = "npm_imported_package_store") +load("@@_main~npm~npm__number-is-integer__1.0.1__links//:defs.bzl", store_796 = "npm_imported_package_store") +load("@@_main~npm~npm__number-is-nan__1.0.1__links//:defs.bzl", store_797 = "npm_imported_package_store") +load("@@_main~npm~npm__oauth-sign__0.9.0__links//:defs.bzl", store_798 = "npm_imported_package_store") +load("@@_main~npm~npm__object-assign__4.1.1__links//:defs.bzl", store_799 = "npm_imported_package_store") +load("@@_main~npm~npm__object-hash__2.2.0__links//:defs.bzl", store_800 = "npm_imported_package_store") +load("@@_main~npm~npm__oidc-token-hash__5.0.1__links//:defs.bzl", store_801 = "npm_imported_package_store") +load("@@_main~npm~npm__once__1.3.3__links//:defs.bzl", store_802 = "npm_imported_package_store") +load("@@_main~npm~npm__once__1.4.0__links//:defs.bzl", store_803 = "npm_imported_package_store") +load("@@_main~npm~npm__opener__1.5.2__links//:defs.bzl", store_804 = "npm_imported_package_store") +load("@@_main~npm~npm__openid-client__5.4.0__links//:defs.bzl", store_805 = "npm_imported_package_store") +load("@@_main~npm~npm__optimist__0.6.0__links//:defs.bzl", store_806 = "npm_imported_package_store") +load("@@_main~npm~npm__optionator__0.8.3__links//:defs.bzl", store_807 = "npm_imported_package_store") +load("@@_main~npm~npm__os-homedir__1.0.2__links//:defs.bzl", store_808 = "npm_imported_package_store") +load("@@_main~npm~npm__os-tmpdir__1.0.2__links//:defs.bzl", store_809 = "npm_imported_package_store") +load("@@_main~npm~npm__osenv__0.1.5__links//:defs.bzl", store_810 = "npm_imported_package_store") +load("@@_main~npm~npm__outdent__0.8.0__links//:defs.bzl", store_811 = "npm_imported_package_store") +load("@@_main~npm~npm__p-cancelable__2.1.1__links//:defs.bzl", store_812 = "npm_imported_package_store") +load("@@_main~npm~npm__p-event__4.2.0__links//:defs.bzl", store_813 = "npm_imported_package_store") +load("@@_main~npm~npm__p-finally__1.0.0__links//:defs.bzl", store_814 = "npm_imported_package_store") +load("@@_main~npm~npm__p-limit__2.3.0__links//:defs.bzl", store_815 = "npm_imported_package_store") +load("@@_main~npm~npm__p-limit__3.1.0__links//:defs.bzl", store_816 = "npm_imported_package_store") +load("@@_main~npm~npm__p-locate__4.1.0__links//:defs.bzl", store_817 = "npm_imported_package_store") +load("@@_main~npm~npm__p-locate__5.0.0__links//:defs.bzl", store_818 = "npm_imported_package_store") +load("@@_main~npm~npm__p-map__4.0.0__links//:defs.bzl", store_819 = "npm_imported_package_store") +load("@@_main~npm~npm__p-timeout__3.2.0__links//:defs.bzl", store_820 = "npm_imported_package_store") +load("@@_main~npm~npm__p-try__2.2.0__links//:defs.bzl", store_821 = "npm_imported_package_store") +load("@@_main~npm~npm__package-json-from-dist__1.0.1__links//:defs.bzl", store_822 = "npm_imported_package_store") +load("@@_main~npm~npm__parent-module__1.0.1__links//:defs.bzl", store_823 = "npm_imported_package_store") +load("@@_main~npm~npm__parenthesis__3.1.8__links//:defs.bzl", store_824 = "npm_imported_package_store") +load("@@_main~npm~npm__parse-json__5.2.0__links//:defs.bzl", store_825 = "npm_imported_package_store") +load("@@_main~npm~npm__parse-rect__1.2.0__links//:defs.bzl", store_826 = "npm_imported_package_store") +load("@@_main~npm~npm__parse-svg-path__0.1.2__links//:defs.bzl", store_827 = "npm_imported_package_store") +load("@@_main~npm~npm__parse-unit__1.0.1__links//:defs.bzl", store_828 = "npm_imported_package_store") +load("@@_main~npm~npm__path-exists__4.0.0__links//:defs.bzl", store_829 = "npm_imported_package_store") +load("@@_main~npm~npm__path-is-absolute__1.0.1__links//:defs.bzl", store_830 = "npm_imported_package_store") +load("@@_main~npm~npm__path-key__3.1.1__links//:defs.bzl", store_831 = "npm_imported_package_store") +load("@@_main~npm~npm__path-parse__1.0.7__links//:defs.bzl", store_832 = "npm_imported_package_store") +load("@@_main~npm~npm__path-scurry__1.10.1__links//:defs.bzl", store_833 = "npm_imported_package_store") +load("@@_main~npm~npm__path-scurry__1.11.1__links//:defs.bzl", store_834 = "npm_imported_package_store") +load("@@_main~npm~npm__path-type__4.0.0__links//:defs.bzl", store_835 = "npm_imported_package_store") +load("@@_main~npm~npm__pathe__1.1.0__links//:defs.bzl", store_836 = "npm_imported_package_store") +load("@@_main~npm~npm__pbf__3.2.1__links//:defs.bzl", store_837 = "npm_imported_package_store") +load("@@_main~npm~npm__pend__1.2.0__links//:defs.bzl", store_838 = "npm_imported_package_store") +load("@@_main~npm~npm__performance-now__2.1.0__links//:defs.bzl", store_839 = "npm_imported_package_store") +load("@@_main~npm~npm__pick-by-alias__1.2.0__links//:defs.bzl", store_840 = "npm_imported_package_store") +load("@@_main~npm~npm__picocolors__1.0.0__links//:defs.bzl", store_841 = "npm_imported_package_store") +load("@@_main~npm~npm__picocolors__1.1.1__links//:defs.bzl", store_842 = "npm_imported_package_store") +load("@@_main~npm~npm__picomatch__2.3.1__links//:defs.bzl", store_843 = "npm_imported_package_store") +load("@@_main~npm~npm__picomatch__4.0.2__links//:defs.bzl", store_844 = "npm_imported_package_store") +load("@@_main~npm~npm__pify__4.0.1__links//:defs.bzl", store_845 = "npm_imported_package_store") +load("@@_main~npm~npm__pkg-dir__4.2.0__links//:defs.bzl", store_846 = "npm_imported_package_store") +load("@@_main~npm~npm__pkg-types__1.0.2__links//:defs.bzl", store_847 = "npm_imported_package_store") +load("@@_main~npm~npm__plotly.js__2.25.2__links//:defs.bzl", link_848 = "npm_link_imported_package_store", store_848 = "npm_imported_package_store") +load("@@_main~npm~npm__pngjs__5.0.0__links//:defs.bzl", link_849 = "npm_link_imported_package_store", store_849 = "npm_imported_package_store") +load("@@_main~npm~npm__point-in-polygon__1.1.0__links//:defs.bzl", store_850 = "npm_imported_package_store") +load("@@_main~npm~npm__polybooljs__1.2.0__links//:defs.bzl", store_851 = "npm_imported_package_store") +load("@@_main~npm~npm__postcss-modules-extract-imports__3.0.0_postcss_8.4.21__links//:defs.bzl", store_852 = "npm_imported_package_store") +load("@@_main~npm~npm__postcss-modules-local-by-default__4.0.0_postcss_8.4.21__links//:defs.bzl", store_853 = "npm_imported_package_store") +load("@@_main~npm~npm__postcss-modules-scope__3.0.0_postcss_8.4.21__links//:defs.bzl", store_854 = "npm_imported_package_store") +load("@@_main~npm~npm__postcss-modules-values__4.0.0_postcss_8.4.21__links//:defs.bzl", store_855 = "npm_imported_package_store") +load("@@_main~npm~npm__postcss-selector-parser__6.0.11__links//:defs.bzl", store_856 = "npm_imported_package_store") +load("@@_main~npm~npm__postcss-value-parser__4.2.0__links//:defs.bzl", store_857 = "npm_imported_package_store") +load("@@_main~npm~npm__postcss__8.4.21__links//:defs.bzl", store_858 = "npm_imported_package_store") +load("@@_main~npm~npm__postcss__8.4.31__links//:defs.bzl", store_859 = "npm_imported_package_store") +load("@@_main~npm~npm__postcss__8.5.3__links//:defs.bzl", store_860 = "npm_imported_package_store") +load("@@_main~npm~npm__potpack__1.0.2__links//:defs.bzl", store_861 = "npm_imported_package_store") +load("@@_main~npm~npm__prelude-ls__1.1.2__links//:defs.bzl", store_862 = "npm_imported_package_store") +load("@@_main~npm~npm__probe-image-size__7.2.3__links//:defs.bzl", store_863 = "npm_imported_package_store") +load("@@_main~npm~npm__process-nextick-args__2.0.1__links//:defs.bzl", store_864 = "npm_imported_package_store") +load("@@_main~npm~npm__progress__2.0.3__links//:defs.bzl", store_865 = "npm_imported_package_store") +load("@@_main~npm~npm__promise-inflight__1.0.1__links//:defs.bzl", store_866 = "npm_imported_package_store") +load("@@_main~npm~npm__promise-retry__2.0.1__links//:defs.bzl", store_867 = "npm_imported_package_store") +load("@@_main~npm~npm__protoc-gen-grpc__github.com_gregmagolan-codaio_protoc-gen-grpc-ts_be5580b06348d3eb9b4610a4a94065154a0df41f__links//:defs.bzl", link_868 = "npm_link_imported_package_store", store_868 = "npm_imported_package_store") +load("@@_main~npm~npm__protocol-buffers-schema__3.6.0__links//:defs.bzl", store_869 = "npm_imported_package_store") +load("@@_main~npm~npm__proxy-from-env__1.1.0__links//:defs.bzl", store_870 = "npm_imported_package_store") +load("@@_main~npm~npm__psl__1.9.0__links//:defs.bzl", store_871 = "npm_imported_package_store") +load("@@_main~npm~npm__pump__1.0.3__links//:defs.bzl", store_872 = "npm_imported_package_store") +load("@@_main~npm~npm__pump__3.0.0__links//:defs.bzl", store_873 = "npm_imported_package_store") +load("@@_main~npm~npm__punycode__2.3.0__links//:defs.bzl", store_874 = "npm_imported_package_store") +load("@@_main~npm~npm__puppeteer-core__19.11.1_777974123__links//:defs.bzl", store_875 = "npm_imported_package_store") +load("@@_main~npm~npm__puppeteer__19.11.1_777974123__links//:defs.bzl", link_876 = "npm_link_imported_package_store", store_876 = "npm_imported_package_store") +load("@@_main~npm~npm__qs__6.5.3__links//:defs.bzl", store_877 = "npm_imported_package_store") +load("@@_main~npm~npm__quickselect__2.0.0__links//:defs.bzl", store_878 = "npm_imported_package_store") +load("@@_main~npm~npm__raf__3.4.1__links//:defs.bzl", store_879 = "npm_imported_package_store") +load("@@_main~npm~npm__ramda__0.25.0__links//:defs.bzl", store_880 = "npm_imported_package_store") +load("@@_main~npm~npm__randombytes__2.1.0__links//:defs.bzl", store_881 = "npm_imported_package_store") +load("@@_main~npm~npm__rc__1.2.8__links//:defs.bzl", store_882 = "npm_imported_package_store") +load("@@_main~npm~npm__react-dom__19.1.0_react_19.1.0__links//:defs.bzl", link_883 = "npm_link_imported_package_store", store_883 = "npm_imported_package_store") +load("@@_main~npm~npm__react__17.0.2__links//:defs.bzl", link_884 = "npm_link_imported_package_store", store_884 = "npm_imported_package_store") +load("@@_main~npm~npm__react__19.1.0__links//:defs.bzl", link_885 = "npm_link_imported_package_store", store_885 = "npm_imported_package_store") +load("@@_main~npm~npm__read-yaml-file__2.1.0__links//:defs.bzl", store_886 = "npm_imported_package_store") +load("@@_main~npm~npm__readable-stream__1.0.34__links//:defs.bzl", store_887 = "npm_imported_package_store") +load("@@_main~npm~npm__readable-stream__2.3.8__links//:defs.bzl", store_888 = "npm_imported_package_store") +load("@@_main~npm~npm__readable-stream__3.6.1__links//:defs.bzl", store_889 = "npm_imported_package_store") +load("@@_main~npm~npm__readdirp__3.6.0__links//:defs.bzl", store_890 = "npm_imported_package_store") +load("@@_main~npm~npm__rechoir__0.8.0__links//:defs.bzl", store_891 = "npm_imported_package_store") +load("@@_main~npm~npm__regenerator-runtime__0.13.11__links//:defs.bzl", store_892 = "npm_imported_package_store") +load("@@_main~npm~npm__regl-error2d__2.0.12__links//:defs.bzl", store_893 = "npm_imported_package_store") +load("@@_main~npm~npm__regl-line2d__3.1.2__links//:defs.bzl", store_894 = "npm_imported_package_store") +load("@@_main~npm~npm__regl-scatter2d__3.3.1__links//:defs.bzl", store_895 = "npm_imported_package_store") +load("@@_main~npm~npm__regl-splom__1.0.14__links//:defs.bzl", store_896 = "npm_imported_package_store") +load("@@_main~npm~npm__regl__2.1.0__links//:defs.bzl", store_897 = "npm_imported_package_store") +load("@@_main~npm~npm__request__2.88.2__links//:defs.bzl", store_898 = "npm_imported_package_store") +load("@@_main~npm~npm__require-directory__2.1.1__links//:defs.bzl", store_899 = "npm_imported_package_store") +load("@@_main~npm~npm__require-from-string__2.0.2__links//:defs.bzl", store_900 = "npm_imported_package_store") +load("@@_main~npm~npm__require-like__0.1.2__links//:defs.bzl", store_901 = "npm_imported_package_store") +load("@@_main~npm~npm__resolve-cwd__3.0.0__links//:defs.bzl", store_902 = "npm_imported_package_store") +load("@@_main~npm~npm__resolve-from__4.0.0__links//:defs.bzl", store_903 = "npm_imported_package_store") +load("@@_main~npm~npm__resolve-from__5.0.0__links//:defs.bzl", store_904 = "npm_imported_package_store") +load("@@_main~npm~npm__resolve-protobuf-schema__2.1.0__links//:defs.bzl", store_905 = "npm_imported_package_store") +load("@@_main~npm~npm__resolve__0.6.3__links//:defs.bzl", store_906 = "npm_imported_package_store") +load("@@_main~npm~npm__resolve__1.22.1__links//:defs.bzl", store_907 = "npm_imported_package_store") +load("@@_main~npm~npm__responselike__2.0.1__links//:defs.bzl", store_908 = "npm_imported_package_store") +load("@@_main~npm~npm__retry__0.12.0__links//:defs.bzl", store_909 = "npm_imported_package_store") +load("@@_main~npm~npm__rfc4648__1.5.2__links//:defs.bzl", store_910 = "npm_imported_package_store") +load("@@_main~npm~npm__right-now__1.0.0__links//:defs.bzl", store_911 = "npm_imported_package_store") +load("@@_main~npm~npm__rimraf__2.7.1__links//:defs.bzl", store_912 = "npm_imported_package_store") +load("@@_main~npm~npm__rimraf__3.0.2__links//:defs.bzl", store_913 = "npm_imported_package_store") +load("@@_main~npm~npm__rimraf__5.0.10__links//:defs.bzl", store_914 = "npm_imported_package_store") +load("@@_main~npm~npm__rollup__2.70.2__links//:defs.bzl", link_915 = "npm_link_imported_package_store", store_915 = "npm_imported_package_store") +load("@@_main~npm~npm__rollup__4.39.0__links//:defs.bzl", link_916 = "npm_link_imported_package_store", store_916 = "npm_imported_package_store") +load("@@_main~npm~npm__rw__1.3.3__links//:defs.bzl", store_917 = "npm_imported_package_store") +load("@@_main~npm~npm__sade__1.8.1__links//:defs.bzl", store_918 = "npm_imported_package_store") +load("@@_main~npm~npm__safe-buffer__5.1.2__links//:defs.bzl", store_919 = "npm_imported_package_store") +load("@@_main~npm~npm__safe-buffer__5.2.1__links//:defs.bzl", store_920 = "npm_imported_package_store") +load("@@_main~npm~npm__safer-buffer__2.1.2__links//:defs.bzl", store_921 = "npm_imported_package_store") +load("@@_main~npm~npm__sax__1.2.4__links//:defs.bzl", store_922 = "npm_imported_package_store") +load("@@_main~npm~npm__scheduler__0.26.0__links//:defs.bzl", store_923 = "npm_imported_package_store") +load("@@_main~npm~npm__schema-utils__3.1.1__links//:defs.bzl", store_924 = "npm_imported_package_store") +load("@@_main~npm~npm__schema-utils__4.0.0__links//:defs.bzl", store_925 = "npm_imported_package_store") +load("@@_main~npm~npm__seedrandom__3.0.5__links//:defs.bzl", store_926 = "npm_imported_package_store") +load("@@_main~npm~npm__segfault-handler__1.3.0__links//:defs.bzl", link_927 = "npm_link_imported_package_store", store_927 = "npm_imported_package_store") +load("@@_main~npm~npm__semver-first-satisfied__1.1.0__links//:defs.bzl", link_928 = "npm_link_imported_package_store", store_928 = "npm_imported_package_store") +load("@@_main~npm~npm__semver__5.7.1__links//:defs.bzl", store_929 = "npm_imported_package_store") +load("@@_main~npm~npm__semver__6.3.0__links//:defs.bzl", store_930 = "npm_imported_package_store") +load("@@_main~npm~npm__semver__7.3.8__links//:defs.bzl", store_931 = "npm_imported_package_store") +load("@@_main~npm~npm__semver__7.5.0__links//:defs.bzl", store_932 = "npm_imported_package_store") +load("@@_main~npm~npm__semver__7.7.1__links//:defs.bzl", store_933 = "npm_imported_package_store") +load("@@_main~npm~npm__serialize-javascript__6.0.0__links//:defs.bzl", store_934 = "npm_imported_package_store") +load("@@_main~npm~npm__serialize-javascript__6.0.1__links//:defs.bzl", store_935 = "npm_imported_package_store") +load("@@_main~npm~npm__set-blocking__2.0.0__links//:defs.bzl", store_936 = "npm_imported_package_store") +load("@@_main~npm~npm__setprototypeof__1.2.0__links//:defs.bzl", store_937 = "npm_imported_package_store") +load("@@_main~npm~npm__shallow-clone__3.0.1__links//:defs.bzl", store_938 = "npm_imported_package_store") +load("@@_main~npm~npm__shallow-copy__0.0.1__links//:defs.bzl", store_939 = "npm_imported_package_store") +load("@@_main~npm~npm__sharp__0.33.5__links//:defs.bzl", store_940 = "npm_imported_package_store") +load("@@_main~npm~npm__shebang-command__2.0.0__links//:defs.bzl", store_941 = "npm_imported_package_store") +load("@@_main~npm~npm__shebang-regex__3.0.0__links//:defs.bzl", store_942 = "npm_imported_package_store") +load("@@_main~npm~npm__signal-exit__3.0.7__links//:defs.bzl", store_943 = "npm_imported_package_store") +load("@@_main~npm~npm__signal-exit__4.1.0__links//:defs.bzl", store_944 = "npm_imported_package_store") +load("@@_main~npm~npm__signum__1.0.0__links//:defs.bzl", store_945 = "npm_imported_package_store") +load("@@_main~npm~npm__simple-swizzle__0.2.2__links//:defs.bzl", store_946 = "npm_imported_package_store") +load("@@_main~npm~npm__sirv__1.0.19__links//:defs.bzl", store_947 = "npm_imported_package_store") +load("@@_main~npm~npm__smart-buffer__4.2.0__links//:defs.bzl", store_948 = "npm_imported_package_store") +load("@@_main~npm~npm__socks-proxy-agent__7.0.0__links//:defs.bzl", store_949 = "npm_imported_package_store") +load("@@_main~npm~npm__socks__2.7.1__links//:defs.bzl", store_950 = "npm_imported_package_store") +load("@@_main~npm~npm__source-map-js__1.0.2__links//:defs.bzl", store_951 = "npm_imported_package_store") +load("@@_main~npm~npm__source-map-js__1.2.1__links//:defs.bzl", store_952 = "npm_imported_package_store") +load("@@_main~npm~npm__source-map-support__0.5.21__links//:defs.bzl", link_953 = "npm_link_imported_package_store", store_953 = "npm_imported_package_store") +load("@@_main~npm~npm__source-map__0.6.1__links//:defs.bzl", store_954 = "npm_imported_package_store") +load("@@_main~npm~npm__sourcemap-codec__1.4.8__links//:defs.bzl", store_955 = "npm_imported_package_store") +load("@@_main~npm~npm__sshpk__1.17.0__links//:defs.bzl", store_956 = "npm_imported_package_store") +load("@@_main~npm~npm__ssri__9.0.1__links//:defs.bzl", store_957 = "npm_imported_package_store") +load("@@_main~npm~npm__stack-trace__0.0.9__links//:defs.bzl", store_958 = "npm_imported_package_store") +load("@@_main~npm~npm__static-eval__2.1.0__links//:defs.bzl", store_959 = "npm_imported_package_store") +load("@@_main~npm~npm__statuses__2.0.1__links//:defs.bzl", store_960 = "npm_imported_package_store") +load("@@_main~npm~npm__stream-buffers__3.0.2__links//:defs.bzl", store_961 = "npm_imported_package_store") +load("@@_main~npm~npm__stream-parser__0.3.1__links//:defs.bzl", store_962 = "npm_imported_package_store") +load("@@_main~npm~npm__stream-shift__1.0.1__links//:defs.bzl", store_963 = "npm_imported_package_store") +load("@@_main~npm~npm__streamsearch__1.1.0__links//:defs.bzl", store_964 = "npm_imported_package_store") +load("@@_main~npm~npm__string-split-by__1.0.0__links//:defs.bzl", store_965 = "npm_imported_package_store") +load("@@_main~npm~npm__string-width__1.0.2__links//:defs.bzl", store_966 = "npm_imported_package_store") +load("@@_main~npm~npm__string-width__4.2.3__links//:defs.bzl", store_967 = "npm_imported_package_store") +load("@@_main~npm~npm__string-width__5.1.2__links//:defs.bzl", store_968 = "npm_imported_package_store") +load("@@_main~npm~npm__string_decoder__0.10.31__links//:defs.bzl", store_969 = "npm_imported_package_store") +load("@@_main~npm~npm__string_decoder__1.1.1__links//:defs.bzl", store_970 = "npm_imported_package_store") +load("@@_main~npm~npm__string_decoder__1.3.0__links//:defs.bzl", store_971 = "npm_imported_package_store") +load("@@_main~npm~npm__strip-ansi__3.0.1__links//:defs.bzl", store_972 = "npm_imported_package_store") +load("@@_main~npm~npm__strip-ansi__6.0.1__links//:defs.bzl", store_973 = "npm_imported_package_store") +load("@@_main~npm~npm__strip-ansi__7.1.0__links//:defs.bzl", store_974 = "npm_imported_package_store") +load("@@_main~npm~npm__strip-bom__4.0.0__links//:defs.bzl", store_975 = "npm_imported_package_store") +load("@@_main~npm~npm__strip-json-comments__2.0.1__links//:defs.bzl", store_976 = "npm_imported_package_store") +load("@@_main~npm~npm__strip-json-comments__3.1.1__links//:defs.bzl", store_977 = "npm_imported_package_store") +load("@@_main~npm~npm__strongly-connected-components__1.0.1__links//:defs.bzl", store_978 = "npm_imported_package_store") +load("@@_main~npm~npm__styled-jsx__5.1.6_react_19.1.0__links//:defs.bzl", store_979 = "npm_imported_package_store") +load("@@_main~npm~npm__supercluster__7.1.5__links//:defs.bzl", store_980 = "npm_imported_package_store") +load("@@_main~npm~npm__superscript-text__1.0.0__links//:defs.bzl", store_981 = "npm_imported_package_store") +load("@@_main~npm~npm__supports-color__5.5.0__links//:defs.bzl", store_982 = "npm_imported_package_store") +load("@@_main~npm~npm__supports-color__7.2.0__links//:defs.bzl", store_983 = "npm_imported_package_store") +load("@@_main~npm~npm__supports-color__8.1.1__links//:defs.bzl", store_984 = "npm_imported_package_store") +load("@@_main~npm~npm__supports-preserve-symlinks-flag__1.0.0__links//:defs.bzl", store_985 = "npm_imported_package_store") +load("@@_main~npm~npm__svg-arc-to-cubic-bezier__3.2.0__links//:defs.bzl", store_986 = "npm_imported_package_store") +load("@@_main~npm~npm__svg-path-bounds__1.0.2__links//:defs.bzl", store_987 = "npm_imported_package_store") +load("@@_main~npm~npm__svg-path-sdf__1.1.3__links//:defs.bzl", store_988 = "npm_imported_package_store") +load("@@_main~npm~npm__syncpack__github.com_JamieMason_syncpack_c245af8ea73ce3345d92bbda6c684092a841e262__links//:defs.bzl", link_989 = "npm_link_imported_package_store", store_989 = "npm_imported_package_store") +load("@@_main~npm~npm__tailwindcss__4.1.0__links//:defs.bzl", link_990 = "npm_link_imported_package_store", store_990 = "npm_imported_package_store") +load("@@_main~npm~npm__tapable__2.2.1__links//:defs.bzl", store_991 = "npm_imported_package_store") +load("@@_main~npm~npm__tar-fs__1.16.3__links//:defs.bzl", store_992 = "npm_imported_package_store") +load("@@_main~npm~npm__tar-fs__2.1.1__links//:defs.bzl", store_993 = "npm_imported_package_store") +load("@@_main~npm~npm__tar-stream__1.6.2__links//:defs.bzl", store_994 = "npm_imported_package_store") +load("@@_main~npm~npm__tar-stream__2.2.0__links//:defs.bzl", store_995 = "npm_imported_package_store") +load("@@_main~npm~npm__tar__4.4.19__links//:defs.bzl", store_996 = "npm_imported_package_store") +load("@@_main~npm~npm__tar__6.1.13__links//:defs.bzl", store_997 = "npm_imported_package_store") +load("@@_main~npm~npm__tar__7.4.3__links//:defs.bzl", store_998 = "npm_imported_package_store") +load("@@_main~npm~npm__terser-webpack-plugin__5.3.6_webpack_5.76.3__links//:defs.bzl", store_999 = "npm_imported_package_store") +load("@@_main~npm~npm__terser__5.16.5__links//:defs.bzl", store_1000 = "npm_imported_package_store") +load("@@_main~npm~npm__test-exclude__7.0.1__links//:defs.bzl", store_1001 = "npm_imported_package_store") +load("@@_main~npm~npm__through2__0.6.5__links//:defs.bzl", store_1002 = "npm_imported_package_store") +load("@@_main~npm~npm__through2__2.0.5__links//:defs.bzl", store_1003 = "npm_imported_package_store") +load("@@_main~npm~npm__through__2.3.8__links//:defs.bzl", store_1004 = "npm_imported_package_store") +load("@@_main~npm~npm__tightrope__0.1.0__links//:defs.bzl", store_1005 = "npm_imported_package_store") +load("@@_main~npm~npm__tiny-emitter__2.1.0__links//:defs.bzl", store_1006 = "npm_imported_package_store") +load("@@_main~npm~npm__tinycolor2__1.6.0__links//:defs.bzl", store_1007 = "npm_imported_package_store") +load("@@_main~npm~npm__tinyqueue__2.0.3__links//:defs.bzl", store_1008 = "npm_imported_package_store") +load("@@_main~npm~npm__tmp__0.0.33__links//:defs.bzl", store_1009 = "npm_imported_package_store") +load("@@_main~npm~npm__to-buffer__1.1.1__links//:defs.bzl", store_1010 = "npm_imported_package_store") +load("@@_main~npm~npm__to-fast-properties__2.0.0__links//:defs.bzl", store_1011 = "npm_imported_package_store") +load("@@_main~npm~npm__to-float32__1.1.0__links//:defs.bzl", store_1012 = "npm_imported_package_store") +load("@@_main~npm~npm__to-px__1.0.1__links//:defs.bzl", store_1013 = "npm_imported_package_store") +load("@@_main~npm~npm__to-readable-stream__2.1.0__links//:defs.bzl", store_1014 = "npm_imported_package_store") +load("@@_main~npm~npm__to-regex-range__5.0.1__links//:defs.bzl", store_1015 = "npm_imported_package_store") +load("@@_main~npm~npm__toidentifier__1.0.1__links//:defs.bzl", store_1016 = "npm_imported_package_store") +load("@@_main~npm~npm__topojson-client__3.1.0__links//:defs.bzl", store_1017 = "npm_imported_package_store") +load("@@_main~npm~npm__totalist__1.1.0__links//:defs.bzl", store_1018 = "npm_imported_package_store") +load("@@_main~npm~npm__tough-cookie__2.5.0__links//:defs.bzl", store_1019 = "npm_imported_package_store") +load("@@_main~npm~npm__tr46__0.0.3__links//:defs.bzl", store_1020 = "npm_imported_package_store") +load("@@_main~npm~npm__tslib__2.8.1__links//:defs.bzl", link_1021 = "npm_link_imported_package_store", store_1021 = "npm_imported_package_store") +load("@@_main~npm~npm__tunnel-agent__0.6.0__links//:defs.bzl", store_1022 = "npm_imported_package_store") +load("@@_main~npm~npm__tweetnacl__0.14.5__links//:defs.bzl", store_1023 = "npm_imported_package_store") +load("@@_main~npm~npm__type-check__0.3.2__links//:defs.bzl", store_1024 = "npm_imported_package_store") +load("@@_main~npm~npm__type-fest__0.10.0__links//:defs.bzl", store_1025 = "npm_imported_package_store") +load("@@_main~npm~npm__type__1.2.0__links//:defs.bzl", store_1026 = "npm_imported_package_store") +load("@@_main~npm~npm__type__2.7.2__links//:defs.bzl", store_1027 = "npm_imported_package_store") +load("@@_main~npm~npm__typed-function__4.1.0__links//:defs.bzl", store_1028 = "npm_imported_package_store") +load("@@_main~npm~npm__typedarray-pool__1.2.0__links//:defs.bzl", store_1029 = "npm_imported_package_store") +load("@@_main~npm~npm__typedarray__0.0.6__links//:defs.bzl", store_1030 = "npm_imported_package_store") +load("@@_main~npm~npm__typeof-article__0.1.1__links//:defs.bzl", store_1031 = "npm_imported_package_store") +load("@@_main~npm~npm__typescript__4.9.5__links//:defs.bzl", link_1032 = "npm_link_imported_package_store", store_1032 = "npm_imported_package_store") +load("@@_main~npm~npm__typescript__5.6.3__links//:defs.bzl", store_1033 = "npm_imported_package_store") +load("@@_main~npm~npm__typescript__5.8.2__links//:defs.bzl", link_1034 = "npm_link_imported_package_store", store_1034 = "npm_imported_package_store") +load("@@_main~npm~npm__ufo__1.1.0__links//:defs.bzl", store_1035 = "npm_imported_package_store") +load("@@_main~npm~npm__unbzip2-stream__1.4.3__links//:defs.bzl", store_1036 = "npm_imported_package_store") +load("@@_main~npm~npm__undici-types__5.26.5__links//:defs.bzl", store_1037 = "npm_imported_package_store") +load("@@_main~npm~npm__undici-types__6.19.8__links//:defs.bzl", store_1038 = "npm_imported_package_store") +load("@@_main~npm~npm__unique-filename__2.0.1__links//:defs.bzl", store_1039 = "npm_imported_package_store") +load("@@_main~npm~npm__unique-slug__3.0.0__links//:defs.bzl", store_1040 = "npm_imported_package_store") +load("@@_main~npm~npm__universalify__0.1.2__links//:defs.bzl", store_1041 = "npm_imported_package_store") +load("@@_main~npm~npm__universalify__2.0.0__links//:defs.bzl", store_1042 = "npm_imported_package_store") +load("@@_main~npm~npm__unix-dgram__2.0.6__links//:defs.bzl", store_1043 = "npm_imported_package_store") +load("@@_main~npm~npm__unquote__1.1.1__links//:defs.bzl", store_1044 = "npm_imported_package_store") +load("@@_main~npm~npm__unused__0.2.2__links//:defs.bzl", link_1045 = "npm_link_imported_package_store", store_1045 = "npm_imported_package_store") +load("@@_main~npm~npm__update-browserslist-db__1.0.10_browserslist_4.21.5__links//:defs.bzl", store_1046 = "npm_imported_package_store") +load("@@_main~npm~npm__update-diff__1.1.0__links//:defs.bzl", store_1047 = "npm_imported_package_store") +load("@@_main~npm~npm__uri-js__4.4.1__links//:defs.bzl", store_1048 = "npm_imported_package_store") +load("@@_main~npm~npm__util-deprecate__1.0.2__links//:defs.bzl", store_1049 = "npm_imported_package_store") +load("@@_main~npm~npm__uuid__3.4.0__links//:defs.bzl", store_1050 = "npm_imported_package_store") +load("@@_main~npm~npm__uuid__8.3.2__links//:defs.bzl", link_1051 = "npm_link_imported_package_store", store_1051 = "npm_imported_package_store") +load("@@_main~npm~npm__uvu__0.5.3__links//:defs.bzl", link_1052 = "npm_link_imported_package_store", store_1052 = "npm_imported_package_store") +load("@@_main~npm~npm__v8-to-istanbul__9.1.0__links//:defs.bzl", store_1053 = "npm_imported_package_store") +load("@@_main~npm~npm__verror__1.10.0__links//:defs.bzl", store_1054 = "npm_imported_package_store") +load("@@_main~npm~npm__vt-pbf__3.1.3__links//:defs.bzl", store_1055 = "npm_imported_package_store") +load("@@_main~npm~npm__watchpack__2.4.0__links//:defs.bzl", store_1056 = "npm_imported_package_store") +load("@@_main~npm~npm__weak-map__1.0.8__links//:defs.bzl", store_1057 = "npm_imported_package_store") +load("@@_main~npm~npm__webgl-context__2.2.0__links//:defs.bzl", store_1058 = "npm_imported_package_store") +load("@@_main~npm~npm__webidl-conversions__3.0.1__links//:defs.bzl", store_1059 = "npm_imported_package_store") +load("@@_main~npm~npm__webpack-bundle-analyzer__4.5.0_bufferutil_4.0.8__links//:defs.bzl", link_1060 = "npm_link_imported_package_store", store_1060 = "npm_imported_package_store") +load("@@_main~npm~npm__webpack-cli__5.0.1_webpack_5.76.3__links//:defs.bzl", link_1061 = "npm_link_imported_package_store", store_1061 = "npm_imported_package_store") +load("@@_main~npm~npm__webpack-merge__5.8.0__links//:defs.bzl", store_1062 = "npm_imported_package_store") +load("@@_main~npm~npm__webpack-sources__3.2.3__links//:defs.bzl", store_1063 = "npm_imported_package_store") +load("@@_main~npm~npm__webpack__5.76.3_webpack-cli_5.0.1__links//:defs.bzl", link_1064 = "npm_link_imported_package_store", store_1064 = "npm_imported_package_store") +load("@@_main~npm~npm__whatwg-url__5.0.0__links//:defs.bzl", store_1065 = "npm_imported_package_store") +load("@@_main~npm~npm__which__2.0.2__links//:defs.bzl", store_1066 = "npm_imported_package_store") +load("@@_main~npm~npm__wide-align__1.1.5__links//:defs.bzl", store_1067 = "npm_imported_package_store") +load("@@_main~npm~npm__wildcard__2.0.0__links//:defs.bzl", store_1068 = "npm_imported_package_store") +load("@@_main~npm~npm__word-wrap__1.2.3__links//:defs.bzl", store_1069 = "npm_imported_package_store") +load("@@_main~npm~npm__wordwrap__0.0.3__links//:defs.bzl", store_1070 = "npm_imported_package_store") +load("@@_main~npm~npm__workerpool__6.2.1__links//:defs.bzl", store_1071 = "npm_imported_package_store") +load("@@_main~npm~npm__world-calendars__1.0.3__links//:defs.bzl", store_1072 = "npm_imported_package_store") +load("@@_main~npm~npm__wrap-ansi__7.0.0__links//:defs.bzl", store_1073 = "npm_imported_package_store") +load("@@_main~npm~npm__wrap-ansi__8.1.0__links//:defs.bzl", store_1074 = "npm_imported_package_store") +load("@@_main~npm~npm__wrappy__1.0.2__links//:defs.bzl", store_1075 = "npm_imported_package_store") +load("@@_main~npm~npm__ws__7.5.9_bufferutil_4.0.8__links//:defs.bzl", store_1076 = "npm_imported_package_store") +load("@@_main~npm~npm__ws__8.13.0_bufferutil_4.0.8__links//:defs.bzl", store_1077 = "npm_imported_package_store") +load("@@_main~npm~npm__ws__8.18.0_bufferutil_4.0.8__links//:defs.bzl", store_1078 = "npm_imported_package_store") +load("@@_main~npm~npm__xml__1.0.1__links//:defs.bzl", store_1079 = "npm_imported_package_store") +load("@@_main~npm~npm__xtend__2.2.0__links//:defs.bzl", store_1080 = "npm_imported_package_store") +load("@@_main~npm~npm__xtend__4.0.2__links//:defs.bzl", store_1081 = "npm_imported_package_store") +load("@@_main~npm~npm__y18n__5.0.8__links//:defs.bzl", store_1082 = "npm_imported_package_store") +load("@@_main~npm~npm__yallist__3.1.1__links//:defs.bzl", store_1083 = "npm_imported_package_store") +load("@@_main~npm~npm__yallist__4.0.0__links//:defs.bzl", store_1084 = "npm_imported_package_store") +load("@@_main~npm~npm__yallist__5.0.0__links//:defs.bzl", store_1085 = "npm_imported_package_store") +load("@@_main~npm~npm__yargs-parser__20.2.4__links//:defs.bzl", store_1086 = "npm_imported_package_store") +load("@@_main~npm~npm__yargs-parser__20.2.9__links//:defs.bzl", store_1087 = "npm_imported_package_store") +load("@@_main~npm~npm__yargs-parser__21.1.1__links//:defs.bzl", store_1088 = "npm_imported_package_store") +load("@@_main~npm~npm__yargs-unparser__2.0.0__links//:defs.bzl", store_1089 = "npm_imported_package_store") +load("@@_main~npm~npm__yargs__16.2.0__links//:defs.bzl", store_1090 = "npm_imported_package_store") +load("@@_main~npm~npm__yargs__17.7.1__links//:defs.bzl", store_1091 = "npm_imported_package_store") +load("@@_main~npm~npm__yargs__17.7.2__links//:defs.bzl", store_1092 = "npm_imported_package_store") +load("@@_main~npm~npm__yauzl__2.10.0__links//:defs.bzl", store_1093 = "npm_imported_package_store") +load("@@_main~npm~npm__yocto-queue__0.1.0__links//:defs.bzl", store_1094 = "npm_imported_package_store") +load("@@_main~npm~npm__zod__3.21.4__links//:defs.bzl", store_1095 = "npm_imported_package_store") # buildifier: disable=bzl-visibility load("@aspect_rules_js//js:defs.bzl", _js_library = "js_library") @@ -2219,6 +2222,9 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): store_1090(name) store_1091(name) store_1092(name) + store_1093(name) + store_1094(name) + store_1095(name) if link: if bazel_package == "js/private/worker/src": link_1("{}/abortcontroller-polyfill".format(name), link_root_name = name, link_alias = "abortcontroller-polyfill") @@ -2261,11 +2267,11 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@types"].append(link_targets[-1]) link_561("{}/google-protobuf".format(name), link_root_name = name, link_alias = "google-protobuf") link_targets.append(":{}/google-protobuf".format(name)) - link_915("{}/rollup".format(name), link_root_name = name, link_alias = "rollup") + link_916("{}/rollup".format(name), link_root_name = name, link_alias = "rollup") link_targets.append(":{}/rollup".format(name)) - link_1020("{}/tslib".format(name), link_root_name = name, link_alias = "tslib") + link_1021("{}/tslib".format(name), link_root_name = name, link_alias = "tslib") link_targets.append(":{}/tslib".format(name)) - link_1031("{}/typescript".format(name), link_root_name = name, link_alias = "typescript") + link_1034("{}/typescript".format(name), link_root_name = name, link_alias = "typescript") link_targets.append(":{}/typescript".format(name)) elif bazel_package == "js/private/test/image": link_6("{}/acorn".format(name), link_root_name = name, link_alias = "acorn") @@ -2299,34 +2305,34 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@rollup"].append(link_targets[-1]) link_419("{}/debug".format(name), link_root_name = name, link_alias = "debug") link_targets.append(":{}/debug".format(name)) - link_711("{}/meaning-of-life".format(name), link_root_name = name, link_alias = "meaning-of-life") + link_712("{}/meaning-of-life".format(name), link_root_name = name, link_alias = "meaning-of-life") link_targets.append(":{}/meaning-of-life".format(name)) - link_746("{}/mobx-react".format(name), link_root_name = name, link_alias = "mobx-react") + link_747("{}/mobx-react".format(name), link_root_name = name, link_alias = "mobx-react") link_targets.append(":{}/mobx-react".format(name)) - link_747("{}/mobx".format(name), link_root_name = name, link_alias = "mobx") + link_748("{}/mobx".format(name), link_root_name = name, link_alias = "mobx") link_targets.append(":{}/mobx".format(name)) - link_762("{}/ms".format(name), link_root_name = name, link_alias = "ms") + link_763("{}/ms".format(name), link_root_name = name, link_alias = "ms") link_targets.append(":{}/ms".format(name)) - link_883("{}/react".format(name), link_root_name = name, link_alias = "react") + link_884("{}/react".format(name), link_root_name = name, link_alias = "react") link_targets.append(":{}/react".format(name)) - link_914("{}/rollup".format(name), link_root_name = name, link_alias = "rollup") + link_915("{}/rollup".format(name), link_root_name = name, link_alias = "rollup") link_targets.append(":{}/rollup".format(name)) - link_1049("{}/uvu".format(name), link_root_name = name, link_alias = "uvu") + link_1052("{}/uvu".format(name), link_root_name = name, link_alias = "uvu") link_targets.append(":{}/uvu".format(name)) elif bazel_package == "examples/npm_package/packages/pkg_a": link_7("{}/acorn".format(name), link_root_name = name, link_alias = "acorn") link_targets.append(":{}/acorn".format(name)) - link_1048("{}/uuid".format(name), link_root_name = name, link_alias = "uuid") + link_1051("{}/uuid".format(name), link_root_name = name, link_alias = "uuid") link_targets.append(":{}/uuid".format(name)) elif bazel_package == "examples/npm_package/packages/pkg_d": link_7("{}/acorn".format(name), link_root_name = name, link_alias = "acorn") link_targets.append(":{}/acorn".format(name)) - link_1048("{}/uuid".format(name), link_root_name = name, link_alias = "uuid") + link_1051("{}/uuid".format(name), link_root_name = name, link_alias = "uuid") link_targets.append(":{}/uuid".format(name)) elif bazel_package == "examples/npm_package/packages/pkg_b": link_8("{}/acorn".format(name), link_root_name = name, link_alias = "acorn") link_targets.append(":{}/acorn".format(name)) - link_1048("{}/uuid".format(name), link_root_name = name, link_alias = "uuid") + link_1051("{}/uuid".format(name), link_root_name = name, link_alias = "uuid") link_targets.append(":{}/uuid".format(name)) elif bazel_package == "examples/linked_lib": link_47("{}/@aspect-test/e".format(name), link_root_name = name, link_alias = "@aspect-test/e") @@ -2420,28 +2426,28 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): link_targets.append(":{}/inline-fixtures".format(name)) link_660("{}/json-stable-stringify".format(name), link_root_name = name, link_alias = "json-stable-stringify") link_targets.append(":{}/json-stable-stringify".format(name)) - link_692("{}/lodash".format(name), link_root_name = name, link_alias = "lodash") + link_693("{}/lodash".format(name), link_root_name = name, link_alias = "lodash") link_targets.append(":{}/lodash".format(name)) - link_779("{}/node-gyp".format(name), link_root_name = name, link_alias = "node-gyp") + link_780("{}/node-gyp".format(name), link_root_name = name, link_alias = "node-gyp") link_targets.append(":{}/node-gyp".format(name)) - link_847("{}/plotly.js".format(name), link_root_name = name, link_alias = "plotly.js") + link_848("{}/plotly.js".format(name), link_root_name = name, link_alias = "plotly.js") link_targets.append(":{}/plotly.js".format(name)) - link_848("{}/pngjs".format(name), link_root_name = name, link_alias = "pngjs") + link_849("{}/pngjs".format(name), link_root_name = name, link_alias = "pngjs") link_targets.append(":{}/pngjs".format(name)) - link_867("{}/protoc-gen-grpc".format(name), link_root_name = name, link_alias = "protoc-gen-grpc") + link_868("{}/protoc-gen-grpc".format(name), link_root_name = name, link_alias = "protoc-gen-grpc") link_targets.append(":{}/protoc-gen-grpc".format(name)) - link_875("{}/puppeteer".format(name), link_root_name = name, link_alias = "puppeteer") + link_876("{}/puppeteer".format(name), link_root_name = name, link_alias = "puppeteer") link_targets.append(":{}/puppeteer".format(name)) - link_926("{}/segfault-handler".format(name), link_root_name = name, link_alias = "segfault-handler") + link_927("{}/segfault-handler".format(name), link_root_name = name, link_alias = "segfault-handler") link_targets.append(":{}/segfault-handler".format(name)) - link_927("{}/semver-first-satisfied".format(name), link_root_name = name, link_alias = "semver-first-satisfied") + link_928("{}/semver-first-satisfied".format(name), link_root_name = name, link_alias = "semver-first-satisfied") link_targets.append(":{}/semver-first-satisfied".format(name)) - link_988("{}/syncpack".format(name), link_root_name = name, link_alias = "syncpack") + link_989("{}/syncpack".format(name), link_root_name = name, link_alias = "syncpack") link_targets.append(":{}/syncpack".format(name)) - link_1031("{}/typescript".format(name), link_root_name = name, link_alias = "typescript") + link_1032("{}/typescript".format(name), link_root_name = name, link_alias = "typescript") link_targets.append(":{}/typescript".format(name)) - link_1042("{}/unused".format(name), link_root_name = name, link_alias = "unused") - link_1057("{}/webpack-bundle-analyzer".format(name), link_root_name = name, link_alias = "webpack-bundle-analyzer") + link_1045("{}/unused".format(name), link_root_name = name, link_alias = "unused") + link_1060("{}/webpack-bundle-analyzer".format(name), link_root_name = name, link_alias = "webpack-bundle-analyzer") link_targets.append(":{}/webpack-bundle-analyzer".format(name)) elif bazel_package == "js/private/coverage/bundle": link_195("{}/@rollup/plugin-commonjs".format(name), link_root_name = name, link_alias = "@rollup/plugin-commonjs") @@ -2464,7 +2470,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@rollup"].append(link_targets[-1]) link_325("{}/c8".format(name), link_root_name = name, link_alias = "c8") link_targets.append(":{}/c8".format(name)) - link_915("{}/rollup".format(name), link_root_name = name, link_alias = "rollup") + link_916("{}/rollup".format(name), link_root_name = name, link_alias = "rollup") link_targets.append(":{}/rollup".format(name)) elif bazel_package == "examples/nextjs": link_239("{}/@tailwindcss/postcss".format(name), link_root_name = name, link_alias = "@tailwindcss/postcss") @@ -2473,13 +2479,13 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@tailwindcss"] = [link_targets[-1]] else: scope_targets["@tailwindcss"].append(link_targets[-1]) - link_774("{}/next".format(name), link_root_name = name, link_alias = "next") + link_775("{}/next".format(name), link_root_name = name, link_alias = "next") link_targets.append(":{}/next".format(name)) - link_882("{}/react-dom".format(name), link_root_name = name, link_alias = "react-dom") + link_883("{}/react-dom".format(name), link_root_name = name, link_alias = "react-dom") link_targets.append(":{}/react-dom".format(name)) - link_884("{}/react".format(name), link_root_name = name, link_alias = "react") + link_885("{}/react".format(name), link_root_name = name, link_alias = "react") link_targets.append(":{}/react".format(name)) - link_989("{}/tailwindcss".format(name), link_root_name = name, link_alias = "tailwindcss") + link_990("{}/tailwindcss".format(name), link_root_name = name, link_alias = "tailwindcss") link_targets.append(":{}/tailwindcss".format(name)) elif bazel_package == "": link_260("{}/@types/node".format(name), link_root_name = name, link_alias = "@types/node") @@ -2494,7 +2500,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): link_targets.append(":{}/inline-fixtures".format(name)) link_666("{}/jsonpath-plus".format(name), link_root_name = name, link_alias = "jsonpath-plus") link_targets.append(":{}/jsonpath-plus".format(name)) - link_1031("{}/typescript".format(name), link_root_name = name, link_alias = "typescript") + link_1034("{}/typescript".format(name), link_root_name = name, link_alias = "typescript") link_targets.append(":{}/typescript".format(name)) elif bazel_package == "js/private/test/js_run_devserver": link_260("{}/@types/node".format(name), link_root_name = name, link_alias = "@types/node") @@ -2534,13 +2540,13 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@vanilla-extract"].append(link_targets[-1]) link_392("{}/css-loader".format(name), link_root_name = name, link_alias = "css-loader") link_targets.append(":{}/css-loader".format(name)) - link_709("{}/mathjs".format(name), link_root_name = name, link_alias = "mathjs") + link_710("{}/mathjs".format(name), link_root_name = name, link_alias = "mathjs") link_targets.append(":{}/mathjs".format(name)) - link_719("{}/mini-css-extract-plugin".format(name), link_root_name = name, link_alias = "mini-css-extract-plugin") + link_720("{}/mini-css-extract-plugin".format(name), link_root_name = name, link_alias = "mini-css-extract-plugin") link_targets.append(":{}/mini-css-extract-plugin".format(name)) - link_1058("{}/webpack-cli".format(name), link_root_name = name, link_alias = "webpack-cli") + link_1061("{}/webpack-cli".format(name), link_root_name = name, link_alias = "webpack-cli") link_targets.append(":{}/webpack-cli".format(name)) - link_1061("{}/webpack".format(name), link_root_name = name, link_alias = "webpack") + link_1064("{}/webpack".format(name), link_root_name = name, link_alias = "webpack") link_targets.append(":{}/webpack".format(name)) elif bazel_package == "examples/npm_package/libs/lib_a": link_337("{}/chalk".format(name), link_root_name = name, link_alias = "chalk") @@ -2551,14 +2557,14 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): link_338("{}/chalk-alt".format(name), link_root_name = name, link_alias = "chalk-alt") link_targets.append(":{}/chalk-alt".format(name)) elif bazel_package == "examples/macro": - link_748("{}/mocha-junit-reporter".format(name), link_root_name = name, link_alias = "mocha-junit-reporter") + link_749("{}/mocha-junit-reporter".format(name), link_root_name = name, link_alias = "mocha-junit-reporter") link_targets.append(":{}/mocha-junit-reporter".format(name)) - link_749("{}/mocha-multi-reporters".format(name), link_root_name = name, link_alias = "mocha-multi-reporters") + link_750("{}/mocha-multi-reporters".format(name), link_root_name = name, link_alias = "mocha-multi-reporters") link_targets.append(":{}/mocha-multi-reporters".format(name)) - link_750("{}/mocha".format(name), link_root_name = name, link_alias = "mocha") + link_751("{}/mocha".format(name), link_root_name = name, link_alias = "mocha") link_targets.append(":{}/mocha".format(name)) elif bazel_package == "examples/stack_traces": - link_952("{}/source-map-support".format(name), link_root_name = name, link_alias = "source-map-support") + link_953("{}/source-map-support".format(name), link_root_name = name, link_alias = "source-map-support") link_targets.append(":{}/source-map-support".format(name)) if is_root: diff --git a/npm/private/versions.bzl b/npm/private/versions.bzl index 864ed6c28..efa36e3cd 100644 --- a/npm/private/versions.bzl +++ b/npm/private/versions.bzl @@ -882,4 +882,9 @@ PNPM_VERSIONS = { "10.12.4": "sha512-Xqiw3u2U7WhpHJutTJVUknBcXuuKh++GvGLHSiawN7CP+VcPEIsuTb0d0akYb+qSXlJ/FBxkjoWvRWMQdGgBhA==", "10.13.0": "sha512-4Iy/pdDEfhSNnZKWVROvPQakL/mbbg6Cp9EFEoWND7aAoDweZ3LTaaIwXHkwbJJXmJo1drcFfWh3RpyaHHVj8A==", "10.13.1": "sha512-N+vxpcejDV+r4MXfRO6NpMllygxa89urKMOhaBtwolYhjQXIHJwNz3Z+9rhVHrW5YAQrntQwDFkkIzY3fgHPrQ==", + "10.14.0": "sha512-rSenlkG0nD5IGhaoBbqnGBegS74Go40X5g4urug/ahRsamiBJfV5LkjdW6MOfaUqXNpMOZK5zPMz+c4iOvhHSA==", + "10.15.0": "sha512-SG68JZ0+mZpOhpHOA7XKxKccvso5Nyqbdiy1AM/fCHPiyxar49lRse4s8BJQPwJ7mLZYTk3yJSTgx0UNnseqew==", + "10.15.1": "sha512-NOU4wym1VTAUyo6PRTWZf5YYCh0PYUM5NXRJk1NQ2STiL4YUaCGRJk7DPRRirCFWGv+X9rsYBlNRwWLH6PbeZw==", + "10.16.0": "sha512-gGbnsDQhe3AKmk27OgBQYdZBuhMKiZFSE6ELPKSRnBnAN77IBmr9xVm4ljX9uAaxbqZz8kaPuyiqv6E8U+P3aQ==", + "10.16.1": "sha512-DhVaomKduGcrSehHXaYiaqS96oX9zf3BU1CHSUbU88kfqvZMvcSl0auAAvRz1cP87c0ZeYnPA5D5ut08BGeHBg==", } diff --git a/package.json b/package.json index 4162cf4c2..159a62956 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "chalk": "5.1.1", "inline-fixtures": "1.1.0", "jsonpath-plus": "7.2.0", - "typescript": "4.9.5" + "typescript": "^5.8.0" }, "pnpm": { "packageExtensions": { @@ -33,8 +33,7 @@ "//1": "these deps are from devDependencies of @kubernetes/client-node and needed for 'prepare' lifecycle hook", "//2": "https://github.com/kubernetes-client/javascript/blob/fc681991e61c6808dd26012a2331f83671a11218/package.json", "dependencies": { - "@types/underscore": "^1.11.4", - "typescript": "~4.9.4" + "typescript": "~5.6.2" } } }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cae7df399..bb7294cf5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,7 +9,7 @@ overrides: semver-max: file:./npm/private/test/vendored/semver-max is-odd: file:./npm/private/test/vendored/is-odd -packageExtensionsChecksum: 4368ccb508aca4e83892ade0753603ce +packageExtensionsChecksum: dbd1907a44683cb2a1ebe7ad47f6c88f patchedDependencies: meaning-of-life@1.0.0: @@ -33,8 +33,8 @@ importers: specifier: 7.2.0 version: 7.2.0 typescript: - specifier: 4.9.5 - version: 4.9.5 + specifier: ^5.8.0 + version: 5.8.2 examples/js_binary: devDependencies: @@ -316,7 +316,7 @@ importers: version: 16.0.1(rollup@4.39.0) '@rollup/plugin-typescript': specifier: 12.1.2 - version: 12.1.2(rollup@4.39.0)(tslib@2.8.1)(typescript@4.9.5) + version: 12.1.2(rollup@4.39.0)(tslib@2.8.1)(typescript@5.8.2) '@types/google-protobuf': specifier: 3.15.12 version: 3.15.12 @@ -333,8 +333,8 @@ importers: specifier: 2.8.1 version: 2.8.1 typescript: - specifier: 4.9.5 - version: 4.9.5 + specifier: ^5.8.0 + version: 5.8.2 npm/private/test: devDependencies: @@ -1755,7 +1755,7 @@ packages: rollup: 4.39.0 dev: true - /@rollup/plugin-typescript@12.1.2(rollup@4.39.0)(tslib@2.8.1)(typescript@4.9.5): + /@rollup/plugin-typescript@12.1.2(rollup@4.39.0)(tslib@2.8.1)(typescript@5.8.2): resolution: {integrity: sha512-cdtSp154H5sv637uMr1a8OTWB0L1SWDSm1rDGiyfcGcvQ6cuTs4MDk2BVEBGysUWago4OJN4EQZqOTl/QY3Jgg==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1772,7 +1772,7 @@ packages: resolve: 1.22.1 rollup: 4.39.0 tslib: 2.8.1 - typescript: 4.9.5 + typescript: 5.8.2 dev: true /@rollup/pluginutils@3.1.0(rollup@2.70.2): @@ -7610,6 +7610,18 @@ packages: hasBin: true dev: true + /typescript@5.6.3: + resolution: {integrity: sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==} + engines: {node: '>=14.17'} + hasBin: true + dev: true + + /typescript@5.8.2: + resolution: {integrity: sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==} + engines: {node: '>=14.17'} + hasBin: true + dev: true + /ufo@1.1.0: resolution: {integrity: sha512-LQc2s/ZDMaCN3QLpa+uzHUOQ7SdV0qgv3VBXOolQGXTaaZpIur6PwUclF5nN2hNkiTRcUugXd1zFOW3FLJ135Q==} dev: true @@ -8202,7 +8214,7 @@ packages: stream-buffers: 3.0.2 tar: 7.4.3 tslib: 2.8.1 - typescript: 4.9.5 + typescript: 5.6.3 ws: 8.18.0(bufferutil@4.0.8) optionalDependencies: openid-client: 5.4.0 diff --git a/tools/preset.bazelrc b/tools/preset.bazelrc index 24815c7f3..39966beae 100644 --- a/tools/preset.bazelrc +++ b/tools/preset.bazelrc @@ -24,6 +24,15 @@ coverage --build_runfile_links common:debug --nocache_test_results # Docs: https://registry.build/flag/bazel@7.6.1?filter=cache_test_results +# Don’t encourage a rules author to update their deps if not needed. +# These bazel_dep calls should indicate the minimum version constraint of the ruleset. +# If the author instead updates to the newest of any of their transitives, as this flag would suggest, +# then they'll also force their dependents to a newer version. +# Context: +# https://bazelbuild.slack.com/archives/C014RARENH0/p1691158021917459?thread_ts=1691156601.420349&cid=C014RARENH0 +common:ruleset --check_direct_dependencies="off" +# Docs: https://registry.build/flag/bazel@7.6.1?filter=check_direct_dependencies + # On CI, use colors to highlight output on the screen. Set to `no` if your CI does not display colors. common:ci --color="yes" # Docs: https://registry.build/flag/bazel@7.6.1?filter=color @@ -148,6 +157,13 @@ common:ci --remote_local_fallback common:ci --remote_timeout=3600 # Docs: https://registry.build/flag/bazel@7.6.1?filter=remote_timeout +# Do not upload locally executed action results to the remote cache. +# This should be the default for local builds so local builds cannot poison the remote cache. +# +# Note that this flag is flipped to True under --config=ci, see below. +common --noremote_upload_local_results +# Docs: https://registry.build/flag/bazel@7.6.1?filter=remote_upload_local_results + # On CI, upload locally executed action results to the remote cache. common:ci --remote_upload_local_results # Docs: https://registry.build/flag/bazel@7.6.1?filter=remote_upload_local_results