refactor: migrate to use new rules_js based ng_package

josephperrott · josephperrott · commit fc569fdc7c85 · 2025-04-21T16:14:23.000Z
diff --git a/packages.bzl b/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, **{
diff --git a/src/cdk-experimental/BUILD.bazel b/src/cdk-experimental/BUILD.bazel
@@ -1,7 +1,6 @@
 load("//src/cdk-experimental:config.bzl", "CDK_EXPERIMENTAL_TARGETS")
 load("//tools:defaults.bzl", "ng_package")
 load("//tools:defaults2.bzl", "ts_project")
-load("//tools/bazel:legacy_target.bzl", "get_legacy_label")
 load("@npm2//:defs.bzl", "npm_link_all_packages")
 
 package(default_visibility = ["//visibility:public"])
@@ -29,5 +28,5 @@ ng_package(
         "//integration:__subpackages__",
         "//src/material-experimental:__subpackages__",
     ],
-    deps = [get_legacy_label(t) for t in CDK_EXPERIMENTAL_TARGETS],
+    deps = CDK_EXPERIMENTAL_TARGETS,
 )
diff --git a/src/cdk/BUILD.bazel b/src/cdk/BUILD.bazel
@@ -1,7 +1,6 @@
 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("//tools/bazel:legacy_target.bzl", "get_legacy_label")
 load("@npm2//:defs.bzl", "npm_link_all_packages")
 
 package(default_visibility = ["//visibility:public"])
@@ -68,7 +67,7 @@ ng_package(
         "//goldens:__pkg__",
         "//integration:__subpackages__",
     ],
-    deps = [get_legacy_label(t) for t in CDK_TARGETS],
+    deps = CDK_TARGETS,
 )
 
 filegroup(
diff --git a/src/components-examples/BUILD.bazel b/src/components-examples/BUILD.bazel
@@ -3,7 +3,6 @@ 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("//tools/bazel:legacy_target.bzl", "get_legacy_label")
 load("@npm2//:defs.bzl", "npm_link_all_packages")
 
 package(default_visibility = ["//visibility:public"])
@@ -73,7 +72,7 @@ ng_package(
     ],
     tags = ["docs-package"],
     visibility = ["//:__pkg__"],
-    deps = [":components-examples_legacy"] + [get_legacy_label(t) for t in ALL_EXAMPLES],
+    deps = [":components-examples"] + ALL_EXAMPLES,
 )
 
 genrule(
diff --git a/src/google-maps/BUILD.bazel b/src/google-maps/BUILD.bazel
@@ -44,7 +44,7 @@ ng_package(
         "//goldens:__pkg__",
         "//integration:__subpackages__",
     ],
-    deps = [":google-maps_legacy"],
+    deps = [":google-maps"],
 )
 
 filegroup(
diff --git a/src/material-date-fns-adapter/BUILD.bazel b/src/material-date-fns-adapter/BUILD.bazel
@@ -50,5 +50,5 @@ ng_package(
         "//goldens:__pkg__",
         "//integration:__subpackages__",
     ],
-    deps = [":material-date-fns-adapter_legacy"],
+    deps = [":material-date-fns-adapter"],
 )
diff --git a/src/material-experimental/BUILD.bazel b/src/material-experimental/BUILD.bazel
@@ -6,7 +6,6 @@ load(
 )
 load("//tools:defaults.bzl", "ng_package", "sass_library")
 load("//tools:defaults2.bzl", "ts_project")
-load("//tools/bazel:legacy_target.bzl", "get_legacy_label")
 load("@npm2//:defs.bzl", "npm_link_all_packages")
 
 package(default_visibility = ["//visibility:public"])
@@ -53,5 +52,5 @@ ng_package(
         "//goldens:__pkg__",
         "//integration:__subpackages__",
     ],
-    deps = [get_legacy_label(t) for t in MATERIAL_EXPERIMENTAL_TARGETS + MATERIAL_EXPERIMENTAL_TESTING_TARGETS],
+    deps = MATERIAL_EXPERIMENTAL_TARGETS + MATERIAL_EXPERIMENTAL_TESTING_TARGETS,
 )
