From 34d1ca886853278f1ff59cdaef8ef24e0f6e61c6 Mon Sep 17 00:00:00 2001 From: Jason Bedard Date: Thu, 27 Jun 2024 16:29:55 -0700 Subject: [PATCH] refactor(pnpm): strip special characters from pkg labels (#1821) --- e2e/pnpm_lockfiles/MODULE.bazel | 2 +- e2e/pnpm_lockfiles/lockfile-test.bzl | 2 +- e2e/pnpm_lockfiles/v60/snapshots/defs.bzl | 2 +- e2e/pnpm_lockfiles/v61/snapshots/defs.bzl | 2 +- e2e/pnpm_lockfiles/v90/snapshots/defs.bzl | 2 +- npm/private/pnpm.bzl | 5 +- .../test/snapshots/bzlmod/npm_defs.bzl | 10 +-- npm/private/test/snapshots/wksp/npm_defs.bzl | 10 +-- .../test/snapshots/wksp/repositories.bzl | 88 +++++++++---------- npm/private/utils.bzl | 2 +- 10 files changed, 62 insertions(+), 63 deletions(-) diff --git a/e2e/pnpm_lockfiles/MODULE.bazel b/e2e/pnpm_lockfiles/MODULE.bazel index d19c057cf..b9bd0f891 100644 --- a/e2e/pnpm_lockfiles/MODULE.bazel +++ b/e2e/pnpm_lockfiles/MODULE.bazel @@ -79,7 +79,7 @@ npm = use_extension( # Deep with many peers "lock-%s__at_rollup_plugin-typescript__8.2.1__%s" % ( version, - "ommloj5qql5ba6x5wuiluawhoi" if version == "v54" else "-1662662592" if version == "v90" else "-1662692290", + "ommloj5qql5ba6x5wuiluawhoi" if version == "v54" else "1662662592" if version == "v90" else "1662692290", ), # Dep with patch diff --git a/e2e/pnpm_lockfiles/lockfile-test.bzl b/e2e/pnpm_lockfiles/lockfile-test.bzl index 57e914c92..f49676542 100644 --- a/e2e/pnpm_lockfiles/lockfile-test.bzl +++ b/e2e/pnpm_lockfiles/lockfile-test.bzl @@ -88,7 +88,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 "-1662692290"), + "@%s__at_rollup_plugin-typescript__8.2.1__%s//:pkg" % (lock_repo, "ommloj5qql5ba6x5wuiluawhoi" if lock_version == "v54" else "1662662592" if lock_version == "v90" else "1662692290"), # uuv 'hasBin' ":node_modules/uvu", diff --git a/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl index 72b12de0c..2dfe8417b 100644 --- a/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl @@ -12,7 +12,7 @@ load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0__at_asp 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__-1662692290__links//:defs.bzl", link_12 = "npm_link_imported_package_store", store_12 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_rollup_plugin-typescript__8.2.1__1662692290__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") diff --git a/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl index 72b12de0c..2dfe8417b 100644 --- a/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl @@ -12,7 +12,7 @@ load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0__at_asp 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__-1662692290__links//:defs.bzl", link_12 = "npm_link_imported_package_store", store_12 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_rollup_plugin-typescript__8.2.1__1662692290__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") diff --git a/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl index 60609ad92..f913c815f 100644 --- a/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl @@ -12,7 +12,7 @@ load("@@aspect_rules_js~~npm~lock-__at_aspect-test_d__2.0.0__at_asp load("@@aspect_rules_js~~npm~lock-__at_aspect-test_e__1.0.0__links//:defs.bzl", link_9 = "npm_link_imported_package_store", store_9 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_foo_jsonify__https___github.com_aspect-build_test-packages_releases_download_0.0.0_at_foo-jsonify-0.0.0.tgz__links//:defs.bzl", link_10 = "npm_link_imported_package_store", store_10 = "npm_imported_package_store") load("@@aspect_rules_js~~npm~lock-__at_isaacs_cliui__8.0.2__links//:defs.bzl", link_11 = "npm_link_imported_package_store", store_11 = "npm_imported_package_store") -load("@@aspect_rules_js~~npm~lock-__at_rollup_plugin-typescript__8.2.1__-1662662592__links//:defs.bzl", link_12 = "npm_link_imported_package_store", store_12 = "npm_imported_package_store") +load("@@aspect_rules_js~~npm~lock-__at_rollup_plugin-typescript__8.2.1__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") diff --git a/npm/private/pnpm.bzl b/npm/private/pnpm.bzl index 98f386369..8ac6d12e8 100644 --- a/npm/private/pnpm.bzl +++ b/npm/private/pnpm.bzl @@ -223,9 +223,8 @@ def _convert_pnpm_v6_v9_version_peer_dep(version): # Prevent long paths. The pnpm lockfile v6 no longer hashes long sequences of # 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) - version = version.rstrip("_") + peer_dep = utils.hash(peer_dep) + version = version[0:peer_dep_index] + "_" + utils.sanitize_string(peer_dep) return version def _strip_v6_default_registry_to_version(name, version): diff --git a/npm/private/test/snapshots/bzlmod/npm_defs.bzl b/npm/private/test/snapshots/bzlmod/npm_defs.bzl index 1d6dfde12..f61320577 100644 --- a/npm/private/test/snapshots/bzlmod/npm_defs.bzl +++ b/npm/private/test/snapshots/bzlmod/npm_defs.bzl @@ -200,9 +200,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_197 = "npm_imported_package_store") load("@@_main~npm~npm__at_webassemblyjs_wasm-parser__1.11.1__links//:defs.bzl", store_198 = "npm_imported_package_store") load("@@_main~npm~npm__at_webassemblyjs_wast-printer__1.11.1__links//:defs.bzl", store_199 = "npm_imported_package_store") -load("@@_main~npm~npm__at_webpack-cli_configtest__2.0.1__-1256213976__links//:defs.bzl", store_200 = "npm_imported_package_store") -load("@@_main~npm~npm__at_webpack-cli_info__2.0.1__-1256213976__links//:defs.bzl", store_201 = "npm_imported_package_store") -load("@@_main~npm~npm__at_webpack-cli_serve__2.0.1__-1256213976__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_200 = "npm_imported_package_store") +load("@@_main~npm~npm__at_webpack-cli_info__2.0.1__1256213976__links//:defs.bzl", store_201 = "npm_imported_package_store") +load("@@_main~npm~npm__at_webpack-cli_serve__2.0.1__1256213976__links//:defs.bzl", store_202 = "npm_imported_package_store") load("@@_main~npm~npm__at_xtuc_ieee754__1.2.0__links//:defs.bzl", store_203 = "npm_imported_package_store") load("@@_main~npm~npm__at_xtuc_long__4.2.2__links//:defs.bzl", store_204 = "npm_imported_package_store") load("@@_main~npm~npm__aws-sign2__0.7.0__links//:defs.bzl", store_205 = "npm_imported_package_store") @@ -770,8 +770,8 @@ load("@@_main~npm~npm__psl__1.9.0__links//:defs.bzl", store_766 = "npm_imported_ load("@@_main~npm~npm__pump__1.0.3__links//:defs.bzl", store_767 = "npm_imported_package_store") load("@@_main~npm~npm__pump__3.0.0__links//:defs.bzl", store_768 = "npm_imported_package_store") load("@@_main~npm~npm__punycode__2.3.0__links//:defs.bzl", store_769 = "npm_imported_package_store") -load("@@_main~npm~npm__puppeteer-core__19.11.0__-369149898__links//:defs.bzl", store_770 = "npm_imported_package_store") -load("@@_main~npm~npm__puppeteer__19.11.0__-369149898__links//:defs.bzl", link_771 = "npm_link_imported_package_store", store_771 = "npm_imported_package_store") +load("@@_main~npm~npm__puppeteer-core__19.11.0__369149898__links//:defs.bzl", store_770 = "npm_imported_package_store") +load("@@_main~npm~npm__puppeteer__19.11.0__369149898__links//:defs.bzl", link_771 = "npm_link_imported_package_store", store_771 = "npm_imported_package_store") load("@@_main~npm~npm__qs__6.5.3__links//:defs.bzl", store_772 = "npm_imported_package_store") load("@@_main~npm~npm__queue-tick__1.0.1__links//:defs.bzl", store_773 = "npm_imported_package_store") load("@@_main~npm~npm__quickselect__2.0.0__links//:defs.bzl", store_774 = "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 888d7d532..7bfc15dce 100644 --- a/npm/private/test/snapshots/wksp/npm_defs.bzl +++ b/npm/private/test/snapshots/wksp/npm_defs.bzl @@ -200,9 +200,9 @@ load("@@npm__at_webassemblyjs_wasm-gen__1.11.1__links//:defs.bzl", store_196 = " load("@@npm__at_webassemblyjs_wasm-opt__1.11.1__links//:defs.bzl", store_197 = "npm_imported_package_store") load("@@npm__at_webassemblyjs_wasm-parser__1.11.1__links//:defs.bzl", store_198 = "npm_imported_package_store") load("@@npm__at_webassemblyjs_wast-printer__1.11.1__links//:defs.bzl", store_199 = "npm_imported_package_store") -load("@@npm__at_webpack-cli_configtest__2.0.1__-1256213976__links//:defs.bzl", store_200 = "npm_imported_package_store") -load("@@npm__at_webpack-cli_info__2.0.1__-1256213976__links//:defs.bzl", store_201 = "npm_imported_package_store") -load("@@npm__at_webpack-cli_serve__2.0.1__-1256213976__links//:defs.bzl", store_202 = "npm_imported_package_store") +load("@@npm__at_webpack-cli_configtest__2.0.1__1256213976__links//:defs.bzl", store_200 = "npm_imported_package_store") +load("@@npm__at_webpack-cli_info__2.0.1__1256213976__links//:defs.bzl", store_201 = "npm_imported_package_store") +load("@@npm__at_webpack-cli_serve__2.0.1__1256213976__links//:defs.bzl", store_202 = "npm_imported_package_store") load("@@npm__at_xtuc_ieee754__1.2.0__links//:defs.bzl", store_203 = "npm_imported_package_store") load("@@npm__at_xtuc_long__4.2.2__links//:defs.bzl", store_204 = "npm_imported_package_store") load("@@npm__aws-sign2__0.7.0__links//:defs.bzl", store_205 = "npm_imported_package_store") @@ -770,8 +770,8 @@ load("@@npm__psl__1.9.0__links//:defs.bzl", store_766 = "npm_imported_package_st load("@@npm__pump__1.0.3__links//:defs.bzl", store_767 = "npm_imported_package_store") load("@@npm__pump__3.0.0__links//:defs.bzl", store_768 = "npm_imported_package_store") load("@@npm__punycode__2.3.0__links//:defs.bzl", store_769 = "npm_imported_package_store") -load("@@npm__puppeteer-core__19.11.0__-369149898__links//:defs.bzl", store_770 = "npm_imported_package_store") -load("@@npm__puppeteer__19.11.0__-369149898__links//:defs.bzl", link_771 = "npm_link_imported_package_store", store_771 = "npm_imported_package_store") +load("@@npm__puppeteer-core__19.11.0__369149898__links//:defs.bzl", store_770 = "npm_imported_package_store") +load("@@npm__puppeteer__19.11.0__369149898__links//:defs.bzl", link_771 = "npm_link_imported_package_store", store_771 = "npm_imported_package_store") load("@@npm__qs__6.5.3__links//:defs.bzl", store_772 = "npm_imported_package_store") load("@@npm__queue-tick__1.0.1__links//:defs.bzl", store_773 = "npm_imported_package_store") load("@@npm__quickselect__2.0.0__links//:defs.bzl", store_774 = "npm_imported_package_store") diff --git a/npm/private/test/snapshots/wksp/repositories.bzl b/npm/private/test/snapshots/wksp/repositories.bzl index 99d6a8725..d452d479b 100644 --- a/npm/private/test/snapshots/wksp/repositories.bzl +++ b/npm/private/test/snapshots/wksp/repositories.bzl @@ -5268,9 +5268,9 @@ def npm_repositories(): "@webassemblyjs/wasm-opt": ["1.11.1"], "@webassemblyjs/wasm-parser": ["1.11.1"], "@webassemblyjs/wast-printer": ["1.11.1"], - "@webpack-cli/configtest": ["2.0.1_-1256213976"], - "@webpack-cli/info": ["2.0.1_-1256213976"], - "@webpack-cli/serve": ["2.0.1_-1256213976"], + "@webpack-cli/configtest": ["2.0.1_1256213976"], + "@webpack-cli/info": ["2.0.1_1256213976"], + "@webpack-cli/serve": ["2.0.1_1256213976"], "@xtuc/ieee754": ["1.2.0"], "@xtuc/long": ["4.2.2"], "acorn": ["8.8.2"], @@ -5788,12 +5788,12 @@ 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 = {}, package = "@webpack-cli/configtest", - version = "2.0.1_-1256213976", + version = "2.0.1_1256213976", url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.0.1.tgz", system_tar = "gnu", package_visibility = ["//visibility:public"], @@ -5831,9 +5831,9 @@ def npm_repositories(): "@webassemblyjs/wasm-opt": ["1.11.1"], "@webassemblyjs/wasm-parser": ["1.11.1"], "@webassemblyjs/wast-printer": ["1.11.1"], - "@webpack-cli/configtest": ["2.0.1_-1256213976"], - "@webpack-cli/info": ["2.0.1_-1256213976"], - "@webpack-cli/serve": ["2.0.1_-1256213976"], + "@webpack-cli/configtest": ["2.0.1_1256213976"], + "@webpack-cli/info": ["2.0.1_1256213976"], + "@webpack-cli/serve": ["2.0.1_1256213976"], "@xtuc/ieee754": ["1.2.0"], "@xtuc/long": ["4.2.2"], "acorn": ["8.8.2"], @@ -5923,12 +5923,12 @@ 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 = {}, package = "@webpack-cli/info", - version = "2.0.1_-1256213976", + version = "2.0.1_1256213976", url = "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.1.tgz", system_tar = "gnu", package_visibility = ["//visibility:public"], @@ -5966,9 +5966,9 @@ def npm_repositories(): "@webassemblyjs/wasm-opt": ["1.11.1"], "@webassemblyjs/wasm-parser": ["1.11.1"], "@webassemblyjs/wast-printer": ["1.11.1"], - "@webpack-cli/configtest": ["2.0.1_-1256213976"], - "@webpack-cli/info": ["2.0.1_-1256213976"], - "@webpack-cli/serve": ["2.0.1_-1256213976"], + "@webpack-cli/configtest": ["2.0.1_1256213976"], + "@webpack-cli/info": ["2.0.1_1256213976"], + "@webpack-cli/serve": ["2.0.1_1256213976"], "@xtuc/ieee754": ["1.2.0"], "@xtuc/long": ["4.2.2"], "acorn": ["8.8.2"], @@ -6058,12 +6058,12 @@ 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 = {}, package = "@webpack-cli/serve", - version = "2.0.1_-1256213976", + version = "2.0.1_1256213976", url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.1.tgz", system_tar = "gnu", package_visibility = ["//visibility:public"], @@ -6101,9 +6101,9 @@ def npm_repositories(): "@webassemblyjs/wasm-opt": ["1.11.1"], "@webassemblyjs/wasm-parser": ["1.11.1"], "@webassemblyjs/wast-printer": ["1.11.1"], - "@webpack-cli/configtest": ["2.0.1_-1256213976"], - "@webpack-cli/info": ["2.0.1_-1256213976"], - "@webpack-cli/serve": ["2.0.1_-1256213976"], + "@webpack-cli/configtest": ["2.0.1_1256213976"], + "@webpack-cli/info": ["2.0.1_1256213976"], + "@webpack-cli/serve": ["2.0.1_1256213976"], "@xtuc/ieee754": ["1.2.0"], "@xtuc/long": ["4.2.2"], "acorn": ["8.8.2"], @@ -8455,9 +8455,9 @@ def npm_repositories(): "@webassemblyjs/wasm-opt": ["1.11.1"], "@webassemblyjs/wasm-parser": ["1.11.1"], "@webassemblyjs/wast-printer": ["1.11.1"], - "@webpack-cli/configtest": ["2.0.1_-1256213976"], - "@webpack-cli/info": ["2.0.1_-1256213976"], - "@webpack-cli/serve": ["2.0.1_-1256213976"], + "@webpack-cli/configtest": ["2.0.1_1256213976"], + "@webpack-cli/info": ["2.0.1_1256213976"], + "@webpack-cli/serve": ["2.0.1_1256213976"], "@xtuc/ieee754": ["1.2.0"], "@xtuc/long": ["4.2.2"], "acorn": ["8.8.2"], @@ -16102,9 +16102,9 @@ def npm_repositories(): "@webassemblyjs/wasm-opt": ["1.11.1"], "@webassemblyjs/wasm-parser": ["1.11.1"], "@webassemblyjs/wast-printer": ["1.11.1"], - "@webpack-cli/configtest": ["2.0.1_-1256213976"], - "@webpack-cli/info": ["2.0.1_-1256213976"], - "@webpack-cli/serve": ["2.0.1_-1256213976"], + "@webpack-cli/configtest": ["2.0.1_1256213976"], + "@webpack-cli/info": ["2.0.1_1256213976"], + "@webpack-cli/serve": ["2.0.1_1256213976"], "@xtuc/ieee754": ["1.2.0"], "@xtuc/long": ["4.2.2"], "acorn": ["8.8.2"], @@ -20232,12 +20232,12 @@ 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 = {}, package = "puppeteer-core", - version = "19.11.0_-369149898", + version = "19.11.0_369149898", url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.11.0.tgz", system_tar = "gnu", package_visibility = ["//visibility:public"], @@ -20301,7 +20301,7 @@ def npm_repositories(): "progress": ["2.0.3"], "proxy-from-env": ["1.1.0"], "pump": ["3.0.0"], - "puppeteer-core": ["19.11.0_-369149898"], + "puppeteer-core": ["19.11.0_369149898"], "readable-stream": ["3.6.1"], "require-directory": ["2.1.1"], "safe-buffer": ["5.2.1"], @@ -20329,14 +20329,14 @@ 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 = { "npm/private/test": ["puppeteer"], }, package = "puppeteer", - version = "19.11.0_-369149898", + version = "19.11.0_369149898", url = "https://registry.npmjs.org/puppeteer/-/puppeteer-19.11.0.tgz", system_tar = "gnu", package_visibility = ["//visibility:public"], @@ -20349,7 +20349,7 @@ def npm_repositories(): "https-proxy-agent": "5.0.1", "progress": "2.0.3", "proxy-from-env": "1.1.0", - "puppeteer-core": "19.11.0_-369149898", + "puppeteer-core": "19.11.0_369149898", }, transitive_closure = { "@babel/code-frame": ["7.18.6"], @@ -20412,8 +20412,8 @@ def npm_repositories(): "progress": ["2.0.3"], "proxy-from-env": ["1.1.0"], "pump": ["3.0.0"], - "puppeteer": ["19.11.0_-369149898"], - "puppeteer-core": ["19.11.0_-369149898"], + "puppeteer": ["19.11.0_369149898"], + "puppeteer-core": ["19.11.0_369149898"], "readable-stream": ["3.6.1"], "require-directory": ["2.1.1"], "resolve-from": ["4.0.0"], @@ -23652,9 +23652,9 @@ def npm_repositories(): "@webassemblyjs/wasm-opt": ["1.11.1"], "@webassemblyjs/wasm-parser": ["1.11.1"], "@webassemblyjs/wast-printer": ["1.11.1"], - "@webpack-cli/configtest": ["2.0.1_-1256213976"], - "@webpack-cli/info": ["2.0.1_-1256213976"], - "@webpack-cli/serve": ["2.0.1_-1256213976"], + "@webpack-cli/configtest": ["2.0.1_1256213976"], + "@webpack-cli/info": ["2.0.1_1256213976"], + "@webpack-cli/serve": ["2.0.1_1256213976"], "@xtuc/ieee754": ["1.2.0"], "@xtuc/long": ["4.2.2"], "acorn": ["8.8.2"], @@ -25185,9 +25185,9 @@ def npm_repositories(): integrity = "sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==", deps = { "@discoveryjs/json-ext": "0.5.7", - "@webpack-cli/configtest": "2.0.1_-1256213976", - "@webpack-cli/info": "2.0.1_-1256213976", - "@webpack-cli/serve": "2.0.1_-1256213976", + "@webpack-cli/configtest": "2.0.1_1256213976", + "@webpack-cli/info": "2.0.1_1256213976", + "@webpack-cli/serve": "2.0.1_1256213976", "colorette": "2.0.19", "commander": "9.5.0", "cross-spawn": "7.0.3", @@ -25227,9 +25227,9 @@ def npm_repositories(): "@webassemblyjs/wasm-opt": ["1.11.1"], "@webassemblyjs/wasm-parser": ["1.11.1"], "@webassemblyjs/wast-printer": ["1.11.1"], - "@webpack-cli/configtest": ["2.0.1_-1256213976"], - "@webpack-cli/info": ["2.0.1_-1256213976"], - "@webpack-cli/serve": ["2.0.1_-1256213976"], + "@webpack-cli/configtest": ["2.0.1_1256213976"], + "@webpack-cli/info": ["2.0.1_1256213976"], + "@webpack-cli/serve": ["2.0.1_1256213976"], "@xtuc/ieee754": ["1.2.0"], "@xtuc/long": ["4.2.2"], "acorn": ["8.8.2"], @@ -25431,9 +25431,9 @@ def npm_repositories(): "@webassemblyjs/wasm-opt": ["1.11.1"], "@webassemblyjs/wasm-parser": ["1.11.1"], "@webassemblyjs/wast-printer": ["1.11.1"], - "@webpack-cli/configtest": ["2.0.1_-1256213976"], - "@webpack-cli/info": ["2.0.1_-1256213976"], - "@webpack-cli/serve": ["2.0.1_-1256213976"], + "@webpack-cli/configtest": ["2.0.1_1256213976"], + "@webpack-cli/info": ["2.0.1_1256213976"], + "@webpack-cli/serve": ["2.0.1_1256213976"], "@xtuc/ieee754": ["1.2.0"], "@xtuc/long": ["4.2.2"], "acorn": ["8.8.2"], diff --git a/npm/private/utils.bzl b/npm/private/utils.bzl index cb73b23cf..031c6335f 100644 --- a/npm/private/utils.bzl +++ b/npm/private/utils.bzl @@ -26,7 +26,7 @@ def _sanitize_string(string): if not c.isalnum() and c != "-" and c != "_" and c != ".": c = "_" result += c - return result + return result.strip("_-") 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"