Skip to content

Commit

Permalink
build: update to rules_nodejs 0.40.0 (#33802)
Browse files Browse the repository at this point in the history 
This release includes nodejs cross-platform RBE fix in bazelbuild/rules_nodejs#1320 and adds `args` to terser_minified in bazelbuild/rules_nodejs#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

fix: fix

PR Close #33802
  • Loading branch information
@gregmagolan @kara
gregmagolan authored and kara committed Nov 13, 2019
1 parent 744a385 commit ba4f171
Show file tree
Hide file tree
Showing 9 changed files with 72 additions and 71 deletions.
4 changes: 2 additions & 2 deletions WORKSPACE
View file
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions integration/bazel/WORKSPACE
View file
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions integration/bazel/package.json
View file
Expand Up @@ -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",
Expand Down
60 changes: 30 additions & 30 deletions integration/bazel/yarn.lock
View file
Expand Up @@ -3,10 +3,10 @@


"@angular/animations@file:../../dist/packages-dist/animations":
version "9.0.0-next.14"
version "9.0.0-rc.1"

"@angular/bazel@file:../../dist/packages-dist/bazel":
version "9.0.0-next.14"
version "9.0.0-rc.1"
dependencies:
"@microsoft/api-extractor" "^7.3.9"
shelljs "0.8.2"
Expand All @@ -22,10 +22,10 @@
parse5 "^5.0.0"

"@angular/common@file:../../dist/packages-dist/common":
version "9.0.0-next.14"
version "9.0.0-rc.1"

"@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli":
version "9.0.0-next.14"
version "9.0.0-rc.1"
dependencies:
canonical-path "1.0.0"
chokidar "^2.1.1"
Expand All @@ -39,13 +39,13 @@
yargs "13.1.0"

"@angular/compiler@file:../../dist/packages-dist/compiler":
version "9.0.0-next.14"
version "9.0.0-rc.1"

"@angular/core@file:../../dist/packages-dist/core":
version "9.0.0-next.14"
version "9.0.0-rc.1"

"@angular/forms@file:../../dist/packages-dist/forms":
version "9.0.0-next.14"
version "9.0.0-rc.1"

"@angular/material@8.0.1":
version "8.0.1"
Expand All @@ -55,13 +55,13 @@
tslib "^1.7.1"

"@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic":
version "9.0.0-next.14"
version "9.0.0-rc.1"

"@angular/platform-browser@file:../../dist/packages-dist/platform-browser":
version "9.0.0-next.14"
version "9.0.0-rc.1"

"@angular/router@file:../../dist/packages-dist/router":
version "9.0.0-next.14"
version "9.0.0-rc.1"

"@bazel/bazel-darwin_x64@1.0.0":
version "1.0.0"
Expand Down Expand Up @@ -92,10 +92,10 @@
resolved "https://registry.yarnpkg.com/@bazel/hide-bazel-files/-/hide-bazel-files-0.38.3.tgz#e98231d3d360d51860d9c1a7c3345b40dab4cf81"
integrity sha512-o+dNkfDm3qxWQ8h/04cWuTcjR7qnjZi3pQGv4aklVb16oPWx2jF8BzbkwvWuIkdbOl9VnqYP0vaHzwQVJRRcIA==

"@bazel/karma@0.39.1":
version "0.39.1"
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.39.1.tgz#23898875444a5ef1fd9ac0dbaebcdd05b90d51f8"
integrity sha512-P4LNCeopKGmhwRJrA6qtMLAvMgIalq5I9XYlaPOLjkoYKcjwAReBKyWY9VYhDEYld2P/P1YJmx/+nQDZAowocA==
"@bazel/karma@0.40.0":
version "0.40.0"
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.40.0.tgz#5d6b669355d173dea02e9b5d21ff41db91ceb3fd"
integrity sha512-xRbUU3vg2KUmCTYBkHsvdDEy6vhtmWICiE/s0vikb4c3lCY5UtY/Y9fmoflhNHjOgjnncEFS8J4uMaWn5rZmhg==
dependencies:
jasmine-core "2.8.0"
karma "~4.1.0"
Expand All @@ -109,27 +109,27 @@
semver "5.6.0"
tmp "0.0.33"

"@bazel/protractor@0.39.1":
version "0.39.1"
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-0.39.1.tgz#24988e12eaa3efbcdbb7e80dba20105e379e4016"
integrity sha512-zVbCrK8Uyfd2D93laHYp+YLvoR2Pfov/i13b6MTDkgDkzWd0NoPIlPqLAXuKhOUi5rYUcbp+DoY9A+HA2Rfy1g==
"@bazel/protractor@0.40.0":
version "0.40.0"
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-0.40.0.tgz#0c64ddbf5a063417f43520ec1fed5cbc485792cf"
integrity sha512-qio8c8ie6Ajwu6hEs3vYf5+18JvrYH/6bv2b5YcE7HnyQZKGeJCDyTUErIUkCHwq8RsIqpsgxtCj69xmUxZXbw==
dependencies:
protractor "^5.4.2"

"@bazel/rollup@0.39.1":
version "0.39.1"
resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-0.39.1.tgz#9c7ca1fef256743353b8acb7944ca2f9723d83a1"
integrity sha512-5EqAgupj8NHQ2p3GgtuOZ8O0qM6S0NfDj8OgROuSF0sJFH9ojQkXBZowHfZfWT3Xt6Igi3dw55bZS964havh8Q==
"@bazel/rollup@0.40.0":
version "0.40.0"
resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-0.40.0.tgz#8ee08e1967c1ff7d549ce81b676872fa7e45afdb"
integrity sha512-7ZKzOIfHm0lEc3G/o2ykCZQlc7xcKSHiwIV4GIeaYJIbFUnO/L0cmaWzxOhdlr7NFfTdXcltTFnCrG7wlaad9A==

"@bazel/terser@0.39.1":
version "0.39.1"
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-0.39.1.tgz#fa8ad78502d6e953a953dc6ef4e135e6a50aaf3e"
integrity sha512-YIfs7uoEQU2xnpfY3bF7GjCaaHTE6e5gUIy0Ua9V1qeLZECUmVQgIfmSEV/JTykzIQpO+l3dX3IcIzkYZGlF/A==
"@bazel/terser@0.40.0":
version "0.40.0"
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-0.40.0.tgz#e31c76c32055a6bdffc711b05b530ae8df7ed1d5"
integrity sha512-XSnoLnB9i+RTJ4T1Tyrq0NMcIStzb9LQ1szMBOkJY4mBTRRNpf8Qnq+k5Vu9YY/dNIKVWtowNYBSWHzxxcL05g==

"@bazel/typescript@0.39.1":
version "0.39.1"
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.39.1.tgz#fbe3f9e287aa294935987bbbd9f2dce5341a9b02"
integrity sha512-n4P6VKir1L3+rM/DgHa5mnlCfT7Wo0ra+TnkbTuZ08SeN/r8HTmClK6YADoDc5ORMQhzq8eXuVuLWeUUsFJyHQ==
"@bazel/typescript@0.40.0":
version "0.40.0"
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.40.0.tgz#4f70d1365ee28fb8c1fd430a25034b74deecada9"
integrity sha512-826LXZYVlvcf9zNNcywzGprMUgCFqcwCeM/VLp+xG8/q6idJpqCBxABfJy2U6iZ8qIg5+wlxgYkOcmAZBfKMfA==
dependencies:
protobufjs "6.8.8"
semver "5.6.0"
Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/bazel/src/builders/files/WORKSPACE.template
View file
Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions packages/bazel/src/schematics/ng-add/index.ts
View file
Expand Up @@ -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',
Expand Down
1 change: 1 addition & 0 deletions tools/defaults.bzl
View file
Expand Up @@ -263,6 +263,7 @@ def karma_web_test_suite(bootstrap = [], deps = [], **kwargs):
tags = tags + ["native"]

_karma_web_test_suite(
runtime_deps = local_runtime_deps,
bootstrap = bootstrap,
deps = local_deps,
# Run unit tests on local Chromium by default.
Expand Down
40 changes: 20 additions & 20 deletions yarn.lock
View file
Expand Up @@ -282,19 +282,19 @@
resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.10.3.tgz#2e2b8a1d3e885946eac41db2b1aa6801fb319887"
integrity sha512-v1nXbMTHVlMM4z4uWp6XiRoHAyUlYggF1SOboLLWRp0+D22kWixqArWqnozLw2mOtnxr97BdLjluWiho6A8Hjg==

"@bazel/jasmine@0.39.1":
version "0.39.1"
resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.39.1.tgz#fd78c8dbe2d927ca358df506e181a07d5c0cbb9d"
integrity sha512-l+IerE7rKuHYShkWk7L71x65X1mlrNFrAPk/EGlyRpuY+lDDP6P8ElHBV4e+32s0Yt5Ewi46BvGMYkOWHdbzgA==
"@bazel/jasmine@0.40.0":
version "0.40.0"
resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.40.0.tgz#50820683e011153737eb3fc451ba5c05cc07034f"
integrity sha512-PQzLDu2hhNPNQutgWVTl8KT31QLGS4BJFKR8a3quTxNiZci/mSqJ/sdC9oF61f//vtj46uODesl/BpPZBYAT4g==
dependencies:
jasmine "~3.4.0"
jasmine-core "~3.4.0"
v8-coverage "1.0.9"

"@bazel/karma@0.39.1":
version "0.39.1"
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.39.1.tgz#23898875444a5ef1fd9ac0dbaebcdd05b90d51f8"
integrity sha512-P4LNCeopKGmhwRJrA6qtMLAvMgIalq5I9XYlaPOLjkoYKcjwAReBKyWY9VYhDEYld2P/P1YJmx/+nQDZAowocA==
"@bazel/karma@0.40.0":
version "0.40.0"
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.40.0.tgz#5d6b669355d173dea02e9b5d21ff41db91ceb3fd"
integrity sha512-xRbUU3vg2KUmCTYBkHsvdDEy6vhtmWICiE/s0vikb4c3lCY5UtY/Y9fmoflhNHjOgjnncEFS8J4uMaWn5rZmhg==
dependencies:
jasmine-core "2.8.0"
karma "~4.1.0"
Expand All @@ -308,22 +308,22 @@
semver "5.6.0"
tmp "0.0.33"

"@bazel/protractor@0.39.1":
version "0.39.1"
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-0.39.1.tgz#24988e12eaa3efbcdbb7e80dba20105e379e4016"
integrity sha512-zVbCrK8Uyfd2D93laHYp+YLvoR2Pfov/i13b6MTDkgDkzWd0NoPIlPqLAXuKhOUi5rYUcbp+DoY9A+HA2Rfy1g==
"@bazel/protractor@0.40.0":
version "0.40.0"
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-0.40.0.tgz#0c64ddbf5a063417f43520ec1fed5cbc485792cf"
integrity sha512-qio8c8ie6Ajwu6hEs3vYf5+18JvrYH/6bv2b5YcE7HnyQZKGeJCDyTUErIUkCHwq8RsIqpsgxtCj69xmUxZXbw==
dependencies:
protractor "^5.4.2"

"@bazel/terser@0.39.1":
version "0.39.1"
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-0.39.1.tgz#fa8ad78502d6e953a953dc6ef4e135e6a50aaf3e"
integrity sha512-YIfs7uoEQU2xnpfY3bF7GjCaaHTE6e5gUIy0Ua9V1qeLZECUmVQgIfmSEV/JTykzIQpO+l3dX3IcIzkYZGlF/A==
"@bazel/terser@0.40.0":
version "0.40.0"
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-0.40.0.tgz#e31c76c32055a6bdffc711b05b530ae8df7ed1d5"
integrity sha512-XSnoLnB9i+RTJ4T1Tyrq0NMcIStzb9LQ1szMBOkJY4mBTRRNpf8Qnq+k5Vu9YY/dNIKVWtowNYBSWHzxxcL05g==

"@bazel/typescript@0.39.1":
version "0.39.1"
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.39.1.tgz#fbe3f9e287aa294935987bbbd9f2dce5341a9b02"
integrity sha512-n4P6VKir1L3+rM/DgHa5mnlCfT7Wo0ra+TnkbTuZ08SeN/r8HTmClK6YADoDc5ORMQhzq8eXuVuLWeUUsFJyHQ==
"@bazel/typescript@0.40.0":
version "0.40.0"
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.40.0.tgz#4f70d1365ee28fb8c1fd430a25034b74deecada9"
integrity sha512-826LXZYVlvcf9zNNcywzGprMUgCFqcwCeM/VLp+xG8/q6idJpqCBxABfJy2U6iZ8qIg5+wlxgYkOcmAZBfKMfA==
dependencies:
protobufjs "6.8.8"
semver "5.6.0"
Expand Down

0 comments on commit ba4f171

Please sign in to comment.