Skip to content

Commit 436e738

Browse files
gregmagolanmatsko
gregmagolan
authored and
matsko
committed
build: update to rules_nodejs 1.1.0 (angular#34736)
This release resolves the bootstrap require patching issue with jasmine_node_test. Require patches are now included before any bootstrap scripts. PR Close angular#34736
1 parent 6174dff commit 436e738

File tree

11 files changed

+67
-100
lines changed

11 files changed

+67
-100
lines changed

‎WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
88
# Fetch rules_nodejs so we can install our npm dependencies
99
http_archive(
1010
name = "build_bazel_rules_nodejs",
11-
sha256 = "e1a0d6eb40ec89f61a13a028e7113aa3630247253bcb1406281b627e44395145",
12-
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.0.1/rules_nodejs-1.0.1.tar.gz"],
11+
sha256 = "c97bf38546c220fa250ff2cc052c1a9eac977c662c1fc23eda797b0ce8e70a43",
12+
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.1.0/rules_nodejs-1.1.0.tar.gz"],
1313
)
1414

1515
# Check the bazel version and download npm dependencies

‎integration/bazel/WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
88
# Fetch rules_nodejs so we can install our npm dependencies
99
http_archive(
1010
name = "build_bazel_rules_nodejs",
11-
sha256 = "e1a0d6eb40ec89f61a13a028e7113aa3630247253bcb1406281b627e44395145",
12-
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.0.1/rules_nodejs-1.0.1.tar.gz"],
11+
sha256 = "c97bf38546c220fa250ff2cc052c1a9eac977c662c1fc23eda797b0ce8e70a43",
12+
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.1.0/rules_nodejs-1.1.0.tar.gz"],
1313
)
1414

1515
# Fetch sass rules for compiling sass files

‎integration/bazel/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
"@angular/compiler": "file:../../dist/packages-dist/compiler",
2424
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
2525
"@bazel/bazel": "file:../../node_modules/@bazel/bazel",
26-
"@bazel/karma": "1.0.1",
27-
"@bazel/protractor": "1.0.1",
28-
"@bazel/rollup": "1.0.1",
29-
"@bazel/terser": "1.0.1",
30-
"@bazel/typescript": "1.0.1",
26+
"@bazel/karma": "1.1.0",
27+
"@bazel/protractor": "1.1.0",
28+
"@bazel/rollup": "1.1.0",
29+
"@bazel/terser": "1.1.0",
30+
"@bazel/typescript": "1.1.0",
3131
"@types/jasmine": "2.8.8",
3232
"http-server": "0.12.0",
3333
"karma": "4.4.1",

‎integration/bazel/yarn.lock

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -92,32 +92,32 @@
9292
resolved "https://registry.yarnpkg.com/@bazel/hide-bazel-files/-/hide-bazel-files-0.38.3.tgz#e98231d3d360d51860d9c1a7c3345b40dab4cf81"
9393
integrity sha512-o+dNkfDm3qxWQ8h/04cWuTcjR7qnjZi3pQGv4aklVb16oPWx2jF8BzbkwvWuIkdbOl9VnqYP0vaHzwQVJRRcIA==
9494

95-
"@bazel/karma@1.0.1":
96-
version "1.0.1"
97-
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-1.0.1.tgz#f60de501367125ece03af1250ccb69d836fee2cc"
98-
integrity sha512-AJ7KOx+oWHTAwstTMH95jpPP4MSKnG2eZiTms5OilhLz6KWg+l4hGumJ+jB8ntt/ZlMv9nrLVohS5zjEUyeTYA==
95+
"@bazel/karma@1.1.0":
96+
version "1.1.0"
97+
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-1.1.0.tgz#3340904942acd970964ad40a28177f780d2d658a"
98+
integrity sha512-4AwY86r/MNPCcVkR4z5wO9d4dftdSWi7nFnIEFGsl++Mzpgrfc70dGReu35BFC38JavWrEkZuh7RU1d8bbD8WQ==
9999
dependencies:
100100
tmp "0.1.0"
101101

102-
"@bazel/protractor@1.0.1":
103-
version "1.0.1"
104-
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-1.0.1.tgz#48d1f12c9edec114b04b45a159fa8c231c65c688"
105-
integrity sha512-gAJ4nMQRXu4/k+EvH/aD4BUBrSy9dn/xtAI0qRs8t2997Zafb2HI0Ejd0Ep3geBcnloC/EWGSQAIBt5vQrOWAw==
102+
"@bazel/protractor@1.1.0":
103+
version "1.1.0"
104+
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-1.1.0.tgz#0adf7c76a73ee437e0ba223662d98ba2f1a3356d"
105+
integrity sha512-k1Oqt0FMmnxk4lJZ4vA/CHOWcMKWuCr85Ljlq0hZrxfDokuxwGBMAUZgTQIh5KkvRnAo0utYRESMhWed8H2DpA==
106106

107-
"@bazel/rollup@1.0.1":
108-
version "1.0.1"
109-
resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-1.0.1.tgz#aaef886ff6cb00fc19995479aef4275359b57eee"
110-
integrity sha512-LL9eszGoHbw50+59KqqgmHB1AFQKlYeJFDCMzJU5DnAMLWz/bSlf77CaC3iipL7AVQXVqu1aJEviiNYDVGTlig==
107+
"@bazel/rollup@1.1.0":
108+
version "1.1.0"
109+
resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-1.1.0.tgz#e1e496d77fcd55971ff4ef51e982476dfe092ac8"
110+
integrity sha512-FiSiXZ/AOWnAVR39gLVYlATe/clGyvap5skiILtDksVtm6C620Rkqr/4QfIdFHZzdMb+eaxbRbMkOxux4O2McQ==
111111

112-
"@bazel/terser@1.0.1":
113-
version "1.0.1"
114-
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-1.0.1.tgz#edc22ef7d507ddf249ab039fc9f8c4d05c4789f9"
115-
integrity sha512-ldww7M6V6itnhCbtIdiGenKJZVwfpeA+h1z41KYCPQouNBrf0zBH717NYUx1IXkxmWfuT1cmgDWLYEhBC+R2Sw==
112+
"@bazel/terser@1.1.0":
113+
version "1.1.0"
114+
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-1.1.0.tgz#e737ed06ef445e2c510ac08f956607434771dbf1"
115+
integrity sha512-oGnRvDi/ESZ+fY7BzTvlUiLa5kbzY370gLtByFFX0Ix2PlVIs558bsbLMmt3Lbnts75t4GQTkB5NanZkk1Sjkg==
116116

117-
"@bazel/typescript@1.0.1":
118-
version "1.0.1"
119-
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-1.0.1.tgz#23c8232f9a08199971a306a688843f10832f2458"
120-
integrity sha512-dEZVAqmsJRcxnUPedXJ5QJIcmzxxXLDSybNO2uBXET8PvDfRpFGwu/ui+FE3uC3gYYXUFUas6WIEw5oiSeicVQ==
117+
"@bazel/typescript@1.1.0":
118+
version "1.1.0"
119+
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-1.1.0.tgz#b57ac6c6d627577f394a60fb540fbbdf53bcff0d"
120+
integrity sha512-QnTdb6rwZUR+KfUuAdyazpkA7BOvrWRe7tkPDdyIZHJdBPYdpJW+AapnFSfxvXEIP0Nwesl5KP6Saau0GPiBLg==
121121
dependencies:
122122
protobufjs "6.8.8"
123123
semver "5.6.0"

‎package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
"@angular-devkit/schematics": "9.0.0-rc.4",
4242
"@angular/bazel": "file:./tools/npm/@angular_bazel",
4343
"@babel/core": "^7.6.4",
44-
"@bazel/jasmine": "1.0.1",
45-
"@bazel/karma": "1.0.1",
46-
"@bazel/protractor": "1.0.1",
47-
"@bazel/rollup": "1.0.1",
48-
"@bazel/terser": "1.0.1",
49-
"@bazel/typescript": "1.0.1",
44+
"@bazel/jasmine": "1.1.0",
45+
"@bazel/karma": "1.1.0",
46+
"@bazel/protractor": "1.1.0",
47+
"@bazel/rollup": "1.1.0",
48+
"@bazel/terser": "1.1.0",
49+
"@bazel/typescript": "1.1.0",
5050
"@microsoft/api-extractor": "^7.3.9",
5151
"@schematics/angular": "9.0.0-rc.4",
5252
"@types/angular": "^1.6.47",

‎packages/bazel/src/builders/files/WORKSPACE.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ workspace(
1515

1616
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
1717

18-
RULES_NODEJS_VERSION = "1.0.1"
19-
RULES_NODEJS_SHA256 = "e1a0d6eb40ec89f61a13a028e7113aa3630247253bcb1406281b627e44395145"
18+
RULES_NODEJS_VERSION = "1.1.0"
19+
RULES_NODEJS_SHA256 = "c97bf38546c220fa250ff2cc052c1a9eac977c662c1fc23eda797b0ce8e70a43"
2020
http_archive(
2121
name = "build_bazel_rules_nodejs",
2222
sha256 = RULES_NODEJS_SHA256,

‎packages/bazel/src/schematics/ng-add/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ function addDevDependenciesToPackageJson(options: Schema) {
4040
['@angular/bazel', angularCore.version],
4141
['@bazel/bazel', '1.1.0'],
4242
['@bazel/ibazel', '0.10.3'],
43-
['@bazel/karma', '1.0.1'],
44-
['@bazel/protractor', '1.0.1'],
45-
['@bazel/rollup', '1.0.1'],
46-
['@bazel/terser', '1.0.1'],
47-
['@bazel/typescript', '1.0.1'],
43+
['@bazel/karma', '1.1.0'],
44+
['@bazel/protractor', '1.1.0'],
45+
['@bazel/rollup', '1.1.0'],
46+
['@bazel/terser', '1.1.0'],
47+
['@bazel/typescript', '1.1.0'],
4848
['history-server', '1.3.1'],
4949
['html-insert-assets', '0.2.0'],
5050
['karma', '4.4.1'],

‎tools/defaults.bzl

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -291,16 +291,11 @@ def jasmine_node_test(bootstrap = [], **kwargs):
291291
"@npm//source-map-support",
292292
"@npm//tslib",
293293
"@npm//xhr2",
294-
"//tools/testing:bazel_patch_require.js",
295294
]
296295
configuration_env_vars = kwargs.pop("configuration_env_vars", []) + [
297296
"angular_ivy_enabled",
298297
]
299-
templated_args = [
300-
# bazel_patch_require.js must be first
301-
# TODO(gregmagolan): remove this once linker has been applied to nodejs_binary targets by default in rules_nodejs
302-
"--node_options=--require=$(rlocation $(location //tools/testing:bazel_patch_require.js))",
303-
] + kwargs.pop("templated_args", [])
298+
templated_args = kwargs.pop("templated_args", [])
304299
for label in bootstrap:
305300
deps += [label]
306301
templated_args += ["--node_options=--require=$(rlocation $(location %s))" % label]

‎tools/testing/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
22

33
package(default_visibility = ["//visibility:public"])
44

5-
exports_files(["bazel_patch_require.js"])
6-
75
ts_library(
86
name = "browser",
97
testonly = 1,

‎tools/testing/bazel_patch_require.js

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)