[19.2.x]: Patch port of #30797

.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx

@@ -3,19 +3,19 @@
 # This file should be checked into version control along with the pnpm-lock.yaml file.
 .npmrc=-1406867100
 integration/package.json=-620011313
-package.json=1405819661
+package.json=-1359805610
 patches/@angular__compiler-cli.patch=-11405367
 patches/@angular__core.patch=213102054
-pnpm-lock.yaml=313249421
+pnpm-lock.yaml=1963318324
 pnpm-workspace.yaml=334858811
 src/cdk-experimental/package.json=237487315
 src/cdk/package.json=-908433069
-src/components-examples/package.json=-2087309525
+src/components-examples/package.json=560048349
 src/dev-app/package.json=624475908
 src/e2e-app/package.json=-1971485006
 src/google-maps/package.json=-886415500
 src/material-date-fns-adapter/package.json=-332076964
-src/material-experimental/package.json=-1707816737
+src/material-experimental/package.json=1822916455
 src/material-luxon-adapter/package.json=-199007660
 src/material-moment-adapter/package.json=-1407689629
 src/material/package.json=-1237533685

.bazelrc

@@ -58,7 +58,7 @@ build:snapshot-build --stamp
 ####################################
 # Bazel custom flags               #
 ####################################
-build --flag_alias=partial_compilation=@npm//@angular/bazel/src:partial_compilation
+build --flag_alias=partial_compilation=@rules_angular//src/ng_project/config:partial_compilation
 
 ##################################
 # Always enable Ivy compilation  #

WORKSPACE

