From aec2a2cbc27f7be445ebc558dd08742bf18bcb15 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott@gmail.com>
Date: Thu, 4 Feb 2021 14:46:29 -0800
Subject: [PATCH] fix(dev-infra): update build tooling for latest changes in
 rules_nodejs (#40710)

Update the build tooling to handle the changes in the latest version of rules_nodejs.

PR Close #40710
---
 .../benchmark/component_benchmark/component_benchmark.bzl  | 7 ++++---
 dev-infra/benchmark/ng_rollup_bundle/rollup.config-tmpl.js | 4 ++--
 modules/benchmarks/src/class_bindings/BUILD.bazel          | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dev-infra/benchmark/component_benchmark/component_benchmark.bzl b/dev-infra/benchmark/component_benchmark/component_benchmark.bzl
index 62a82272c0..4076a0f363 100644
--- a/dev-infra/benchmark/component_benchmark/component_benchmark.bzl
+++ b/dev-infra/benchmark/component_benchmark/component_benchmark.bzl
@@ -1,6 +1,7 @@
 load("//dev-infra/benchmark/ng_rollup_bundle:ng_rollup_bundle.bzl", "ng_rollup_bundle")
 load("//tools:defaults.bzl", "ng_module")
-load("@npm//@bazel/typescript:index.bzl", "ts_devserver", "ts_library")
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("@npm//@bazel/concatjs:index.bzl", "concatjs_devserver")
 load(":benchmark_test.bzl", "benchmark_test")
 
 def copy_default_file(origin, destination):
@@ -113,7 +114,7 @@ def component_benchmark(
         tsconfig = "//dev-infra/benchmark/component_benchmark:tsconfig-e2e.json",
     )
 
-    # Bundle the application (needed by ts_devserver).
+    # Bundle the application (needed by concatjs_devserver).
     ng_rollup_bundle(
         name = app_main,
         entry_point = entry_point,
@@ -130,7 +131,7 @@ def component_benchmark(
     )
 
     # The server for our application.
-    ts_devserver(
+    concatjs_devserver(
         name = server,
         bootstrap = ["//packages/zone.js/bundles:zone.umd.js"],
         port = 4200,
diff --git a/dev-infra/benchmark/ng_rollup_bundle/rollup.config-tmpl.js b/dev-infra/benchmark/ng_rollup_bundle/rollup.config-tmpl.js
index 305d96256b..e480962cc9 100644
--- a/dev-infra/benchmark/ng_rollup_bundle/rollup.config-tmpl.js
+++ b/dev-infra/benchmark/ng_rollup_bundle/rollup.config-tmpl.js
@@ -28,8 +28,8 @@ function log_verbose(...m) {
 const useBuildOptimizer = TMPL_build_optimizer;
 const bannerFile = TMPL_banner_file;
 const ivyEnabled = 'TMPL_angular_ivy_enabled' === 'True';
-// `bazel_stamp_file` is a substitution that is applied by `@bazel/rollup`.
-const stampDataFile = bazel_stamp_file;
+// `bazel_version_file` is a substitution that is applied by `@bazel/rollup`.
+const stampDataFile = bazel_version_file;
 
 log_verbose(`running with
   cwd: ${process.cwd()}
diff --git a/modules/benchmarks/src/class_bindings/BUILD.bazel b/modules/benchmarks/src/class_bindings/BUILD.bazel
index 48c3cdec70..9832ec19ce 100644
--- a/modules/benchmarks/src/class_bindings/BUILD.bazel
+++ b/modules/benchmarks/src/class_bindings/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
 
-load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary")
+load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
 load("//dev-infra/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 sass_binary(