diff --git a/src/material-luxon-adapter/BUILD.bazel b/src/material-luxon-adapter/BUILD.bazel
@@ -52,5 +52,5 @@ ng_package(
         "//goldens:__pkg__",
         "//integration:__subpackages__",
     ],
-    deps = [":material-luxon-adapter_legacy"],
+    deps = [":material-luxon-adapter"],
 )
diff --git a/src/material-moment-adapter/BUILD.bazel b/src/material-moment-adapter/BUILD.bazel
@@ -57,5 +57,5 @@ ng_package(
         "//goldens:__pkg__",
         "//integration:__subpackages__",
     ],
-    deps = [":material-moment-adapter_legacy"],
+    deps = [":material-moment-adapter"],
 )
diff --git a/src/material/BUILD.bazel b/src/material/BUILD.bazel
@@ -7,7 +7,6 @@ load(
 )
 load("//tools:defaults.bzl", "ng_package", "sass_library")
 load("//tools:defaults2.bzl", "ts_project")
-load("//tools/bazel:legacy_target.bzl", "get_legacy_label")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -193,5 +192,5 @@ ng_package(
         "//goldens:__pkg__",
         "//integration:__subpackages__",
     ],
-    deps = [get_legacy_label(t) for t in MATERIAL_TARGETS + MATERIAL_TESTING_TARGETS],
+    deps = MATERIAL_TARGETS + MATERIAL_TESTING_TARGETS,
 )
diff --git a/src/youtube-player/BUILD.bazel b/src/youtube-player/BUILD.bazel
@@ -64,7 +64,7 @@ ng_package(
         "//goldens:__pkg__",
         "//integration:__subpackages__",
     ],
