Revert "[PATCH] Migrate to use rules_js based ng_package (#30917)" (#30928)

This reverts commit 89db9f7.

Author: mmalerba

.bazelignore

@@ -31,3 +31,5 @@ src/material-moment-adapter/node_modules
 src/material/node_modules
 src/universal-app/node_modules
 src/youtube-player/node_modules
+
+tools/bazel/legacy-rnjs/node_modules

BUILD.bazel

@@ -3,7 +3,7 @@ load("//src/cdk:config.bzl", "CDK_ENTRYPOINTS")
 load("//src/cdk-experimental:config.bzl", "CDK_EXPERIMENTAL_ENTRYPOINTS")
 load("//src/material:config.bzl", "MATERIAL_ENTRYPOINTS", "MATERIAL_TESTING_ENTRYPOINTS")
 load("//src/material-experimental:config.bzl", "MATERIAL_EXPERIMENTAL_ENTRYPOINTS", "MATERIAL_EXPERIMENTAL_TESTING_ENTRYPOINTS")
-load("@npm//:defs.bzl", "npm_link_all_packages")
+load("@npm2//:defs.bzl", "npm_link_all_packages")
 
 package(default_visibility = ["//visibility:public"])
 

WORKSPACE

@@ -12,7 +12,9 @@ http_archive(
     urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.8.4/rules_nodejs-5.8.4.tar.gz"],
 )
 
-# Add skylib which contains common Bazel utilities.
+# Add skylib which contains common Bazel utilities. Note that `rules_nodejs` would also
+# bring in the skylib repository but with an older version that does not support shorthands
+# for declaring Bazel build setting flags.
 http_archive(
     name = "bazel_skylib",
     sha256 = "a9c5d3a22461ed7063aa7b088f9c96fa0aaaa8b6984b601f84d705adc47d8a58",
@@ -54,6 +56,8 @@ load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
 
 rules_js_dependencies()
 
+load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
+
 NODE_VERSION = "22.0.0"
 
 NODE_REPOSITORIES = {
@@ -66,17 +70,39 @@ NODE_REPOSITORIES = {
     "22.0.0-windows_amd64": ("node-v22.0.0-win-x64.zip", "node-v22.0.0-win-x64", "32d639b47d4c0a651ff8f8d7d41a454168a3d4045be37985f9a810cf8cef6174"),
 }
 
+nodejs_register_toolchains(
+    name = "nodejs",
+    node_repositories = NODE_REPOSITORIES,
+    node_version = NODE_VERSION,
+)
+
 load("@aspect_rules_js//js:toolchains.bzl", "rules_js_register_toolchains")
 
 rules_js_register_toolchains(
     node_repositories = NODE_REPOSITORIES,
     node_version = NODE_VERSION,
 )
 
+load("@build_bazel_rules_nodejs//:index.bzl", "yarn_install")
+
+# TODO(devversion): Remove this once `ng_package` is ported over to `rules_js`.
+yarn_install(
+    name = "npm",
+    data = [
+        "//tools/bazel/legacy-rnjs:.yarn/patches/@angular-bazel-https-c46f484fb8.patch",
+        "//tools/bazel/legacy-rnjs:.yarn/releases/yarn-4.5.0.cjs",
+        "//tools/bazel/legacy-rnjs:.yarnrc.yml",
+    ],
+    exports_directories_only = False,
+    package_json = "//tools/bazel/legacy-rnjs:package.json",
+    yarn = "//tools/bazel/legacy-rnjs:.yarn/releases/yarn-4.5.0.cjs",
+    yarn_lock = "//tools/bazel/legacy-rnjs:yarn.lock",
+)
+
 load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
 
 npm_translate_lock(
-    name = "npm",
+    name = "npm2",
     custom_postinstalls = {
         "@angular/animations": "node ../../@nginfra/angular-linking/index.mjs",
         "@angular/common": "node ../../@nginfra/angular-linking/index.mjs",
@@ -149,7 +175,7 @@ npm_translate_lock(
     verify_node_modules_ignored = "//:.bazelignore",
 )
 
-load("@npm//:repositories.bzl", "npm_repositories")
+load("@npm2//:repositories.bzl", "npm_repositories")
 
 npm_repositories()
 
@@ -204,7 +230,7 @@ setup_dependencies_2()
 
 git_repository(
     name = "rules_angular",
-    commit = "005c80615934c891d729d5efc1ae661f9e3210c4",
+    commit = "514eda9ec00a6745dc11b2a62d7be2634199171e",
     remote = "https://github.com/devversion/rules_angular.git",
 )
 

docs/BUILD.bazel

@@ -1,6 +1,6 @@
 load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
 load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_library", "js_test")
-load("@npm//:defs.bzl", "npm_link_all_packages")
+load("@npm2//:defs.bzl", "npm_link_all_packages")
 load("//docs:defs.bzl", "ng_app")
 
 package(default_visibility = ["//visibility:public"])

docs/defs.bzl

@@ -1,4 +1,4 @@
-load("@npm//:@angular-devkit/architect-cli/package_json.bzl", architect_cli = "bin")
+load("@npm2//:@angular-devkit/architect-cli/package_json.bzl", architect_cli = "bin")
 load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
 
 # NOTE:

integration/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//:defs.bzl", "npm_link_all_packages")
+load("@npm2//:defs.bzl", "npm_link_all_packages")
 
 package(default_visibility = ["//visibility:public"])
 

package.json

@@ -124,7 +124,6 @@
     "karma-jasmine": "^4.0.1",
     "karma-parallel": "^0.3.1",
     "karma-sourcemap-loader": "^0.3.8",
-    "magic-string": "0.30.17",
     "marked": "^2.0.0",
     "minimatch": "^3.0.4",
     "node-fetch": "^2.6.0",
@@ -136,8 +135,6 @@
     "reflect-metadata": "^0.1.13",
     "requirejs": "^2.3.6",
     "rollup": "^2.66.1",
-    "rollup-plugin-dts": "6.2.1",
-    "rollup-plugin-sourcemaps2": "0.5.0",
     "sass": "^1.80.6",
     "selenium-webdriver": "^3.6.0",
     "semver": "^7.3.5",

packages.bzl

@@ -20,9 +20,9 @@ PKG_GROUP_REPLACEMENTS = {
 # the peer dependencies and versions, primarily in `package.json`s.
 NPM_PACKAGE_SUBSTITUTIONS = dict(PKG_GROUP_REPLACEMENTS, **{
     # Peer dependency version on the Angular framework.
-    "0.0.0-NG": "{{STABLE_FRAMEWORK_PEER_DEP_RANGE}}",
+    "0.0.0-NG": "{STABLE_FRAMEWORK_PEER_DEP_RANGE}",
     # Version of the local package being built, generated via the `--workspace_status_command` flag.
-    "0.0.0-PLACEHOLDER": "{{STABLE_PROJECT_VERSION}}",
+    "0.0.0-PLACEHOLDER": "{STABLE_PROJECT_VERSION}",
 })
 
 NO_STAMP_NPM_PACKAGE_SUBSTITUTIONS = dict(NPM_PACKAGE_SUBSTITUTIONS, **{

pnpm-lock.yaml

@@ -1,7 +1,8 @@
 load("//src/cdk-experimental:config.bzl", "CDK_EXPERIMENTAL_TARGETS")
 load("//tools:defaults.bzl", "ng_package")
 load("//tools:defaults2.bzl", "ts_project")
-load("@npm//:defs.bzl", "npm_link_all_packages")
+load("//tools/bazel:legacy_target.bzl", "get_legacy_label")
+load("@npm2//:defs.bzl", "npm_link_all_packages")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -28,5 +29,5 @@ ng_package(
         "//integration:__subpackages__",
         "//src/material-experimental:__subpackages__",
     ],
-    deps = CDK_EXPERIMENTAL_TARGETS,
+    deps = [get_legacy_label(t) for t in CDK_EXPERIMENTAL_TARGETS],
 )

src/cdk-experimental/BUILD.bazel

@@ -52,6 +52,6 @@ ts_project(
 e2e_test_suite(
     name = "e2e_tests",
     deps = [
-        ":e2e_test_sources",
+        ":e2e_test_sources_legacy",
     ],
 )

src/cdk-experimental/scrolling/BUILD.bazel

@@ -1,7 +1,8 @@
 load("//src/cdk:config.bzl", "CDK_ENTRYPOINTS", "CDK_ENTRYPOINTS_WITH_STYLES", "CDK_SCSS_LIBS", "CDK_TARGETS")
 load("//tools:defaults.bzl", "ng_package", "sass_library")
 load("//tools:defaults2.bzl", "ts_project")
-load("@npm//:defs.bzl", "npm_link_all_packages")
+load("//tools/bazel:legacy_target.bzl", "get_legacy_label")
+load("@npm2//:defs.bzl", "npm_link_all_packages")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -67,7 +68,7 @@ ng_package(
         "//goldens:__pkg__",
         "//integration:__subpackages__",
     ],
-    deps = CDK_TARGETS,
+    deps = [get_legacy_label(t) for t in CDK_TARGETS],
 )
 
 filegroup(

src/cdk/BUILD.bazel

@@ -94,7 +94,7 @@ ts_project(
 e2e_test_suite(
     name = "e2e_tests",
     deps = [
-        ":e2e_test_sources",
+        ":e2e_test_sources_legacy",
     ],
 )
 

src/cdk/overlay/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
+load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin")
 load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
 load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
 

src/cdk/schematics/BUILD.bazel

@@ -38,7 +38,7 @@ ng_web_test_suite(
 e2e_test_suite(
     name = "protractor_e2e_tests",
     deps = [
-        "//src/cdk/testing/tests:e2e_test_sources",
+        "//src/cdk/testing/tests:e2e_test_sources_legacy",
     ],
 )
 

src/cdk/testing/BUILD.bazel

@@ -3,7 +3,8 @@ load("//tools/highlight-files:index.bzl", "highlight_files")
 load("//tools/package-docs-content:index.bzl", "package_docs_content")
 load(":config.bzl", "ALL_EXAMPLES")
 load("//tools:defaults2.bzl", "ng_project")
-load("@npm//:defs.bzl", "npm_link_all_packages")
+load("//tools/bazel:legacy_target.bzl", "get_legacy_label")
+load("@npm2//:defs.bzl", "npm_link_all_packages")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -72,7 +73,7 @@ ng_package(
     ],
     tags = ["docs-package"],
     visibility = ["//:__pkg__"],
-    deps = [":components-examples"] + ALL_EXAMPLES,
+    deps = [":components-examples_legacy"] + [get_legacy_label(t) for t in ALL_EXAMPLES],
 )
 
 genrule(

src/components-examples/BUILD.bazel

@@ -1,6 +1,6 @@
 load("//tools:defaults.bzl", "sass_binary")
 load("//tools:defaults2.bzl", "http_server", "ng_project")
-load("@npm//:defs.bzl", "npm_link_all_packages")
+load("@npm2//:defs.bzl", "npm_link_all_packages")
 load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild")
 load("@aspect_rules_js//npm:defs.bzl", "npm_package")
 load("//src/components-examples:config.bzl", "ALL_EXAMPLES")