From 57c70917098edd42db2ec9f624ed8035c550b365 Mon Sep 17 00:00:00 2001 From: Jason Bedard Date: Sat, 4 Jan 2025 14:43:07 -0800 Subject: [PATCH 1/2] chore: update e2e/pnpm_lockfiles versions --- e2e/pnpm_lockfiles/MODULE.bazel | 6 +- e2e/pnpm_lockfiles/base/package.json | 2 +- e2e/pnpm_lockfiles/lockfile-test.bzl | 6 +- e2e/pnpm_lockfiles/v54/pnpm-lock.yaml | 41 +++++----- e2e/pnpm_lockfiles/v54/snapshots/defs.bzl | 12 +-- .../v54/snapshots/repositories.bzl | 80 +++++++++---------- e2e/pnpm_lockfiles/v60/pnpm-lock.yaml | 29 +++---- e2e/pnpm_lockfiles/v60/snapshots/defs.bzl | 8 +- .../v60/snapshots/repositories.bzl | 60 +++++++------- e2e/pnpm_lockfiles/v61/pnpm-lock.yaml | 29 +++---- e2e/pnpm_lockfiles/v61/snapshots/defs.bzl | 8 +- .../v61/snapshots/repositories.bzl | 60 +++++++------- e2e/pnpm_lockfiles/v90/pnpm-lock.yaml | 49 ++++++------ e2e/pnpm_lockfiles/v90/snapshots/defs.bzl | 12 +-- .../v90/snapshots/repositories.bzl | 80 +++++++++---------- 15 files changed, 243 insertions(+), 239 deletions(-) diff --git a/e2e/pnpm_lockfiles/MODULE.bazel b/e2e/pnpm_lockfiles/MODULE.bazel index 0fd7c0ced..b2566d2bf 100644 --- a/e2e/pnpm_lockfiles/MODULE.bazel +++ b/e2e/pnpm_lockfiles/MODULE.bazel @@ -72,8 +72,8 @@ npm = use_extension( "lock-%s__rollup__3.29.4__links" % version, # Dep only referenced via npm: should have the real package name in the repo name - "lock-%s__at_types_sizzle__2.3.8" % version, - "lock-%s__at_types_sizzle__2.3.8__links" % version, + "lock-%s__at_types_sizzle__2.3.9" % version, + "lock-%s__at_types_sizzle__2.3.9__links" % version, # Dep with peers "lock-%s__at_aspect-test_d__2.0.0_at_aspect-test_c_2.0.2" % version, @@ -82,7 +82,7 @@ npm = use_extension( # Deep with many peers "lock-%s__at_rollup_plugin-typescript__8.2.1_%s" % ( version, - "ommloj5qql5ba6x5wuiluawhoi" if version == "v54" else "1662662592" if version == "v90" else "1813138439", + "3vgsug3mjv7wvue74swjdxifxy" if version == "v54" else "626159424" if version == "v90" else "1813138439", ), # Dep with patch diff --git a/e2e/pnpm_lockfiles/base/package.json b/e2e/pnpm_lockfiles/base/package.json index 028c9dfdd..4ec309573 100644 --- a/e2e/pnpm_lockfiles/base/package.json +++ b/e2e/pnpm_lockfiles/base/package.json @@ -36,7 +36,7 @@ "@aspect-test/b": "5.0.2", "@types/node": "16.18.11", "@types/archiver": "5.3.1", - "alias-only-sizzle": "npm:@types/sizzle@~2.3.8", + "alias-only-sizzle": "npm:@types/sizzle@~2.3.9", "alias-types-node": "npm:@types/node@~16.18.11" }, "optionalDependencies": { diff --git a/e2e/pnpm_lockfiles/lockfile-test.bzl b/e2e/pnpm_lockfiles/lockfile-test.bzl index e5c0e394d..85d9be2ac 100644 --- a/e2e/pnpm_lockfiles/lockfile-test.bzl +++ b/e2e/pnpm_lockfiles/lockfile-test.bzl @@ -106,7 +106,7 @@ def lockfile_test(name = None): # npm: alias to a package that has many peers ":node_modules/rollup-plugin-with-peers", # underlying repo for the many-peers package - "@%s__at_rollup_plugin-typescript__8.2.1_%s//:pkg" % (lock_repo, "ommloj5qql5ba6x5wuiluawhoi" if lock_version == "v54" else "1662662592" if lock_version == "v90" else "1813138439"), + "@%s__at_rollup_plugin-typescript__8.2.1_%s//:pkg" % (lock_repo, "3vgsug3mjv7wvue74swjdxifxy" if lock_version == "v54" else "626159424" if lock_version == "v90" else "1813138439"), # uuv 'hasBin' ":node_modules/uvu", @@ -156,8 +156,8 @@ def lockfile_test(name = None): # npm: alias to package not listed elsewhere ":node_modules/alias-only-sizzle", - ":.aspect_rules_js/node_modules/@types+sizzle@2.3.8", - "@%s__at_types_sizzle__2.3.8//:pkg" % lock_repo, + ":.aspect_rules_js/node_modules/@types+sizzle@2.3.9", + "@%s__at_types_sizzle__2.3.9//:pkg" % lock_repo, # Targets within the virtual store... # Direct dep targets diff --git a/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml index 62f0da297..184db34c0 100644 --- a/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml +++ b/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml @@ -31,7 +31,7 @@ importers: '@scoped/d': ../projects/d '@types/archiver': 5.3.1 '@types/node': 16.18.11 - alias-only-sizzle: npm:@types/sizzle@~2.3.8 + alias-only-sizzle: npm:@types/sizzle@~2.3.9 alias-types-node: npm:@types/node@~16.18.11 aspect-test-a-no-scope: npm:@aspect-test/a aspect-test-a/no-at: npm:@aspect-test/a @@ -77,10 +77,10 @@ importers: jsonify: '@github.com/aspect-build/test-packages/releases/download/0.0.0/@foo-jsonify-0.0.0.tgz' meaning-of-life: 1.0.0_o3deharooos255qt5xdujc3cuq rollup: 2.14.0 - rollup-plugin-with-peers: /@rollup/plugin-typescript/8.2.1_ommloj5qql5ba6x5wuiluawhoi + rollup-plugin-with-peers: /@rollup/plugin-typescript/8.2.1_3vgsug3mjv7wvue74swjdxifxy rollup3: /rollup/3.29.4 scoped/bad: link:../projects/b - tslib: 2.6.3 + tslib: 2.8.1 typescript: 5.5.2 uvu: 0.5.6 optionalDependencies: @@ -89,7 +89,7 @@ importers: '@aspect-test/b': 5.0.2 '@types/archiver': registry.npmjs.org/@types/archiver/5.3.1 '@types/node': registry.npmjs.org/@types/node/16.18.11 - alias-only-sizzle: registry.npmjs.org/@types/sizzle/2.3.8 + alias-only-sizzle: registry.npmjs.org/@types/sizzle/2.3.9 alias-types-node: registry.npmjs.org/@types/node/16.18.11 ../projects/a: @@ -166,7 +166,7 @@ packages: wrap-ansi-cjs: /wrap-ansi/7.0.0 dev: false - /@rollup/plugin-typescript/8.2.1_ommloj5qql5ba6x5wuiluawhoi: + /@rollup/plugin-typescript/8.2.1_3vgsug3mjv7wvue74swjdxifxy: resolution: {integrity: sha512-Qd2E1pleDR4bwyFxqbjt4eJf+wB0UKVMLc7/BAFDGVdAXQMCsD4DUv5/7/ww47BZCYxWtJqe1Lo0KVNswBJlRw==} engines: {node: '>=8.0.0'} peerDependencies: @@ -175,9 +175,9 @@ packages: typescript: '>=3.7.0' dependencies: '@rollup/pluginutils': 3.1.0_rollup@2.14.0 - resolve: 1.22.8 + resolve: 1.22.10 rollup: 2.14.0 - tslib: 2.6.3 + tslib: 2.8.1 typescript: 5.5.2 dev: false @@ -198,8 +198,8 @@ packages: engines: {node: '>=8'} dev: false - /ansi-regex/6.0.1: - resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} + /ansi-regex/6.1.0: + resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==} engines: {node: '>=12'} dev: false @@ -265,8 +265,8 @@ packages: function-bind: 1.1.2 dev: false - /is-core-module/2.15.0: - resolution: {integrity: sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==} + /is-core-module/2.16.1: + resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==} engines: {node: '>= 0.4'} dependencies: hasown: 2.0.2 @@ -340,11 +340,12 @@ packages: engines: {node: '>=8.6'} dev: false - /resolve/1.22.8: - resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} + /resolve/1.22.10: + resolution: {integrity: sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==} + engines: {node: '>= 0.4'} hasBin: true dependencies: - is-core-module: 2.15.0 + is-core-module: 2.16.1 path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 dev: false @@ -401,7 +402,7 @@ packages: resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} engines: {node: '>=12'} dependencies: - ansi-regex: 6.0.1 + ansi-regex: 6.1.0 dev: false /supports-preserve-symlinks-flag/1.0.0: @@ -409,8 +410,8 @@ packages: engines: {node: '>= 0.4'} dev: false - /tslib/2.6.3: - resolution: {integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==} + /tslib/2.8.1: + resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} dev: false /typescript/5.5.2: @@ -534,8 +535,8 @@ packages: version: 16.18.11 dev: true - registry.npmjs.org/@types/sizzle/2.3.8: - resolution: {integrity: sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz} + registry.npmjs.org/@types/sizzle/2.3.9: + resolution: {integrity: sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz} name: '@types/sizzle' - version: 2.3.8 + version: 2.3.9 dev: true diff --git a/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl index 0ee188618..8924db26d 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.0.1__links//:defs.bzl", store_1 = "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-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") @@ -11,14 +11,14 @@ load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.2__links/ load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0_at_aspect-test_c_2.0.2__links//:defs.bzl", store_8 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_foo_jsonify__at_github.com_aspect-build_test-packages_releases_download_0.0.0_at_foo-jsonify-0.0.0.tgz__links//:defs.bzl", link_9 = "npm_link_imported_package_store", store_9 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_isaacs_cliui__8.0.2__links//:defs.bzl", link_10 = "npm_link_imported_package_store", store_10 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_rollup_plugin-typescript__8.2.1_ommloj5qql5ba6x5wuiluawhoi__links//:defs.bzl", link_11 = "npm_link_imported_package_store", store_11 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_rollup_plugin-typescript__8.2.1_3vgsug3mjv7wvue74swjdxifxy__links//:defs.bzl", link_11 = "npm_link_imported_package_store", store_11 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_rollup_pluginutils__3.1.0_rollup_2.14.0__links//:defs.bzl", store_12 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_types_archiver__5.3.1__links//:defs.bzl", link_13 = "npm_link_imported_package_store", store_13 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_types_estree__0.0.39__links//:defs.bzl", store_14 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_types_glob__8.1.0__links//:defs.bzl", store_15 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_types_minimatch__5.1.2__links//:defs.bzl", store_16 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_types_node__16.18.11__links//:defs.bzl", link_17 = "npm_link_imported_package_store", store_17 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_sizzle__2.3.8__links//:defs.bzl", link_18 = "npm_link_imported_package_store", store_18 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_sizzle__2.3.9__links//:defs.bzl", link_18 = "npm_link_imported_package_store", store_18 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__color-convert__2.0.1__links//:defs.bzl", store_19 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__color-name__1.1.4__links//:defs.bzl", store_20 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__debug__github.com_ngokevin_debug_9742c5f383a6f8046241920156236ade8ec30d53__links//:defs.bzl", link_21 = "npm_link_imported_package_store", store_21 = "npm_imported_package_store") @@ -32,7 +32,7 @@ load("@@aspect_rules_js~~npm~lock-__fsevents__2.3.3__links//:defs.b load("@@aspect_rules_js~~npm~lock-__function-bind__1.1.2__links//:defs.bzl", store_29 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__hasown__2.0.2__links//:defs.bzl", store_30 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__hello__at_gitpkg.vercel.app_EqualMa_gitpkg-hello_packages_hello__links//:defs.bzl", link_31 = "npm_link_imported_package_store", store_31 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__is-core-module__2.15.0__links//:defs.bzl", store_32 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__is-core-module__2.16.1__links//:defs.bzl", store_32 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__is-fullwidth-code-point__3.0.0__links//:defs.bzl", store_33 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__is-odd__0.1.0__links//:defs.bzl", link_34 = "npm_link_imported_package_store", store_34 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__is-odd__1.0.0__links//:defs.bzl", link_35 = "npm_link_imported_package_store", store_35 = "npm_imported_package_store") @@ -46,7 +46,7 @@ load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_43 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__path-parse__1.0.7__links//:defs.bzl", store_44 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__picomatch__2.3.1__links//:defs.bzl", store_45 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__resolve__1.22.8__links//:defs.bzl", store_46 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__resolve__1.22.10__links//:defs.bzl", store_46 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__rollup__2.14.0__links//:defs.bzl", link_47 = "npm_link_imported_package_store", store_47 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__rollup__3.29.4__links//:defs.bzl", link_48 = "npm_link_imported_package_store", store_48 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_49 = "npm_imported_package_store") @@ -55,7 +55,7 @@ load("@@aspect_rules_js~~npm~lock-__string-width__5.1.2__links//:de load("@@aspect_rules_js~~npm~lock-__strip-ansi__6.0.1__links//:defs.bzl", store_52 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__strip-ansi__7.1.0__links//:defs.bzl", store_53 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__supports-preserve-symlinks-flag__1.0.0__links//:defs.bzl", store_54 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__tslib__2.6.3__links//:defs.bzl", link_55 = "npm_link_imported_package_store", store_55 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__tslib__2.8.1__links//:defs.bzl", link_55 = "npm_link_imported_package_store", store_55 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__typescript__5.5.2__links//:defs.bzl", link_56 = "npm_link_imported_package_store", store_56 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_57 = "npm_link_imported_package_store", store_57 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__wrap-ansi__7.0.0__links//:defs.bzl", store_58 = "npm_imported_package_store") diff --git a/e2e/pnpm_lockfiles/v54/snapshots/repositories.bzl b/e2e/pnpm_lockfiles/v54/snapshots/repositories.bzl index 5d867df7d..6ef5457f9 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.0.1", + name = "lock-__ansi-regex__6.1.0", root_package = "", link_workspace = "", link_packages = {}, package = "ansi-regex", - version = "6.0.1", - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + version = "6.1.0", + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + integrity = "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", transitive_closure = { - "ansi-regex": ["6.0.1"], + "ansi-regex": ["6.1.0"], }, ) @@ -224,7 +224,7 @@ def npm_repositories(): }, transitive_closure = { "@isaacs/cliui": ["8.0.2"], - "ansi-regex": ["5.0.1", "6.0.1"], + "ansi-regex": ["5.0.1", "6.1.0"], "ansi-styles": ["4.3.0", "6.2.1"], "color-convert": ["2.0.1"], "color-name": ["1.1.4"], @@ -238,40 +238,40 @@ def npm_repositories(): ) npm_import( - name = "lock-__at_rollup_plugin-typescript__8.2.1_ommloj5qql5ba6x5wuiluawhoi", + name = "lock-__at_rollup_plugin-typescript__8.2.1_3vgsug3mjv7wvue74swjdxifxy", root_package = "", link_workspace = "", link_packages = { "": ["rollup-plugin-with-peers"], }, package = "@rollup/plugin-typescript", - version = "8.2.1_ommloj5qql5ba6x5wuiluawhoi", + version = "8.2.1_3vgsug3mjv7wvue74swjdxifxy", url = "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-8.2.1.tgz", system_tar = "", package_visibility = ["//visibility:public"], integrity = "sha512-Qd2E1pleDR4bwyFxqbjt4eJf+wB0UKVMLc7/BAFDGVdAXQMCsD4DUv5/7/ww47BZCYxWtJqe1Lo0KVNswBJlRw==", deps = { "@rollup/pluginutils": "3.1.0_rollup_2.14.0", - "resolve": "1.22.8", + "resolve": "1.22.10", "rollup": "2.14.0", - "tslib": "2.6.3", + "tslib": "2.8.1", "typescript": "5.5.2", }, transitive_closure = { - "@rollup/plugin-typescript": ["8.2.1_ommloj5qql5ba6x5wuiluawhoi"], + "@rollup/plugin-typescript": ["8.2.1_3vgsug3mjv7wvue74swjdxifxy"], "@rollup/pluginutils": ["3.1.0_rollup_2.14.0"], "@types/estree": ["0.0.39"], "estree-walker": ["1.0.1"], "fsevents": ["2.3.3"], "function-bind": ["1.1.2"], "hasown": ["2.0.2"], - "is-core-module": ["2.15.0"], + "is-core-module": ["2.16.1"], "path-parse": ["1.0.7"], "picomatch": ["2.3.1"], - "resolve": ["1.22.8"], + "resolve": ["1.22.10"], "rollup": ["2.14.0"], "supports-preserve-symlinks-flag": ["1.0.0"], - "tslib": ["2.6.3"], + "tslib": ["2.8.1"], "typescript": ["5.5.2"], }, ) @@ -404,21 +404,21 @@ def npm_repositories(): ) npm_import( - name = "lock-__at_types_sizzle__2.3.8", + name = "lock-__at_types_sizzle__2.3.9", root_package = "", link_workspace = "", link_packages = { "": ["alias-only-sizzle"], }, package = "@types/sizzle", - version = "2.3.8", - url = "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.8.tgz", + version = "2.3.9", + url = "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.9.tgz", system_tar = "", package_visibility = ["//visibility:public"], dev = True, - integrity = "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==", + integrity = "sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==", transitive_closure = { - "@types/sizzle": ["2.3.8"], + "@types/sizzle": ["2.3.9"], }, ) @@ -644,23 +644,23 @@ def npm_repositories(): ) npm_import( - name = "lock-__is-core-module__2.15.0", + name = "lock-__is-core-module__2.16.1", root_package = "", link_workspace = "", link_packages = {}, package = "is-core-module", - version = "2.15.0", - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz", + version = "2.16.1", + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==", + integrity = "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", deps = { "hasown": "2.0.2", }, transitive_closure = { "function-bind": ["1.1.2"], "hasown": ["2.0.2"], - "is-core-module": ["2.15.0"], + "is-core-module": ["2.16.1"], }, ) @@ -908,27 +908,27 @@ def npm_repositories(): ) npm_import( - name = "lock-__resolve__1.22.8", + name = "lock-__resolve__1.22.10", root_package = "", link_workspace = "", link_packages = {}, package = "resolve", - version = "1.22.8", - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + version = "1.22.10", + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + integrity = "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", deps = { - "is-core-module": "2.15.0", + "is-core-module": "2.16.1", "path-parse": "1.0.7", "supports-preserve-symlinks-flag": "1.0.0", }, transitive_closure = { "function-bind": ["1.1.2"], "hasown": ["2.0.2"], - "is-core-module": ["2.15.0"], + "is-core-module": ["2.16.1"], "path-parse": ["1.0.7"], - "resolve": ["1.22.8"], + "resolve": ["1.22.10"], "supports-preserve-symlinks-flag": ["1.0.0"], }, ) @@ -1039,7 +1039,7 @@ def npm_repositories(): "strip-ansi": "7.1.0", }, transitive_closure = { - "ansi-regex": ["6.0.1"], + "ansi-regex": ["6.1.0"], "eastasianwidth": ["0.2.0"], "emoji-regex": ["9.2.2"], "string-width": ["5.1.2"], @@ -1079,10 +1079,10 @@ def npm_repositories(): package_visibility = ["//visibility:public"], integrity = "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", deps = { - "ansi-regex": "6.0.1", + "ansi-regex": "6.1.0", }, transitive_closure = { - "ansi-regex": ["6.0.1"], + "ansi-regex": ["6.1.0"], "strip-ansi": ["7.1.0"], }, ) @@ -1104,20 +1104,20 @@ def npm_repositories(): ) npm_import( - name = "lock-__tslib__2.6.3", + name = "lock-__tslib__2.8.1", root_package = "", link_workspace = "", link_packages = { "": ["tslib"], }, package = "tslib", - version = "2.6.3", - url = "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", + version = "2.8.1", + url = "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==", + integrity = "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", transitive_closure = { - "tslib": ["2.6.3"], + "tslib": ["2.8.1"], }, ) @@ -1214,7 +1214,7 @@ def npm_repositories(): "strip-ansi": "7.1.0", }, transitive_closure = { - "ansi-regex": ["6.0.1"], + "ansi-regex": ["6.1.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 e833321c3..71606432f 100644 --- a/e2e/pnpm_lockfiles/v60/pnpm-lock.yaml +++ b/e2e/pnpm_lockfiles/v60/pnpm-lock.yaml @@ -123,8 +123,8 @@ importers: specifier: 16.18.11 version: registry.npmjs.org/@types/node@16.18.11 alias-only-sizzle: - specifier: npm:@types/sizzle@~2.3.8 - version: registry.npmjs.org/@types/sizzle@2.3.8 + specifier: npm:@types/sizzle@~2.3.9 + version: registry.npmjs.org/@types/sizzle@2.3.9 alias-types-node: specifier: npm:@types/node@~16.18.11 version: registry.npmjs.org/@types/node@16.18.11 @@ -215,7 +215,7 @@ packages: typescript: '>=3.7.0' dependencies: '@rollup/pluginutils': 3.1.0(rollup@3.29.4) - resolve: 1.22.8 + resolve: 1.22.10 rollup: 3.29.4 tslib: 2.6.3 typescript: 5.5.2 @@ -238,8 +238,8 @@ packages: engines: {node: '>=8'} dev: false - /ansi-regex@6.0.1: - resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} + /ansi-regex@6.1.0: + resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==} engines: {node: '>=12'} dev: false @@ -305,8 +305,8 @@ packages: function-bind: 1.1.2 dev: false - /is-core-module@2.15.0: - resolution: {integrity: sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==} + /is-core-module@2.16.1: + resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==} engines: {node: '>= 0.4'} dependencies: hasown: 2.0.2 @@ -380,11 +380,12 @@ packages: engines: {node: '>=8.6'} dev: false - /resolve@1.22.8: - resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} + /resolve@1.22.10: + resolution: {integrity: sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==} + engines: {node: '>= 0.4'} hasBin: true dependencies: - is-core-module: 2.15.0 + is-core-module: 2.16.1 path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 dev: false @@ -441,7 +442,7 @@ packages: resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} engines: {node: '>=12'} dependencies: - ansi-regex: 6.0.1 + ansi-regex: 6.1.0 dev: false /supports-preserve-symlinks-flag@1.0.0: @@ -574,8 +575,8 @@ packages: version: 16.18.11 dev: true - registry.npmjs.org/@types/sizzle@2.3.8: - resolution: {integrity: sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz} + registry.npmjs.org/@types/sizzle@2.3.9: + resolution: {integrity: sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz} name: '@types/sizzle' - version: 2.3.8 + version: 2.3.9 dev: true diff --git a/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl index e5439de91..2f865b3bc 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.0.1__links//:defs.bzl", store_1 = "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-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") @@ -19,7 +19,7 @@ load("@@aspect_rules_js~~npm~lock-__at_types_estree__0.0.39__links/ load("@@aspect_rules_js~~npm~lock-__at_types_glob__8.1.0__links//:defs.bzl", store_16 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_types_minimatch__5.1.2__links//:defs.bzl", store_17 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_types_node__16.18.11__links//:defs.bzl", link_18 = "npm_link_imported_package_store", store_18 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_sizzle__2.3.8__links//:defs.bzl", link_19 = "npm_link_imported_package_store", store_19 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_sizzle__2.3.9__links//:defs.bzl", link_19 = "npm_link_imported_package_store", store_19 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__color-convert__2.0.1__links//:defs.bzl", store_20 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__color-name__1.1.4__links//:defs.bzl", store_21 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__debug__github.com_ngokevin_debug_9742c5f383a6f8046241920156236ade8ec30d53__links//:defs.bzl", link_22 = "npm_link_imported_package_store", store_22 = "npm_imported_package_store") @@ -33,7 +33,7 @@ load("@@aspect_rules_js~~npm~lock-__fsevents__2.3.3__links//:defs.b load("@@aspect_rules_js~~npm~lock-__function-bind__1.1.2__links//:defs.bzl", store_30 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__hasown__2.0.2__links//:defs.bzl", store_31 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__hello__at_gitpkg.vercel.app_EqualMa_gitpkg-hello_packages_hello__links//:defs.bzl", link_32 = "npm_link_imported_package_store", store_32 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__is-core-module__2.15.0__links//:defs.bzl", store_33 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__is-core-module__2.16.1__links//:defs.bzl", store_33 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__is-fullwidth-code-point__3.0.0__links//:defs.bzl", store_34 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__is-odd__0.1.0__links//:defs.bzl", link_35 = "npm_link_imported_package_store", store_35 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__is-odd__1.0.0__links//:defs.bzl", link_36 = "npm_link_imported_package_store", store_36 = "npm_imported_package_store") @@ -47,7 +47,7 @@ load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_44 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__path-parse__1.0.7__links//:defs.bzl", store_45 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__picomatch__2.3.1__links//:defs.bzl", store_46 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__resolve__1.22.8__links//:defs.bzl", store_47 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__resolve__1.22.10__links//:defs.bzl", store_47 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__rollup__2.14.0__links//:defs.bzl", link_48 = "npm_link_imported_package_store", store_48 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__rollup__3.29.4__links//:defs.bzl", link_49 = "npm_link_imported_package_store", store_49 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_50 = "npm_imported_package_store") diff --git a/e2e/pnpm_lockfiles/v60/snapshots/repositories.bzl b/e2e/pnpm_lockfiles/v60/snapshots/repositories.bzl index a97b6b735..13b0c96c5 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.0.1", + name = "lock-__ansi-regex__6.1.0", root_package = "", link_workspace = "", link_packages = {}, package = "ansi-regex", - version = "6.0.1", - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + version = "6.1.0", + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + integrity = "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", transitive_closure = { - "ansi-regex": ["6.0.1"], + "ansi-regex": ["6.1.0"], }, ) @@ -242,7 +242,7 @@ def npm_repositories(): }, transitive_closure = { "@isaacs/cliui": ["8.0.2"], - "ansi-regex": ["5.0.1", "6.0.1"], + "ansi-regex": ["5.0.1", "6.1.0"], "ansi-styles": ["4.3.0", "6.2.1"], "color-convert": ["2.0.1"], "color-name": ["1.1.4"], @@ -270,7 +270,7 @@ def npm_repositories(): integrity = "sha512-Qd2E1pleDR4bwyFxqbjt4eJf+wB0UKVMLc7/BAFDGVdAXQMCsD4DUv5/7/ww47BZCYxWtJqe1Lo0KVNswBJlRw==", deps = { "@rollup/pluginutils": "3.1.0_rollup_3.29.4", - "resolve": "1.22.8", + "resolve": "1.22.10", "rollup": "3.29.4", "tslib": "2.6.3", "typescript": "5.5.2", @@ -283,10 +283,10 @@ def npm_repositories(): "fsevents": ["2.3.3"], "function-bind": ["1.1.2"], "hasown": ["2.0.2"], - "is-core-module": ["2.15.0"], + "is-core-module": ["2.16.1"], "path-parse": ["1.0.7"], "picomatch": ["2.3.1"], - "resolve": ["1.22.8"], + "resolve": ["1.22.10"], "rollup": ["3.29.4"], "supports-preserve-symlinks-flag": ["1.0.0"], "tslib": ["2.6.3"], @@ -422,21 +422,21 @@ def npm_repositories(): ) npm_import( - name = "lock-__at_types_sizzle__2.3.8", + name = "lock-__at_types_sizzle__2.3.9", root_package = "", link_workspace = "", link_packages = { "": ["alias-only-sizzle"], }, package = "@types/sizzle", - version = "2.3.8", - url = "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.8.tgz", + version = "2.3.9", + url = "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.9.tgz", system_tar = "", package_visibility = ["//visibility:public"], dev = True, - integrity = "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==", + integrity = "sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==", transitive_closure = { - "@types/sizzle": ["2.3.8"], + "@types/sizzle": ["2.3.9"], }, ) @@ -662,23 +662,23 @@ def npm_repositories(): ) npm_import( - name = "lock-__is-core-module__2.15.0", + name = "lock-__is-core-module__2.16.1", root_package = "", link_workspace = "", link_packages = {}, package = "is-core-module", - version = "2.15.0", - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz", + version = "2.16.1", + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==", + integrity = "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", deps = { "hasown": "2.0.2", }, transitive_closure = { "function-bind": ["1.1.2"], "hasown": ["2.0.2"], - "is-core-module": ["2.15.0"], + "is-core-module": ["2.16.1"], }, ) @@ -926,27 +926,27 @@ def npm_repositories(): ) npm_import( - name = "lock-__resolve__1.22.8", + name = "lock-__resolve__1.22.10", root_package = "", link_workspace = "", link_packages = {}, package = "resolve", - version = "1.22.8", - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + version = "1.22.10", + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + integrity = "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", deps = { - "is-core-module": "2.15.0", + "is-core-module": "2.16.1", "path-parse": "1.0.7", "supports-preserve-symlinks-flag": "1.0.0", }, transitive_closure = { "function-bind": ["1.1.2"], "hasown": ["2.0.2"], - "is-core-module": ["2.15.0"], + "is-core-module": ["2.16.1"], "path-parse": ["1.0.7"], - "resolve": ["1.22.8"], + "resolve": ["1.22.10"], "supports-preserve-symlinks-flag": ["1.0.0"], }, ) @@ -1057,7 +1057,7 @@ def npm_repositories(): "strip-ansi": "7.1.0", }, transitive_closure = { - "ansi-regex": ["6.0.1"], + "ansi-regex": ["6.1.0"], "eastasianwidth": ["0.2.0"], "emoji-regex": ["9.2.2"], "string-width": ["5.1.2"], @@ -1097,10 +1097,10 @@ def npm_repositories(): package_visibility = ["//visibility:public"], integrity = "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", deps = { - "ansi-regex": "6.0.1", + "ansi-regex": "6.1.0", }, transitive_closure = { - "ansi-regex": ["6.0.1"], + "ansi-regex": ["6.1.0"], "strip-ansi": ["7.1.0"], }, ) @@ -1232,7 +1232,7 @@ def npm_repositories(): "strip-ansi": "7.1.0", }, transitive_closure = { - "ansi-regex": ["6.0.1"], + "ansi-regex": ["6.1.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 e2a9342ad..a5a8a932c 100644 --- a/e2e/pnpm_lockfiles/v61/pnpm-lock.yaml +++ b/e2e/pnpm_lockfiles/v61/pnpm-lock.yaml @@ -127,8 +127,8 @@ importers: specifier: 16.18.11 version: registry.npmjs.org/@types/node@16.18.11 alias-only-sizzle: - specifier: npm:@types/sizzle@~2.3.8 - version: registry.npmjs.org/@types/sizzle@2.3.8 + specifier: npm:@types/sizzle@~2.3.9 + version: registry.npmjs.org/@types/sizzle@2.3.9 alias-types-node: specifier: npm:@types/node@~16.18.11 version: registry.npmjs.org/@types/node@16.18.11 @@ -219,7 +219,7 @@ packages: typescript: '>=3.7.0' dependencies: '@rollup/pluginutils': 3.1.0(rollup@3.29.4) - resolve: 1.22.8 + resolve: 1.22.10 rollup: 3.29.4 tslib: 2.6.3 typescript: 5.5.2 @@ -242,8 +242,8 @@ packages: engines: {node: '>=8'} dev: false - /ansi-regex@6.0.1: - resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} + /ansi-regex@6.1.0: + resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==} engines: {node: '>=12'} dev: false @@ -309,8 +309,8 @@ packages: function-bind: 1.1.2 dev: false - /is-core-module@2.15.0: - resolution: {integrity: sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==} + /is-core-module@2.16.1: + resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==} engines: {node: '>= 0.4'} dependencies: hasown: 2.0.2 @@ -384,11 +384,12 @@ packages: engines: {node: '>=8.6'} dev: false - /resolve@1.22.8: - resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} + /resolve@1.22.10: + resolution: {integrity: sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==} + engines: {node: '>= 0.4'} hasBin: true dependencies: - is-core-module: 2.15.0 + is-core-module: 2.16.1 path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 dev: false @@ -445,7 +446,7 @@ packages: resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} engines: {node: '>=12'} dependencies: - ansi-regex: 6.0.1 + ansi-regex: 6.1.0 dev: false /supports-preserve-symlinks-flag@1.0.0: @@ -578,8 +579,8 @@ packages: version: 16.18.11 dev: true - registry.npmjs.org/@types/sizzle@2.3.8: - resolution: {integrity: sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz} + registry.npmjs.org/@types/sizzle@2.3.9: + resolution: {integrity: sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz} name: '@types/sizzle' - version: 2.3.8 + version: 2.3.9 dev: true diff --git a/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl index e5439de91..2f865b3bc 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.0.1__links//:defs.bzl", store_1 = "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-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") @@ -19,7 +19,7 @@ load("@@aspect_rules_js~~npm~lock-__at_types_estree__0.0.39__links/ load("@@aspect_rules_js~~npm~lock-__at_types_glob__8.1.0__links//:defs.bzl", store_16 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_types_minimatch__5.1.2__links//:defs.bzl", store_17 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_types_node__16.18.11__links//:defs.bzl", link_18 = "npm_link_imported_package_store", store_18 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_sizzle__2.3.8__links//:defs.bzl", link_19 = "npm_link_imported_package_store", store_19 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_sizzle__2.3.9__links//:defs.bzl", link_19 = "npm_link_imported_package_store", store_19 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__color-convert__2.0.1__links//:defs.bzl", store_20 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__color-name__1.1.4__links//:defs.bzl", store_21 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__debug__github.com_ngokevin_debug_9742c5f383a6f8046241920156236ade8ec30d53__links//:defs.bzl", link_22 = "npm_link_imported_package_store", store_22 = "npm_imported_package_store") @@ -33,7 +33,7 @@ load("@@aspect_rules_js~~npm~lock-__fsevents__2.3.3__links//:defs.b load("@@aspect_rules_js~~npm~lock-__function-bind__1.1.2__links//:defs.bzl", store_30 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__hasown__2.0.2__links//:defs.bzl", store_31 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__hello__at_gitpkg.vercel.app_EqualMa_gitpkg-hello_packages_hello__links//:defs.bzl", link_32 = "npm_link_imported_package_store", store_32 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__is-core-module__2.15.0__links//:defs.bzl", store_33 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__is-core-module__2.16.1__links//:defs.bzl", store_33 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__is-fullwidth-code-point__3.0.0__links//:defs.bzl", store_34 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__is-odd__0.1.0__links//:defs.bzl", link_35 = "npm_link_imported_package_store", store_35 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__is-odd__1.0.0__links//:defs.bzl", link_36 = "npm_link_imported_package_store", store_36 = "npm_imported_package_store") @@ -47,7 +47,7 @@ load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_44 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__path-parse__1.0.7__links//:defs.bzl", store_45 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__picomatch__2.3.1__links//:defs.bzl", store_46 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__resolve__1.22.8__links//:defs.bzl", store_47 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__resolve__1.22.10__links//:defs.bzl", store_47 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__rollup__2.14.0__links//:defs.bzl", link_48 = "npm_link_imported_package_store", store_48 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__rollup__3.29.4__links//:defs.bzl", link_49 = "npm_link_imported_package_store", store_49 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_50 = "npm_imported_package_store") diff --git a/e2e/pnpm_lockfiles/v61/snapshots/repositories.bzl b/e2e/pnpm_lockfiles/v61/snapshots/repositories.bzl index a97b6b735..13b0c96c5 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.0.1", + name = "lock-__ansi-regex__6.1.0", root_package = "", link_workspace = "", link_packages = {}, package = "ansi-regex", - version = "6.0.1", - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + version = "6.1.0", + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + integrity = "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", transitive_closure = { - "ansi-regex": ["6.0.1"], + "ansi-regex": ["6.1.0"], }, ) @@ -242,7 +242,7 @@ def npm_repositories(): }, transitive_closure = { "@isaacs/cliui": ["8.0.2"], - "ansi-regex": ["5.0.1", "6.0.1"], + "ansi-regex": ["5.0.1", "6.1.0"], "ansi-styles": ["4.3.0", "6.2.1"], "color-convert": ["2.0.1"], "color-name": ["1.1.4"], @@ -270,7 +270,7 @@ def npm_repositories(): integrity = "sha512-Qd2E1pleDR4bwyFxqbjt4eJf+wB0UKVMLc7/BAFDGVdAXQMCsD4DUv5/7/ww47BZCYxWtJqe1Lo0KVNswBJlRw==", deps = { "@rollup/pluginutils": "3.1.0_rollup_3.29.4", - "resolve": "1.22.8", + "resolve": "1.22.10", "rollup": "3.29.4", "tslib": "2.6.3", "typescript": "5.5.2", @@ -283,10 +283,10 @@ def npm_repositories(): "fsevents": ["2.3.3"], "function-bind": ["1.1.2"], "hasown": ["2.0.2"], - "is-core-module": ["2.15.0"], + "is-core-module": ["2.16.1"], "path-parse": ["1.0.7"], "picomatch": ["2.3.1"], - "resolve": ["1.22.8"], + "resolve": ["1.22.10"], "rollup": ["3.29.4"], "supports-preserve-symlinks-flag": ["1.0.0"], "tslib": ["2.6.3"], @@ -422,21 +422,21 @@ def npm_repositories(): ) npm_import( - name = "lock-__at_types_sizzle__2.3.8", + name = "lock-__at_types_sizzle__2.3.9", root_package = "", link_workspace = "", link_packages = { "": ["alias-only-sizzle"], }, package = "@types/sizzle", - version = "2.3.8", - url = "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.8.tgz", + version = "2.3.9", + url = "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.9.tgz", system_tar = "", package_visibility = ["//visibility:public"], dev = True, - integrity = "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==", + integrity = "sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==", transitive_closure = { - "@types/sizzle": ["2.3.8"], + "@types/sizzle": ["2.3.9"], }, ) @@ -662,23 +662,23 @@ def npm_repositories(): ) npm_import( - name = "lock-__is-core-module__2.15.0", + name = "lock-__is-core-module__2.16.1", root_package = "", link_workspace = "", link_packages = {}, package = "is-core-module", - version = "2.15.0", - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz", + version = "2.16.1", + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==", + integrity = "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", deps = { "hasown": "2.0.2", }, transitive_closure = { "function-bind": ["1.1.2"], "hasown": ["2.0.2"], - "is-core-module": ["2.15.0"], + "is-core-module": ["2.16.1"], }, ) @@ -926,27 +926,27 @@ def npm_repositories(): ) npm_import( - name = "lock-__resolve__1.22.8", + name = "lock-__resolve__1.22.10", root_package = "", link_workspace = "", link_packages = {}, package = "resolve", - version = "1.22.8", - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + version = "1.22.10", + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + integrity = "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", deps = { - "is-core-module": "2.15.0", + "is-core-module": "2.16.1", "path-parse": "1.0.7", "supports-preserve-symlinks-flag": "1.0.0", }, transitive_closure = { "function-bind": ["1.1.2"], "hasown": ["2.0.2"], - "is-core-module": ["2.15.0"], + "is-core-module": ["2.16.1"], "path-parse": ["1.0.7"], - "resolve": ["1.22.8"], + "resolve": ["1.22.10"], "supports-preserve-symlinks-flag": ["1.0.0"], }, ) @@ -1057,7 +1057,7 @@ def npm_repositories(): "strip-ansi": "7.1.0", }, transitive_closure = { - "ansi-regex": ["6.0.1"], + "ansi-regex": ["6.1.0"], "eastasianwidth": ["0.2.0"], "emoji-regex": ["9.2.2"], "string-width": ["5.1.2"], @@ -1097,10 +1097,10 @@ def npm_repositories(): package_visibility = ["//visibility:public"], integrity = "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", deps = { - "ansi-regex": "6.0.1", + "ansi-regex": "6.1.0", }, transitive_closure = { - "ansi-regex": ["6.0.1"], + "ansi-regex": ["6.1.0"], "strip-ansi": ["7.1.0"], }, ) @@ -1232,7 +1232,7 @@ def npm_repositories(): "strip-ansi": "7.1.0", }, transitive_closure = { - "ansi-regex": ["6.0.1"], + "ansi-regex": ["6.1.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 a40086ed3..adc4262a6 100644 --- a/e2e/pnpm_lockfiles/v90/pnpm-lock.yaml +++ b/e2e/pnpm_lockfiles/v90/pnpm-lock.yaml @@ -93,7 +93,7 @@ importers: version: 2.14.0 rollup-plugin-with-peers: specifier: npm:@rollup/plugin-typescript@8.2.1 - version: '@rollup/plugin-typescript@8.2.1(rollup@2.14.0)(tslib@2.6.3)(typescript@5.5.2)' + version: '@rollup/plugin-typescript@8.2.1(rollup@2.14.0)(tslib@2.8.1)(typescript@5.5.2)' rollup3: specifier: npm:rollup@3.29.4 version: rollup@3.29.4 @@ -102,7 +102,7 @@ importers: version: link:../projects/b tslib: specifier: ^2.6.3 - version: 2.6.3 + version: 2.8.1 typescript: specifier: 5.5.2 version: 5.5.2 @@ -124,8 +124,8 @@ importers: specifier: 16.18.11 version: 16.18.11 alias-only-sizzle: - specifier: npm:@types/sizzle@~2.3.8 - version: '@types/sizzle@2.3.8' + specifier: npm:@types/sizzle@~2.3.9 + version: '@types/sizzle@2.3.9' alias-types-node: specifier: npm:@types/node@~16.18.11 version: '@types/node@16.18.11' @@ -220,15 +220,15 @@ packages: '@types/node@16.18.11': resolution: {integrity: sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA==, tarball: https://registry.npmjs.org/@types/node/-/node-16.18.11.tgz} - '@types/sizzle@2.3.8': - resolution: {integrity: sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==, tarball: https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz} + '@types/sizzle@2.3.9': + resolution: {integrity: sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==, tarball: https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz} ansi-regex@5.0.1: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} - ansi-regex@6.0.1: - resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} + ansi-regex@6.1.0: + resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==} engines: {node: '>=12'} ansi-styles@4.3.0: @@ -292,8 +292,8 @@ packages: resolution: {tarball: https://gitpkg.vercel.app/EqualMa/gitpkg-hello/packages/hello} version: 1.0.0 - is-core-module@2.15.0: - resolution: {integrity: sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==} + is-core-module@2.16.1: + resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==} engines: {node: '>= 0.4'} is-fullwidth-code-point@3.0.0: @@ -348,8 +348,9 @@ packages: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} - resolve@1.22.8: - resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} + resolve@1.22.10: + resolution: {integrity: sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==} + engines: {node: '>= 0.4'} hasBin: true rollup@2.14.0: @@ -386,8 +387,8 @@ packages: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} - tslib@2.6.3: - resolution: {integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==} + tslib@2.8.1: + resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} typescript@5.5.2: resolution: {integrity: sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==} @@ -443,12 +444,12 @@ snapshots: wrap-ansi: 8.1.0 wrap-ansi-cjs: wrap-ansi@7.0.0 - '@rollup/plugin-typescript@8.2.1(rollup@2.14.0)(tslib@2.6.3)(typescript@5.5.2)': + '@rollup/plugin-typescript@8.2.1(rollup@2.14.0)(tslib@2.8.1)(typescript@5.5.2)': dependencies: '@rollup/pluginutils': 3.1.0(rollup@2.14.0) - resolve: 1.22.8 + resolve: 1.22.10 rollup: 2.14.0 - tslib: 2.6.3 + tslib: 2.8.1 typescript: 5.5.2 '@rollup/pluginutils@3.1.0(rollup@2.14.0)': @@ -477,11 +478,11 @@ snapshots: '@types/node@16.18.11': {} - '@types/sizzle@2.3.8': {} + '@types/sizzle@2.3.9': {} ansi-regex@5.0.1: {} - ansi-regex@6.0.1: {} + ansi-regex@6.1.0: {} ansi-styles@4.3.0: dependencies: @@ -522,7 +523,7 @@ snapshots: hello@https://gitpkg.vercel.app/EqualMa/gitpkg-hello/packages/hello: {} - is-core-module@2.15.0: + is-core-module@2.16.1: dependencies: hasown: 2.0.2 @@ -564,9 +565,9 @@ snapshots: picomatch@2.3.1: {} - resolve@1.22.8: + resolve@1.22.10: dependencies: - is-core-module: 2.15.0 + is-core-module: 2.16.1 path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 @@ -600,11 +601,11 @@ snapshots: strip-ansi@7.1.0: dependencies: - ansi-regex: 6.0.1 + ansi-regex: 6.1.0 supports-preserve-symlinks-flag@1.0.0: {} - tslib@2.6.3: {} + tslib@2.8.1: {} typescript@5.5.2: {} diff --git a/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl index 08e4cee82..747648189 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.0.1__links//:defs.bzl", store_1 = "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-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") @@ -12,14 +12,14 @@ load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0_at_aspe load("@@aspect_rules_js~~npm~lock-__at_aspect-test_e__1.0.0__links//:defs.bzl", link_9 = "npm_link_imported_package_store", store_9 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_foo_jsonify__https___github.com_aspect-build_test-packages_releases_download_0.0.0_at_foo-jsonify-0.0.0.tgz__links//:defs.bzl", link_10 = "npm_link_imported_package_store", store_10 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_isaacs_cliui__8.0.2__links//:defs.bzl", link_11 = "npm_link_imported_package_store", store_11 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_rollup_plugin-typescript__8.2.1_1662662592__links//:defs.bzl", link_12 = "npm_link_imported_package_store", store_12 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_rollup_plugin-typescript__8.2.1_626159424__links//:defs.bzl", link_12 = "npm_link_imported_package_store", store_12 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_rollup_pluginutils__3.1.0_rollup_2.14.0__links//:defs.bzl", store_13 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_types_archiver__5.3.1__links//:defs.bzl", link_14 = "npm_link_imported_package_store", store_14 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_types_estree__0.0.39__links//:defs.bzl", store_15 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_types_glob__8.1.0__links//:defs.bzl", store_16 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_types_minimatch__5.1.2__links//:defs.bzl", store_17 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_types_node__16.18.11__links//:defs.bzl", link_18 = "npm_link_imported_package_store", store_18 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_types_sizzle__2.3.8__links//:defs.bzl", link_19 = "npm_link_imported_package_store", store_19 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_types_sizzle__2.3.9__links//:defs.bzl", link_19 = "npm_link_imported_package_store", store_19 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__color-convert__2.0.1__links//:defs.bzl", store_20 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__color-name__1.1.4__links//:defs.bzl", store_21 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__debug__https___codeload.github.com_ngokevin_debug_tar.gz_9742c5f383a6f8046241920156236ade8ec30d53__links//:defs.bzl", link_22 = "npm_link_imported_package_store", store_22 = "npm_imported_package_store") @@ -33,7 +33,7 @@ load("@@aspect_rules_js~~npm~lock-__fsevents__2.3.3__links//:defs.b load("@@aspect_rules_js~~npm~lock-__function-bind__1.1.2__links//:defs.bzl", store_30 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__hasown__2.0.2__links//:defs.bzl", store_31 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__hello__https___gitpkg.vercel.app_EqualMa_gitpkg-hello_packages_hello__links//:defs.bzl", link_32 = "npm_link_imported_package_store", store_32 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__is-core-module__2.15.0__links//:defs.bzl", store_33 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__is-core-module__2.16.1__links//:defs.bzl", store_33 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__is-fullwidth-code-point__3.0.0__links//:defs.bzl", store_34 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__is-odd__0.1.0__links//:defs.bzl", link_35 = "npm_link_imported_package_store", store_35 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__is-odd__1.0.0__links//:defs.bzl", link_36 = "npm_link_imported_package_store", store_36 = "npm_imported_package_store") @@ -47,7 +47,7 @@ load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", load("@@aspect_rules_js~~npm~lock-__ms__0.7.3__links//:defs.bzl", store_44 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__path-parse__1.0.7__links//:defs.bzl", store_45 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__picomatch__2.3.1__links//:defs.bzl", store_46 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__resolve__1.22.8__links//:defs.bzl", store_47 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__resolve__1.22.10__links//:defs.bzl", store_47 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__rollup__2.14.0__links//:defs.bzl", link_48 = "npm_link_imported_package_store", store_48 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__rollup__3.29.4__links//:defs.bzl", link_49 = "npm_link_imported_package_store", store_49 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__sade__1.8.1__links//:defs.bzl", store_50 = "npm_imported_package_store") @@ -56,7 +56,7 @@ load("@@aspect_rules_js~~npm~lock-__string-width__5.1.2__links//:de load("@@aspect_rules_js~~npm~lock-__strip-ansi__6.0.1__links//:defs.bzl", store_53 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__strip-ansi__7.1.0__links//:defs.bzl", store_54 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__supports-preserve-symlinks-flag__1.0.0__links//:defs.bzl", store_55 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__tslib__2.6.3__links//:defs.bzl", link_56 = "npm_link_imported_package_store", store_56 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__tslib__2.8.1__links//:defs.bzl", link_56 = "npm_link_imported_package_store", store_56 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__typescript__5.5.2__links//:defs.bzl", link_57 = "npm_link_imported_package_store", store_57 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__uvu__0.5.6__links//:defs.bzl", link_58 = "npm_link_imported_package_store", store_58 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__wrap-ansi__7.0.0__links//:defs.bzl", store_59 = "npm_imported_package_store") diff --git a/e2e/pnpm_lockfiles/v90/snapshots/repositories.bzl b/e2e/pnpm_lockfiles/v90/snapshots/repositories.bzl index 526e92c40..468863b49 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.0.1", + name = "lock-__ansi-regex__6.1.0", root_package = "", link_workspace = "", link_packages = {}, package = "ansi-regex", - version = "6.0.1", - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + version = "6.1.0", + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + integrity = "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", transitive_closure = { - "ansi-regex": ["6.0.1"], + "ansi-regex": ["6.1.0"], }, ) @@ -242,7 +242,7 @@ def npm_repositories(): }, transitive_closure = { "@isaacs/cliui": ["8.0.2"], - "ansi-regex": ["5.0.1", "6.0.1"], + "ansi-regex": ["5.0.1", "6.1.0"], "ansi-styles": ["4.3.0", "6.2.1"], "color-convert": ["2.0.1"], "color-name": ["1.1.4"], @@ -256,40 +256,40 @@ def npm_repositories(): ) npm_import( - name = "lock-__at_rollup_plugin-typescript__8.2.1_1662662592", + name = "lock-__at_rollup_plugin-typescript__8.2.1_626159424", root_package = "", link_workspace = "", link_packages = { "": ["rollup-plugin-with-peers"], }, package = "@rollup/plugin-typescript", - version = "8.2.1_1662662592", + version = "8.2.1_626159424", url = "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-8.2.1.tgz", system_tar = "", package_visibility = ["//visibility:public"], integrity = "sha512-Qd2E1pleDR4bwyFxqbjt4eJf+wB0UKVMLc7/BAFDGVdAXQMCsD4DUv5/7/ww47BZCYxWtJqe1Lo0KVNswBJlRw==", deps = { "@rollup/pluginutils": "3.1.0_rollup_2.14.0", - "resolve": "1.22.8", + "resolve": "1.22.10", "rollup": "2.14.0", - "tslib": "2.6.3", + "tslib": "2.8.1", "typescript": "5.5.2", }, transitive_closure = { - "@rollup/plugin-typescript": ["8.2.1_1662662592"], + "@rollup/plugin-typescript": ["8.2.1_626159424"], "@rollup/pluginutils": ["3.1.0_rollup_2.14.0"], "@types/estree": ["0.0.39"], "estree-walker": ["1.0.1"], "fsevents": ["2.3.3"], "function-bind": ["1.1.2"], "hasown": ["2.0.2"], - "is-core-module": ["2.15.0"], + "is-core-module": ["2.16.1"], "path-parse": ["1.0.7"], "picomatch": ["2.3.1"], - "resolve": ["1.22.8"], + "resolve": ["1.22.10"], "rollup": ["2.14.0"], "supports-preserve-symlinks-flag": ["1.0.0"], - "tslib": ["2.6.3"], + "tslib": ["2.8.1"], "typescript": ["5.5.2"], }, ) @@ -418,20 +418,20 @@ def npm_repositories(): ) npm_import( - name = "lock-__at_types_sizzle__2.3.8", + name = "lock-__at_types_sizzle__2.3.9", root_package = "", link_workspace = "", link_packages = { "": ["alias-only-sizzle"], }, package = "@types/sizzle", - version = "2.3.8", - url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz", + version = "2.3.9", + url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==", + integrity = "sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==", transitive_closure = { - "@types/sizzle": ["2.3.8"], + "@types/sizzle": ["2.3.9"], }, ) @@ -657,23 +657,23 @@ def npm_repositories(): ) npm_import( - name = "lock-__is-core-module__2.15.0", + name = "lock-__is-core-module__2.16.1", root_package = "", link_workspace = "", link_packages = {}, package = "is-core-module", - version = "2.15.0", - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz", + version = "2.16.1", + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==", + integrity = "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", deps = { "hasown": "2.0.2", }, transitive_closure = { "function-bind": ["1.1.2"], "hasown": ["2.0.2"], - "is-core-module": ["2.15.0"], + "is-core-module": ["2.16.1"], }, ) @@ -921,27 +921,27 @@ def npm_repositories(): ) npm_import( - name = "lock-__resolve__1.22.8", + name = "lock-__resolve__1.22.10", root_package = "", link_workspace = "", link_packages = {}, package = "resolve", - version = "1.22.8", - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + version = "1.22.10", + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + integrity = "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", deps = { - "is-core-module": "2.15.0", + "is-core-module": "2.16.1", "path-parse": "1.0.7", "supports-preserve-symlinks-flag": "1.0.0", }, transitive_closure = { "function-bind": ["1.1.2"], "hasown": ["2.0.2"], - "is-core-module": ["2.15.0"], + "is-core-module": ["2.16.1"], "path-parse": ["1.0.7"], - "resolve": ["1.22.8"], + "resolve": ["1.22.10"], "supports-preserve-symlinks-flag": ["1.0.0"], }, ) @@ -1052,7 +1052,7 @@ def npm_repositories(): "strip-ansi": "7.1.0", }, transitive_closure = { - "ansi-regex": ["6.0.1"], + "ansi-regex": ["6.1.0"], "eastasianwidth": ["0.2.0"], "emoji-regex": ["9.2.2"], "string-width": ["5.1.2"], @@ -1092,10 +1092,10 @@ def npm_repositories(): package_visibility = ["//visibility:public"], integrity = "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", deps = { - "ansi-regex": "6.0.1", + "ansi-regex": "6.1.0", }, transitive_closure = { - "ansi-regex": ["6.0.1"], + "ansi-regex": ["6.1.0"], "strip-ansi": ["7.1.0"], }, ) @@ -1117,20 +1117,20 @@ def npm_repositories(): ) npm_import( - name = "lock-__tslib__2.6.3", + name = "lock-__tslib__2.8.1", root_package = "", link_workspace = "", link_packages = { "": ["tslib"], }, package = "tslib", - version = "2.6.3", - url = "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", + version = "2.8.1", + url = "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", system_tar = "", package_visibility = ["//visibility:public"], - integrity = "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==", + integrity = "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", transitive_closure = { - "tslib": ["2.6.3"], + "tslib": ["2.8.1"], }, ) @@ -1227,7 +1227,7 @@ def npm_repositories(): "strip-ansi": "7.1.0", }, transitive_closure = { - "ansi-regex": ["6.0.1"], + "ansi-regex": ["6.1.0"], "ansi-styles": ["6.2.1"], "eastasianwidth": ["0.2.0"], "emoji-regex": ["9.2.2"], From 65218296648dfbceeea55458931134ee3240b4b8 Mon Sep 17 00:00:00 2001 From: Jason Bedard Date: Sat, 4 Jan 2025 14:46:10 -0800 Subject: [PATCH 2/2] test: demonstrate dev dependencies between workspace projects --- e2e/pnpm_lockfiles/.bazelignore | 1 + e2e/pnpm_lockfiles/lockfile-test.bzl | 5 +- .../projects/a-types/BUILD.bazel | 10 ++++ e2e/pnpm_lockfiles/projects/a-types/a.d.ts | 1 + .../projects/a-types/package.json | 7 +++ e2e/pnpm_lockfiles/projects/b/package.json | 4 ++ e2e/pnpm_lockfiles/v54/BUILD.bazel | 4 +- e2e/pnpm_lockfiles/v54/pnpm-lock.yaml | 12 +++- e2e/pnpm_lockfiles/v54/snapshots/defs.bzl | 56 ++++++++++++++++++- .../v54/snapshots/repositories.bzl | 3 +- e2e/pnpm_lockfiles/v60/BUILD.bazel | 4 +- e2e/pnpm_lockfiles/v60/pnpm-lock.yaml | 14 ++++- e2e/pnpm_lockfiles/v60/snapshots/defs.bzl | 56 ++++++++++++++++++- .../v60/snapshots/repositories.bzl | 3 +- e2e/pnpm_lockfiles/v61/BUILD.bazel | 4 +- e2e/pnpm_lockfiles/v61/pnpm-lock.yaml | 14 ++++- e2e/pnpm_lockfiles/v61/snapshots/defs.bzl | 56 ++++++++++++++++++- .../v61/snapshots/repositories.bzl | 3 +- e2e/pnpm_lockfiles/v90/BUILD.bazel | 4 +- e2e/pnpm_lockfiles/v90/pnpm-lock.yaml | 13 +++++ e2e/pnpm_lockfiles/v90/snapshots/defs.bzl | 56 ++++++++++++++++++- .../v90/snapshots/repositories.bzl | 2 + 22 files changed, 309 insertions(+), 23 deletions(-) create mode 100644 e2e/pnpm_lockfiles/projects/a-types/BUILD.bazel create mode 100644 e2e/pnpm_lockfiles/projects/a-types/a.d.ts create mode 100644 e2e/pnpm_lockfiles/projects/a-types/package.json diff --git a/e2e/pnpm_lockfiles/.bazelignore b/e2e/pnpm_lockfiles/.bazelignore index c3059a4a0..37f70f9cb 100644 --- a/e2e/pnpm_lockfiles/.bazelignore +++ b/e2e/pnpm_lockfiles/.bazelignore @@ -1,6 +1,7 @@ node_modules/ cases/node_modules projects/a/node_modules +projects/a-types/node_modules projects/b/node_modules projects/c/node_modules projects/d/node_modules diff --git a/e2e/pnpm_lockfiles/lockfile-test.bzl b/e2e/pnpm_lockfiles/lockfile-test.bzl index 85d9be2ac..16c773066 100644 --- a/e2e/pnpm_lockfiles/lockfile-test.bzl +++ b/e2e/pnpm_lockfiles/lockfile-test.bzl @@ -33,17 +33,20 @@ WKSP_FILES = { "repositories.bzl": "@REPO_NAME//:repositories.bzl", } -def lockfile_test(name = None): +def lockfile_test(npm_link_all_packages, name = None): """ Tests for a lockfile and associated targets + files generated by rules_js. Args: name: the lockfile version name + npm_link_all_packages: the npm_link_all_packages function """ lock_version = name if name else native.package_name() lock_repo = "lock-%s" % lock_version + npm_link_all_packages(name = "node_modules") + # Copy each test to this lockfile dir for test in ["patched-dependencies-test.js", "aliases-test.js"]: copy_file( diff --git a/e2e/pnpm_lockfiles/projects/a-types/BUILD.bazel b/e2e/pnpm_lockfiles/projects/a-types/BUILD.bazel new file mode 100644 index 000000000..65d85d8a5 --- /dev/null +++ b/e2e/pnpm_lockfiles/projects/a-types/BUILD.bazel @@ -0,0 +1,10 @@ +load("@aspect_rules_js//js:defs.bzl", "js_library") + +js_library( + name = "pkg", + srcs = [ + "a.d.ts", + "package.json", + ], + visibility = ["//visibility:public"], +) diff --git a/e2e/pnpm_lockfiles/projects/a-types/a.d.ts b/e2e/pnpm_lockfiles/projects/a-types/a.d.ts new file mode 100644 index 000000000..e51367dee --- /dev/null +++ b/e2e/pnpm_lockfiles/projects/a-types/a.d.ts @@ -0,0 +1 @@ +export const A: number diff --git a/e2e/pnpm_lockfiles/projects/a-types/package.json b/e2e/pnpm_lockfiles/projects/a-types/package.json new file mode 100644 index 000000000..5c09fa8d4 --- /dev/null +++ b/e2e/pnpm_lockfiles/projects/a-types/package.json @@ -0,0 +1,7 @@ +{ + "name": "a-types", + "private": true, + "dependencies": { + "@types/node": "16.18.11" + } +} diff --git a/e2e/pnpm_lockfiles/projects/b/package.json b/e2e/pnpm_lockfiles/projects/b/package.json index da16dd8db..12b206152 100644 --- a/e2e/pnpm_lockfiles/projects/b/package.json +++ b/e2e/pnpm_lockfiles/projects/b/package.json @@ -3,5 +3,9 @@ "private": true, "dependencies": { "@scoped/a": "workspace:*" + }, + "devDependencies": { + "@types/node": "16.18.11", + "a-types": "workspace:*" } } diff --git a/e2e/pnpm_lockfiles/v54/BUILD.bazel b/e2e/pnpm_lockfiles/v54/BUILD.bazel index 647dcd96c..0d1fbac79 100644 --- a/e2e/pnpm_lockfiles/v54/BUILD.bazel +++ b/e2e/pnpm_lockfiles/v54/BUILD.bazel @@ -1,6 +1,4 @@ load("@lock-v54//:defs.bzl", "npm_link_all_packages") load("//:lockfile-test.bzl", "lockfile_test") -npm_link_all_packages() - -lockfile_test() +lockfile_test(npm_link_all_packages = npm_link_all_packages) diff --git a/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml index 184db34c0..7ac55692f 100644 --- a/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml +++ b/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml @@ -95,11 +95,22 @@ importers: ../projects/a: specifiers: {} + ../projects/a-types: + specifiers: + '@types/node': 16.18.11 + dependencies: + '@types/node': registry.npmjs.org/@types/node/16.18.11 + ../projects/b: specifiers: '@scoped/a': workspace:* + '@types/node': 16.18.11 + a-types: workspace:* dependencies: '@scoped/a': link:../a + devDependencies: + '@types/node': registry.npmjs.org/@types/node/16.18.11 + a-types: link:../a-types ../projects/c: specifiers: @@ -533,7 +544,6 @@ packages: resolution: {integrity: sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@types/node/-/node-16.18.11.tgz} name: '@types/node' version: 16.18.11 - dev: true registry.npmjs.org/@types/sizzle/2.3.9: resolution: {integrity: sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz} diff --git a/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl index 8924db26d..0b512d2bb 100644 --- a/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl @@ -70,7 +70,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") -_LINK_PACKAGES = ["", "projects/a", "projects/b", "projects/c", "projects/d", "vendored/is-number"] +_LINK_PACKAGES = ["", "projects/a", "projects/a-types", "projects/b", "projects/c", "projects/d", "vendored/is-number"] # buildifier: disable=function-docstring def npm_link_all_packages(name = "node_modules", imported_links = []): @@ -251,6 +251,20 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): link_targets.append("//{}:{}/typescript".format(bazel_package, name)) link_57(name = "{}/uvu".format(name)) link_targets.append("//{}:{}/uvu".format(bazel_package, name)) + elif bazel_package == "projects/a-types": + link_17(name = "{}/@types/node".format(name)) + link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) + elif bazel_package == "projects/b": + link_17(name = "{}/@types/node".format(name)) + link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -442,6 +456,39 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): ) link_targets.append(":{}/scoped/bad".format(name)) + if is_root: + _npm_package_store( + name = ".aspect_rules_js/{}/a-types@0.0.0".format(name), + src = "//projects/a-types:pkg", + package = "a-types", + version = "0.0.0", + deps = { + "//:.aspect_rules_js/{}/@types+node@16.18.11".format(name): "@types/node", + }, + visibility = ["//visibility:public"], + tags = ["manual"], + ) + + if bazel_package in ["projects/b"]: + # terminal target for direct dependencies + _npm_link_package_store( + name = "{}/a-types".format(name), + src = "//:.aspect_rules_js/{}/a-types@0.0.0".format(name), + visibility = ["//visibility:public"], + tags = ["manual"], + ) + + # filegroup target that provides a single file which is + # package directory for use in $(execpath) and $(rootpath) + native.filegroup( + name = "{}/a-types/dir".format(name), + srcs = [":{}/a-types".format(name)], + output_group = "package_directory", + visibility = ["//visibility:public"], + tags = ["manual"], + ) + link_targets.append(":{}/a-types".format(name)) + for scope, scoped_targets in scope_targets.items(): _js_library( name = "{}/{}".format(name, scope), @@ -496,6 +543,10 @@ def npm_link_targets(name = "node_modules", package = None): link_targets.append("//{}:{}/tslib".format(bazel_package, name)) link_targets.append("//{}:{}/typescript".format(bazel_package, name)) link_targets.append("//{}:{}/uvu".format(bazel_package, name)) + elif bazel_package == "projects/a-types": + link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) + elif bazel_package == "projects/b": + link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) if bazel_package in [""]: link_targets.append("//{}:{}/@scoped/c".format(bazel_package, name)) @@ -511,4 +562,7 @@ def npm_link_targets(name = "node_modules", package = None): if bazel_package in [""]: link_targets.append("//{}:{}/scoped/bad".format(bazel_package, name)) + + if bazel_package in ["projects/b"]: + link_targets.append("//{}:{}/a-types".format(bazel_package, name)) return link_targets diff --git a/e2e/pnpm_lockfiles/v54/snapshots/repositories.bzl b/e2e/pnpm_lockfiles/v54/snapshots/repositories.bzl index 6ef5457f9..e2791e82e 100644 --- a/e2e/pnpm_lockfiles/v54/snapshots/repositories.bzl +++ b/e2e/pnpm_lockfiles/v54/snapshots/repositories.bzl @@ -390,13 +390,14 @@ def npm_repositories(): link_workspace = "", link_packages = { "": ["@types/node", "alias-types-node"], + "projects/a-types": ["@types/node"], + "projects/b": ["@types/node"], }, package = "@types/node", version = "16.18.11", url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.11.tgz", system_tar = "", package_visibility = ["//visibility:public"], - dev = True, integrity = "sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA==", transitive_closure = { "@types/node": ["16.18.11"], diff --git a/e2e/pnpm_lockfiles/v60/BUILD.bazel b/e2e/pnpm_lockfiles/v60/BUILD.bazel index 5814a53f1..e5ce7c2bc 100644 --- a/e2e/pnpm_lockfiles/v60/BUILD.bazel +++ b/e2e/pnpm_lockfiles/v60/BUILD.bazel @@ -1,6 +1,4 @@ load("@lock-v60//:defs.bzl", "npm_link_all_packages") load("//:lockfile-test.bzl", "lockfile_test") -npm_link_all_packages() - -lockfile_test() +lockfile_test(npm_link_all_packages = npm_link_all_packages) diff --git a/e2e/pnpm_lockfiles/v60/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v60/pnpm-lock.yaml index 71606432f..673a89cc9 100644 --- a/e2e/pnpm_lockfiles/v60/pnpm-lock.yaml +++ b/e2e/pnpm_lockfiles/v60/pnpm-lock.yaml @@ -131,11 +131,24 @@ importers: ../projects/a: {} + ../projects/a-types: + dependencies: + '@types/node': + specifier: 16.18.11 + version: registry.npmjs.org/@types/node@16.18.11 + ../projects/b: dependencies: '@scoped/a': specifier: workspace:* version: link:../a + devDependencies: + '@types/node': + specifier: 16.18.11 + version: registry.npmjs.org/@types/node@16.18.11 + a-types: + specifier: workspace:* + version: link:../a-types ../projects/c: dependencies: @@ -573,7 +586,6 @@ packages: resolution: {integrity: sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@types/node/-/node-16.18.11.tgz} name: '@types/node' version: 16.18.11 - dev: true registry.npmjs.org/@types/sizzle@2.3.9: resolution: {integrity: sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz} diff --git a/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl index 2f865b3bc..4d1cfcfb3 100644 --- a/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl @@ -71,7 +71,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") -_LINK_PACKAGES = ["", "projects/a", "projects/b", "projects/c", "projects/d", "vendored/is-number"] +_LINK_PACKAGES = ["", "projects/a", "projects/a-types", "projects/b", "projects/c", "projects/d", "vendored/is-number"] # buildifier: disable=function-docstring def npm_link_all_packages(name = "node_modules", imported_links = []): @@ -259,6 +259,20 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): link_targets.append("//{}:{}/typescript".format(bazel_package, name)) link_58(name = "{}/uvu".format(name)) link_targets.append("//{}:{}/uvu".format(bazel_package, name)) + elif bazel_package == "projects/a-types": + link_18(name = "{}/@types/node".format(name)) + link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) + elif bazel_package == "projects/b": + link_18(name = "{}/@types/node".format(name)) + link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -450,6 +464,39 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): ) link_targets.append(":{}/scoped/bad".format(name)) + if is_root: + _npm_package_store( + name = ".aspect_rules_js/{}/a-types@0.0.0".format(name), + src = "//projects/a-types:pkg", + package = "a-types", + version = "0.0.0", + deps = { + "//:.aspect_rules_js/{}/@types+node@16.18.11".format(name): "@types/node", + }, + visibility = ["//visibility:public"], + tags = ["manual"], + ) + + if bazel_package in ["projects/b"]: + # terminal target for direct dependencies + _npm_link_package_store( + name = "{}/a-types".format(name), + src = "//:.aspect_rules_js/{}/a-types@0.0.0".format(name), + visibility = ["//visibility:public"], + tags = ["manual"], + ) + + # filegroup target that provides a single file which is + # package directory for use in $(execpath) and $(rootpath) + native.filegroup( + name = "{}/a-types/dir".format(name), + srcs = [":{}/a-types".format(name)], + output_group = "package_directory", + visibility = ["//visibility:public"], + tags = ["manual"], + ) + link_targets.append(":{}/a-types".format(name)) + for scope, scoped_targets in scope_targets.items(): _js_library( name = "{}/{}".format(name, scope), @@ -505,6 +552,10 @@ def npm_link_targets(name = "node_modules", package = None): link_targets.append("//{}:{}/tslib".format(bazel_package, name)) link_targets.append("//{}:{}/typescript".format(bazel_package, name)) link_targets.append("//{}:{}/uvu".format(bazel_package, name)) + elif bazel_package == "projects/a-types": + link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) + elif bazel_package == "projects/b": + link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) if bazel_package in [""]: link_targets.append("//{}:{}/@scoped/c".format(bazel_package, name)) @@ -520,4 +571,7 @@ def npm_link_targets(name = "node_modules", package = None): if bazel_package in [""]: link_targets.append("//{}:{}/scoped/bad".format(bazel_package, name)) + + if bazel_package in ["projects/b"]: + link_targets.append("//{}:{}/a-types".format(bazel_package, name)) return link_targets diff --git a/e2e/pnpm_lockfiles/v60/snapshots/repositories.bzl b/e2e/pnpm_lockfiles/v60/snapshots/repositories.bzl index 13b0c96c5..958eeedc7 100644 --- a/e2e/pnpm_lockfiles/v60/snapshots/repositories.bzl +++ b/e2e/pnpm_lockfiles/v60/snapshots/repositories.bzl @@ -408,13 +408,14 @@ def npm_repositories(): link_workspace = "", link_packages = { "": ["@types/node", "alias-types-node"], + "projects/a-types": ["@types/node"], + "projects/b": ["@types/node"], }, package = "@types/node", version = "16.18.11", url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.11.tgz", system_tar = "", package_visibility = ["//visibility:public"], - dev = True, integrity = "sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA==", transitive_closure = { "@types/node": ["16.18.11"], diff --git a/e2e/pnpm_lockfiles/v61/BUILD.bazel b/e2e/pnpm_lockfiles/v61/BUILD.bazel index 8af83ae39..f6f49b563 100644 --- a/e2e/pnpm_lockfiles/v61/BUILD.bazel +++ b/e2e/pnpm_lockfiles/v61/BUILD.bazel @@ -1,6 +1,4 @@ load("@lock-v61//:defs.bzl", "npm_link_all_packages") load("//:lockfile-test.bzl", "lockfile_test") -npm_link_all_packages() - -lockfile_test() +lockfile_test(npm_link_all_packages = npm_link_all_packages) diff --git a/e2e/pnpm_lockfiles/v61/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v61/pnpm-lock.yaml index a5a8a932c..de2fb16ef 100644 --- a/e2e/pnpm_lockfiles/v61/pnpm-lock.yaml +++ b/e2e/pnpm_lockfiles/v61/pnpm-lock.yaml @@ -135,11 +135,24 @@ importers: ../projects/a: {} + ../projects/a-types: + dependencies: + '@types/node': + specifier: 16.18.11 + version: registry.npmjs.org/@types/node@16.18.11 + ../projects/b: dependencies: '@scoped/a': specifier: workspace:* version: link:../a + devDependencies: + '@types/node': + specifier: 16.18.11 + version: registry.npmjs.org/@types/node@16.18.11 + a-types: + specifier: workspace:* + version: link:../a-types ../projects/c: dependencies: @@ -577,7 +590,6 @@ packages: resolution: {integrity: sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@types/node/-/node-16.18.11.tgz} name: '@types/node' version: 16.18.11 - dev: true registry.npmjs.org/@types/sizzle@2.3.9: resolution: {integrity: sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz} diff --git a/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl index 2f865b3bc..4d1cfcfb3 100644 --- a/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl @@ -71,7 +71,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") -_LINK_PACKAGES = ["", "projects/a", "projects/b", "projects/c", "projects/d", "vendored/is-number"] +_LINK_PACKAGES = ["", "projects/a", "projects/a-types", "projects/b", "projects/c", "projects/d", "vendored/is-number"] # buildifier: disable=function-docstring def npm_link_all_packages(name = "node_modules", imported_links = []): @@ -259,6 +259,20 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): link_targets.append("//{}:{}/typescript".format(bazel_package, name)) link_58(name = "{}/uvu".format(name)) link_targets.append("//{}:{}/uvu".format(bazel_package, name)) + elif bazel_package == "projects/a-types": + link_18(name = "{}/@types/node".format(name)) + link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) + elif bazel_package == "projects/b": + link_18(name = "{}/@types/node".format(name)) + link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -450,6 +464,39 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): ) link_targets.append(":{}/scoped/bad".format(name)) + if is_root: + _npm_package_store( + name = ".aspect_rules_js/{}/a-types@0.0.0".format(name), + src = "//projects/a-types:pkg", + package = "a-types", + version = "0.0.0", + deps = { + "//:.aspect_rules_js/{}/@types+node@16.18.11".format(name): "@types/node", + }, + visibility = ["//visibility:public"], + tags = ["manual"], + ) + + if bazel_package in ["projects/b"]: + # terminal target for direct dependencies + _npm_link_package_store( + name = "{}/a-types".format(name), + src = "//:.aspect_rules_js/{}/a-types@0.0.0".format(name), + visibility = ["//visibility:public"], + tags = ["manual"], + ) + + # filegroup target that provides a single file which is + # package directory for use in $(execpath) and $(rootpath) + native.filegroup( + name = "{}/a-types/dir".format(name), + srcs = [":{}/a-types".format(name)], + output_group = "package_directory", + visibility = ["//visibility:public"], + tags = ["manual"], + ) + link_targets.append(":{}/a-types".format(name)) + for scope, scoped_targets in scope_targets.items(): _js_library( name = "{}/{}".format(name, scope), @@ -505,6 +552,10 @@ def npm_link_targets(name = "node_modules", package = None): link_targets.append("//{}:{}/tslib".format(bazel_package, name)) link_targets.append("//{}:{}/typescript".format(bazel_package, name)) link_targets.append("//{}:{}/uvu".format(bazel_package, name)) + elif bazel_package == "projects/a-types": + link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) + elif bazel_package == "projects/b": + link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) if bazel_package in [""]: link_targets.append("//{}:{}/@scoped/c".format(bazel_package, name)) @@ -520,4 +571,7 @@ def npm_link_targets(name = "node_modules", package = None): if bazel_package in [""]: link_targets.append("//{}:{}/scoped/bad".format(bazel_package, name)) + + if bazel_package in ["projects/b"]: + link_targets.append("//{}:{}/a-types".format(bazel_package, name)) return link_targets diff --git a/e2e/pnpm_lockfiles/v61/snapshots/repositories.bzl b/e2e/pnpm_lockfiles/v61/snapshots/repositories.bzl index 13b0c96c5..958eeedc7 100644 --- a/e2e/pnpm_lockfiles/v61/snapshots/repositories.bzl +++ b/e2e/pnpm_lockfiles/v61/snapshots/repositories.bzl @@ -408,13 +408,14 @@ def npm_repositories(): link_workspace = "", link_packages = { "": ["@types/node", "alias-types-node"], + "projects/a-types": ["@types/node"], + "projects/b": ["@types/node"], }, package = "@types/node", version = "16.18.11", url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.11.tgz", system_tar = "", package_visibility = ["//visibility:public"], - dev = True, integrity = "sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA==", transitive_closure = { "@types/node": ["16.18.11"], diff --git a/e2e/pnpm_lockfiles/v90/BUILD.bazel b/e2e/pnpm_lockfiles/v90/BUILD.bazel index e6d1703ef..a9e1d7789 100644 --- a/e2e/pnpm_lockfiles/v90/BUILD.bazel +++ b/e2e/pnpm_lockfiles/v90/BUILD.bazel @@ -1,6 +1,4 @@ load("@lock-v90//:defs.bzl", "npm_link_all_packages") load("//:lockfile-test.bzl", "lockfile_test") -npm_link_all_packages() - -lockfile_test() +lockfile_test(npm_link_all_packages = npm_link_all_packages) diff --git a/e2e/pnpm_lockfiles/v90/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v90/pnpm-lock.yaml index adc4262a6..e88209463 100644 --- a/e2e/pnpm_lockfiles/v90/pnpm-lock.yaml +++ b/e2e/pnpm_lockfiles/v90/pnpm-lock.yaml @@ -132,11 +132,24 @@ importers: ../projects/a: {} + ../projects/a-types: + dependencies: + '@types/node': + specifier: 16.18.11 + version: 16.18.11 + ../projects/b: dependencies: '@scoped/a': specifier: workspace:* version: link:../a + devDependencies: + '@types/node': + specifier: 16.18.11 + version: 16.18.11 + a-types: + specifier: workspace:* + version: link:../a-types ../projects/c: dependencies: diff --git a/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl index 747648189..814e8b226 100644 --- a/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl @@ -71,7 +71,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") -_LINK_PACKAGES = ["", "projects/a", "projects/b", "projects/c", "projects/d", "vendored/is-number"] +_LINK_PACKAGES = ["", "projects/a", "projects/a-types", "projects/b", "projects/c", "projects/d", "vendored/is-number"] # buildifier: disable=function-docstring def npm_link_all_packages(name = "node_modules", imported_links = []): @@ -259,6 +259,20 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): link_targets.append("//{}:{}/typescript".format(bazel_package, name)) link_58(name = "{}/uvu".format(name)) link_targets.append("//{}:{}/uvu".format(bazel_package, name)) + elif bazel_package == "projects/a-types": + link_18(name = "{}/@types/node".format(name)) + link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) + elif bazel_package == "projects/b": + link_18(name = "{}/@types/node".format(name)) + link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -450,6 +464,39 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): ) link_targets.append(":{}/scoped/bad".format(name)) + if is_root: + _npm_package_store( + name = ".aspect_rules_js/{}/a-types@0.0.0".format(name), + src = "//projects/a-types:pkg", + package = "a-types", + version = "0.0.0", + deps = { + "//:.aspect_rules_js/{}/@types+node@16.18.11".format(name): "@types/node", + }, + visibility = ["//visibility:public"], + tags = ["manual"], + ) + + if bazel_package in ["projects/b"]: + # terminal target for direct dependencies + _npm_link_package_store( + name = "{}/a-types".format(name), + src = "//:.aspect_rules_js/{}/a-types@0.0.0".format(name), + visibility = ["//visibility:public"], + tags = ["manual"], + ) + + # filegroup target that provides a single file which is + # package directory for use in $(execpath) and $(rootpath) + native.filegroup( + name = "{}/a-types/dir".format(name), + srcs = [":{}/a-types".format(name)], + output_group = "package_directory", + visibility = ["//visibility:public"], + tags = ["manual"], + ) + link_targets.append(":{}/a-types".format(name)) + for scope, scoped_targets in scope_targets.items(): _js_library( name = "{}/{}".format(name, scope), @@ -505,6 +552,10 @@ def npm_link_targets(name = "node_modules", package = None): link_targets.append("//{}:{}/tslib".format(bazel_package, name)) link_targets.append("//{}:{}/typescript".format(bazel_package, name)) link_targets.append("//{}:{}/uvu".format(bazel_package, name)) + elif bazel_package == "projects/a-types": + link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) + elif bazel_package == "projects/b": + link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) if bazel_package in [""]: link_targets.append("//{}:{}/@scoped/c".format(bazel_package, name)) @@ -520,4 +571,7 @@ def npm_link_targets(name = "node_modules", package = None): if bazel_package in [""]: link_targets.append("//{}:{}/scoped/bad".format(bazel_package, name)) + + if bazel_package in ["projects/b"]: + link_targets.append("//{}:{}/a-types".format(bazel_package, name)) return link_targets diff --git a/e2e/pnpm_lockfiles/v90/snapshots/repositories.bzl b/e2e/pnpm_lockfiles/v90/snapshots/repositories.bzl index 468863b49..ce9eb9898 100644 --- a/e2e/pnpm_lockfiles/v90/snapshots/repositories.bzl +++ b/e2e/pnpm_lockfiles/v90/snapshots/repositories.bzl @@ -405,6 +405,8 @@ def npm_repositories(): link_workspace = "", link_packages = { "": ["@types/node", "alias-types-node"], + "projects/a-types": ["@types/node"], + "projects/b": ["@types/node"], }, package = "@types/node", version = "16.18.11",