diff --git a/MODULE.bazel b/MODULE.bazel index dad051f53..80965c394 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -221,7 +221,7 @@ use_repo( "npm__rollup__2.70.2", "npm__rollup__2.70.2__links", "npm__unused__0.2.2__links", - "npm__webpack-bundle-analyzer__4.5.0__bufferutil_4.0.7", + "npm__webpack-bundle-analyzer__4.5.0_bufferutil_4.0.7", ) # As an example, manually import a package using explicit coordinates. diff --git a/e2e/pnpm_lockfiles/MODULE.bazel b/e2e/pnpm_lockfiles/MODULE.bazel index 9ecb74f08..41473fc8e 100644 --- a/e2e/pnpm_lockfiles/MODULE.bazel +++ b/e2e/pnpm_lockfiles/MODULE.bazel @@ -75,17 +75,17 @@ npm = use_extension( "lock-%s__at_types_sizzle__2.3.8__links" % version, # Dep with peers - "lock-%s__at_aspect-test_d__2.0.0__at_aspect-test_c_2.0.2" % version, - "lock-%s__at_aspect-test_d__2.0.0__at_aspect-test_c_2.0.2__links" % version, + "lock-%s__at_aspect-test_d__2.0.0_at_aspect-test_c_2.0.2" % version, + "lock-%s__at_aspect-test_d__2.0.0_at_aspect-test_c_2.0.2__links" % version, # Deep with many peers - "lock-%s__at_rollup_plugin-typescript__8.2.1__%s" % ( + "lock-%s__at_rollup_plugin-typescript__8.2.1_%s" % ( version, "ommloj5qql5ba6x5wuiluawhoi" if version == "v54" else "1662662592" if version == "v90" else "1813138439", ), # Dep with patch - "lock-%s__meaning-of-life__1.0.0__o3deharooos255qt5xdujc3cuq" % version, + "lock-%s__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq" % version, ) for version in PNPM_LOCK_VERSIONS ] diff --git a/e2e/pnpm_lockfiles/lockfile-test.bzl b/e2e/pnpm_lockfiles/lockfile-test.bzl index 0dbb8c952..45662adf7 100644 --- a/e2e/pnpm_lockfiles/lockfile-test.bzl +++ b/e2e/pnpm_lockfiles/lockfile-test.bzl @@ -102,7 +102,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, "ommloj5qql5ba6x5wuiluawhoi" if lock_version == "v54" else "1662662592" if lock_version == "v90" else "1813138439"), # uuv 'hasBin' ":node_modules/uvu", @@ -174,14 +174,14 @@ def lockfile_test(name = None): # Patched dependencies ":.aspect_rules_js/node_modules/meaning-of-life@1.0.0_o3deharooos255qt5xdujc3cuq", - "@%s__meaning-of-life__1.0.0__o3deharooos255qt5xdujc3cuq//:pkg" % lock_repo, + "@%s__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq//:pkg" % lock_repo, # Direct deps from custom registry ":.aspect_rules_js/node_modules/@types+node@16.18.11", # Direct deps with peers ":.aspect_rules_js/node_modules/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.2", - "@%s__at_aspect-test_d__2.0.0__at_aspect-test_c_2.0.2//:pkg" % lock_repo, + "@%s__at_aspect-test_d__2.0.0_at_aspect-test_c_2.0.2//:pkg" % lock_repo, ], ) diff --git a/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl index 92d43ab55..42d95fcaa 100644 --- a/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl @@ -8,11 +8,11 @@ load("@@aspect_rules_js~~npm~lock-__at_aspect-test_a__5.0.2__links/ load("@@aspect_rules_js~~npm~lock-__at_aspect-test_b__5.0.2__links//:defs.bzl", link_5 = "npm_link_imported_package_store", store_5 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.0__links//:defs.bzl", link_6 = "npm_link_imported_package_store", store_6 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.2__links//:defs.bzl", store_7 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0__at_aspect-test_c_2.0.2__links//:defs.bzl", store_8 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_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_pluginutils__3.1.0__rollupat_2.14.0__links//:defs.bzl", store_12 = "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_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") @@ -41,7 +41,7 @@ load("@@aspect_rules_js~~npm~lock-__is-odd__3.0.0__links//:defs.bzl load("@@aspect_rules_js~~npm~lock-__is-odd__3.0.1__links//:defs.bzl", link_38 = "npm_link_imported_package_store", store_38 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__jquery__github.com_jquery_jquery_e61fccb9d736235b4b011f89cba6866bc0b8997d__links//:defs.bzl", link_39 = "npm_link_imported_package_store", store_39 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__kleur__4.1.5__links//:defs.bzl", store_40 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0__o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_41 = "npm_link_imported_package_store", store_41 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_41 = "npm_link_imported_package_store", store_41 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_42 = "npm_imported_package_store") 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") diff --git a/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl index 157c914e8..070836a18 100644 --- a/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl @@ -8,12 +8,12 @@ load("@@aspect_rules_js~~npm~lock-__at_aspect-test_a__5.0.2__links/ load("@@aspect_rules_js~~npm~lock-__at_aspect-test_b__5.0.2__links//:defs.bzl", link_5 = "npm_link_imported_package_store", store_5 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.0__links//:defs.bzl", link_6 = "npm_link_imported_package_store", store_6 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.2__links//:defs.bzl", store_7 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0__at_aspect-test_c_2.0.2__links//:defs.bzl", store_8 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0_at_aspect-test_c_2.0.2__links//:defs.bzl", store_8 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_aspect-test_e__1.0.0__links//:defs.bzl", link_9 = "npm_link_imported_package_store", store_9 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_foo_jsonify__at_github.com_aspect-build_test-packages_releases_download_0.0.0_at_foo-jsonify-0.0.0.tgz__links//:defs.bzl", link_10 = "npm_link_imported_package_store", store_10 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_isaacs_cliui__8.0.2__links//:defs.bzl", link_11 = "npm_link_imported_package_store", store_11 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_rollup_plugin-typescript__8.2.1__1813138439__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_3.29.4__links//:defs.bzl", store_13 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_rollup_plugin-typescript__8.2.1_1813138439__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_3.29.4__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") @@ -42,7 +42,7 @@ load("@@aspect_rules_js~~npm~lock-__is-odd__3.0.0__links//:defs.bzl load("@@aspect_rules_js~~npm~lock-__is-odd__3.0.1__links//:defs.bzl", link_39 = "npm_link_imported_package_store", store_39 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__jquery__github.com_jquery_jquery_e61fccb9d736235b4b011f89cba6866bc0b8997d__links//:defs.bzl", link_40 = "npm_link_imported_package_store", store_40 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__kleur__4.1.5__links//:defs.bzl", store_41 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0__o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_42 = "npm_link_imported_package_store", store_42 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_42 = "npm_link_imported_package_store", store_42 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_43 = "npm_imported_package_store") 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") diff --git a/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl index 157c914e8..070836a18 100644 --- a/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl @@ -8,12 +8,12 @@ load("@@aspect_rules_js~~npm~lock-__at_aspect-test_a__5.0.2__links/ load("@@aspect_rules_js~~npm~lock-__at_aspect-test_b__5.0.2__links//:defs.bzl", link_5 = "npm_link_imported_package_store", store_5 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.0__links//:defs.bzl", link_6 = "npm_link_imported_package_store", store_6 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.2__links//:defs.bzl", store_7 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0__at_aspect-test_c_2.0.2__links//:defs.bzl", store_8 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0_at_aspect-test_c_2.0.2__links//:defs.bzl", store_8 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_aspect-test_e__1.0.0__links//:defs.bzl", link_9 = "npm_link_imported_package_store", store_9 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_foo_jsonify__at_github.com_aspect-build_test-packages_releases_download_0.0.0_at_foo-jsonify-0.0.0.tgz__links//:defs.bzl", link_10 = "npm_link_imported_package_store", store_10 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_isaacs_cliui__8.0.2__links//:defs.bzl", link_11 = "npm_link_imported_package_store", store_11 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_rollup_plugin-typescript__8.2.1__1813138439__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_3.29.4__links//:defs.bzl", store_13 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_rollup_plugin-typescript__8.2.1_1813138439__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_3.29.4__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") @@ -42,7 +42,7 @@ load("@@aspect_rules_js~~npm~lock-__is-odd__3.0.0__links//:defs.bzl load("@@aspect_rules_js~~npm~lock-__is-odd__3.0.1__links//:defs.bzl", link_39 = "npm_link_imported_package_store", store_39 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__jquery__github.com_jquery_jquery_e61fccb9d736235b4b011f89cba6866bc0b8997d__links//:defs.bzl", link_40 = "npm_link_imported_package_store", store_40 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__kleur__4.1.5__links//:defs.bzl", store_41 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0__o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_42 = "npm_link_imported_package_store", store_42 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_42 = "npm_link_imported_package_store", store_42 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_43 = "npm_imported_package_store") 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") diff --git a/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl index 5948df2ae..612e83c61 100644 --- a/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl @@ -8,12 +8,12 @@ load("@@aspect_rules_js~~npm~lock-__at_aspect-test_a__5.0.2__links/ load("@@aspect_rules_js~~npm~lock-__at_aspect-test_b__5.0.2__links//:defs.bzl", link_5 = "npm_link_imported_package_store", store_5 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.0__links//:defs.bzl", link_6 = "npm_link_imported_package_store", store_6 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_aspect-test_c__2.0.2__links//:defs.bzl", store_7 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0__at_aspect-test_c_2.0.2__links//:defs.bzl", store_8 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0_at_aspect-test_c_2.0.2__links//:defs.bzl", store_8 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_aspect-test_e__1.0.0__links//:defs.bzl", link_9 = "npm_link_imported_package_store", store_9 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_foo_jsonify__https___github.com_aspect-build_test-packages_releases_download_0.0.0_at_foo-jsonify-0.0.0.tgz__links//:defs.bzl", link_10 = "npm_link_imported_package_store", store_10 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_isaacs_cliui__8.0.2__links//:defs.bzl", link_11 = "npm_link_imported_package_store", store_11 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_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_pluginutils__3.1.0__rollup_2.14.0__links//:defs.bzl", store_13 = "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_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") @@ -42,7 +42,7 @@ load("@@aspect_rules_js~~npm~lock-__is-odd__3.0.0__links//:defs.bzl load("@@aspect_rules_js~~npm~lock-__is-odd__3.0.1__links//:defs.bzl", link_39 = "npm_link_imported_package_store", store_39 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__jquery__https___codeload.github.com_jquery_jquery_tar.gz_e61fccb9d736235b4b011f89cba6866bc0b8997d__links//:defs.bzl", link_40 = "npm_link_imported_package_store", store_40 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__kleur__4.1.5__links//:defs.bzl", store_41 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0__o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_42 = "npm_link_imported_package_store", store_42 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_42 = "npm_link_imported_package_store", store_42 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__mri__1.2.0__links//:defs.bzl", store_43 = "npm_imported_package_store") 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") diff --git a/npm/private/pnpm.bzl b/npm/private/pnpm.bzl index 51a017fb6..86f352619 100644 --- a/npm/private/pnpm.bzl +++ b/npm/private/pnpm.bzl @@ -118,18 +118,26 @@ def _convert_v5_importers(importers): return result def _convert_pnpm_v5_version_peer_dep(version): - # Covert a pnpm lock file v5 version string of the format - # 1.2.3_@scope+peer@2.0.2_@scope+peer@4.5.6 - # to a version_peer_version that is compatible with rules_js. + # Convert a pnpm lock file v5 dependency version string to a format + # compatible with rules_js. + # + # Example versions: + # 1.2.3 + # 1.2.3_@scope+peer@2.0.2_@scope+peer@4.5.6 + # 2.0.0_@aspect-test+c@2.0.2 + # 3.1.0_rollup@2.14.0 + # 4.5.6_o3deharooos255qt5xdujc3cuq # If there is a suffix to the version peer_dep_index = version.find("_") if peer_dep_index != -1: # if the suffix contains an @version (not just a _patchhash) - peer_dep_index = version.find("@", peer_dep_index) - if peer_dep_index != -1: + peer_dep_at_index = version.find("@", peer_dep_index) + if peer_dep_at_index != -1: peer_dep = version[peer_dep_index:] - version = version[0:peer_dep_index] + utils.sanitize_string(peer_dep) + peer_dep = peer_dep.replace("_@", "_at_").replace("@", "_").replace("/", "_").replace("+", "_") + + version = version[0:peer_dep_index] + peer_dep return version @@ -206,9 +214,13 @@ def _convert_v5_packages(packages): ######################### Lockfile v6 ######################### def _convert_pnpm_v6_v9_version_peer_dep(version): - # Covert a pnpm lock file v6 version string of the format - # 1.2.3(@scope/peer@2.0.2)(@scope/peer@4.5.6) - # to a version_peer_version that is compatible with rules_js. + # Convert a pnpm lock file v6-9+ version string to a format compatible + # with rules_js. + # + # Examples: + # 1.2.3 + # 1.2.3(@scope/peer@2.0.2)(@scope/peer@4.5.6) + # 4.5.6(patch_hash=o3deharooos255qt5xdujc3cuq) if version[-1] == ")": # Drop the patch_hash= not present in v5 so (patch_hash=123) -> (123) like v5 version = version.replace("(patch_hash=", "(") @@ -221,7 +233,9 @@ def _convert_pnpm_v6_v9_version_peer_dep(version): # peer deps so we must hash here to prevent extremely long file paths that lead to # "File name too long) build failures. peer_dep = utils.hash(peer_dep) - version = version[0:peer_dep_index] + "_" + utils.sanitize_string(peer_dep) + else: + peer_dep = peer_dep.replace("(@", "(_at_").replace(")(", "_").replace("@", "_").replace("/", "_") + version = version[0:peer_dep_index] + "_" + peer_dep.strip("_-()") return version def _strip_v6_default_registry_to_version(name, version): diff --git a/npm/private/test/BUILD.bazel b/npm/private/test/BUILD.bazel index 48dfb112a..52ea4cb48 100644 --- a/npm/private/test/BUILD.bazel +++ b/npm/private/test/BUILD.bazel @@ -50,7 +50,7 @@ write_source_files( "snapshots/wksp/fsevents_links_defs.bzl": "@npm__fsevents__2.3.2__links//:defs.bzl", "snapshots/wksp/rollup_links_defs.bzl": "@npm__rollup__2.70.2__links//:defs.bzl", "snapshots/wksp/package_json.bzl": "@npm__rollup__2.70.2//examples/npm_deps:package_json.bzl", - "snapshots/wksp/package_json_with_dashes.bzl": "@npm__webpack-bundle-analyzer__4.5.0__bufferutil_4.0.7//npm/private/test:package_json.bzl", + "snapshots/wksp/package_json_with_dashes.bzl": "@npm__webpack-bundle-analyzer__4.5.0_bufferutil_4.0.7//npm/private/test:package_json.bzl", }, target_compatible_with = select({ "@aspect_bazel_lib//lib:bzlmod": ["@platforms//:incompatible"], @@ -68,7 +68,7 @@ write_source_files( "snapshots/bzlmod/fsevents_links_defs.bzl": "@npm__fsevents__2.3.2__links//:defs.bzl", "snapshots/bzlmod/rollup_links_defs.bzl": "@npm__rollup__2.70.2__links//:defs.bzl", "snapshots/bzlmod/package_json.bzl": "@npm__rollup__2.70.2//examples/npm_deps:package_json.bzl", - "snapshots/bzlmod/package_json_with_dashes.bzl": "@npm__webpack-bundle-analyzer__4.5.0__bufferutil_4.0.7//npm/private/test:package_json.bzl", + "snapshots/bzlmod/package_json_with_dashes.bzl": "@npm__webpack-bundle-analyzer__4.5.0_bufferutil_4.0.7//npm/private/test:package_json.bzl", }, target_compatible_with = select({ "@aspect_bazel_lib//lib:bzlmod": [], diff --git a/npm/private/test/snapshots/bzlmod/npm_defs.bzl b/npm/private/test/snapshots/bzlmod/npm_defs.bzl index 368b4ca5c..bd118d2fa 100644 --- a/npm/private/test/snapshots/bzlmod/npm_defs.bzl +++ b/npm/private/test/snapshots/bzlmod/npm_defs.bzl @@ -4,7 +4,7 @@ load("@@_main~npm~npm__abbrev__1.1.1__links//:defs.bzl", store_0 = "npm_imported load("@@_main~npm~npm__abort-controller__3.0.0__links//:defs.bzl", store_1 = "npm_imported_package_store") load("@@_main~npm~npm__abortcontroller-polyfill__1.7.5__links//:defs.bzl", link_2 = "npm_link_imported_package_store", store_2 = "npm_imported_package_store") load("@@_main~npm~npm__abs-svg-path__0.1.1__links//:defs.bzl", store_3 = "npm_imported_package_store") -load("@@_main~npm~npm__acorn-import-assertions__1.8.0__acorn_8.8.2__links//:defs.bzl", store_4 = "npm_imported_package_store") +load("@@_main~npm~npm__acorn-import-assertions__1.8.0_acorn_8.8.2__links//:defs.bzl", store_4 = "npm_imported_package_store") load("@@_main~npm~npm__acorn-walk__8.2.0__links//:defs.bzl", store_5 = "npm_imported_package_store") load("@@_main~npm~npm__acorn__7.4.1__links//:defs.bzl", store_6 = "npm_imported_package_store") load("@@_main~npm~npm__acorn__8.7.1__links//:defs.bzl", link_7 = "npm_link_imported_package_store", store_7 = "npm_imported_package_store") @@ -13,9 +13,9 @@ load("@@_main~npm~npm__agent-base__6.0.2__links//:defs.bzl", store_9 = "npm_impo load("@@_main~npm~npm__agentkeepalive__4.2.1__links//:defs.bzl", store_10 = "npm_imported_package_store") load("@@_main~npm~npm__aggregate-error__3.1.0__links//:defs.bzl", store_11 = "npm_imported_package_store") load("@@_main~npm~npm__ahocorasick__1.0.2__links//:defs.bzl", store_12 = "npm_imported_package_store") -load("@@_main~npm~npm__ajv-formats__2.1.1__ajv_8.12.0__links//:defs.bzl", store_13 = "npm_imported_package_store") -load("@@_main~npm~npm__ajv-keywords__3.5.2__ajv_6.12.6__links//:defs.bzl", store_14 = "npm_imported_package_store") -load("@@_main~npm~npm__ajv-keywords__5.1.0__ajv_8.12.0__links//:defs.bzl", store_15 = "npm_imported_package_store") +load("@@_main~npm~npm__ajv-formats__2.1.1_ajv_8.12.0__links//:defs.bzl", store_13 = "npm_imported_package_store") +load("@@_main~npm~npm__ajv-keywords__3.5.2_ajv_6.12.6__links//:defs.bzl", store_14 = "npm_imported_package_store") +load("@@_main~npm~npm__ajv-keywords__5.1.0_ajv_8.12.0__links//:defs.bzl", store_15 = "npm_imported_package_store") load("@@_main~npm~npm__ajv__6.12.6__links//:defs.bzl", store_16 = "npm_imported_package_store") load("@@_main~npm~npm__ajv__8.12.0__links//:defs.bzl", store_17 = "npm_imported_package_store") load("@@_main~npm~npm__almost-equal__1.1.0__links//:defs.bzl", store_18 = "npm_imported_package_store") @@ -45,14 +45,14 @@ load("@@_main~npm~npm__at_ampproject_remapping__2.2.0__links//:defs.bzl", store_ load("@@_main~npm~npm__at_aspect-test_a__5.0.2__links//:defs.bzl", link_42 = "npm_link_imported_package_store", store_42 = "npm_imported_package_store") load("@@_main~npm~npm__at_aspect-test_b__5.0.2__links//:defs.bzl", store_43 = "npm_imported_package_store") load("@@_main~npm~npm__at_aspect-test_c__2.0.2__links//:defs.bzl", link_44 = "npm_link_imported_package_store", store_44 = "npm_imported_package_store") -load("@@_main~npm~npm__at_aspect-test_d__2.0.0__at_aspect-test_c_2.0.2__links//:defs.bzl", store_45 = "npm_imported_package_store") +load("@@_main~npm~npm__at_aspect-test_d__2.0.0_at_aspect-test_c_2.0.2__links//:defs.bzl", store_45 = "npm_imported_package_store") load("@@_main~npm~npm__at_aspect-test_e__1.0.0__links//:defs.bzl", link_46 = "npm_link_imported_package_store", store_46 = "npm_imported_package_store") load("@@_main~npm~npm__at_aspect-test_f__1.0.0__links//:defs.bzl", link_47 = "npm_link_imported_package_store", store_47 = "npm_imported_package_store") load("@@_main~npm~npm__at_babel_code-frame__7.18.6__links//:defs.bzl", store_48 = "npm_imported_package_store") load("@@_main~npm~npm__at_babel_compat-data__7.21.0__links//:defs.bzl", store_49 = "npm_imported_package_store") load("@@_main~npm~npm__at_babel_core__7.21.0__links//:defs.bzl", store_50 = "npm_imported_package_store") load("@@_main~npm~npm__at_babel_generator__7.21.1__links//:defs.bzl", store_51 = "npm_imported_package_store") -load("@@_main~npm~npm__at_babel_helper-compilation-targets__7.20.7__at_babel_core_7.21.0__links//:defs.bzl", store_52 = "npm_imported_package_store") +load("@@_main~npm~npm__at_babel_helper-compilation-targets__7.20.7_at_babel_core_7.21.0__links//:defs.bzl", store_52 = "npm_imported_package_store") load("@@_main~npm~npm__at_babel_helper-environment-visitor__7.18.9__links//:defs.bzl", store_53 = "npm_imported_package_store") load("@@_main~npm~npm__at_babel_helper-function-name__7.21.0__links//:defs.bzl", store_54 = "npm_imported_package_store") load("@@_main~npm~npm__at_babel_helper-hoist-variables__7.18.6__links//:defs.bzl", store_55 = "npm_imported_package_store") @@ -67,7 +67,7 @@ load("@@_main~npm~npm__at_babel_helper-validator-option__7.21.0__links//:defs.bz load("@@_main~npm~npm__at_babel_helpers__7.21.0__links//:defs.bzl", store_64 = "npm_imported_package_store") load("@@_main~npm~npm__at_babel_highlight__7.18.6__links//:defs.bzl", store_65 = "npm_imported_package_store") load("@@_main~npm~npm__at_babel_parser__7.21.2__links//:defs.bzl", store_66 = "npm_imported_package_store") -load("@@_main~npm~npm__at_babel_plugin-syntax-typescript__7.20.0__at_babel_core_7.21.0__links//:defs.bzl", store_67 = "npm_imported_package_store") +load("@@_main~npm~npm__at_babel_plugin-syntax-typescript__7.20.0_at_babel_core_7.21.0__links//:defs.bzl", store_67 = "npm_imported_package_store") load("@@_main~npm~npm__at_babel_runtime__7.21.0__links//:defs.bzl", store_68 = "npm_imported_package_store") load("@@_main~npm~npm__at_babel_template__7.20.7__links//:defs.bzl", store_69 = "npm_imported_package_store") load("@@_main~npm~npm__at_babel_traverse__7.21.2__links//:defs.bzl", store_70 = "npm_imported_package_store") @@ -112,11 +112,11 @@ load("@@_main~npm~npm__at_jridgewell_set-array__1.1.2__links//:defs.bzl", store_ load("@@_main~npm~npm__at_jridgewell_source-map__0.3.2__links//:defs.bzl", store_109 = "npm_imported_package_store") load("@@_main~npm~npm__at_jridgewell_sourcemap-codec__1.4.14__links//:defs.bzl", store_110 = "npm_imported_package_store") load("@@_main~npm~npm__at_jridgewell_trace-mapping__0.3.17__links//:defs.bzl", store_111 = "npm_imported_package_store") -load("@@_main~npm~npm__at_kubernetes_client-node__github.com_kubernetes-client_javascript_fc681991e61c6808dd26012a2331f83671a11218__bufferutil_4.0.7__links//:defs.bzl", link_112 = "npm_link_imported_package_store", store_112 = "npm_imported_package_store") +load("@@_main~npm~npm__at_kubernetes_client-node__github.com_kubernetes-client_javascript_fc681991e61c6808dd26012a2331f83671a11218_bufferutil_4.0.7__links//:defs.bzl", link_112 = "npm_link_imported_package_store", store_112 = "npm_imported_package_store") load("@@_main~npm~npm__at_mapbox_geojson-rewind__0.5.2__links//:defs.bzl", store_113 = "npm_imported_package_store") load("@@_main~npm~npm__at_mapbox_geojson-types__1.0.2__links//:defs.bzl", store_114 = "npm_imported_package_store") load("@@_main~npm~npm__at_mapbox_jsonlint-lines-primitives__2.0.2__links//:defs.bzl", store_115 = "npm_imported_package_store") -load("@@_main~npm~npm__at_mapbox_mapbox-gl-supported__1.5.0__mapbox-gl_1.10.1__links//:defs.bzl", store_116 = "npm_imported_package_store") +load("@@_main~npm~npm__at_mapbox_mapbox-gl-supported__1.5.0_mapbox-gl_1.10.1__links//:defs.bzl", store_116 = "npm_imported_package_store") load("@@_main~npm~npm__at_mapbox_node-pre-gyp__1.0.10__links//:defs.bzl", store_117 = "npm_imported_package_store") load("@@_main~npm~npm__at_mapbox_point-geometry__0.1.0__links//:defs.bzl", store_118 = "npm_imported_package_store") load("@@_main~npm~npm__at_mapbox_tiny-sdf__1.2.5__links//:defs.bzl", store_119 = "npm_imported_package_store") @@ -132,20 +132,20 @@ load("@@_main~npm~npm__at_plotly_d3__3.8.1__links//:defs.bzl", store_128 = "npm_ load("@@_main~npm~npm__at_plotly_point-cluster__3.1.9__links//:defs.bzl", store_129 = "npm_imported_package_store") load("@@_main~npm~npm__at_plotly_regl__2.1.2__links//:defs.bzl", link_130 = "npm_link_imported_package_store", store_130 = "npm_imported_package_store") load("@@_main~npm~npm__at_polka_url__1.0.0-next.21__links//:defs.bzl", store_131 = "npm_imported_package_store") -load("@@_main~npm~npm__at_puppeteer_browsers__0.5.0__typescript_4.9.5__links//:defs.bzl", store_132 = "npm_imported_package_store") -load("@@_main~npm~npm__at_rollup_plugin-commonjs__21.1.0__rollup_2.70.2__links//:defs.bzl", link_133 = "npm_link_imported_package_store", store_133 = "npm_imported_package_store") -load("@@_main~npm~npm__at_rollup_plugin-commonjs__23.0.0__rollup_2.79.1__links//:defs.bzl", link_134 = "npm_link_imported_package_store", store_134 = "npm_imported_package_store") -load("@@_main~npm~npm__at_rollup_plugin-commonjs__23.0.2__rollup_3.2.5__links//:defs.bzl", link_135 = "npm_link_imported_package_store", store_135 = "npm_imported_package_store") -load("@@_main~npm~npm__at_rollup_plugin-json__5.0.0__rollup_2.79.1__links//:defs.bzl", link_136 = "npm_link_imported_package_store", store_136 = "npm_imported_package_store") -load("@@_main~npm~npm__at_rollup_plugin-json__5.0.1__rollup_3.2.5__links//:defs.bzl", link_137 = "npm_link_imported_package_store", store_137 = "npm_imported_package_store") -load("@@_main~npm~npm__at_rollup_plugin-node-resolve__15.0.0__rollup_2.79.1__links//:defs.bzl", link_138 = "npm_link_imported_package_store", store_138 = "npm_imported_package_store") -load("@@_main~npm~npm__at_rollup_plugin-node-resolve__15.0.1__rollup_3.2.5__links//:defs.bzl", link_139 = "npm_link_imported_package_store", store_139 = "npm_imported_package_store") -load("@@_main~npm~npm__at_rollup_plugin-terser__0.2.0__rollup_2.79.1__links//:defs.bzl", link_140 = "npm_link_imported_package_store", store_140 = "npm_imported_package_store") -load("@@_main~npm~npm__at_rollup_plugin-typescript__10.0.1__500960093__links//:defs.bzl", link_141 = "npm_link_imported_package_store", store_141 = "npm_imported_package_store") -load("@@_main~npm~npm__at_rollup_pluginutils__3.1.0__rollup_2.70.2__links//:defs.bzl", store_142 = "npm_imported_package_store") +load("@@_main~npm~npm__at_puppeteer_browsers__0.5.0_typescript_4.9.5__links//:defs.bzl", store_132 = "npm_imported_package_store") +load("@@_main~npm~npm__at_rollup_plugin-commonjs__21.1.0_rollup_2.70.2__links//:defs.bzl", link_133 = "npm_link_imported_package_store", store_133 = "npm_imported_package_store") +load("@@_main~npm~npm__at_rollup_plugin-commonjs__23.0.0_rollup_2.79.1__links//:defs.bzl", link_134 = "npm_link_imported_package_store", store_134 = "npm_imported_package_store") +load("@@_main~npm~npm__at_rollup_plugin-commonjs__23.0.2_rollup_3.2.5__links//:defs.bzl", link_135 = "npm_link_imported_package_store", store_135 = "npm_imported_package_store") +load("@@_main~npm~npm__at_rollup_plugin-json__5.0.0_rollup_2.79.1__links//:defs.bzl", link_136 = "npm_link_imported_package_store", store_136 = "npm_imported_package_store") +load("@@_main~npm~npm__at_rollup_plugin-json__5.0.1_rollup_3.2.5__links//:defs.bzl", link_137 = "npm_link_imported_package_store", store_137 = "npm_imported_package_store") +load("@@_main~npm~npm__at_rollup_plugin-node-resolve__15.0.0_rollup_2.79.1__links//:defs.bzl", link_138 = "npm_link_imported_package_store", store_138 = "npm_imported_package_store") +load("@@_main~npm~npm__at_rollup_plugin-node-resolve__15.0.1_rollup_3.2.5__links//:defs.bzl", link_139 = "npm_link_imported_package_store", store_139 = "npm_imported_package_store") +load("@@_main~npm~npm__at_rollup_plugin-terser__0.2.0_rollup_2.79.1__links//:defs.bzl", link_140 = "npm_link_imported_package_store", store_140 = "npm_imported_package_store") +load("@@_main~npm~npm__at_rollup_plugin-typescript__10.0.1_500960093__links//:defs.bzl", link_141 = "npm_link_imported_package_store", store_141 = "npm_imported_package_store") +load("@@_main~npm~npm__at_rollup_pluginutils__3.1.0_rollup_2.70.2__links//:defs.bzl", store_142 = "npm_imported_package_store") load("@@_main~npm~npm__at_rollup_pluginutils__4.2.1__links//:defs.bzl", store_143 = "npm_imported_package_store") -load("@@_main~npm~npm__at_rollup_pluginutils__5.0.2__rollup_2.79.1__links//:defs.bzl", store_144 = "npm_imported_package_store") -load("@@_main~npm~npm__at_rollup_pluginutils__5.0.2__rollup_3.2.5__links//:defs.bzl", store_145 = "npm_imported_package_store") +load("@@_main~npm~npm__at_rollup_pluginutils__5.0.2_rollup_2.79.1__links//:defs.bzl", store_144 = "npm_imported_package_store") +load("@@_main~npm~npm__at_rollup_pluginutils__5.0.2_rollup_3.2.5__links//:defs.bzl", store_145 = "npm_imported_package_store") load("@@_main~npm~npm__at_sindresorhus_is__2.1.1__links//:defs.bzl", store_146 = "npm_imported_package_store") load("@@_main~npm~npm__at_szmarczak_http-timer__4.0.6__links//:defs.bzl", store_147 = "npm_imported_package_store") load("@@_main~npm~npm__at_tootallnate_once__2.0.0__links//:defs.bzl", store_148 = "npm_imported_package_store") @@ -187,7 +187,7 @@ load("@@_main~npm~npm__at_vanilla-extract_css__1.9.2__links//:defs.bzl", link_18 load("@@_main~npm~npm__at_vanilla-extract_css__1.9.5__links//:defs.bzl", store_184 = "npm_imported_package_store") load("@@_main~npm~npm__at_vanilla-extract_integration__6.1.0__links//:defs.bzl", store_185 = "npm_imported_package_store") load("@@_main~npm~npm__at_vanilla-extract_private__1.0.3__links//:defs.bzl", store_186 = "npm_imported_package_store") -load("@@_main~npm~npm__at_vanilla-extract_webpack-plugin__2.2.0__webpack_5.76.3__links//:defs.bzl", link_187 = "npm_link_imported_package_store", store_187 = "npm_imported_package_store") +load("@@_main~npm~npm__at_vanilla-extract_webpack-plugin__2.2.0_webpack_5.76.3__links//:defs.bzl", link_187 = "npm_link_imported_package_store", store_187 = "npm_imported_package_store") load("@@_main~npm~npm__at_webassemblyjs_ast__1.11.1__links//:defs.bzl", store_188 = "npm_imported_package_store") load("@@_main~npm~npm__at_webassemblyjs_floating-point-hex-parser__1.11.1__links//:defs.bzl", store_189 = "npm_imported_package_store") load("@@_main~npm~npm__at_webassemblyjs_helper-api-error__1.11.1__links//:defs.bzl", store_190 = "npm_imported_package_store") @@ -203,9 +203,9 @@ load("@@_main~npm~npm__at_webassemblyjs_wasm-gen__1.11.1__links//:defs.bzl", sto load("@@_main~npm~npm__at_webassemblyjs_wasm-opt__1.11.1__links//:defs.bzl", store_200 = "npm_imported_package_store") load("@@_main~npm~npm__at_webassemblyjs_wasm-parser__1.11.1__links//:defs.bzl", store_201 = "npm_imported_package_store") load("@@_main~npm~npm__at_webassemblyjs_wast-printer__1.11.1__links//:defs.bzl", store_202 = "npm_imported_package_store") -load("@@_main~npm~npm__at_webpack-cli_configtest__2.0.1__1256213976__links//:defs.bzl", store_203 = "npm_imported_package_store") -load("@@_main~npm~npm__at_webpack-cli_info__2.0.1__1256213976__links//:defs.bzl", store_204 = "npm_imported_package_store") -load("@@_main~npm~npm__at_webpack-cli_serve__2.0.1__1256213976__links//:defs.bzl", store_205 = "npm_imported_package_store") +load("@@_main~npm~npm__at_webpack-cli_configtest__2.0.1_1256213976__links//:defs.bzl", store_203 = "npm_imported_package_store") +load("@@_main~npm~npm__at_webpack-cli_info__2.0.1_1256213976__links//:defs.bzl", store_204 = "npm_imported_package_store") +load("@@_main~npm~npm__at_webpack-cli_serve__2.0.1_1256213976__links//:defs.bzl", store_205 = "npm_imported_package_store") load("@@_main~npm~npm__at_xtuc_ieee754__1.2.0__links//:defs.bzl", store_206 = "npm_imported_package_store") load("@@_main~npm~npm__at_xtuc_long__4.2.2__links//:defs.bzl", store_207 = "npm_imported_package_store") load("@@_main~npm~npm__aws-sign2__0.7.0__links//:defs.bzl", store_208 = "npm_imported_package_store") @@ -257,7 +257,7 @@ load("@@_main~npm~npm__chokidar__3.5.3__links//:defs.bzl", store_253 = "npm_impo load("@@_main~npm~npm__chownr__1.1.4__links//:defs.bzl", store_254 = "npm_imported_package_store") load("@@_main~npm~npm__chownr__2.0.0__links//:defs.bzl", store_255 = "npm_imported_package_store") load("@@_main~npm~npm__chrome-trace-event__1.0.3__links//:defs.bzl", store_256 = "npm_imported_package_store") -load("@@_main~npm~npm__chromium-bidi__0.4.7__devtools-protocol_0.0.1107588__links//:defs.bzl", store_257 = "npm_imported_package_store") +load("@@_main~npm~npm__chromium-bidi__0.4.7_devtools-protocol_0.0.1107588__links//:defs.bzl", store_257 = "npm_imported_package_store") load("@@_main~npm~npm__clamp__1.0.1__links//:defs.bzl", store_258 = "npm_imported_package_store") load("@@_main~npm~npm__clean-stack__2.2.0__links//:defs.bzl", store_259 = "npm_imported_package_store") load("@@_main~npm~npm__cliui__7.0.4__links//:defs.bzl", store_260 = "npm_imported_package_store") @@ -301,7 +301,7 @@ load("@@_main~npm~npm__css-font-style-keywords__1.0.1__links//:defs.bzl", store_ load("@@_main~npm~npm__css-font-weight-keywords__1.0.0__links//:defs.bzl", store_298 = "npm_imported_package_store") load("@@_main~npm~npm__css-font__1.2.0__links//:defs.bzl", store_299 = "npm_imported_package_store") load("@@_main~npm~npm__css-global-keywords__1.0.1__links//:defs.bzl", store_300 = "npm_imported_package_store") -load("@@_main~npm~npm__css-loader__6.7.3__webpack_5.76.3__links//:defs.bzl", link_301 = "npm_link_imported_package_store", store_301 = "npm_imported_package_store") +load("@@_main~npm~npm__css-loader__6.7.3_webpack_5.76.3__links//:defs.bzl", link_301 = "npm_link_imported_package_store", store_301 = "npm_imported_package_store") load("@@_main~npm~npm__css-system-font-keywords__1.0.0__links//:defs.bzl", store_302 = "npm_imported_package_store") load("@@_main~npm~npm__css-what__5.1.0__links//:defs.bzl", store_303 = "npm_imported_package_store") load("@@_main~npm~npm__csscolorparser__1.0.3__links//:defs.bzl", store_304 = "npm_imported_package_store") @@ -329,7 +329,7 @@ load("@@_main~npm~npm__date.js__0.3.3__links//:defs.bzl", store_325 = "npm_impor load("@@_main~npm~npm__debug__2.6.9__links//:defs.bzl", store_326 = "npm_imported_package_store") load("@@_main~npm~npm__debug__3.1.0__links//:defs.bzl", store_327 = "npm_imported_package_store") load("@@_main~npm~npm__debug__3.2.7__links//:defs.bzl", link_328 = "npm_link_imported_package_store", store_328 = "npm_imported_package_store") -load("@@_main~npm~npm__debug__4.3.4__supports-color_8.1.1__links//:defs.bzl", store_329 = "npm_imported_package_store") +load("@@_main~npm~npm__debug__4.3.4_supports-color_8.1.1__links//:defs.bzl", store_329 = "npm_imported_package_store") load("@@_main~npm~npm__debug__github.com_ngokevin_debug_9742c5f383a6f8046241920156236ade8ec30d53__links//:defs.bzl", link_330 = "npm_link_imported_package_store", store_330 = "npm_imported_package_store") load("@@_main~npm~npm__decamelize__4.0.0__links//:defs.bzl", store_331 = "npm_imported_package_store") load("@@_main~npm~npm__decimal.js__10.4.3__links//:defs.bzl", store_332 = "npm_imported_package_store") @@ -514,7 +514,7 @@ load("@@_main~npm~npm__https-proxy-agent__5.0.1__links//:defs.bzl", store_510 = load("@@_main~npm~npm__humanize-ms__1.2.1__links//:defs.bzl", store_511 = "npm_imported_package_store") load("@@_main~npm~npm__iconv-lite__0.4.24__links//:defs.bzl", store_512 = "npm_imported_package_store") load("@@_main~npm~npm__iconv-lite__0.6.3__links//:defs.bzl", store_513 = "npm_imported_package_store") -load("@@_main~npm~npm__icss-utils__5.1.0__postcss_8.4.21__links//:defs.bzl", store_514 = "npm_imported_package_store") +load("@@_main~npm~npm__icss-utils__5.1.0_postcss_8.4.21__links//:defs.bzl", store_514 = "npm_imported_package_store") load("@@_main~npm~npm__ieee754__1.2.1__links//:defs.bzl", store_515 = "npm_imported_package_store") load("@@_main~npm~npm__ignore-walk__3.0.4__links//:defs.bzl", store_516 = "npm_imported_package_store") load("@@_main~npm~npm__import-fresh__3.3.0__links//:defs.bzl", store_517 = "npm_imported_package_store") @@ -561,7 +561,7 @@ load("@@_main~npm~npm__isarray__1.0.0__links//:defs.bzl", store_557 = "npm_impor load("@@_main~npm~npm__isarray__2.0.5__links//:defs.bzl", store_558 = "npm_imported_package_store") load("@@_main~npm~npm__isexe__2.0.0__links//:defs.bzl", store_559 = "npm_imported_package_store") load("@@_main~npm~npm__isobject__3.0.1__links//:defs.bzl", store_560 = "npm_imported_package_store") -load("@@_main~npm~npm__isomorphic-ws__5.0.0__ws_8.13.0__links//:defs.bzl", store_561 = "npm_imported_package_store") +load("@@_main~npm~npm__isomorphic-ws__5.0.0_ws_8.13.0__links//:defs.bzl", store_561 = "npm_imported_package_store") load("@@_main~npm~npm__isstream__0.1.2__links//:defs.bzl", store_562 = "npm_imported_package_store") load("@@_main~npm~npm__istanbul-lib-coverage__3.2.0__links//:defs.bzl", store_563 = "npm_imported_package_store") load("@@_main~npm~npm__istanbul-lib-report__3.0.0__links//:defs.bzl", store_564 = "npm_imported_package_store") @@ -620,14 +620,14 @@ load("@@_main~npm~npm__mapbox-gl__1.10.1__links//:defs.bzl", store_616 = "npm_im load("@@_main~npm~npm__math-log2__1.0.1__links//:defs.bzl", store_617 = "npm_imported_package_store") load("@@_main~npm~npm__mathjs__11.4.0__links//:defs.bzl", link_618 = "npm_link_imported_package_store", store_618 = "npm_imported_package_store") load("@@_main~npm~npm__md5__2.3.0__links//:defs.bzl", store_619 = "npm_imported_package_store") -load("@@_main~npm~npm__meaning-of-life__1.0.0__o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_620 = "npm_link_imported_package_store", store_620 = "npm_imported_package_store") +load("@@_main~npm~npm__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_620 = "npm_link_imported_package_store", store_620 = "npm_imported_package_store") load("@@_main~npm~npm__media-query-parser__2.0.2__links//:defs.bzl", store_621 = "npm_imported_package_store") load("@@_main~npm~npm__merge-stream__2.0.0__links//:defs.bzl", store_622 = "npm_imported_package_store") load("@@_main~npm~npm__mime-db__1.52.0__links//:defs.bzl", store_623 = "npm_imported_package_store") load("@@_main~npm~npm__mime-types__2.1.35__links//:defs.bzl", store_624 = "npm_imported_package_store") load("@@_main~npm~npm__mimic-response__1.0.1__links//:defs.bzl", store_625 = "npm_imported_package_store") load("@@_main~npm~npm__mimic-response__2.1.0__links//:defs.bzl", store_626 = "npm_imported_package_store") -load("@@_main~npm~npm__mini-css-extract-plugin__2.7.5__webpack_5.76.3__links//:defs.bzl", link_627 = "npm_link_imported_package_store", store_627 = "npm_imported_package_store") +load("@@_main~npm~npm__mini-css-extract-plugin__2.7.5_webpack_5.76.3__links//:defs.bzl", link_627 = "npm_link_imported_package_store", store_627 = "npm_imported_package_store") load("@@_main~npm~npm__minimatch__3.1.2__links//:defs.bzl", store_628 = "npm_imported_package_store") load("@@_main~npm~npm__minimatch__5.0.1__links//:defs.bzl", store_629 = "npm_imported_package_store") load("@@_main~npm~npm__minimatch__5.1.6__links//:defs.bzl", store_630 = "npm_imported_package_store") @@ -651,12 +651,12 @@ load("@@_main~npm~npm__mkdirp-classic__0.5.3__links//:defs.bzl", store_647 = "np load("@@_main~npm~npm__mkdirp__0.5.6__links//:defs.bzl", store_648 = "npm_imported_package_store") load("@@_main~npm~npm__mkdirp__1.0.4__links//:defs.bzl", store_649 = "npm_imported_package_store") load("@@_main~npm~npm__mlly__1.1.1__links//:defs.bzl", store_650 = "npm_imported_package_store") -load("@@_main~npm~npm__mobx-react-lite__3.4.0__mobx_6.3.0__react_17.0.2__links//:defs.bzl", store_651 = "npm_imported_package_store") -load("@@_main~npm~npm__mobx-react__7.3.0__mobx_6.3.0__react_17.0.2__links//:defs.bzl", link_652 = "npm_link_imported_package_store", store_652 = "npm_imported_package_store") +load("@@_main~npm~npm__mobx-react-lite__3.4.0_mobx_6.3.0_react_17.0.2__links//:defs.bzl", store_651 = "npm_imported_package_store") +load("@@_main~npm~npm__mobx-react__7.3.0_mobx_6.3.0_react_17.0.2__links//:defs.bzl", link_652 = "npm_link_imported_package_store", store_652 = "npm_imported_package_store") load("@@_main~npm~npm__mobx__6.3.0__links//:defs.bzl", link_653 = "npm_link_imported_package_store", store_653 = "npm_imported_package_store") -load("@@_main~npm~npm__mocha-junit-reporter__2.2.0__mocha_10.2.0__links//:defs.bzl", link_654 = "npm_link_imported_package_store", store_654 = "npm_imported_package_store") -load("@@_main~npm~npm__mocha-multi-reporters__1.5.1__181752652__links//:defs.bzl", link_655 = "npm_link_imported_package_store", store_655 = "npm_imported_package_store") -load("@@_main~npm~npm__mocha__10.2.0__mocha-multi-reporters_1.5.1__links//:defs.bzl", link_656 = "npm_link_imported_package_store", store_656 = "npm_imported_package_store") +load("@@_main~npm~npm__mocha-junit-reporter__2.2.0_mocha_10.2.0__links//:defs.bzl", link_654 = "npm_link_imported_package_store", store_654 = "npm_imported_package_store") +load("@@_main~npm~npm__mocha-multi-reporters__1.5.1_181752652__links//:defs.bzl", link_655 = "npm_link_imported_package_store", store_655 = "npm_imported_package_store") +load("@@_main~npm~npm__mocha__10.2.0_mocha-multi-reporters_1.5.1__links//:defs.bzl", link_656 = "npm_link_imported_package_store", store_656 = "npm_imported_package_store") load("@@_main~npm~npm__moment-timezone__0.5.41__links//:defs.bzl", store_657 = "npm_imported_package_store") load("@@_main~npm~npm__moment__2.29.4__links//:defs.bzl", store_658 = "npm_imported_package_store") load("@@_main~npm~npm__mouse-change__1.4.0__links//:defs.bzl", store_659 = "npm_imported_package_store") @@ -751,10 +751,10 @@ load("@@_main~npm~npm__plotly.js__2.25.2__links//:defs.bzl", link_747 = "npm_lin load("@@_main~npm~npm__pngjs__5.0.0__links//:defs.bzl", link_748 = "npm_link_imported_package_store", store_748 = "npm_imported_package_store") load("@@_main~npm~npm__point-in-polygon__1.1.0__links//:defs.bzl", store_749 = "npm_imported_package_store") load("@@_main~npm~npm__polybooljs__1.2.0__links//:defs.bzl", store_750 = "npm_imported_package_store") -load("@@_main~npm~npm__postcss-modules-extract-imports__3.0.0__postcss_8.4.21__links//:defs.bzl", store_751 = "npm_imported_package_store") -load("@@_main~npm~npm__postcss-modules-local-by-default__4.0.0__postcss_8.4.21__links//:defs.bzl", store_752 = "npm_imported_package_store") -load("@@_main~npm~npm__postcss-modules-scope__3.0.0__postcss_8.4.21__links//:defs.bzl", store_753 = "npm_imported_package_store") -load("@@_main~npm~npm__postcss-modules-values__4.0.0__postcss_8.4.21__links//:defs.bzl", store_754 = "npm_imported_package_store") +load("@@_main~npm~npm__postcss-modules-extract-imports__3.0.0_postcss_8.4.21__links//:defs.bzl", store_751 = "npm_imported_package_store") +load("@@_main~npm~npm__postcss-modules-local-by-default__4.0.0_postcss_8.4.21__links//:defs.bzl", store_752 = "npm_imported_package_store") +load("@@_main~npm~npm__postcss-modules-scope__3.0.0_postcss_8.4.21__links//:defs.bzl", store_753 = "npm_imported_package_store") +load("@@_main~npm~npm__postcss-modules-values__4.0.0_postcss_8.4.21__links//:defs.bzl", store_754 = "npm_imported_package_store") load("@@_main~npm~npm__postcss-selector-parser__6.0.11__links//:defs.bzl", store_755 = "npm_imported_package_store") load("@@_main~npm~npm__postcss-value-parser__4.2.0__links//:defs.bzl", store_756 = "npm_imported_package_store") load("@@_main~npm~npm__postcss__8.4.21__links//:defs.bzl", store_757 = "npm_imported_package_store") @@ -773,8 +773,8 @@ load("@@_main~npm~npm__psl__1.9.0__links//:defs.bzl", store_769 = "npm_imported_ load("@@_main~npm~npm__pump__1.0.3__links//:defs.bzl", store_770 = "npm_imported_package_store") load("@@_main~npm~npm__pump__3.0.0__links//:defs.bzl", store_771 = "npm_imported_package_store") load("@@_main~npm~npm__punycode__2.3.0__links//:defs.bzl", store_772 = "npm_imported_package_store") -load("@@_main~npm~npm__puppeteer-core__19.11.0__369149898__links//:defs.bzl", store_773 = "npm_imported_package_store") -load("@@_main~npm~npm__puppeteer__19.11.0__369149898__links//:defs.bzl", link_774 = "npm_link_imported_package_store", store_774 = "npm_imported_package_store") +load("@@_main~npm~npm__puppeteer-core__19.11.0_369149898__links//:defs.bzl", store_773 = "npm_imported_package_store") +load("@@_main~npm~npm__puppeteer__19.11.0_369149898__links//:defs.bzl", link_774 = "npm_link_imported_package_store", store_774 = "npm_imported_package_store") load("@@_main~npm~npm__qs__6.5.3__links//:defs.bzl", store_775 = "npm_imported_package_store") load("@@_main~npm~npm__queue-tick__1.0.1__links//:defs.bzl", store_776 = "npm_imported_package_store") load("@@_main~npm~npm__quickselect__2.0.0__links//:defs.bzl", store_777 = "npm_imported_package_store") @@ -889,7 +889,7 @@ load("@@_main~npm~npm__tar-stream__2.2.0__links//:defs.bzl", store_885 = "npm_im load("@@_main~npm~npm__tar-stream__3.0.0__links//:defs.bzl", link_886 = "npm_link_imported_package_store", store_886 = "npm_imported_package_store") load("@@_main~npm~npm__tar__4.4.19__links//:defs.bzl", store_887 = "npm_imported_package_store") load("@@_main~npm~npm__tar__6.1.13__links//:defs.bzl", store_888 = "npm_imported_package_store") -load("@@_main~npm~npm__terser-webpack-plugin__5.3.6__webpack_5.76.3__links//:defs.bzl", store_889 = "npm_imported_package_store") +load("@@_main~npm~npm__terser-webpack-plugin__5.3.6_webpack_5.76.3__links//:defs.bzl", store_889 = "npm_imported_package_store") load("@@_main~npm~npm__terser__5.16.5__links//:defs.bzl", store_890 = "npm_imported_package_store") load("@@_main~npm~npm__test-exclude__6.0.0__links//:defs.bzl", store_891 = "npm_imported_package_store") load("@@_main~npm~npm__through2__0.6.5__links//:defs.bzl", store_892 = "npm_imported_package_store") @@ -934,7 +934,7 @@ load("@@_main~npm~npm__universalify__2.0.0__links//:defs.bzl", store_930 = "npm_ load("@@_main~npm~npm__unix-dgram__2.0.6__links//:defs.bzl", store_931 = "npm_imported_package_store") load("@@_main~npm~npm__unquote__1.1.1__links//:defs.bzl", store_932 = "npm_imported_package_store") load("@@_main~npm~npm__unused__0.2.2__links//:defs.bzl", link_933 = "npm_link_imported_package_store", store_933 = "npm_imported_package_store") -load("@@_main~npm~npm__update-browserslist-db__1.0.10__browserslist_4.21.5__links//:defs.bzl", store_934 = "npm_imported_package_store") +load("@@_main~npm~npm__update-browserslist-db__1.0.10_browserslist_4.21.5__links//:defs.bzl", store_934 = "npm_imported_package_store") load("@@_main~npm~npm__update-diff__1.1.0__links//:defs.bzl", store_935 = "npm_imported_package_store") load("@@_main~npm~npm__uri-js__4.4.1__links//:defs.bzl", store_936 = "npm_imported_package_store") load("@@_main~npm~npm__util-deprecate__1.0.2__links//:defs.bzl", store_937 = "npm_imported_package_store") @@ -948,11 +948,11 @@ load("@@_main~npm~npm__watchpack__2.4.0__links//:defs.bzl", store_944 = "npm_imp load("@@_main~npm~npm__weak-map__1.0.8__links//:defs.bzl", store_945 = "npm_imported_package_store") load("@@_main~npm~npm__webgl-context__2.2.0__links//:defs.bzl", store_946 = "npm_imported_package_store") load("@@_main~npm~npm__webidl-conversions__3.0.1__links//:defs.bzl", store_947 = "npm_imported_package_store") -load("@@_main~npm~npm__webpack-bundle-analyzer__4.5.0__bufferutil_4.0.7__links//:defs.bzl", link_948 = "npm_link_imported_package_store", store_948 = "npm_imported_package_store") -load("@@_main~npm~npm__webpack-cli__5.0.1__webpack_5.76.3__links//:defs.bzl", link_949 = "npm_link_imported_package_store", store_949 = "npm_imported_package_store") +load("@@_main~npm~npm__webpack-bundle-analyzer__4.5.0_bufferutil_4.0.7__links//:defs.bzl", link_948 = "npm_link_imported_package_store", store_948 = "npm_imported_package_store") +load("@@_main~npm~npm__webpack-cli__5.0.1_webpack_5.76.3__links//:defs.bzl", link_949 = "npm_link_imported_package_store", store_949 = "npm_imported_package_store") load("@@_main~npm~npm__webpack-merge__5.8.0__links//:defs.bzl", store_950 = "npm_imported_package_store") load("@@_main~npm~npm__webpack-sources__3.2.3__links//:defs.bzl", store_951 = "npm_imported_package_store") -load("@@_main~npm~npm__webpack__5.76.3__webpack-cli_5.0.1__links//:defs.bzl", link_952 = "npm_link_imported_package_store", store_952 = "npm_imported_package_store") +load("@@_main~npm~npm__webpack__5.76.3_webpack-cli_5.0.1__links//:defs.bzl", link_952 = "npm_link_imported_package_store", store_952 = "npm_imported_package_store") load("@@_main~npm~npm__whatwg-url__5.0.0__links//:defs.bzl", store_953 = "npm_imported_package_store") load("@@_main~npm~npm__which__2.0.2__links//:defs.bzl", store_954 = "npm_imported_package_store") load("@@_main~npm~npm__wide-align__1.1.5__links//:defs.bzl", store_955 = "npm_imported_package_store") @@ -964,8 +964,8 @@ load("@@_main~npm~npm__world-calendars__1.0.3__links//:defs.bzl", store_960 = "n load("@@_main~npm~npm__wrap-ansi__7.0.0__links//:defs.bzl", store_961 = "npm_imported_package_store") load("@@_main~npm~npm__wrap-ansi__8.1.0__links//:defs.bzl", store_962 = "npm_imported_package_store") load("@@_main~npm~npm__wrappy__1.0.2__links//:defs.bzl", store_963 = "npm_imported_package_store") -load("@@_main~npm~npm__ws__7.5.9__bufferutil_4.0.7__links//:defs.bzl", store_964 = "npm_imported_package_store") -load("@@_main~npm~npm__ws__8.13.0__bufferutil_4.0.7__links//:defs.bzl", store_965 = "npm_imported_package_store") +load("@@_main~npm~npm__ws__7.5.9_bufferutil_4.0.7__links//:defs.bzl", store_964 = "npm_imported_package_store") +load("@@_main~npm~npm__ws__8.13.0_bufferutil_4.0.7__links//:defs.bzl", store_965 = "npm_imported_package_store") load("@@_main~npm~npm__xml__1.0.1__links//:defs.bzl", store_966 = "npm_imported_package_store") load("@@_main~npm~npm__xtend__2.2.0__links//:defs.bzl", store_967 = "npm_imported_package_store") load("@@_main~npm~npm__xtend__4.0.2__links//:defs.bzl", store_968 = "npm_imported_package_store") diff --git a/npm/private/test/snapshots/wksp/npm_defs.bzl b/npm/private/test/snapshots/wksp/npm_defs.bzl index fd2245fb7..07a74a96d 100644 --- a/npm/private/test/snapshots/wksp/npm_defs.bzl +++ b/npm/private/test/snapshots/wksp/npm_defs.bzl @@ -4,7 +4,7 @@ load("@@npm__abbrev__1.1.1__links//:defs.bzl", store_0 = "npm_imported_package_s load("@@npm__abort-controller__3.0.0__links//:defs.bzl", store_1 = "npm_imported_package_store") load("@@npm__abortcontroller-polyfill__1.7.5__links//:defs.bzl", link_2 = "npm_link_imported_package_store", store_2 = "npm_imported_package_store") load("@@npm__abs-svg-path__0.1.1__links//:defs.bzl", store_3 = "npm_imported_package_store") -load("@@npm__acorn-import-assertions__1.8.0__acorn_8.8.2__links//:defs.bzl", store_4 = "npm_imported_package_store") +load("@@npm__acorn-import-assertions__1.8.0_acorn_8.8.2__links//:defs.bzl", store_4 = "npm_imported_package_store") load("@@npm__acorn-walk__8.2.0__links//:defs.bzl", store_5 = "npm_imported_package_store") load("@@npm__acorn__7.4.1__links//:defs.bzl", store_6 = "npm_imported_package_store") load("@@npm__acorn__8.7.1__links//:defs.bzl", link_7 = "npm_link_imported_package_store", store_7 = "npm_imported_package_store") @@ -13,9 +13,9 @@ load("@@npm__agent-base__6.0.2__links//:defs.bzl", store_9 = "npm_imported_packa load("@@npm__agentkeepalive__4.2.1__links//:defs.bzl", store_10 = "npm_imported_package_store") load("@@npm__aggregate-error__3.1.0__links//:defs.bzl", store_11 = "npm_imported_package_store") load("@@npm__ahocorasick__1.0.2__links//:defs.bzl", store_12 = "npm_imported_package_store") -load("@@npm__ajv-formats__2.1.1__ajv_8.12.0__links//:defs.bzl", store_13 = "npm_imported_package_store") -load("@@npm__ajv-keywords__3.5.2__ajv_6.12.6__links//:defs.bzl", store_14 = "npm_imported_package_store") -load("@@npm__ajv-keywords__5.1.0__ajv_8.12.0__links//:defs.bzl", store_15 = "npm_imported_package_store") +load("@@npm__ajv-formats__2.1.1_ajv_8.12.0__links//:defs.bzl", store_13 = "npm_imported_package_store") +load("@@npm__ajv-keywords__3.5.2_ajv_6.12.6__links//:defs.bzl", store_14 = "npm_imported_package_store") +load("@@npm__ajv-keywords__5.1.0_ajv_8.12.0__links//:defs.bzl", store_15 = "npm_imported_package_store") load("@@npm__ajv__6.12.6__links//:defs.bzl", store_16 = "npm_imported_package_store") load("@@npm__ajv__8.12.0__links//:defs.bzl", store_17 = "npm_imported_package_store") load("@@npm__almost-equal__1.1.0__links//:defs.bzl", store_18 = "npm_imported_package_store") @@ -45,14 +45,14 @@ load("@@npm__at_ampproject_remapping__2.2.0__links//:defs.bzl", store_41 = "npm_ load("@@npm__at_aspect-test_a__5.0.2__links//:defs.bzl", link_42 = "npm_link_imported_package_store", store_42 = "npm_imported_package_store") load("@@npm__at_aspect-test_b__5.0.2__links//:defs.bzl", store_43 = "npm_imported_package_store") load("@@npm__at_aspect-test_c__2.0.2__links//:defs.bzl", link_44 = "npm_link_imported_package_store", store_44 = "npm_imported_package_store") -load("@@npm__at_aspect-test_d__2.0.0__at_aspect-test_c_2.0.2__links//:defs.bzl", store_45 = "npm_imported_package_store") +load("@@npm__at_aspect-test_d__2.0.0_at_aspect-test_c_2.0.2__links//:defs.bzl", store_45 = "npm_imported_package_store") load("@@npm__at_aspect-test_e__1.0.0__links//:defs.bzl", link_46 = "npm_link_imported_package_store", store_46 = "npm_imported_package_store") load("@@npm__at_aspect-test_f__1.0.0__links//:defs.bzl", link_47 = "npm_link_imported_package_store", store_47 = "npm_imported_package_store") load("@@npm__at_babel_code-frame__7.18.6__links//:defs.bzl", store_48 = "npm_imported_package_store") load("@@npm__at_babel_compat-data__7.21.0__links//:defs.bzl", store_49 = "npm_imported_package_store") load("@@npm__at_babel_core__7.21.0__links//:defs.bzl", store_50 = "npm_imported_package_store") load("@@npm__at_babel_generator__7.21.1__links//:defs.bzl", store_51 = "npm_imported_package_store") -load("@@npm__at_babel_helper-compilation-targets__7.20.7__at_babel_core_7.21.0__links//:defs.bzl", store_52 = "npm_imported_package_store") +load("@@npm__at_babel_helper-compilation-targets__7.20.7_at_babel_core_7.21.0__links//:defs.bzl", store_52 = "npm_imported_package_store") load("@@npm__at_babel_helper-environment-visitor__7.18.9__links//:defs.bzl", store_53 = "npm_imported_package_store") load("@@npm__at_babel_helper-function-name__7.21.0__links//:defs.bzl", store_54 = "npm_imported_package_store") load("@@npm__at_babel_helper-hoist-variables__7.18.6__links//:defs.bzl", store_55 = "npm_imported_package_store") @@ -67,7 +67,7 @@ load("@@npm__at_babel_helper-validator-option__7.21.0__links//:defs.bzl", store_ load("@@npm__at_babel_helpers__7.21.0__links//:defs.bzl", store_64 = "npm_imported_package_store") load("@@npm__at_babel_highlight__7.18.6__links//:defs.bzl", store_65 = "npm_imported_package_store") load("@@npm__at_babel_parser__7.21.2__links//:defs.bzl", store_66 = "npm_imported_package_store") -load("@@npm__at_babel_plugin-syntax-typescript__7.20.0__at_babel_core_7.21.0__links//:defs.bzl", store_67 = "npm_imported_package_store") +load("@@npm__at_babel_plugin-syntax-typescript__7.20.0_at_babel_core_7.21.0__links//:defs.bzl", store_67 = "npm_imported_package_store") load("@@npm__at_babel_runtime__7.21.0__links//:defs.bzl", store_68 = "npm_imported_package_store") load("@@npm__at_babel_template__7.20.7__links//:defs.bzl", store_69 = "npm_imported_package_store") load("@@npm__at_babel_traverse__7.21.2__links//:defs.bzl", store_70 = "npm_imported_package_store") @@ -112,11 +112,11 @@ load("@@npm__at_jridgewell_set-array__1.1.2__links//:defs.bzl", store_108 = "npm load("@@npm__at_jridgewell_source-map__0.3.2__links//:defs.bzl", store_109 = "npm_imported_package_store") load("@@npm__at_jridgewell_sourcemap-codec__1.4.14__links//:defs.bzl", store_110 = "npm_imported_package_store") load("@@npm__at_jridgewell_trace-mapping__0.3.17__links//:defs.bzl", store_111 = "npm_imported_package_store") -load("@@npm__at_kubernetes_client-node__github.com_kubernetes-client_javascript_fc681991e61c6808dd26012a2331f83671a11218__bufferutil_4.0.7__links//:defs.bzl", link_112 = "npm_link_imported_package_store", store_112 = "npm_imported_package_store") +load("@@npm__at_kubernetes_client-node__github.com_kubernetes-client_javascript_fc681991e61c6808dd26012a2331f83671a11218_bufferutil_4.0.7__links//:defs.bzl", link_112 = "npm_link_imported_package_store", store_112 = "npm_imported_package_store") load("@@npm__at_mapbox_geojson-rewind__0.5.2__links//:defs.bzl", store_113 = "npm_imported_package_store") load("@@npm__at_mapbox_geojson-types__1.0.2__links//:defs.bzl", store_114 = "npm_imported_package_store") load("@@npm__at_mapbox_jsonlint-lines-primitives__2.0.2__links//:defs.bzl", store_115 = "npm_imported_package_store") -load("@@npm__at_mapbox_mapbox-gl-supported__1.5.0__mapbox-gl_1.10.1__links//:defs.bzl", store_116 = "npm_imported_package_store") +load("@@npm__at_mapbox_mapbox-gl-supported__1.5.0_mapbox-gl_1.10.1__links//:defs.bzl", store_116 = "npm_imported_package_store") load("@@npm__at_mapbox_node-pre-gyp__1.0.10__links//:defs.bzl", store_117 = "npm_imported_package_store") load("@@npm__at_mapbox_point-geometry__0.1.0__links//:defs.bzl", store_118 = "npm_imported_package_store") load("@@npm__at_mapbox_tiny-sdf__1.2.5__links//:defs.bzl", store_119 = "npm_imported_package_store") @@ -132,20 +132,20 @@ load("@@npm__at_plotly_d3__3.8.1__links//:defs.bzl", store_128 = "npm_imported_p load("@@npm__at_plotly_point-cluster__3.1.9__links//:defs.bzl", store_129 = "npm_imported_package_store") load("@@npm__at_plotly_regl__2.1.2__links//:defs.bzl", link_130 = "npm_link_imported_package_store", store_130 = "npm_imported_package_store") load("@@npm__at_polka_url__1.0.0-next.21__links//:defs.bzl", store_131 = "npm_imported_package_store") -load("@@npm__at_puppeteer_browsers__0.5.0__typescript_4.9.5__links//:defs.bzl", store_132 = "npm_imported_package_store") -load("@@npm__at_rollup_plugin-commonjs__21.1.0__rollup_2.70.2__links//:defs.bzl", link_133 = "npm_link_imported_package_store", store_133 = "npm_imported_package_store") -load("@@npm__at_rollup_plugin-commonjs__23.0.0__rollup_2.79.1__links//:defs.bzl", link_134 = "npm_link_imported_package_store", store_134 = "npm_imported_package_store") -load("@@npm__at_rollup_plugin-commonjs__23.0.2__rollup_3.2.5__links//:defs.bzl", link_135 = "npm_link_imported_package_store", store_135 = "npm_imported_package_store") -load("@@npm__at_rollup_plugin-json__5.0.0__rollup_2.79.1__links//:defs.bzl", link_136 = "npm_link_imported_package_store", store_136 = "npm_imported_package_store") -load("@@npm__at_rollup_plugin-json__5.0.1__rollup_3.2.5__links//:defs.bzl", link_137 = "npm_link_imported_package_store", store_137 = "npm_imported_package_store") -load("@@npm__at_rollup_plugin-node-resolve__15.0.0__rollup_2.79.1__links//:defs.bzl", link_138 = "npm_link_imported_package_store", store_138 = "npm_imported_package_store") -load("@@npm__at_rollup_plugin-node-resolve__15.0.1__rollup_3.2.5__links//:defs.bzl", link_139 = "npm_link_imported_package_store", store_139 = "npm_imported_package_store") -load("@@npm__at_rollup_plugin-terser__0.2.0__rollup_2.79.1__links//:defs.bzl", link_140 = "npm_link_imported_package_store", store_140 = "npm_imported_package_store") -load("@@npm__at_rollup_plugin-typescript__10.0.1__500960093__links//:defs.bzl", link_141 = "npm_link_imported_package_store", store_141 = "npm_imported_package_store") -load("@@npm__at_rollup_pluginutils__3.1.0__rollup_2.70.2__links//:defs.bzl", store_142 = "npm_imported_package_store") +load("@@npm__at_puppeteer_browsers__0.5.0_typescript_4.9.5__links//:defs.bzl", store_132 = "npm_imported_package_store") +load("@@npm__at_rollup_plugin-commonjs__21.1.0_rollup_2.70.2__links//:defs.bzl", link_133 = "npm_link_imported_package_store", store_133 = "npm_imported_package_store") +load("@@npm__at_rollup_plugin-commonjs__23.0.0_rollup_2.79.1__links//:defs.bzl", link_134 = "npm_link_imported_package_store", store_134 = "npm_imported_package_store") +load("@@npm__at_rollup_plugin-commonjs__23.0.2_rollup_3.2.5__links//:defs.bzl", link_135 = "npm_link_imported_package_store", store_135 = "npm_imported_package_store") +load("@@npm__at_rollup_plugin-json__5.0.0_rollup_2.79.1__links//:defs.bzl", link_136 = "npm_link_imported_package_store", store_136 = "npm_imported_package_store") +load("@@npm__at_rollup_plugin-json__5.0.1_rollup_3.2.5__links//:defs.bzl", link_137 = "npm_link_imported_package_store", store_137 = "npm_imported_package_store") +load("@@npm__at_rollup_plugin-node-resolve__15.0.0_rollup_2.79.1__links//:defs.bzl", link_138 = "npm_link_imported_package_store", store_138 = "npm_imported_package_store") +load("@@npm__at_rollup_plugin-node-resolve__15.0.1_rollup_3.2.5__links//:defs.bzl", link_139 = "npm_link_imported_package_store", store_139 = "npm_imported_package_store") +load("@@npm__at_rollup_plugin-terser__0.2.0_rollup_2.79.1__links//:defs.bzl", link_140 = "npm_link_imported_package_store", store_140 = "npm_imported_package_store") +load("@@npm__at_rollup_plugin-typescript__10.0.1_500960093__links//:defs.bzl", link_141 = "npm_link_imported_package_store", store_141 = "npm_imported_package_store") +load("@@npm__at_rollup_pluginutils__3.1.0_rollup_2.70.2__links//:defs.bzl", store_142 = "npm_imported_package_store") load("@@npm__at_rollup_pluginutils__4.2.1__links//:defs.bzl", store_143 = "npm_imported_package_store") -load("@@npm__at_rollup_pluginutils__5.0.2__rollup_2.79.1__links//:defs.bzl", store_144 = "npm_imported_package_store") -load("@@npm__at_rollup_pluginutils__5.0.2__rollup_3.2.5__links//:defs.bzl", store_145 = "npm_imported_package_store") +load("@@npm__at_rollup_pluginutils__5.0.2_rollup_2.79.1__links//:defs.bzl", store_144 = "npm_imported_package_store") +load("@@npm__at_rollup_pluginutils__5.0.2_rollup_3.2.5__links//:defs.bzl", store_145 = "npm_imported_package_store") load("@@npm__at_sindresorhus_is__2.1.1__links//:defs.bzl", store_146 = "npm_imported_package_store") load("@@npm__at_szmarczak_http-timer__4.0.6__links//:defs.bzl", store_147 = "npm_imported_package_store") load("@@npm__at_tootallnate_once__2.0.0__links//:defs.bzl", store_148 = "npm_imported_package_store") @@ -187,7 +187,7 @@ load("@@npm__at_vanilla-extract_css__1.9.2__links//:defs.bzl", link_183 = "npm_l load("@@npm__at_vanilla-extract_css__1.9.5__links//:defs.bzl", store_184 = "npm_imported_package_store") load("@@npm__at_vanilla-extract_integration__6.1.0__links//:defs.bzl", store_185 = "npm_imported_package_store") load("@@npm__at_vanilla-extract_private__1.0.3__links//:defs.bzl", store_186 = "npm_imported_package_store") -load("@@npm__at_vanilla-extract_webpack-plugin__2.2.0__webpack_5.76.3__links//:defs.bzl", link_187 = "npm_link_imported_package_store", store_187 = "npm_imported_package_store") +load("@@npm__at_vanilla-extract_webpack-plugin__2.2.0_webpack_5.76.3__links//:defs.bzl", link_187 = "npm_link_imported_package_store", store_187 = "npm_imported_package_store") load("@@npm__at_webassemblyjs_ast__1.11.1__links//:defs.bzl", store_188 = "npm_imported_package_store") load("@@npm__at_webassemblyjs_floating-point-hex-parser__1.11.1__links//:defs.bzl", store_189 = "npm_imported_package_store") load("@@npm__at_webassemblyjs_helper-api-error__1.11.1__links//:defs.bzl", store_190 = "npm_imported_package_store") @@ -203,9 +203,9 @@ load("@@npm__at_webassemblyjs_wasm-gen__1.11.1__links//:defs.bzl", store_199 = " load("@@npm__at_webassemblyjs_wasm-opt__1.11.1__links//:defs.bzl", store_200 = "npm_imported_package_store") load("@@npm__at_webassemblyjs_wasm-parser__1.11.1__links//:defs.bzl", store_201 = "npm_imported_package_store") load("@@npm__at_webassemblyjs_wast-printer__1.11.1__links//:defs.bzl", store_202 = "npm_imported_package_store") -load("@@npm__at_webpack-cli_configtest__2.0.1__1256213976__links//:defs.bzl", store_203 = "npm_imported_package_store") -load("@@npm__at_webpack-cli_info__2.0.1__1256213976__links//:defs.bzl", store_204 = "npm_imported_package_store") -load("@@npm__at_webpack-cli_serve__2.0.1__1256213976__links//:defs.bzl", store_205 = "npm_imported_package_store") +load("@@npm__at_webpack-cli_configtest__2.0.1_1256213976__links//:defs.bzl", store_203 = "npm_imported_package_store") +load("@@npm__at_webpack-cli_info__2.0.1_1256213976__links//:defs.bzl", store_204 = "npm_imported_package_store") +load("@@npm__at_webpack-cli_serve__2.0.1_1256213976__links//:defs.bzl", store_205 = "npm_imported_package_store") load("@@npm__at_xtuc_ieee754__1.2.0__links//:defs.bzl", store_206 = "npm_imported_package_store") load("@@npm__at_xtuc_long__4.2.2__links//:defs.bzl", store_207 = "npm_imported_package_store") load("@@npm__aws-sign2__0.7.0__links//:defs.bzl", store_208 = "npm_imported_package_store") @@ -257,7 +257,7 @@ load("@@npm__chokidar__3.5.3__links//:defs.bzl", store_253 = "npm_imported_packa load("@@npm__chownr__1.1.4__links//:defs.bzl", store_254 = "npm_imported_package_store") load("@@npm__chownr__2.0.0__links//:defs.bzl", store_255 = "npm_imported_package_store") load("@@npm__chrome-trace-event__1.0.3__links//:defs.bzl", store_256 = "npm_imported_package_store") -load("@@npm__chromium-bidi__0.4.7__devtools-protocol_0.0.1107588__links//:defs.bzl", store_257 = "npm_imported_package_store") +load("@@npm__chromium-bidi__0.4.7_devtools-protocol_0.0.1107588__links//:defs.bzl", store_257 = "npm_imported_package_store") load("@@npm__clamp__1.0.1__links//:defs.bzl", store_258 = "npm_imported_package_store") load("@@npm__clean-stack__2.2.0__links//:defs.bzl", store_259 = "npm_imported_package_store") load("@@npm__cliui__7.0.4__links//:defs.bzl", store_260 = "npm_imported_package_store") @@ -301,7 +301,7 @@ load("@@npm__css-font-style-keywords__1.0.1__links//:defs.bzl", store_297 = "npm load("@@npm__css-font-weight-keywords__1.0.0__links//:defs.bzl", store_298 = "npm_imported_package_store") load("@@npm__css-font__1.2.0__links//:defs.bzl", store_299 = "npm_imported_package_store") load("@@npm__css-global-keywords__1.0.1__links//:defs.bzl", store_300 = "npm_imported_package_store") -load("@@npm__css-loader__6.7.3__webpack_5.76.3__links//:defs.bzl", link_301 = "npm_link_imported_package_store", store_301 = "npm_imported_package_store") +load("@@npm__css-loader__6.7.3_webpack_5.76.3__links//:defs.bzl", link_301 = "npm_link_imported_package_store", store_301 = "npm_imported_package_store") load("@@npm__css-system-font-keywords__1.0.0__links//:defs.bzl", store_302 = "npm_imported_package_store") load("@@npm__css-what__5.1.0__links//:defs.bzl", store_303 = "npm_imported_package_store") load("@@npm__csscolorparser__1.0.3__links//:defs.bzl", store_304 = "npm_imported_package_store") @@ -329,7 +329,7 @@ load("@@npm__date.js__0.3.3__links//:defs.bzl", store_325 = "npm_imported_packag load("@@npm__debug__2.6.9__links//:defs.bzl", store_326 = "npm_imported_package_store") load("@@npm__debug__3.1.0__links//:defs.bzl", store_327 = "npm_imported_package_store") load("@@npm__debug__3.2.7__links//:defs.bzl", link_328 = "npm_link_imported_package_store", store_328 = "npm_imported_package_store") -load("@@npm__debug__4.3.4__supports-color_8.1.1__links//:defs.bzl", store_329 = "npm_imported_package_store") +load("@@npm__debug__4.3.4_supports-color_8.1.1__links//:defs.bzl", store_329 = "npm_imported_package_store") load("@@npm__debug__github.com_ngokevin_debug_9742c5f383a6f8046241920156236ade8ec30d53__links//:defs.bzl", link_330 = "npm_link_imported_package_store", store_330 = "npm_imported_package_store") load("@@npm__decamelize__4.0.0__links//:defs.bzl", store_331 = "npm_imported_package_store") load("@@npm__decimal.js__10.4.3__links//:defs.bzl", store_332 = "npm_imported_package_store") @@ -514,7 +514,7 @@ load("@@npm__https-proxy-agent__5.0.1__links//:defs.bzl", store_510 = "npm_impor load("@@npm__humanize-ms__1.2.1__links//:defs.bzl", store_511 = "npm_imported_package_store") load("@@npm__iconv-lite__0.4.24__links//:defs.bzl", store_512 = "npm_imported_package_store") load("@@npm__iconv-lite__0.6.3__links//:defs.bzl", store_513 = "npm_imported_package_store") -load("@@npm__icss-utils__5.1.0__postcss_8.4.21__links//:defs.bzl", store_514 = "npm_imported_package_store") +load("@@npm__icss-utils__5.1.0_postcss_8.4.21__links//:defs.bzl", store_514 = "npm_imported_package_store") load("@@npm__ieee754__1.2.1__links//:defs.bzl", store_515 = "npm_imported_package_store") load("@@npm__ignore-walk__3.0.4__links//:defs.bzl", store_516 = "npm_imported_package_store") load("@@npm__import-fresh__3.3.0__links//:defs.bzl", store_517 = "npm_imported_package_store") @@ -561,7 +561,7 @@ load("@@npm__isarray__1.0.0__links//:defs.bzl", store_557 = "npm_imported_packag load("@@npm__isarray__2.0.5__links//:defs.bzl", store_558 = "npm_imported_package_store") load("@@npm__isexe__2.0.0__links//:defs.bzl", store_559 = "npm_imported_package_store") load("@@npm__isobject__3.0.1__links//:defs.bzl", store_560 = "npm_imported_package_store") -load("@@npm__isomorphic-ws__5.0.0__ws_8.13.0__links//:defs.bzl", store_561 = "npm_imported_package_store") +load("@@npm__isomorphic-ws__5.0.0_ws_8.13.0__links//:defs.bzl", store_561 = "npm_imported_package_store") load("@@npm__isstream__0.1.2__links//:defs.bzl", store_562 = "npm_imported_package_store") load("@@npm__istanbul-lib-coverage__3.2.0__links//:defs.bzl", store_563 = "npm_imported_package_store") load("@@npm__istanbul-lib-report__3.0.0__links//:defs.bzl", store_564 = "npm_imported_package_store") @@ -620,14 +620,14 @@ load("@@npm__mapbox-gl__1.10.1__links//:defs.bzl", store_616 = "npm_imported_pac load("@@npm__math-log2__1.0.1__links//:defs.bzl", store_617 = "npm_imported_package_store") load("@@npm__mathjs__11.4.0__links//:defs.bzl", link_618 = "npm_link_imported_package_store", store_618 = "npm_imported_package_store") load("@@npm__md5__2.3.0__links//:defs.bzl", store_619 = "npm_imported_package_store") -load("@@npm__meaning-of-life__1.0.0__o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_620 = "npm_link_imported_package_store", store_620 = "npm_imported_package_store") +load("@@npm__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq__links//:defs.bzl", link_620 = "npm_link_imported_package_store", store_620 = "npm_imported_package_store") load("@@npm__media-query-parser__2.0.2__links//:defs.bzl", store_621 = "npm_imported_package_store") load("@@npm__merge-stream__2.0.0__links//:defs.bzl", store_622 = "npm_imported_package_store") load("@@npm__mime-db__1.52.0__links//:defs.bzl", store_623 = "npm_imported_package_store") load("@@npm__mime-types__2.1.35__links//:defs.bzl", store_624 = "npm_imported_package_store") load("@@npm__mimic-response__1.0.1__links//:defs.bzl", store_625 = "npm_imported_package_store") load("@@npm__mimic-response__2.1.0__links//:defs.bzl", store_626 = "npm_imported_package_store") -load("@@npm__mini-css-extract-plugin__2.7.5__webpack_5.76.3__links//:defs.bzl", link_627 = "npm_link_imported_package_store", store_627 = "npm_imported_package_store") +load("@@npm__mini-css-extract-plugin__2.7.5_webpack_5.76.3__links//:defs.bzl", link_627 = "npm_link_imported_package_store", store_627 = "npm_imported_package_store") load("@@npm__minimatch__3.1.2__links//:defs.bzl", store_628 = "npm_imported_package_store") load("@@npm__minimatch__5.0.1__links//:defs.bzl", store_629 = "npm_imported_package_store") load("@@npm__minimatch__5.1.6__links//:defs.bzl", store_630 = "npm_imported_package_store") @@ -651,12 +651,12 @@ load("@@npm__mkdirp-classic__0.5.3__links//:defs.bzl", store_647 = "npm_imported load("@@npm__mkdirp__0.5.6__links//:defs.bzl", store_648 = "npm_imported_package_store") load("@@npm__mkdirp__1.0.4__links//:defs.bzl", store_649 = "npm_imported_package_store") load("@@npm__mlly__1.1.1__links//:defs.bzl", store_650 = "npm_imported_package_store") -load("@@npm__mobx-react-lite__3.4.0__mobx_6.3.0__react_17.0.2__links//:defs.bzl", store_651 = "npm_imported_package_store") -load("@@npm__mobx-react__7.3.0__mobx_6.3.0__react_17.0.2__links//:defs.bzl", link_652 = "npm_link_imported_package_store", store_652 = "npm_imported_package_store") +load("@@npm__mobx-react-lite__3.4.0_mobx_6.3.0_react_17.0.2__links//:defs.bzl", store_651 = "npm_imported_package_store") +load("@@npm__mobx-react__7.3.0_mobx_6.3.0_react_17.0.2__links//:defs.bzl", link_652 = "npm_link_imported_package_store", store_652 = "npm_imported_package_store") load("@@npm__mobx__6.3.0__links//:defs.bzl", link_653 = "npm_link_imported_package_store", store_653 = "npm_imported_package_store") -load("@@npm__mocha-junit-reporter__2.2.0__mocha_10.2.0__links//:defs.bzl", link_654 = "npm_link_imported_package_store", store_654 = "npm_imported_package_store") -load("@@npm__mocha-multi-reporters__1.5.1__181752652__links//:defs.bzl", link_655 = "npm_link_imported_package_store", store_655 = "npm_imported_package_store") -load("@@npm__mocha__10.2.0__mocha-multi-reporters_1.5.1__links//:defs.bzl", link_656 = "npm_link_imported_package_store", store_656 = "npm_imported_package_store") +load("@@npm__mocha-junit-reporter__2.2.0_mocha_10.2.0__links//:defs.bzl", link_654 = "npm_link_imported_package_store", store_654 = "npm_imported_package_store") +load("@@npm__mocha-multi-reporters__1.5.1_181752652__links//:defs.bzl", link_655 = "npm_link_imported_package_store", store_655 = "npm_imported_package_store") +load("@@npm__mocha__10.2.0_mocha-multi-reporters_1.5.1__links//:defs.bzl", link_656 = "npm_link_imported_package_store", store_656 = "npm_imported_package_store") load("@@npm__moment-timezone__0.5.41__links//:defs.bzl", store_657 = "npm_imported_package_store") load("@@npm__moment__2.29.4__links//:defs.bzl", store_658 = "npm_imported_package_store") load("@@npm__mouse-change__1.4.0__links//:defs.bzl", store_659 = "npm_imported_package_store") @@ -751,10 +751,10 @@ load("@@npm__plotly.js__2.25.2__links//:defs.bzl", link_747 = "npm_link_imported load("@@npm__pngjs__5.0.0__links//:defs.bzl", link_748 = "npm_link_imported_package_store", store_748 = "npm_imported_package_store") load("@@npm__point-in-polygon__1.1.0__links//:defs.bzl", store_749 = "npm_imported_package_store") load("@@npm__polybooljs__1.2.0__links//:defs.bzl", store_750 = "npm_imported_package_store") -load("@@npm__postcss-modules-extract-imports__3.0.0__postcss_8.4.21__links//:defs.bzl", store_751 = "npm_imported_package_store") -load("@@npm__postcss-modules-local-by-default__4.0.0__postcss_8.4.21__links//:defs.bzl", store_752 = "npm_imported_package_store") -load("@@npm__postcss-modules-scope__3.0.0__postcss_8.4.21__links//:defs.bzl", store_753 = "npm_imported_package_store") -load("@@npm__postcss-modules-values__4.0.0__postcss_8.4.21__links//:defs.bzl", store_754 = "npm_imported_package_store") +load("@@npm__postcss-modules-extract-imports__3.0.0_postcss_8.4.21__links//:defs.bzl", store_751 = "npm_imported_package_store") +load("@@npm__postcss-modules-local-by-default__4.0.0_postcss_8.4.21__links//:defs.bzl", store_752 = "npm_imported_package_store") +load("@@npm__postcss-modules-scope__3.0.0_postcss_8.4.21__links//:defs.bzl", store_753 = "npm_imported_package_store") +load("@@npm__postcss-modules-values__4.0.0_postcss_8.4.21__links//:defs.bzl", store_754 = "npm_imported_package_store") load("@@npm__postcss-selector-parser__6.0.11__links//:defs.bzl", store_755 = "npm_imported_package_store") load("@@npm__postcss-value-parser__4.2.0__links//:defs.bzl", store_756 = "npm_imported_package_store") load("@@npm__postcss__8.4.21__links//:defs.bzl", store_757 = "npm_imported_package_store") @@ -773,8 +773,8 @@ load("@@npm__psl__1.9.0__links//:defs.bzl", store_769 = "npm_imported_package_st load("@@npm__pump__1.0.3__links//:defs.bzl", store_770 = "npm_imported_package_store") load("@@npm__pump__3.0.0__links//:defs.bzl", store_771 = "npm_imported_package_store") load("@@npm__punycode__2.3.0__links//:defs.bzl", store_772 = "npm_imported_package_store") -load("@@npm__puppeteer-core__19.11.0__369149898__links//:defs.bzl", store_773 = "npm_imported_package_store") -load("@@npm__puppeteer__19.11.0__369149898__links//:defs.bzl", link_774 = "npm_link_imported_package_store", store_774 = "npm_imported_package_store") +load("@@npm__puppeteer-core__19.11.0_369149898__links//:defs.bzl", store_773 = "npm_imported_package_store") +load("@@npm__puppeteer__19.11.0_369149898__links//:defs.bzl", link_774 = "npm_link_imported_package_store", store_774 = "npm_imported_package_store") load("@@npm__qs__6.5.3__links//:defs.bzl", store_775 = "npm_imported_package_store") load("@@npm__queue-tick__1.0.1__links//:defs.bzl", store_776 = "npm_imported_package_store") load("@@npm__quickselect__2.0.0__links//:defs.bzl", store_777 = "npm_imported_package_store") @@ -889,7 +889,7 @@ load("@@npm__tar-stream__2.2.0__links//:defs.bzl", store_885 = "npm_imported_pac load("@@npm__tar-stream__3.0.0__links//:defs.bzl", link_886 = "npm_link_imported_package_store", store_886 = "npm_imported_package_store") load("@@npm__tar__4.4.19__links//:defs.bzl", store_887 = "npm_imported_package_store") load("@@npm__tar__6.1.13__links//:defs.bzl", store_888 = "npm_imported_package_store") -load("@@npm__terser-webpack-plugin__5.3.6__webpack_5.76.3__links//:defs.bzl", store_889 = "npm_imported_package_store") +load("@@npm__terser-webpack-plugin__5.3.6_webpack_5.76.3__links//:defs.bzl", store_889 = "npm_imported_package_store") load("@@npm__terser__5.16.5__links//:defs.bzl", store_890 = "npm_imported_package_store") load("@@npm__test-exclude__6.0.0__links//:defs.bzl", store_891 = "npm_imported_package_store") load("@@npm__through2__0.6.5__links//:defs.bzl", store_892 = "npm_imported_package_store") @@ -934,7 +934,7 @@ load("@@npm__universalify__2.0.0__links//:defs.bzl", store_930 = "npm_imported_p load("@@npm__unix-dgram__2.0.6__links//:defs.bzl", store_931 = "npm_imported_package_store") load("@@npm__unquote__1.1.1__links//:defs.bzl", store_932 = "npm_imported_package_store") load("@@npm__unused__0.2.2__links//:defs.bzl", link_933 = "npm_link_imported_package_store", store_933 = "npm_imported_package_store") -load("@@npm__update-browserslist-db__1.0.10__browserslist_4.21.5__links//:defs.bzl", store_934 = "npm_imported_package_store") +load("@@npm__update-browserslist-db__1.0.10_browserslist_4.21.5__links//:defs.bzl", store_934 = "npm_imported_package_store") load("@@npm__update-diff__1.1.0__links//:defs.bzl", store_935 = "npm_imported_package_store") load("@@npm__uri-js__4.4.1__links//:defs.bzl", store_936 = "npm_imported_package_store") load("@@npm__util-deprecate__1.0.2__links//:defs.bzl", store_937 = "npm_imported_package_store") @@ -948,11 +948,11 @@ load("@@npm__watchpack__2.4.0__links//:defs.bzl", store_944 = "npm_imported_pack load("@@npm__weak-map__1.0.8__links//:defs.bzl", store_945 = "npm_imported_package_store") load("@@npm__webgl-context__2.2.0__links//:defs.bzl", store_946 = "npm_imported_package_store") load("@@npm__webidl-conversions__3.0.1__links//:defs.bzl", store_947 = "npm_imported_package_store") -load("@@npm__webpack-bundle-analyzer__4.5.0__bufferutil_4.0.7__links//:defs.bzl", link_948 = "npm_link_imported_package_store", store_948 = "npm_imported_package_store") -load("@@npm__webpack-cli__5.0.1__webpack_5.76.3__links//:defs.bzl", link_949 = "npm_link_imported_package_store", store_949 = "npm_imported_package_store") +load("@@npm__webpack-bundle-analyzer__4.5.0_bufferutil_4.0.7__links//:defs.bzl", link_948 = "npm_link_imported_package_store", store_948 = "npm_imported_package_store") +load("@@npm__webpack-cli__5.0.1_webpack_5.76.3__links//:defs.bzl", link_949 = "npm_link_imported_package_store", store_949 = "npm_imported_package_store") load("@@npm__webpack-merge__5.8.0__links//:defs.bzl", store_950 = "npm_imported_package_store") load("@@npm__webpack-sources__3.2.3__links//:defs.bzl", store_951 = "npm_imported_package_store") -load("@@npm__webpack__5.76.3__webpack-cli_5.0.1__links//:defs.bzl", link_952 = "npm_link_imported_package_store", store_952 = "npm_imported_package_store") +load("@@npm__webpack__5.76.3_webpack-cli_5.0.1__links//:defs.bzl", link_952 = "npm_link_imported_package_store", store_952 = "npm_imported_package_store") load("@@npm__whatwg-url__5.0.0__links//:defs.bzl", store_953 = "npm_imported_package_store") load("@@npm__which__2.0.2__links//:defs.bzl", store_954 = "npm_imported_package_store") load("@@npm__wide-align__1.1.5__links//:defs.bzl", store_955 = "npm_imported_package_store") @@ -964,8 +964,8 @@ load("@@npm__world-calendars__1.0.3__links//:defs.bzl", store_960 = "npm_importe load("@@npm__wrap-ansi__7.0.0__links//:defs.bzl", store_961 = "npm_imported_package_store") load("@@npm__wrap-ansi__8.1.0__links//:defs.bzl", store_962 = "npm_imported_package_store") load("@@npm__wrappy__1.0.2__links//:defs.bzl", store_963 = "npm_imported_package_store") -load("@@npm__ws__7.5.9__bufferutil_4.0.7__links//:defs.bzl", store_964 = "npm_imported_package_store") -load("@@npm__ws__8.13.0__bufferutil_4.0.7__links//:defs.bzl", store_965 = "npm_imported_package_store") +load("@@npm__ws__7.5.9_bufferutil_4.0.7__links//:defs.bzl", store_964 = "npm_imported_package_store") +load("@@npm__ws__8.13.0_bufferutil_4.0.7__links//:defs.bzl", store_965 = "npm_imported_package_store") load("@@npm__xml__1.0.1__links//:defs.bzl", store_966 = "npm_imported_package_store") load("@@npm__xtend__2.2.0__links//:defs.bzl", store_967 = "npm_imported_package_store") load("@@npm__xtend__4.0.2__links//:defs.bzl", store_968 = "npm_imported_package_store") diff --git a/npm/private/test/snapshots/wksp/repositories.bzl b/npm/private/test/snapshots/wksp/repositories.bzl index 9348a540e..04fca02ad 100644 --- a/npm/private/test/snapshots/wksp/repositories.bzl +++ b/npm/private/test/snapshots/wksp/repositories.bzl @@ -83,7 +83,7 @@ def npm_repositories(): ) npm_import( - name = "npm__acorn-import-assertions__1.8.0__acorn_8.8.2", + name = "npm__acorn-import-assertions__1.8.0_acorn_8.8.2", root_package = "", link_workspace = "", link_packages = {}, @@ -276,7 +276,7 @@ def npm_repositories(): ) npm_import( - name = "npm__ajv-formats__2.1.1__ajv_8.12.0", + name = "npm__ajv-formats__2.1.1_ajv_8.12.0", root_package = "", link_workspace = "", link_packages = {}, @@ -303,7 +303,7 @@ def npm_repositories(): ) npm_import( - name = "npm__ajv-keywords__3.5.2__ajv_6.12.6", + name = "npm__ajv-keywords__3.5.2_ajv_6.12.6", root_package = "", link_workspace = "", link_packages = {}, @@ -329,7 +329,7 @@ def npm_repositories(): ) npm_import( - name = "npm__ajv-keywords__5.1.0__ajv_8.12.0", + name = "npm__ajv-keywords__5.1.0_ajv_8.12.0", root_package = "", link_workspace = "", link_packages = {}, @@ -985,7 +985,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_aspect-test_d__2.0.0__at_aspect-test_c_2.0.2", + name = "npm__at_aspect-test_d__2.0.0_at_aspect-test_c_2.0.2", root_package = "", link_workspace = "", link_packages = {}, @@ -1218,7 +1218,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_babel_helper-compilation-targets__7.20.7__at_babel_core_7.21.0", + name = "npm__at_babel_helper-compilation-targets__7.20.7_at_babel_core_7.21.0", root_package = "", link_workspace = "", link_packages = {}, @@ -1696,7 +1696,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_babel_plugin-syntax-typescript__7.20.0__at_babel_core_7.21.0", + name = "npm__at_babel_plugin-syntax-typescript__7.20.0_at_babel_core_7.21.0", root_package = "", link_workspace = "", link_packages = {}, @@ -2905,7 +2905,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_kubernetes_client-node__github.com_kubernetes-client_javascript_fc681991e61c6808dd26012a2331f83671a11218__bufferutil_4.0.7", + name = "npm__at_kubernetes_client-node__github.com_kubernetes-client_javascript_fc681991e61c6808dd26012a2331f83671a11218_bufferutil_4.0.7", root_package = "", link_workspace = "", link_packages = { @@ -3100,7 +3100,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_mapbox_mapbox-gl-supported__1.5.0__mapbox-gl_1.10.1", + name = "npm__at_mapbox_mapbox-gl-supported__1.5.0_mapbox-gl_1.10.1", root_package = "", link_workspace = "", link_packages = {}, @@ -3561,7 +3561,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_puppeteer_browsers__0.5.0__typescript_4.9.5", + name = "npm__at_puppeteer_browsers__0.5.0_typescript_4.9.5", root_package = "", link_workspace = "", link_packages = {}, @@ -3643,7 +3643,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_rollup_plugin-commonjs__21.1.0__rollup_2.70.2", + name = "npm__at_rollup_plugin-commonjs__21.1.0_rollup_2.70.2", root_package = "", link_workspace = "", link_packages = { @@ -3700,7 +3700,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_rollup_plugin-commonjs__23.0.0__rollup_2.79.1", + name = "npm__at_rollup_plugin-commonjs__23.0.0_rollup_2.79.1", root_package = "", link_workspace = "", link_packages = { @@ -3749,7 +3749,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_rollup_plugin-commonjs__23.0.2__rollup_3.2.5", + name = "npm__at_rollup_plugin-commonjs__23.0.2_rollup_3.2.5", root_package = "", link_workspace = "", link_packages = { @@ -3797,7 +3797,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_rollup_plugin-json__5.0.0__rollup_2.79.1", + name = "npm__at_rollup_plugin-json__5.0.0_rollup_2.79.1", root_package = "", link_workspace = "", link_packages = { @@ -3826,7 +3826,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_rollup_plugin-json__5.0.1__rollup_3.2.5", + name = "npm__at_rollup_plugin-json__5.0.1_rollup_3.2.5", root_package = "", link_workspace = "", link_packages = { @@ -3856,7 +3856,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_rollup_plugin-node-resolve__15.0.0__rollup_2.79.1", + name = "npm__at_rollup_plugin-node-resolve__15.0.0_rollup_2.79.1", root_package = "", link_workspace = "", link_packages = { @@ -3902,7 +3902,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_rollup_plugin-node-resolve__15.0.1__rollup_3.2.5", + name = "npm__at_rollup_plugin-node-resolve__15.0.1_rollup_3.2.5", root_package = "", link_workspace = "", link_packages = { @@ -3948,7 +3948,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_rollup_plugin-terser__0.2.0__rollup_2.79.1", + name = "npm__at_rollup_plugin-terser__0.2.0_rollup_2.79.1", root_package = "", link_workspace = "", link_packages = { @@ -3992,7 +3992,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_rollup_plugin-typescript__10.0.1__500960093", + name = "npm__at_rollup_plugin-typescript__10.0.1_500960093", root_package = "", link_workspace = "", link_packages = { @@ -4034,7 +4034,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_rollup_pluginutils__3.1.0__rollup_2.70.2", + name = "npm__at_rollup_pluginutils__3.1.0_rollup_2.70.2", root_package = "", link_workspace = "", link_packages = {}, @@ -4087,7 +4087,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_rollup_pluginutils__5.0.2__rollup_2.79.1", + name = "npm__at_rollup_pluginutils__5.0.2_rollup_2.79.1", root_package = "", link_workspace = "", link_packages = {}, @@ -4116,7 +4116,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_rollup_pluginutils__5.0.2__rollup_3.2.5", + name = "npm__at_rollup_pluginutils__5.0.2_rollup_3.2.5", root_package = "", link_workspace = "", link_packages = {}, @@ -5229,7 +5229,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_vanilla-extract_webpack-plugin__2.2.0__webpack_5.76.3", + name = "npm__at_vanilla-extract_webpack-plugin__2.2.0_webpack_5.76.3", root_package = "", link_workspace = "", link_packages = { @@ -5851,7 +5851,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_webpack-cli_configtest__2.0.1__1256213976", + name = "npm__at_webpack-cli_configtest__2.0.1_1256213976", root_package = "", link_workspace = "", link_packages = {}, @@ -5986,7 +5986,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_webpack-cli_info__2.0.1__1256213976", + name = "npm__at_webpack-cli_info__2.0.1_1256213976", root_package = "", link_workspace = "", link_packages = {}, @@ -6121,7 +6121,7 @@ def npm_repositories(): ) npm_import( - name = "npm__at_webpack-cli_serve__2.0.1__1256213976", + name = "npm__at_webpack-cli_serve__2.0.1_1256213976", root_package = "", link_workspace = "", link_packages = {}, @@ -7487,7 +7487,7 @@ def npm_repositories(): ) npm_import( - name = "npm__chromium-bidi__0.4.7__devtools-protocol_0.0.1107588", + name = "npm__chromium-bidi__0.4.7_devtools-protocol_0.0.1107588", root_package = "", link_workspace = "", link_packages = {}, @@ -8466,7 +8466,7 @@ def npm_repositories(): ) npm_import( - name = "npm__css-loader__6.7.3__webpack_5.76.3", + name = "npm__css-loader__6.7.3_webpack_5.76.3", root_package = "", link_workspace = "", link_packages = { @@ -9183,7 +9183,7 @@ def npm_repositories(): ) npm_import( - name = "npm__debug__4.3.4__supports-color_8.1.1", + name = "npm__debug__4.3.4_supports-color_8.1.1", root_package = "", link_workspace = "", link_packages = {}, @@ -13644,7 +13644,7 @@ def npm_repositories(): ) npm_import( - name = "npm__icss-utils__5.1.0__postcss_8.4.21", + name = "npm__icss-utils__5.1.0_postcss_8.4.21", root_package = "", link_workspace = "", link_packages = {}, @@ -14569,7 +14569,7 @@ def npm_repositories(): ) npm_import( - name = "npm__isomorphic-ws__5.0.0__ws_8.13.0", + name = "npm__isomorphic-ws__5.0.0_ws_8.13.0", root_package = "", link_workspace = "", link_packages = {}, @@ -15984,7 +15984,7 @@ def npm_repositories(): ) npm_import( - name = "npm__meaning-of-life__1.0.0__o3deharooos255qt5xdujc3cuq", + name = "npm__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq", root_package = "", link_workspace = "", link_packages = { @@ -16119,7 +16119,7 @@ def npm_repositories(): ) npm_import( - name = "npm__mini-css-extract-plugin__2.7.5__webpack_5.76.3", + name = "npm__mini-css-extract-plugin__2.7.5_webpack_5.76.3", root_package = "", link_workspace = "", link_packages = { @@ -16767,12 +16767,12 @@ def npm_repositories(): ) npm_import( - name = "npm__mobx-react-lite__3.4.0__mobx_6.3.0__react_17.0.2", + name = "npm__mobx-react-lite__3.4.0_mobx_6.3.0_react_17.0.2", root_package = "", link_workspace = "", link_packages = {}, package = "mobx-react-lite", - version = "3.4.0_mobx_6.3.0__react_17.0.2", + version = "3.4.0_mobx_6.3.0_react_17.0.2", url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-3.4.0.tgz", system_tar = "xxx", package_visibility = ["//visibility:public"], @@ -16787,21 +16787,21 @@ def npm_repositories(): "js-tokens": ["4.0.0"], "loose-envify": ["1.4.0"], "mobx": ["6.3.0"], - "mobx-react-lite": ["3.4.0_mobx_6.3.0__react_17.0.2"], + "mobx-react-lite": ["3.4.0_mobx_6.3.0_react_17.0.2"], "object-assign": ["4.1.1"], "react": ["17.0.2"], }, ) npm_import( - name = "npm__mobx-react__7.3.0__mobx_6.3.0__react_17.0.2", + name = "npm__mobx-react__7.3.0_mobx_6.3.0_react_17.0.2", root_package = "", link_workspace = "", link_packages = { "examples/npm_deps": ["mobx-react"], }, package = "mobx-react", - version = "7.3.0_mobx_6.3.0__react_17.0.2", + version = "7.3.0_mobx_6.3.0_react_17.0.2", url = "https://registry.npmjs.org/mobx-react/-/mobx-react-7.3.0.tgz", system_tar = "xxx", package_visibility = ["//visibility:public"], @@ -16810,15 +16810,15 @@ def npm_repositories(): integrity = "sha512-RGEcwZokopqyJE5JPwXKB9FWMSqFM9NJVO2QPI+z6laJTJeBHqvPicjnKgY5mvihxTeXB1+72TnooqUePeGV1g==", deps = { "mobx": "6.3.0", - "mobx-react-lite": "3.4.0_mobx_6.3.0__react_17.0.2", + "mobx-react-lite": "3.4.0_mobx_6.3.0_react_17.0.2", "react": "17.0.2", }, transitive_closure = { "js-tokens": ["4.0.0"], "loose-envify": ["1.4.0"], "mobx": ["6.3.0"], - "mobx-react": ["7.3.0_mobx_6.3.0__react_17.0.2"], - "mobx-react-lite": ["3.4.0_mobx_6.3.0__react_17.0.2"], + "mobx-react": ["7.3.0_mobx_6.3.0_react_17.0.2"], + "mobx-react-lite": ["3.4.0_mobx_6.3.0_react_17.0.2"], "object-assign": ["4.1.1"], "react": ["17.0.2"], }, @@ -16845,7 +16845,7 @@ def npm_repositories(): ) npm_import( - name = "npm__mocha-junit-reporter__2.2.0__mocha_10.2.0", + name = "npm__mocha-junit-reporter__2.2.0_mocha_10.2.0", root_package = "", link_workspace = "", link_packages = { @@ -16955,7 +16955,7 @@ def npm_repositories(): ) npm_import( - name = "npm__mocha-multi-reporters__1.5.1__181752652", + name = "npm__mocha-multi-reporters__1.5.1_181752652", root_package = "", link_workspace = "", link_packages = { @@ -17063,7 +17063,7 @@ def npm_repositories(): ) npm_import( - name = "npm__mocha__10.2.0__mocha-multi-reporters_1.5.1", + name = "npm__mocha__10.2.0_mocha-multi-reporters_1.5.1", root_package = "", link_workspace = "", link_packages = { @@ -19756,7 +19756,7 @@ def npm_repositories(): ) npm_import( - name = "npm__postcss-modules-extract-imports__3.0.0__postcss_8.4.21", + name = "npm__postcss-modules-extract-imports__3.0.0_postcss_8.4.21", root_package = "", link_workspace = "", link_packages = {}, @@ -19780,7 +19780,7 @@ def npm_repositories(): ) npm_import( - name = "npm__postcss-modules-local-by-default__4.0.0__postcss_8.4.21", + name = "npm__postcss-modules-local-by-default__4.0.0_postcss_8.4.21", root_package = "", link_workspace = "", link_packages = {}, @@ -19812,7 +19812,7 @@ def npm_repositories(): ) npm_import( - name = "npm__postcss-modules-scope__3.0.0__postcss_8.4.21", + name = "npm__postcss-modules-scope__3.0.0_postcss_8.4.21", root_package = "", link_workspace = "", link_packages = {}, @@ -19840,7 +19840,7 @@ def npm_repositories(): ) npm_import( - name = "npm__postcss-modules-values__4.0.0__postcss_8.4.21", + name = "npm__postcss-modules-values__4.0.0_postcss_8.4.21", root_package = "", link_workspace = "", link_packages = {}, @@ -20295,7 +20295,7 @@ def npm_repositories(): ) npm_import( - name = "npm__puppeteer-core__19.11.0__369149898", + name = "npm__puppeteer-core__19.11.0_369149898", root_package = "", link_workspace = "", link_packages = {}, @@ -20392,7 +20392,7 @@ def npm_repositories(): ) npm_import( - name = "npm__puppeteer__19.11.0__369149898", + name = "npm__puppeteer__19.11.0_369149898", root_package = "", link_workspace = "", link_packages = { @@ -23668,7 +23668,7 @@ def npm_repositories(): ) npm_import( - name = "npm__terser-webpack-plugin__5.3.6__webpack_5.76.3", + name = "npm__terser-webpack-plugin__5.3.6_webpack_5.76.3", root_package = "", link_workspace = "", link_packages = {}, @@ -24865,7 +24865,7 @@ def npm_repositories(): ) npm_import( - name = "npm__update-browserslist-db__1.0.10__browserslist_4.21.5", + name = "npm__update-browserslist-db__1.0.10_browserslist_4.21.5", root_package = "", link_workspace = "", link_packages = {}, @@ -25182,7 +25182,7 @@ def npm_repositories(): ) npm_import( - name = "npm__webpack-bundle-analyzer__4.5.0__bufferutil_4.0.7", + name = "npm__webpack-bundle-analyzer__4.5.0_bufferutil_4.0.7", root_package = "", link_workspace = "", link_packages = { @@ -25233,7 +25233,7 @@ def npm_repositories(): ) npm_import( - name = "npm__webpack-cli__5.0.1__webpack_5.76.3", + name = "npm__webpack-cli__5.0.1_webpack_5.76.3", root_package = "", link_workspace = "", link_packages = { @@ -25426,7 +25426,7 @@ def npm_repositories(): ) npm_import( - name = "npm__webpack__5.76.3__webpack-cli_5.0.1", + name = "npm__webpack__5.76.3_webpack-cli_5.0.1", root_package = "", link_workspace = "", link_packages = { @@ -25825,7 +25825,7 @@ def npm_repositories(): ) npm_import( - name = "npm__ws__7.5.9__bufferutil_4.0.7", + name = "npm__ws__7.5.9_bufferutil_4.0.7", root_package = "", link_workspace = "", link_packages = {}, @@ -25848,7 +25848,7 @@ def npm_repositories(): ) npm_import( - name = "npm__ws__8.13.0__bufferutil_4.0.7", + name = "npm__ws__8.13.0_bufferutil_4.0.7", root_package = "", link_workspace = "", link_packages = {}, diff --git a/npm/private/utils.bzl b/npm/private/utils.bzl index e6b0d46e4..c087172bd 100644 --- a/npm/private/utils.bzl +++ b/npm/private/utils.bzl @@ -17,7 +17,7 @@ def _sorted_map(m): return result -def _sanitize_string(string): +def _sanitize_rule_name(string): # Workspace names may contain only A-Z, a-z, 0-9, '-', '_' and '.' result = "" for c in string.elems(): @@ -30,17 +30,12 @@ def _sanitize_string(string): def _bazel_name(name, version = None): "Make a bazel friendly name from a package name and (optionally) a version that can be used in repository and target names" - escaped_name = _sanitize_string(name) + escaped_name = _sanitize_rule_name(name) if not version: return escaped_name - # Add an extra _ before the first segment - version_segments_start = version.find("_") - if version_segments_start != -1: - version = version[:version_segments_start] + "_" + version[version_segments_start:] - # Separate name + version with extra _ - return "%s__%s" % (escaped_name, _sanitize_string(version)) + return "%s__%s" % (escaped_name, _sanitize_rule_name(version)) def _package_key(name, version): "Make a name/version pnpm-style name for a package name and version" @@ -249,7 +244,6 @@ utils = struct( bazel_name = _bazel_name, sorted_map = _sorted_map, package_key = _package_key, - sanitize_string = _sanitize_string, friendly_name = _friendly_name, package_store_name = _package_store_name, make_symlink = _make_symlink,