@@ -167,9 +167,10 @@ npm_translate_lock(
         "@angular/animations": "node ../../@nginfra/angular-linking/index.mjs",
         "@angular/common": "node ../../@nginfra/angular-linking/index.mjs",
         "@angular/forms": "node ../../@nginfra/angular-linking/index.mjs",
+        "@angular/localize": "node ../../@nginfra/angular-linking/index.mjs",
         "@angular/platform-browser": "node ../../@nginfra/angular-linking/index.mjs",
+        "@angular/platform-server": "node ../../@nginfra/angular-linking/index.mjs",
         "@angular/router": "node ../../@nginfra/angular-linking/index.mjs",
-        "@angular/localize": "node ../../@nginfra/angular-linking/index.mjs",
     },
     data = [
         "//:package.json",
@@ -192,6 +193,17 @@ npm_translate_lock(
         "//src/youtube-player:package.json",
     ],
     npmrc = "//:.npmrc",
+    package_visibility = {
+        "@angular/cdk": ["//integration:__subpackages__"],
+        "@angular/cdk-experimental": ["//integration:__subpackages__"],
+        "@angular/material": ["//integration:__subpackages__"],
+        "@angular/material-experimental": ["//integration:__subpackages__"],
+        "@angular/google-maps": ["//integration:__subpackages__"],
+        "@angular/youtube-player": ["//integration:__subpackages__"],
+        "@angular/material-moment-adapter": ["//integration:__subpackages__"],
+        "@angular/material-date-fns-adapter": ["//integration:__subpackages__"],
+        "@angular/material-luxon-adapter": ["//integration:__subpackages__"],
+    },
     pnpm_lock = "//:pnpm-lock.yaml",
     update_pnpm_lock = True,
     verify_node_modules_ignored = "//:.bazelignore",
@@ -239,7 +251,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 git_repository(
     name = "devinfra",
-    commit = "b9bcdb3f9dff85fbfe8d1ca1d95531ddfe475f80",
+    commit = "492cc1f5295d3ededcd6b226354a1e2924c64246",
     remote = "https://github.com/angular/dev-infra.git",
 )
 
@@ -253,7 +265,7 @@ setup_dependencies_2()
 
 git_repository(
     name = "rules_angular",
-    commit = "92127883c3a3714e63782a51bac1a7c03ec8b0f5",
+    commit = "60d0dbdf18224f5167da1a43f4de9c4cb717b593",
     remote = "https://github.com/devversion/rules_angular.git",
 )
 

goldens/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@devinfra//bazel/api-golden:index.bzl", "api_golden_test_npm_package")
+load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
 
 exports_files([
     "tsec-exemption.json",
@@ -9,29 +9,33 @@ api_golden_test_npm_package(
     data = glob(["cdk/**"]) + [
         "//src/cdk:npm_package",
     ],
-    golden_dir = "angular_material/goldens/cdk",
-    npm_package = "angular_material/src/cdk/npm_package",
+    golden_dir = "goldens/cdk",
+    npm_package = "src/cdk/npm_package",
 )
 
 api_golden_test_npm_package(
     name = "material_api",
     data = glob(["material/**"]) + ["//src/material:npm_package"],
-    golden_dir = "angular_material/goldens/material",
-    npm_package = "angular_material/src/material/npm_package",
+    golden_dir = "goldens/material",
+    npm_package = "src/material/npm_package",
 )
 
 api_golden_test_npm_package(
     name = "google_maps_api",
     data = glob(["google-maps/**"]) + ["//src/google-maps:npm_package"],
-    golden_dir = "angular_material/goldens/google-maps",
-    npm_package = "angular_material/src/google-maps/npm_package",
-    types = ["@npm//@types/google.maps"],
+    golden_dir = "goldens/google-maps",
+    npm_package = "src/google-maps/npm_package",
+    types = {
+        "//:node_modules/@types/google.maps": "google.maps",
+    },
 )
 
 api_golden_test_npm_package(
     name = "youtube_player_api",
     data = glob(["youtube-player/**"]) + ["//src/youtube-player:npm_package"],
-    golden_dir = "angular_material/goldens/youtube-player",
-    npm_package = "angular_material/src/youtube-player/npm_package",
-    types = ["@npm//@types/youtube"],
+    golden_dir = "goldens/youtube-player",
+    npm_package = "src/youtube-player/npm_package",
+    types = {
+        "//:node_modules/@types/youtube": "youtube",
+    },
 )

package.json

@@ -65,8 +65,8 @@
     "date-fns": "^4.1.0",
     "luxon": "^3.0.0",
     "moment": "^2.29.1",
-    "rxjs-tslint-rules": "^4.34.8",
     "rxjs": "^6.6.7",
+    "rxjs-tslint-rules": "^4.34.8",
     "tslib": "^2.3.1",
     "zone.js": "~0.15.0"
   },
@@ -233,6 +233,11 @@
         "dependencies": {
           "@nginfra/angular-linking": "1.0.6"
         }
+      },
+      "@angular/platform-server": {
+        "dependencies": {
+          "@nginfra/angular-linking": "1.0.6"
+        }
       }
     }
   }

src/BUILD.bazel

@@ -5,6 +5,7 @@ load("//src/cdk:config.bzl", "CDK_ENTRYPOINTS")
 load("//src/material:config.bzl", "MATERIAL_ENTRYPOINTS", "MATERIAL_TESTING_ENTRYPOINTS")
 load("//tools/dgeni:index.bzl", "dgeni_api_docs")
 load("//tools:defaults2.bzl", "ts_project")
+load("@aspect_rules_js//js:defs.bzl", "js_library")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -37,6 +38,11 @@ copy_to_bin(
     srcs = ["package.json"],
 )
 