-    deps = [":youtube-player_legacy"],
+    deps = [":youtube-player"],
 )
 
 ts_project(
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
@@ -2,7 +2,7 @@
 
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
 load("@rules_sass//src:index.bzl", _sass_binary = "sass_binary", _sass_library = "sass_library")
-load("@npm//@angular/bazel:index.bzl", _ng_package = "ng_package")
+load("@rules_angular//src/ng_package:index.bzl", _ng_package = "ng_package")
 load("//:packages.bzl", "NO_STAMP_NPM_PACKAGE_SUBSTITUTIONS", "NPM_PACKAGE_SUBSTITUTIONS")
 load("//:pkg-externals.bzl", "PKG_EXTERNALS")
 load("//tools/markdown-to-html:index.bzl", _markdown_to_html = "markdown_to_html")
@@ -64,21 +64,17 @@ def ng_package(
         externals = externals,
         srcs = srcs + [":license_copied"],
         deps = deps,
-        # We never set a `package_name` for NPM packages, neither do we enable validation.
-        # This is necessary because the source targets of the NPM packages all have
-        # package names set and setting a similar `package_name` on the NPM package would
-        # result in duplicate linker mappings that will conflict. e.g. consider the following
-        # scenario: We have a `ts_library` for `@angular/cdk`. We will configure a package
-        # name for the target so that it can be resolved in NodeJS executions from `node_modules`.
-        # If we'd also set a `package_name` for the associated `pkg_npm` target, there would be
-        # two mappings for `@angular/cdk` and the linker will complain. For a better development
-        # experience, we want the mapping to resolve to the direct outputs of the `ts_library`
-        # instead of requiring tests and other targets to assemble the NPM package first.
-        package_name = None,
-        validate = False,
+        package = package_name,
         readme_md = readme_md,
         substitutions = npmPackageSubstitutions,
         visibility = visibility,
+        rollup_runtime_deps = [
+            "//:node_modules/@rollup/plugin-commonjs",
+            "//:node_modules/@rollup/plugin-node-resolve",
+            "//:node_modules/magic-string",
+            "//:node_modules/rollup-plugin-dts",
+            "//:node_modules/rollup-plugin-sourcemaps2",
+        ],
         **kwargs
     )
 
@@ -97,6 +93,6 @@ def ng_package(
         name = "pkg",
         src = ":%s" % name,
         visibility = visibility,
-        interop_deps = [d.replace("_legacy", "") for d in deps] + package_deps,
+        interop_deps = deps + package_deps,
         package_name = package_name,
     )

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ ng_package(`
`44`	`44`	`"//goldens:__pkg__",`
`45`	`45`	`"//integration:__subpackages__",`
`46`	`46`	`],`
`47`		`- deps = [":google-maps_legacy"],`
	`47`	`+ deps = [":google-maps"],`
`48`	`48`	`)`
`49`	`49`
`50`	`50`	`filegroup(`
Original file line number	Diff line number	Diff line change
`@@ -50,5 +50,5 @@ ng_package(`
`50`	`50`	`"//goldens:__pkg__",`
`51`	`51`	`"//integration:__subpackages__",`
`52`	`52`	`],`
`53`		`- deps = [":material-date-fns-adapter_legacy"],`
	`53`	`+ deps = [":material-date-fns-adapter"],`
`54`	`54`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ load(`
`6`	`6`	`)`
`7`	`7`	`load("//tools:defaults.bzl", "ng_package", "sass_library")`
`8`	`8`	`load("//tools:defaults2.bzl", "ts_project")`
`9`		`-load("//tools/bazel:legacy_target.bzl", "get_legacy_label")`
`10`	`9`	`load("@npm2//:defs.bzl", "npm_link_all_packages")`
`11`	`10`
`12`	`11`	`package(default_visibility = ["//visibility:public"])`
`@@ -53,5 +52,5 @@ ng_package(`
`53`	`52`	`"//goldens:__pkg__",`
`54`	`53`	`"//integration:__subpackages__",`
`55`	`54`	`],`
`56`		`- deps = [get_legacy_label(t) for t in MATERIAL_EXPERIMENTAL_TARGETS + MATERIAL_EXPERIMENTAL_TESTING_TARGETS],`
	`55`	`+ deps = MATERIAL_EXPERIMENTAL_TARGETS + MATERIAL_EXPERIMENTAL_TESTING_TARGETS,`
`57`	`56`	`)`
Original file line number	Diff line number	Diff line change
`@@ -52,5 +52,5 @@ ng_package(`
`52`	`52`	`"//goldens:__pkg__",`
`53`	`53`	`"//integration:__subpackages__",`
`54`	`54`	`],`
`55`		`- deps = [":material-luxon-adapter_legacy"],`
	`55`	`+ deps = [":material-luxon-adapter"],`
`56`	`56`	`)`
Original file line number	Diff line number	Diff line change
`@@ -57,5 +57,5 @@ ng_package(`
`57`	`57`	`"//goldens:__pkg__",`
`58`	`58`	`"//integration:__subpackages__",`
`59`	`59`	`],`
`60`		`- deps = [":material-moment-adapter_legacy"],`
	`60`	`+ deps = [":material-moment-adapter"],`
`61`	`61`	`)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ load(`
`7`	`7`	`)`
`8`	`8`	`load("//tools:defaults.bzl", "ng_package", "sass_library")`
`9`	`9`	`load("//tools:defaults2.bzl", "ts_project")`
`10`		`-load("//tools/bazel:legacy_target.bzl", "get_legacy_label")`
`11`	`10`
`12`	`11`	`package(default_visibility = ["//visibility:public"])`
`13`	`12`
`@@ -193,5 +192,5 @@ ng_package(`
`193`	`192`	`"//goldens:__pkg__",`
`194`	`193`	`"//integration:__subpackages__",`
`195`	`194`	`],`
`196`		`- deps = [get_legacy_label(t) for t in MATERIAL_TARGETS + MATERIAL_TESTING_TARGETS],`
	`195`	`+ deps = MATERIAL_TARGETS + MATERIAL_TESTING_TARGETS,`
`197`	`196`	`)`