From 06aaa4bf74299f5e5ebf2932035bc5e8753e2698 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Wed, 13 Nov 2019 09:04:26 -0800
Subject: [PATCH] build: update to rules_nodejs 0.40.0

This release includes nodejs cross-platform RBE fix in https://github.com/bazelbuild/rules_nodejs/pull/1320 and adds `args` to terser_minified in https://github.com/bazelbuild/rules_nodejs/pull/1317. These changes are needed to land a few outstanding PRs.

* build: fixes for cross-platform RBE #33708
* build: update zone.js to use the new rollup_bundle #33329
---
 WORKSPACE                                            |  4 ++--
 integration/bazel/WORKSPACE                          |  4 ++--
 integration/bazel/package.json                       | 10 +++++-----
 package.json                                         | 10 +++++-----
 packages/bazel/src/builders/files/WORKSPACE.template |  4 ++--
 packages/bazel/src/schematics/ng-add/index.ts        | 10 +++++-----
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 3775ab4b70aa31..f7848fbadbe0a8 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -21,8 +21,8 @@ http_archive(
     patch_args = ["-p1"],
     # Patch https://github.com/bazelbuild/rules_nodejs/pull/903
     patches = ["//tools:rollup_bundle_commonjs_ignoreGlobal.patch"],
-    sha256 = "3d7296d834208792fa3b2ded8ec04e75068e3de172fae79db217615bd75a6ff7",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.39.1/rules_nodejs-0.39.1.tar.gz"],
+    sha256 = "9901bc17138a79135048fb0c107ee7a56e91815ec6594c08cb9a17b80276d62b",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.40.0/rules_nodejs-0.40.0.tar.gz"],
 )
 
 # Check the bazel version and download npm dependencies
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index 52116d6112c3ce..628918064d4500 100644
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@@ -8,8 +8,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch rules_nodejs so we can install our npm dependencies
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "3d7296d834208792fa3b2ded8ec04e75068e3de172fae79db217615bd75a6ff7",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.39.1/rules_nodejs-0.39.1.tar.gz"],
+    sha256 = "9901bc17138a79135048fb0c107ee7a56e91815ec6594c08cb9a17b80276d62b",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.40.0/rules_nodejs-0.40.0.tar.gz"],
 )
 
 # Fetch sass rules for compiling sass files
diff --git a/integration/bazel/package.json b/integration/bazel/package.json
index 61bd473e72fae1..5db5478d0fa351 100644
--- a/integration/bazel/package.json
+++ b/integration/bazel/package.json
@@ -23,11 +23,11 @@
     "@angular/compiler": "file:../../dist/packages-dist/compiler",
     "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
     "@bazel/bazel": "file:../../node_modules/@bazel/bazel",
-    "@bazel/karma": "0.39.1",
-    "@bazel/protractor": "0.39.1",
-    "@bazel/rollup": "0.39.1",
-    "@bazel/terser": "0.39.1",
-    "@bazel/typescript": "0.39.1",
+    "@bazel/karma": "0.40.0",
+    "@bazel/protractor": "0.40.0",
+    "@bazel/rollup": "0.40.0",
+    "@bazel/terser": "0.40.0",
+    "@bazel/typescript": "0.40.0",
     "@types/jasmine": "2.8.8",
     "http-server": "^0.11.1",
     "rollup": "~1.25.0",
diff --git a/package.json b/package.json
index 01d8e6f251aa99..8ec6958cb66d6a 100644
--- a/package.json
+++ b/package.json
@@ -41,11 +41,11 @@
     "@angular-devkit/schematics": "^9.0.0-rc.0",
     "@angular/bazel": "file:./tools/npm/@angular_bazel",
     "@babel/core": "^7.6.4",
-    "@bazel/jasmine": "0.39.1",
-    "@bazel/karma": "0.39.1",
-    "@bazel/protractor": "0.39.1",
-    "@bazel/terser": "0.39.1",
-    "@bazel/typescript": "0.39.1",
+    "@bazel/jasmine": "0.40.0",
+    "@bazel/karma": "0.40.0",
+    "@bazel/protractor": "0.40.0",
+    "@bazel/terser": "0.40.0",
+    "@bazel/typescript": "0.40.0",
     "@microsoft/api-extractor": "^7.3.9",
     "@schematics/angular": "^8.0.0-beta.15",
     "@types/angular": "^1.6.47",
diff --git a/packages/bazel/src/builders/files/WORKSPACE.template b/packages/bazel/src/builders/files/WORKSPACE.template
index 460aa5864a6366..2bec84e090dee6 100644
--- a/packages/bazel/src/builders/files/WORKSPACE.template
+++ b/packages/bazel/src/builders/files/WORKSPACE.template
@@ -15,8 +15,8 @@ workspace(
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-RULES_NODEJS_VERSION = "0.39.1"
-RULES_NODEJS_SHA256 = "3d7296d834208792fa3b2ded8ec04e75068e3de172fae79db217615bd75a6ff7"
+RULES_NODEJS_VERSION = "0.40.0"
+RULES_NODEJS_SHA256 = "9901bc17138a79135048fb0c107ee7a56e91815ec6594c08cb9a17b80276d62b"
 http_archive(
     name = "build_bazel_rules_nodejs",
     sha256 = RULES_NODEJS_SHA256,
diff --git a/packages/bazel/src/schematics/ng-add/index.ts b/packages/bazel/src/schematics/ng-add/index.ts
index ab91e6194571e4..777628f48e4069 100644
--- a/packages/bazel/src/schematics/ng-add/index.ts
+++ b/packages/bazel/src/schematics/ng-add/index.ts
@@ -50,11 +50,11 @@ function addDevDependenciesToPackageJson(options: Schema) {
       '@angular/bazel': angularCoreVersion,
       '@bazel/bazel': '1.0.0',
       '@bazel/ibazel': '^0.10.2',
-      '@bazel/karma': '0.39.1',
-      '@bazel/protractor': '0.39.1',
-      '@bazel/rollup': '0.39.1',
-      '@bazel/terser': '0.39.1',
-      '@bazel/typescript': '0.39.1',
+      '@bazel/karma': '0.40.0',
+      '@bazel/protractor': '0.40.0',
+      '@bazel/rollup': '0.40.0',
+      '@bazel/terser': '0.40.0',
+      '@bazel/typescript': '0.40.0',
       'history-server': '^1.3.1',
       'rollup': '^1.25.2',
       'rollup-plugin-commonjs': '^10.1.0',