+js_library(
+    name = "esbuild-linked-config",
+    srcs = ["esbuild-linked.config.mjs"],
+)
+
 dgeni_api_docs(
     name = "api-docs",
     srcs = apiSourceFiles + [

src/cdk-experimental/BUILD.bazel

@@ -21,6 +21,13 @@ ng_package(
     name = "npm_package",
     package_name = "@angular/cdk-experimental",
     srcs = ["package.json"],
+    package_deps = [":node_modules/@angular/cdk"],
     tags = ["release-package"],
+    visibility = [
+        "//:__pkg__",
+        "//goldens:__pkg__",
+        "//integration:__subpackages__",
+        "//src/material-experimental:__subpackages__",
+    ],
     deps = [get_legacy_label(t) for t in CDK_EXPERIMENTAL_TARGETS],
 )

src/cdk-experimental/column-resize/BUILD.bazel

@@ -12,7 +12,12 @@ ng_project(
         "//:node_modules/@angular/common",
         "//:node_modules/@angular/core",
         "//:node_modules/rxjs",
-        "//src/cdk-experimental:node_modules/@angular/cdk",
         "//src/cdk-experimental/popover-edit",
+        "//src/cdk/bidi",
+        "//src/cdk/coercion",
+        "//src/cdk/keycodes",
+        "//src/cdk/overlay",
+        "//src/cdk/portal",
+        "//src/cdk/table",
     ],
 )

src/cdk-experimental/combobox/BUILD.bazel

@@ -13,7 +13,10 @@ ng_project(
         "//:node_modules/@angular/common",
         "//:node_modules/@angular/core",
         "//src:dev_mode_types",
-        "//src/cdk-experimental:node_modules/@angular/cdk",
+        "//src/cdk/a11y",
+        "//src/cdk/bidi",
+        "//src/cdk/collections",
+        "//src/cdk/overlay",
     ],
 )
 
@@ -28,7 +31,8 @@ ts_project(
         ":combobox",
         "//:node_modules/@angular/core",
         "//:node_modules/@angular/platform-browser",
-        "//src/cdk-experimental:node_modules/@angular/cdk",
+        "//src/cdk/keycodes",
+        "//src/cdk/testing/private",
     ],
 )
 

src/cdk-experimental/popover-edit/BUILD.bazel

@@ -14,7 +14,12 @@ ng_project(
         "//:node_modules/@angular/core",
         "//:node_modules/@angular/forms",
         "//:node_modules/rxjs",
-        "//src/cdk-experimental:node_modules/@angular/cdk",
+        "//src/cdk/a11y",
+        "//src/cdk/bidi",
+        "//src/cdk/keycodes",
+        "//src/cdk/overlay",
+        "//src/cdk/portal",
+        "//src/cdk/scrolling",
     ],
 )
 
@@ -31,7 +36,12 @@ ts_project(
         "//:node_modules/@angular/core",
         "//:node_modules/@angular/forms",
         "//:node_modules/rxjs",
-        "//src/cdk-experimental:node_modules/@angular/cdk",
+        "//src/cdk/bidi",
+        "//src/cdk/collections",
+        "//src/cdk/keycodes",
+        "//src/cdk/overlay",
+        "//src/cdk/table",
+        "//src/cdk/testing/private",
     ],
 )
 

src/cdk-experimental/scrolling/BUILD.bazel

@@ -14,7 +14,9 @@ ng_project(
         "//:node_modules/@angular/core",
         "//:node_modules/rxjs",
         "//src:dev_mode_types",
-        "//src/cdk-experimental:node_modules/@angular/cdk",
+        "//src/cdk/coercion",
+        "//src/cdk/collections",
+        "//src/cdk/scrolling",
     ],
 )
 
@@ -28,7 +30,7 @@ ts_project(
     deps = [
         ":scrolling",
         "//:node_modules/@angular/core",
-        "//src/cdk-experimental:node_modules/@angular/cdk",
+        "//src/cdk/scrolling",
     ],
 )
 

src/cdk-experimental/selection/BUILD.bazel

@@ -15,7 +15,9 @@ ng_project(
         "//:node_modules/@angular/forms",
         "//:node_modules/rxjs",
         "//src:dev_mode_types",
-        "//src/cdk-experimental:node_modules/@angular/cdk",
+        "//src/cdk/coercion",
+        "//src/cdk/collections",
+        "//src/cdk/table",
     ],
 )
 
@@ -30,7 +32,7 @@ ts_project(
         ":selection",
         "//:node_modules/@angular/common",
         "//:node_modules/@angular/core",
-        "//src/cdk-experimental:node_modules/@angular/cdk",
+        "//src/cdk/table",
         "//src/cdk/testing/private",
     ],
 )