build: update load statements to load dev-infra via @npm// workspace

Loading the dev-infra rules via the @npm// workspace as the private
@npm_dev_infra_private repo is no longer published.

Author: josephperrott

.nvmrc

@@ -0,0 +1 @@
+12.14.1

WORKSPACE

@@ -11,6 +11,7 @@ http_archive(
     sha256 = "dd4dc46066e2ce034cba0c81aa3e862b27e8e8d95871f567359f7a534cccb666",
     urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.1.0/rules_nodejs-3.1.0.tar.gz"],
 )
+
 # Add sass rules
 http_archive(
     name = "io_bazel_rules_sass",
@@ -28,19 +29,8 @@ load("@build_bazel_rules_nodejs//:index.bzl", "check_bazel_version", "node_repos
 check_bazel_version("4.0.0")
 
 node_repositories(
-    node_repositories = {
-        "12.9.1-darwin_amd64": ("node-v12.9.1-darwin-x64.tar.gz", "node-v12.9.1-darwin-x64", "9aaf29d30056e2233fd15dfac56eec12e8342d91bb6c13d54fb5e599383dddb9"),
-        "12.9.1-linux_amd64": ("node-v12.9.1-linux-x64.tar.xz", "node-v12.9.1-linux-x64", "680a1263c9f5f91adadcada549f0a9c29f1b26d09658d2b501c334c3f63719e5"),
-        "12.9.1-windows_amd64": ("node-v12.9.1-win-x64.zip", "node-v12.9.1-win-x64", "6a4e54bda091bd02dbd8ff1b9f6671e036297da012a53891e3834d4bf4bed297"),
-    },
-    node_urls = ["https://nodejs.org/dist/v{version}/{filename}"],
-    node_version = "12.9.1",
-    # We do not need to define a specific yarn version as bazel will respect the .yarnrc file
-    # and run the version of yarn defined at the set-path value.
-    # Since bazel runs yarn from the working directory of the package.json, and our .yarnrc
-    # file is in the same directory, it correctly discovers and respects it.  Additionally,
-    # it ensures that the yarn environment variable to detect if yarn has already followed
-    # the set-path value is reset.
+    node_version = "12.14.1",
+    package_json = ["//:package.json"],
 )
 
 yarn_install(
@@ -53,16 +43,13 @@ yarn_install(
     ],
     package_json = "//:package.json",
     quiet = False,
-    strict_visibility = False,
     yarn_lock = "//:yarn.lock",
 )
 
-
 load("@npm//@bazel/protractor:package.bzl", "npm_bazel_protractor_dependencies")
 
 npm_bazel_protractor_dependencies()
 
-
 # Setup web testing. We need to setup a browser because the web testing rules for TypeScript need
 # a reference to a registered browser (ideally that's a hermetic version of a browser)
 load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories")
@@ -115,6 +102,6 @@ rbe_autoconfig(
 # TODO(wagnermaciel): deduplicate browsers - this will load another version of chromium in the
 # repository. We probably want to use the chromium version loaded here (from dev-infra) as that
 # one has RBE improvements.
-load("@npm_angular_dev_infra_private//browsers:browser_repositories.bzl", _dev_infra_browser_repositories = "browser_repositories")
+load("@npm//@angular/dev-infra-private/browsers:browser_repositories.bzl", _dev_infra_browser_repositories = "browser_repositories")
 
 _dev_infra_browser_repositories()

package.json

@@ -126,7 +126,7 @@
     "@angular/bazel": "^12.0.0-next.0",
     "@angular/benchpress": "^0.2.1",
     "@angular/compiler-cli": "^12.0.0-next.0",
-    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#71d57c29a10c03d07f889581608e3a2315a1dc7e",
+    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#a8dbb0d8cd8de1e86a4ec4ea66b5bd89a47d4876",
     "@angular/platform-browser-dynamic": "^12.0.0-next.0",
     "@angular/platform-server": "^12.0.0-next.0",
     "@angular/router": "^12.0.0-next.0",

src/material-experimental/mdc-helpers/BUILD.bazel

@@ -10,7 +10,28 @@ filegroup(
 
 npm_sass_library(
     name = "mdc_scss_deps_lib",
-    deps = ["@npm//material-components-web"],
+    deps = [
+        "@npm//@material/card",
+        "@npm//@material/checkbox",
+        "@npm//@material/chips",
+        "@npm//@material/circular-progress",
+        "@npm//@material/data-table",
+        "@npm//@material/dialog",
+        "@npm//@material/fab",
+        "@npm//@material/form-field",
+        "@npm//@material/linear-progress",
+        "@npm//@material/list",
+        "@npm//@material/menu-surface",
+        "@npm//@material/radio",
+        "@npm//@material/snackbar",
+        "@npm//@material/switch",
+        "@npm//@material/tab",
+        "@npm//@material/tab-bar",
+        "@npm//@material/tab-indicator",
+        "@npm//@material/textfield",
+        "@npm//@material/tooltip",
+        "@npm//material-components-web",
+    ],
 )
 
 sass_library(

src/universal-app/BUILD.bazel

@@ -59,11 +59,10 @@ nodejs_test(
         ":server",
         ":theme_scss",
     ],
-
+    entry_point = ":prerender.ts",
     templated_args = [
-            # TODO(josephperrott): update dependency usages to no longer need bazel patch module resolver
-            # See: https://github.com/bazelbuild/rules_nodejs/wiki#--bazel_patch_module_resolver-now-defaults-to-false-2324
-            "--bazel_patch_module_resolver",
+        # TODO(josephperrott): update dependency usages to no longer need bazel patch module resolver
+        # See: https://github.com/bazelbuild/rules_nodejs/wiki#--bazel_patch_module_resolver-now-defaults-to-false-2324
+        "--bazel_patch_module_resolver",
     ],
-    entry_point = ":prerender.ts",
 )

test/benchmarks/cdk/testing/component-harness/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 load("//tools:defaults.bzl", "ng_test_library", "ng_web_test_suite", "ts_library")
 
 package(default_visibility = ["//visibility:public"])

test/benchmarks/material/button/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/card/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/checkbox/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/chips/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/form-field/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/menu/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/radio/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/slide-toggle/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/table/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 component_benchmark(
     name = "benchmark",

test/benchmarks/material/tabs/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/button/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/card/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/checkbox/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/chips/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/form-field/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/menu/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/radio/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/slide-toggle/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/table/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 component_benchmark(
     name = "benchmark",

test/benchmarks/mdc/tabs/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

tools/defaults.bzl

@@ -165,8 +165,8 @@ def karma_web_test_suite(name, **kwargs):
         kwargs["browsers"] = [
             # Note: when changing the browser names here, also update the "yarn test"
             # script to reflect the new browser names.
-            "@npm_angular_dev_infra_private//browsers/chromium:chromium",
-            "@npm_angular_dev_infra_private//browsers/firefox:firefox",
+            "@npm//@angular/dev-infra-private/browsers/chromium:chromium",
+            "@npm//@angular/dev-infra-private/browsers/firefox:firefox",
         ]
 
     for opt_name in kwargs.keys():
@@ -200,7 +200,7 @@ def karma_web_test_suite(name, **kwargs):
 
 def protractor_web_test_suite(**kwargs):
     _protractor_web_test_suite(
-        browsers = ["@npm_angular_dev_infra_private//browsers/chromium:chromium"],
+        browsers = ["@npm//@angular/dev-infra-private/browsers/chromium:chromium"],
         **kwargs
     )
 

tools/dev-server/BUILD.bazel

@@ -25,9 +25,11 @@ ts_library(
 
 nodejs_binary(
     name = "dev-server_bin",
-    templated_args = ["--bazel_patch_module_resolver"],
     data = [
         ":dev-server_lib",
     ],
     entry_point = ":main.ts",
+    # TODO(josephperrott): update dependency usages to no longer need bazel patch module resolver
+    # See: https://github.com/bazelbuild/rules_nodejs/wiki#--bazel_patch_module_resolver-now-defaults-to-false-2324
+    templated_args = ["--bazel_patch_module_resolver"],
 )

tools/dgeni/BUILD.bazel

@@ -5,13 +5,15 @@ package(default_visibility = ["//visibility:public"])
 
 nodejs_binary(
     name = "dgeni",
-    templated_args = ["--bazel_patch_module_resolver"],
     data = [
         ":sources",
         "@npm//dgeni",
         "@npm//dgeni-packages",
     ],
     entry_point = ":bazel-bin.ts",
+    # TODO(josephperrott): update dependency usages to no longer need bazel patch module resolver
+    # See: https://github.com/bazelbuild/rules_nodejs/wiki#--bazel_patch_module_resolver-now-defaults-to-false-2324
+    templated_args = ["--bazel_patch_module_resolver"],
 )
 
 ts_library(

tools/example-module/BUILD.bazel

@@ -15,11 +15,13 @@ ts_library(
 
 nodejs_binary(
     name = "bazel-bin",
-    templated_args = ["--bazel_patch_module_resolver"],
     data = [
         ":example-module.template",
         ":example-module-lib",
         "@npm//typescript",
     ],
     entry_point = ":bazel-bin.ts",
+    # TODO(josephperrott): update dependency usages to no longer need bazel patch module resolver
+    # See: https://github.com/bazelbuild/rules_nodejs/wiki#--bazel_patch_module_resolver-now-defaults-to-false-2324
+    templated_args = ["--bazel_patch_module_resolver"],
 )

tools/highlight-files/BUILD.bazel

@@ -10,8 +10,8 @@ ts_library(
     deps = [
         "//tools/region-parser",
         "@npm//@types/fs-extra",
-        "@npm//fs-extra",
         "@npm//@types/node",
+        "@npm//fs-extra",
     ],
 )
 
@@ -22,10 +22,10 @@ nodejs_binary(
         "@npm//fs-extra",
         "@npm//highlight.js",
     ],
+    entry_point = ":highlight-files.ts",
     templated_args = [
-            # TODO(josephperrott): update dependency usages to no longer need bazel patch module resolver
-            # See: https://github.com/bazelbuild/rules_nodejs/wiki#--bazel_patch_module_resolver-now-defaults-to-false-2324
-            "--bazel_patch_module_resolver",
+        # TODO(josephperrott): update dependency usages to no longer need bazel patch module resolver
+        # See: https://github.com/bazelbuild/rules_nodejs/wiki#--bazel_patch_module_resolver-now-defaults-to-false-2324
+        "--bazel_patch_module_resolver",
     ],
-    entry_point = ":highlight-files.ts",
 )

tools/markdown-to-html/BUILD.bazel

@@ -15,8 +15,8 @@ ts_library(
     deps = [
         "//tools/highlight-files:sources",
         "@npm//@types/marked",
-        "@npm//marked",
         "@npm//@types/node",
+        "@npm//marked",
     ],
 )
 
@@ -27,8 +27,8 @@ nodejs_binary(
         "@npm//highlight.js",
         "@npm//marked",
     ],
-    templated_args = ["--bazel_patch_module_resolver"],
     entry_point = ":transform-markdown.ts",
+    templated_args = ["--bazel_patch_module_resolver"],
 )
 
 ts_library(

tools/package-docs-content/BUILD.bazel

@@ -9,8 +9,10 @@ nodejs_binary(
         ":sources",
         "@npm//fs-extra",
     ],
-    templated_args = ["--bazel_patch_module_resolver"],
     entry_point = ":package-docs-content.ts",
+    # TODO(josephperrott): update dependency usages to no longer need bazel patch module resolver
+    # See: https://github.com/bazelbuild/rules_nodejs/wiki#--bazel_patch_module_resolver-now-defaults-to-false-2324
+    templated_args = ["--bazel_patch_module_resolver"],
 )
 
 ts_library(

tools/postinstall/apply-patches.js

@@ -87,7 +87,7 @@ function applyPatches() {
     const hasFlatModuleBundle = fs.existsSync(filePath.replace('.d.ts', '.metadata.json'));
     if ((filePath.includes('node_modules/') || !hasFlatModuleBundle) && $1`,
       'node_modules/@angular/compiler-cli/src/transformers/compiler_host.js');
-//  applyPatch(path.join(__dirname, './flat_module_factory_resolution.patch'));
+  applyPatch(path.join(__dirname, './flat_module_factory_resolution.patch'));
   // The three replacements below ensure that metadata files can be read by NGC and
   // that metadata files are collected as Bazel action inputs.
   searchAndReplace(
@@ -108,7 +108,7 @@ function applyPatches() {
       'node_modules/@angular/bazel/src/ng_module.bzl');
 
   // Workaround for: https://github.com/bazelbuild/rules_nodejs/issues/1208.
-//  applyPatch(path.join(__dirname, './manifest_externs_hermeticity.patch'));
+  applyPatch(path.join(__dirname, './manifest_externs_hermeticity.patch'));
 
   // Workaround for https://github.com/angular/angular/issues/33452:
   searchAndReplace(