build: update to the latest version of devinfra and rename npm2 workspace (#63093)

josephperrott · atscott · commit b72ef65b08b8 · 2025-08-11T10:35:33.000-07:00
Rename the npm2 workspace to npm and use the latest version of devinfra which drops rules_nodejs PR Close #63093
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@aspect_rules_js//js:defs.bzl", "js_library")
-load("@npm2//:defs.bzl", "npm_link_all_packages")
+load("@npm//:defs.bzl", "npm_link_all_packages")
 load("//:yarn.bzl", "YARN_PATH")
 load("//tools:defaults2.bzl", "copy_to_bin", "js_binary")
 
diff --git a/WORKSPACE b/WORKSPACE
@@ -47,7 +47,7 @@ rules_js_register_toolchains(
 load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
 
 npm_translate_lock(
-    name = "npm2",
+    name = "npm",
     data = [
         "//:.pnpmfile.cjs",
         "//:package.json",
@@ -84,7 +84,7 @@ npm_translate_lock(
     verify_node_modules_ignored = "//:.bazelignore",
 )
 
-load("@npm2//:repositories.bzl", "npm_repositories")
+load("@npm//:repositories.bzl", "npm_repositories")
 
 npm_repositories()
 
@@ -166,7 +166,7 @@ http_archive(
 
 git_repository(
     name = "devinfra",
-    commit = "17282887a46c27e9f297a3292f1fde5b35dfafc1",
+    commit = "5bd41ae2d8be51c3f98010714f8eaaab6d82fb62",
     remote = "https://github.com/angular/dev-infra.git",
 )
 
diff --git a/adev/BUILD.bazel b/adev/BUILD.bazel
@@ -1,5 +1,5 @@
 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("@rules_angular//src/architect:ng_application.bzl", "ng_application")
 load("@rules_angular//src/architect:ng_config.bzl", "ng_config")
 load("@rules_angular//src/architect:ng_test.bzl", "ng_test")
diff --git a/adev/shared-docs/pipeline/api-gen/BUILD.bazel b/adev/shared-docs/pipeline/api-gen/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@npm2//:defs.bzl", "npm_link_all_packages")
+load("@npm//:defs.bzl", "npm_link_all_packages")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/integration/BUILD.bazel b/integration/BUILD.bazel
@@ -1,3 +1,3 @@
-load("@npm2//:defs.bzl", "npm_link_all_packages")
+load("@npm//:defs.bzl", "npm_link_all_packages")
 
 npm_link_all_packages()
diff --git a/modules/BUILD.bazel b/modules/BUILD.bazel
@@ -1,3 +1,3 @@
-load("@npm2//:defs.bzl", "npm_link_all_packages")
+load("@npm//:defs.bzl", "npm_link_all_packages")
 
 npm_link_all_packages()
diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild")
-load("@npm2//:defs.bzl", "npm_link_all_packages")
+load("@npm//:defs.bzl", "npm_link_all_packages")
 load("//tools:defaults2.bzl", "api_golden_test", "extract_types", "npm_package", "ts_config", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/packages/compiler-cli/linker/babel/test/BUILD.bazel b/packages/compiler-cli/linker/babel/test/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@npm2//:defs.bzl", "npm_link_all_packages")
+load("@npm//:defs.bzl", "npm_link_all_packages")
 load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/packages/core/schematics/BUILD.bazel b/packages/core/schematics/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")
 load("//tools:defaults2.bzl", "npm_package", "ts_config")
 
 exports_files([
diff --git a/packages/core/test/bundling/BUILD.bazel b/packages/core/test/bundling/BUILD.bazel
@@ -1,3 +1,3 @@
-load("@npm2//:defs.bzl", "npm_link_all_packages")
+load("@npm//:defs.bzl", "npm_link_all_packages")
 
 npm_link_all_packages()
diff --git a/packages/language-service/bundles/BUILD.bazel b/packages/language-service/bundles/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@npm2//:rollup/package_json.bzl", rollup = "bin")
+load("@npm//:rollup/package_json.bzl", rollup = "bin")
 
 rollup.rollup(
     name = "language-service",
diff --git a/packages/localize/tools/test/extract/integration/test_files/BUILD.bazel b/packages/localize/tools/test/extract/integration/test_files/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@npm2//:typescript/package_json.bzl", tsc = "bin")
+load("@npm//:typescript/package_json.bzl", tsc = "bin")
 load("//tools:defaults2.bzl", "copy_to_bin")
 
 package(default_visibility = ["//packages/localize/tools/test/extract/integration:__pkg__"])
diff --git a/packages/platform-server/BUILD.bazel b/packages/platform-server/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")
 load("//tools:defaults2.bzl", "api_golden_test_npm_package", "generate_api_docs", "ng_package", "ng_project", "tsec_test")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/packages/platform-server/init/BUILD.bazel b/packages/platform-server/init/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")
 load("//tools:defaults2.bzl", "ng_project", "tsec_test")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/tools/bazel/esbuild/zone_bundle.bzl b/tools/bazel/esbuild/zone_bundle.bzl
@@ -1,5 +1,5 @@
 load("@aspect_rules_esbuild//esbuild:defs.bzl", _esbuild = "esbuild")
-load("@npm2//:typescript/package_json.bzl", tsc = "bin")
+load("@npm//:typescript/package_json.bzl", tsc = "bin")
 
 def zone_bundle(
         name,
diff --git a/tools/bazel/rules_angular_store/BUILD.bazel b/tools/bazel/rules_angular_store/BUILD.bazel
@@ -1,3 +1,3 @@
-load("@npm2//:defs.bzl", "npm_link_all_packages")
+load("@npm//:defs.bzl", "npm_link_all_packages")
 
 npm_link_all_packages()
diff --git a/tools/bazel/tsec.bzl b/tools/bazel/tsec.bzl
@@ -3,7 +3,7 @@
 load("@aspect_rules_js//js:providers.bzl", "JsInfo")
 load("@aspect_rules_ts//ts:defs.bzl", "TsConfigInfo")
 load("@bazel_skylib//lib:new_sets.bzl", "sets")
-load("@npm2//:tsec/package_json.bzl", tsec = "bin")
+load("@npm//:tsec/package_json.bzl", tsec = "bin")
 
 TsecTargetInfo = provider(
     "Attributes required for tsec_test to generate tsconfig.json",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-load("@npm2//:defs.bzl", "npm_link_all_packages")`
	`1`	`+load("@npm//:defs.bzl", "npm_link_all_packages")`
`2`	`2`
`3`	`3`	`package(default_visibility = ["//visibility:public"])`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-load("@npm2//:defs.bzl", "npm_link_all_packages")`
	`1`	`+load("@npm//:defs.bzl", "npm_link_all_packages")`
`2`	`2`
`3`	`3`	`npm_link_all_packages()`