From 3cbaff4569282332f3f6ead7070e0f522a0b09c1 Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Fri, 25 Apr 2025 13:58:36 +0000 Subject: [PATCH] build: rename npm2 to npm as rules_nodejs based npm workspace has been removed --- BUILD.bazel | 2 +- WORKSPACE | 4 ++-- modules/testing/builder/BUILD.bazel | 2 +- packages/angular/build/BUILD.bazel | 2 +- packages/angular/cli/BUILD.bazel | 2 +- packages/angular/pwa/BUILD.bazel | 2 +- packages/angular/ssr/BUILD.bazel | 2 +- packages/angular/ssr/third_party/beasties/BUILD.bazel | 2 +- packages/angular_devkit/architect/BUILD.bazel | 2 +- packages/angular_devkit/architect_cli/BUILD.bazel | 2 +- packages/angular_devkit/build_angular/BUILD.bazel | 2 +- packages/angular_devkit/build_webpack/BUILD.bazel | 2 +- packages/angular_devkit/core/BUILD.bazel | 2 +- packages/angular_devkit/schematics/BUILD.bazel | 2 +- packages/angular_devkit/schematics_cli/BUILD.bazel | 2 +- packages/ngtools/webpack/BUILD.bazel | 2 +- packages/schematics/angular/BUILD.bazel | 2 +- tests/BUILD.bazel | 2 +- tests/legacy-cli/BUILD.bazel | 2 +- tools/baseline_browserslist/BUILD.bazel | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 33ef92b85fd3..9518c3a6f0bb 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,6 +1,6 @@ load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config") load("@bazel_skylib//rules:common_settings.bzl", "bool_flag") -load("@npm2//:defs.bzl", "npm_link_all_packages") +load("@npm//:defs.bzl", "npm_link_all_packages") load("//tools:defaults.bzl", "copy_to_bin") package(default_visibility = ["//visibility:public"]) diff --git a/WORKSPACE b/WORKSPACE index 2475b95bec25..5687f01e0cfc 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -130,7 +130,7 @@ esbuild_repositories( load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock") npm_translate_lock( - name = "npm2", + name = "npm", custom_postinstalls = { # TODO: Standardize browser management for `rules_js` "webdriver-manager": "node ./bin/webdriver-manager update --standalone false --gecko false --versions.chrome 106.0.5249.21", @@ -178,7 +178,7 @@ npm_translate_lock( verify_node_modules_ignored = "//:.bazelignore", ) -load("@npm2//:repositories.bzl", "npm_repositories") +load("@npm//:repositories.bzl", "npm_repositories") npm_repositories() diff --git a/modules/testing/builder/BUILD.bazel b/modules/testing/builder/BUILD.bazel index f3b22a76cd07..9814ad27811d 100644 --- a/modules/testing/builder/BUILD.bazel +++ b/modules/testing/builder/BUILD.bazel @@ -1,4 +1,4 @@ -load("@npm2//:defs.bzl", "npm_link_all_packages") +load("@npm//:defs.bzl", "npm_link_all_packages") load("//tools:defaults.bzl", "jasmine_test", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/angular/build/BUILD.bazel b/packages/angular/build/BUILD.bazel index 4973ad51c480..de157d169bbb 100644 --- a/packages/angular/build/BUILD.bazel +++ b/packages/angular/build/BUILD.bazel @@ -1,5 +1,5 @@ load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package") -load("@npm2//:defs.bzl", "npm_link_all_packages") +load("@npm//:defs.bzl", "npm_link_all_packages") load("//:constants.bzl", "BASELINE_DATE") load("//tools:defaults.bzl", "copy_to_bin", "jasmine_test", "npm_package", "ts_project") load("//tools:ts_json_schema.bzl", "ts_json_schema") diff --git a/packages/angular/cli/BUILD.bazel b/packages/angular/cli/BUILD.bazel index 316150caabb9..efa8d5f601f0 100644 --- a/packages/angular/cli/BUILD.bazel +++ b/packages/angular/cli/BUILD.bazel @@ -3,7 +3,7 @@ # Use of this source code is governed by an MIT-style license that can be # found in the LICENSE file at https://angular.dev/license -load("@npm2//:defs.bzl", "npm_link_all_packages") +load("@npm//:defs.bzl", "npm_link_all_packages") load("//tools:defaults.bzl", "jasmine_test", "npm_package", "ts_project") load("//tools:ng_cli_schema_generator.bzl", "cli_json_schema") load("//tools:ts_json_schema.bzl", "ts_json_schema") diff --git a/packages/angular/pwa/BUILD.bazel b/packages/angular/pwa/BUILD.bazel index 5e8cc46a7ccd..4fc36b05adc6 100644 --- a/packages/angular/pwa/BUILD.bazel +++ b/packages/angular/pwa/BUILD.bazel @@ -3,7 +3,7 @@ # Use of this source code is governed by an MIT-style license that can be # found in the LICENSE file at https://angular.dev/license -load("@npm2//:defs.bzl", "npm_link_all_packages") +load("@npm//:defs.bzl", "npm_link_all_packages") load("//tools:defaults.bzl", "jasmine_test", "npm_package", "ts_project") load("//tools:ts_json_schema.bzl", "ts_json_schema") diff --git a/packages/angular/ssr/BUILD.bazel b/packages/angular/ssr/BUILD.bazel index 9f6f3c9f5690..299f61401f7d 100644 --- a/packages/angular/ssr/BUILD.bazel +++ b/packages/angular/ssr/BUILD.bazel @@ -1,5 +1,5 @@ load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package") -load("@npm2//:defs.bzl", "npm_link_all_packages") +load("@npm//:defs.bzl", "npm_link_all_packages") load("@rules_pkg//:pkg.bzl", "pkg_tar") load("//tools:defaults.bzl", "ng_package", "ts_project") diff --git a/packages/angular/ssr/third_party/beasties/BUILD.bazel b/packages/angular/ssr/third_party/beasties/BUILD.bazel index e54d156866e9..f570567cf596 100644 --- a/packages/angular/ssr/third_party/beasties/BUILD.bazel +++ b/packages/angular/ssr/third_party/beasties/BUILD.bazel @@ -1,5 +1,5 @@ load("@aspect_rules_js//js:defs.bzl", "js_library") -load("@npm2//:rollup/package_json.bzl", rollup = "bin") +load("@npm//:rollup/package_json.bzl", rollup = "bin") package(default_visibility = ["//visibility:public"]) diff --git a/packages/angular_devkit/architect/BUILD.bazel b/packages/angular_devkit/architect/BUILD.bazel index de6e036f3a66..b724096e4219 100644 --- a/packages/angular_devkit/architect/BUILD.bazel +++ b/packages/angular_devkit/architect/BUILD.bazel @@ -4,7 +4,7 @@ # found in the LICENSE file at https://angular.dev/license load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package") -load("@npm2//:defs.bzl", "npm_link_all_packages") +load("@npm//:defs.bzl", "npm_link_all_packages") load("//tools:defaults.bzl", "jasmine_test", "npm_package", "ts_project") load("//tools:ts_json_schema.bzl", "ts_json_schema") diff --git a/packages/angular_devkit/architect_cli/BUILD.bazel b/packages/angular_devkit/architect_cli/BUILD.bazel index 0f9cd4b80174..62bf288cbf7a 100644 --- a/packages/angular_devkit/architect_cli/BUILD.bazel +++ b/packages/angular_devkit/architect_cli/BUILD.bazel @@ -1,4 +1,4 @@ -load("@npm2//:defs.bzl", "npm_link_all_packages") +load("@npm//:defs.bzl", "npm_link_all_packages") load("//tools:defaults.bzl", "npm_package", "ts_project") # Copyright Google Inc. All Rights Reserved. diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel index 4e1603904308..40884c857ee2 100644 --- a/packages/angular_devkit/build_angular/BUILD.bazel +++ b/packages/angular_devkit/build_angular/BUILD.bazel @@ -4,7 +4,7 @@ # found in the LICENSE file at https://angular.dev/license load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package") -load("@npm2//:defs.bzl", "npm_link_all_packages") +load("@npm//:defs.bzl", "npm_link_all_packages") load("//tools:defaults.bzl", "copy_to_bin", "jasmine_test", "npm_package", "ts_project") load("//tools:ts_json_schema.bzl", "ts_json_schema") diff --git a/packages/angular_devkit/build_webpack/BUILD.bazel b/packages/angular_devkit/build_webpack/BUILD.bazel index c3c893f6e15d..e01feffdd673 100644 --- a/packages/angular_devkit/build_webpack/BUILD.bazel +++ b/packages/angular_devkit/build_webpack/BUILD.bazel @@ -4,7 +4,7 @@ # found in the LICENSE file at https://angular.dev/license load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package") -load("@npm2//:defs.bzl", "npm_link_all_packages") +load("@npm//:defs.bzl", "npm_link_all_packages") load("//tools:defaults.bzl", "jasmine_test", "npm_package", "ts_project") load("//tools:ts_json_schema.bzl", "ts_json_schema") diff --git a/packages/angular_devkit/core/BUILD.bazel b/packages/angular_devkit/core/BUILD.bazel index 0ebb7ec87ec4..dc27e8e3f5c1 100644 --- a/packages/angular_devkit/core/BUILD.bazel +++ b/packages/angular_devkit/core/BUILD.bazel @@ -1,5 +1,5 @@ load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package") -load("@npm2//:defs.bzl", "npm_link_all_packages") +load("@npm//:defs.bzl", "npm_link_all_packages") load("//tools:defaults.bzl", "jasmine_test", "npm_package", "ts_project") # Copyright Google Inc. All Rights Reserved. diff --git a/packages/angular_devkit/schematics/BUILD.bazel b/packages/angular_devkit/schematics/BUILD.bazel index 73f02c718ade..d4376bc57d4a 100644 --- a/packages/angular_devkit/schematics/BUILD.bazel +++ b/packages/angular_devkit/schematics/BUILD.bazel @@ -1,5 +1,5 @@ load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package") -load("@npm2//:defs.bzl", "npm_link_all_packages") +load("@npm//:defs.bzl", "npm_link_all_packages") load("//tools:defaults.bzl", "jasmine_test", "npm_package", "ts_project") # Copyright Google Inc. All Rights Reserved. diff --git a/packages/angular_devkit/schematics_cli/BUILD.bazel b/packages/angular_devkit/schematics_cli/BUILD.bazel index 9f4347a8081d..f67abd6a3eb6 100644 --- a/packages/angular_devkit/schematics_cli/BUILD.bazel +++ b/packages/angular_devkit/schematics_cli/BUILD.bazel @@ -1,4 +1,4 @@ -load("@npm2//:defs.bzl", "npm_link_all_packages") +load("@npm//:defs.bzl", "npm_link_all_packages") load("//tools:defaults.bzl", "npm_package", "ts_project") load("//tools:ts_json_schema.bzl", "ts_json_schema") diff --git a/packages/ngtools/webpack/BUILD.bazel b/packages/ngtools/webpack/BUILD.bazel index f530470d9b57..1a5b8b0b486d 100644 --- a/packages/ngtools/webpack/BUILD.bazel +++ b/packages/ngtools/webpack/BUILD.bazel @@ -4,7 +4,7 @@ # found in the LICENSE file at https://angular.dev/license load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package") -load("@npm2//:defs.bzl", "npm_link_all_packages") +load("@npm//:defs.bzl", "npm_link_all_packages") load("//tools:defaults.bzl", "jasmine_test", "npm_package", "ts_project") licenses(["notice"]) diff --git a/packages/schematics/angular/BUILD.bazel b/packages/schematics/angular/BUILD.bazel index aead664e0231..0e5ba72fed90 100644 --- a/packages/schematics/angular/BUILD.bazel +++ b/packages/schematics/angular/BUILD.bazel @@ -3,7 +3,7 @@ # Use of this source code is governed by an MIT-style license that can be # found in the LICENSE file at https://angular.dev/license -load("@npm2//:defs.bzl", "npm_link_all_packages") +load("@npm//:defs.bzl", "npm_link_all_packages") load("//:constants.bzl", "BASELINE_DATE") load("//tools:defaults.bzl", "copy_to_bin", "jasmine_test", "npm_package", "ts_project") load("//tools:ts_json_schema.bzl", "ts_json_schema") diff --git a/tests/BUILD.bazel b/tests/BUILD.bazel index 9d85c5cf8b41..2c0b57b1fe3e 100644 --- a/tests/BUILD.bazel +++ b/tests/BUILD.bazel @@ -1,4 +1,4 @@ -load("@npm2//:defs.bzl", "npm_link_all_packages") +load("@npm//:defs.bzl", "npm_link_all_packages") # Copyright Google Inc. All Rights Reserved. # diff --git a/tests/legacy-cli/BUILD.bazel b/tests/legacy-cli/BUILD.bazel index cd097276f01f..c148aba86de5 100644 --- a/tests/legacy-cli/BUILD.bazel +++ b/tests/legacy-cli/BUILD.bazel @@ -1,5 +1,5 @@ load("@aspect_bazel_lib//lib:directory_path.bzl", "directory_path") -load("@npm2//:rollup/package_json.bzl", rollup = "bin") +load("@npm//:rollup/package_json.bzl", rollup = "bin") load("//tools:defaults.bzl", "ts_project") load(":e2e.bzl", "e2e_suites") diff --git a/tools/baseline_browserslist/BUILD.bazel b/tools/baseline_browserslist/BUILD.bazel index b8afa2926fa2..34141cd15759 100644 --- a/tools/baseline_browserslist/BUILD.bazel +++ b/tools/baseline_browserslist/BUILD.bazel @@ -1,6 +1,6 @@ load("@aspect_rules_js//js:defs.bzl", "js_binary") load("@aspect_rules_ts//ts:defs.bzl", "ts_config") -load("@npm2//:defs.bzl", "npm_link_all_packages") +load("@npm//:defs.bzl", "npm_link_all_packages") load("//tools:defaults.bzl", "jasmine_test", "ts_project") npm_link_all_packages()