Skip to content

Commit

Permalink
build: update to rules_nodejs 0.40.0
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 angular#33708
* build: update zone.js to use the new rollup_bundle angular#33329
  • Loading branch information
gregmagolan committed Nov 13, 2019
1 parent 2be0a1d commit 06aaa4b
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions WORKSPACE
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
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
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
10 changes: 5 additions & 5 deletions package.json
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
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
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

0 comments on commit 06aaa4b

Please sign in to comment.