Skip to content

Commit 5998dd3

Browse files
devversiondevversion
authored
build: update to nodejs v16 and update rules_nodejs to v4 stable (#23485)
1 parent 1b2dc9c commit 5998dd3

File tree

11 files changed

+101
-93
lines changed

11 files changed

+101
-93
lines changed

‎.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
# To validate changes, use an online parser, eg.
88
# http://yaml-online-parser.appspot.com/
99

10-
var_1: &docker_image circleci/node:14.16.1
11-
var_2: &docker-firefox-image circleci/node:14.16.1-browsers
10+
var_1: &docker_image circleci/node:16.6.0
11+
var_2: &docker-firefox-image circleci/node:16.6.0-browsers
1212

1313
# **Note**: When updating the beginning of the cache key, also update the cache key to match
1414
# the new cache key prefix. This allows us to take advantage of CircleCI's fallback caching.
1515
# Read more here: https://circleci.com/docs/2.0/caching/#restoring-cache.
16-
var_3: &cache_key v8-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-{{ checksum "WORKSPACE" }}-{{ checksum "yarn.lock" }}
16+
var_3: &cache_key v9-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-{{ checksum "WORKSPACE" }}-{{ checksum "yarn.lock" }}
1717
# We want to invalidate the cache if the postinstall patches change. In order to apply new
1818
# patches, a clean version of the node modules is needed. Additionally, we invalidate the cache
1919
# if the Bazel version changes. We do this because otherwise the `bazelisk` cache folder will
2020
# contain all previously used versions and ultimately cause the cache restoring to be slower.
21-
var_4: &cache_fallback_key v8-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-
21+
var_4: &cache_fallback_key v9-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-
2222

2323
# Settings common to each job
2424
var_5: &job_defaults

‎.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.16.1
1+
16.6.0

‎WORKSPACE

Lines changed: 4 additions & 4 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
# Add NodeJS rules
99
http_archive(
1010
name = "build_bazel_rules_nodejs",
11-
sha256 = "5c40083120eadec50a3497084f99bc75a85400ea727e82e0b2f422720573130f",
12-
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.0.0-beta.0/rules_nodejs-4.0.0-beta.0.tar.gz"],
11+
sha256 = "8a7c981217239085f78acc9898a1f7ba99af887c1996ceb3b4504655383a2c3c",
12+
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.0.0/rules_nodejs-4.0.0.tar.gz"],
1313
)
1414

1515
# Add sass rules
@@ -44,7 +44,7 @@ load("@build_bazel_rules_nodejs//:index.bzl", "check_bazel_version", "node_repos
4444
check_bazel_version("4.0.0")
4545

4646
node_repositories(
47-
node_version = "14.16.1",
47+
node_version = "16.6.0",
4848
package_json = ["//:package.json"],
4949
)
5050

@@ -96,6 +96,6 @@ load(
9696

9797
_dev_infra_browser_repositories()
9898

99-
load("@npm//@bazel/esbuild:esbuild_repositories.bzl", "esbuild_repositories")
99+
load("@build_bazel_rules_nodejs//toolchains/esbuild:esbuild_repositories.bzl", "esbuild_repositories")
100100

101101
esbuild_repositories()

‎package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"license": "MIT",
1111
"engines": {
12-
"node": ">=14.0.0 <16.0.0",
12+
"node": ">=14.0.0 <17.0.0",
1313
"yarn": ">= 1.0.0",
1414
"npm": "Please use Yarn instead of NPM to install dependencies. See: https://yarnpkg.com/lang/en/docs/install/"
1515
},
@@ -85,15 +85,15 @@
8585
"@babel/traverse": "^7.13.0",
8686
"@bazel/bazelisk": "1.9.0",
8787
"@bazel/buildifier": "4.0.1",
88-
"@bazel/concatjs": "4.0.0-beta.0",
89-
"@bazel/esbuild": "4.0.0-beta.0",
88+
"@bazel/concatjs": "4.0.0",
89+
"@bazel/esbuild": "4.0.0",
9090
"@bazel/ibazel": "0.15.10",
91-
"@bazel/jasmine": "4.0.0-beta.0",
92-
"@bazel/protractor": "4.0.0-beta.0",
93-
"@bazel/rollup": "4.0.0-beta.0",
94-
"@bazel/runfiles": "4.0.0-beta.0",
95-
"@bazel/terser": "4.0.0-beta.0",
96-
"@bazel/typescript": "4.0.0-beta.0",
91+
"@bazel/jasmine": "4.0.0",
92+
"@bazel/protractor": "4.0.0",
93+
"@bazel/rollup": "4.0.0",
94+
"@bazel/runfiles": "4.0.0",
95+
"@bazel/terser": "4.0.0",
96+
"@bazel/typescript": "4.0.0",
9797
"@firebase/app-types": "^0.6.1",
9898
"@material/animation": "13.0.0-canary.0a9069300.0",
9999
"@material/auto-init": "13.0.0-canary.0a9069300.0",

‎src/cdk/testing/private/e2e/asserts.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export async function expectLocation(element: FinderResult, {x, y}: Point) {
4040
* Asserts that one element is aligned with another.
4141
*/
4242
export async function expectAlignedWith(element: FinderResult, otherElement: FinderResult) {
43-
await getElement(otherElement).getLocation().then((location: Point) => {
44-
expectLocation(getElement(element), location);
43+
await getElement(otherElement).getLocation().then(async (location: Point) => {
44+
await expectLocation(getElement(element), location);
4545
});
4646
}

‎src/material-date-fns-adapter/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ng_module", "ng_package", "ng_test_library", "ng_web_test_suite")
2-
load(":esbuild-amd.bzl", "esbuild_amd")
2+
load("//tools/esbuild:index.bzl", "esbuild_amd")
33

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

‎src/material-date-fns-adapter/esbuild-amd.bzl

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

‎tools/esbuild/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
exports_files(["esbuild-amd-config.mjs"])

‎tools/esbuild/esbuild-amd-config.mjs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
export default {
2+
globalName: "__exports",
3+
banner: {js: 'define("TMPL_MODULE_NAME", [], function() {'},
4+
footer: {js: 'return __exports;})'},
5+
};

‎tools/esbuild/index.bzl

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
load("@npm//@bazel/esbuild:index.bzl", "esbuild_config", _esbuild = "esbuild")
2+
load("@npm//@angular/dev-infra-private/bazel:expand_template.bzl", "expand_template")
3+
4+
def esbuild(**kwargs):
5+
_esbuild(**kwargs)
6+
7+
"""Generates an AMD bundle for the specified entry-point with the given AMD module name."""
8+
9+
def esbuild_amd(name, entry_point, module_name, testonly, deps):
10+
expand_template(
11+
name = "%s_config" % name,
12+
testonly = testonly,
13+
template = "//tools/esbuild:esbuild-amd-config.mjs",
14+
output_name = "%s_config.mjs" % name,
15+
substitutions = {
16+
"TMPL_MODULE_NAME": module_name,
17+
},
18+
)
19+
20+
esbuild_config(
21+
name = "%s_config_lib" % name,
22+
testonly = testonly,
23+
config_file = "%s_config" % name,
24+
)
25+
26+
_esbuild(
27+
name = "%s_bundle" % name,
28+
testonly = testonly,
29+
deps = deps,
30+
minify = True,
31+
sourcemap = "inline",
32+
platform = "browser",
33+
target = "es2015",
34+
entry_point = entry_point,
35+
config = "%s_config_lib" % name,
36+
)
37+
38+
native.filegroup(
39+
name = name,
40+
testonly = testonly,
41+
srcs = ["%s_bundle" % name],
42+
)

‎yarn.lock

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -543,19 +543,19 @@
543543
resolved "https://registry.yarnpkg.com/@bazel/buildifier/-/buildifier-4.0.1.tgz#52cfbad5cbb86e9183a29dde2370cd465730ea0d"
544544
integrity sha512-BTmtvJbeeEVrqRApI1gr5hvPgYcHLpdGJ5EXNXEWO692ztMPSj5fB/dH0xUlaW45jn6LimYx8ymqTMhj3538og==
545545

546-
"@bazel/[email protected]-beta.0":
547-
version "4.0.0-beta.0"
548-
resolved "https://registry.yarnpkg.com/@bazel/concatjs/-/concatjs-4.0.0-beta.0.tgz#f1dddefe2cefc543ec61f06c5bc28c908bfb4569"
549-
integrity sha512-azGMcLwOIEEbTHm0ORCsSMZ5yBIQaRWlWMN3b7M5uD6C646EaiM7b2wx8CkOJlyZrZOLEajjvePvN7lqkPM1Cg==
546+
"@bazel/[email protected]":
547+
version "4.0.0"
548+
resolved "https://registry.yarnpkg.com/@bazel/concatjs/-/concatjs-4.0.0.tgz#fae04e7adb560f7666a71d8552bb424bb53b7d45"
549+
integrity sha512-Ua+8Myq1RJjffASRHUzqFu05Zs5qU5Auzc+aiyq8V9opP5WTT4HR5lymmJrT/S1brhhM/1GZfbMZbYaddgyeVw==
550550
dependencies:
551551
protobufjs "6.8.8"
552552
source-map-support "0.5.9"
553553
tsutils "2.27.2"
554554

555-
"@bazel/[email protected]-beta.0":
556-
version "4.0.0-beta.0"
557-
resolved "https://registry.yarnpkg.com/@bazel/esbuild/-/esbuild-4.0.0-beta.0.tgz#ff75447b18bc0d56b376d7e44095d9ca9b904583"
558-
integrity sha512-4AxL8IhyeyeTH0fr1XFfdd1ls/AnsiEu1oBXxoplb0ar88pRrdl0UjCUgLylWj75uIcQsqu/l3Xv7qOfDSXWsQ==
555+
"@bazel/[email protected]":
556+
version "4.0.0"
557+
resolved "https://registry.yarnpkg.com/@bazel/esbuild/-/esbuild-4.0.0.tgz#daa8286d72a9e6522f6f2c514aed9716a331aa25"
558+
integrity sha512-SrdJexg+PNjdsTDp0voPS0SlU/yovbwrH+ObtFShHQ2X52u9mqvU2Cm7If48pWobkGK4rl7vDbzIHYWVKdGXlw==
559559

560560
"@bazel/[email protected]":
561561
version "4.0.0-rc.1"
@@ -567,10 +567,10 @@
567567
resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.15.10.tgz#cf0cff1aec6d8e7bb23e1fc618d09fbd39b7a13f"
568568
integrity sha512-0v+OwCQ6fsGFa50r6MXWbUkSGuWOoZ22K4pMSdtWiL5LKFIE4kfmMmtQS+M7/ICNwk2EIYob+NRreyi/DGUz5A==
569569

570-
"@bazel/[email protected]-beta.0":
571-
version "4.0.0-beta.0"
572-
resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-4.0.0-beta.0.tgz#575e9cd88932b19c54447fba43cbd62e14ff3022"
573-
integrity sha512-VYEAaHCi8ot0aSMKbIio6usJZqvINd7LzrrGoChGAGwMgGEpTfMGdprwdlrQPKD6/GbLkVtkCcsViG92ynXhdQ==
570+
"@bazel/[email protected]":
571+
version "4.0.0"
572+
resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-4.0.0.tgz#2e95f1b3458e0d69f16e0c820fe4631a43942a90"
573+
integrity sha512-vi1n+vbLwKki7aa8kXDG709nxRXAmLEvqbijSpm8d3rrW4f68Ad5xKyT2gezO84OeysUHU3cDZViXWwFcoHRng==
574574
dependencies:
575575
c8 "~7.5.0"
576576
jasmine-reporters "~2.4.0"
@@ -583,40 +583,40 @@
583583
c8 "~7.5.0"
584584
jasmine-reporters "~2.4.0"
585585

586-
"@bazel/[email protected]-beta.0":
587-
version "4.0.0-beta.0"
588-
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-4.0.0-beta.0.tgz#fcabfd5c32005fcb93b80f83bcf99058bcf07d4f"
589-
integrity sha512-cIlqzPEXu3zFhFR+5Vqo5D/qLkOEY/gZ1xc74/V/CVAlbkCZsWJ18gDE1bhca9t1Mj41igDqwlvXUndxdQjNtw==
586+
"@bazel/[email protected]":
587+
version "4.0.0"
588+
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-4.0.0.tgz#f29ae81c22790596bfd8212952a8e370406d094f"
589+
integrity sha512-YiSU2IYdiW7HoVC3gAZJs9M0CiH9qluAvA9YLfvM3pM7rI1OmXYCm3hojgOLIRslbThcpfAcmQKjeUfdQPX5bA==
590590

591591
"@bazel/[email protected]":
592592
version "4.0.0-rc.1"
593593
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-4.0.0-rc.1.tgz#1c7ae5366423ab02f2b5a30352b98cd1729837a5"
594594
integrity sha512-qF9QPn/qTbU2yD+1liv5HwfD/2dkmDq7Mrb4OI1TI6Q74XY+k0wplDWh0GZFTQtHTOxzAOzivGCZBC8/9eSxLw==
595595

596-
"@bazel/[email protected]-beta.0":
597-
version "4.0.0-beta.0"
598-
resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-4.0.0-beta.0.tgz#ec4bc88f401bd555d43c55c34183cda4f004ae96"
599-
integrity sha512-CAl5+iNuVgFA52zOFmoQvY9LpjEf/hPiw/PRPXR0JrXy83xk+Nxnrv7UKvP4Jmux+K24uDf+ZOIr62rGzMHVhA==
596+
"@bazel/[email protected]":
597+
version "4.0.0"
598+
resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-4.0.0.tgz#909cfa9bd0243fd78657711b3aa644b8432ba636"
599+
integrity sha512-OcL7QtNk2nyN/v7fnih0VQ0pIDwSxdGkyZvt/m1SwODx/eJpBceam0yboLoer/sYEZPhv7YFyCTk9n2X64TZ5g==
600600

601-
"@bazel/[email protected]-beta.0":
602-
version "4.0.0-beta.0"
603-
resolved "https://registry.yarnpkg.com/@bazel/runfiles/-/runfiles-4.0.0-beta.0.tgz#e62679d80cf9fcd84996e5f3ae4bedc33ed1a993"
604-
integrity sha512-pFdanyvI0wf2WtdQXUmcTZw7OJ83uj2bxF3rOskx45wewBRAlQZkm2q2A6WEffSfdf2WaBlk5u/x2kqK2nyG7w==
601+
"@bazel/[email protected]":
602+
version "4.0.0"
603+
resolved "https://registry.yarnpkg.com/@bazel/runfiles/-/runfiles-4.0.0.tgz#3d649d93710364515402b873add73947aaa702e8"
604+
integrity sha512-1V0E1ooSw7DARfOBkr24O5GOpqODDd7RuJ2Xb+JljjdpUdJTIaVeqELBpSHAiYzqVJYWAn61sD5JP1CPCllixA==
605605

606606
"@bazel/[email protected]":
607607
version "4.0.0-rc.1"
608608
resolved "https://registry.yarnpkg.com/@bazel/runfiles/-/runfiles-4.0.0-rc.1.tgz#aaf97d633ba813db2c0bfa5bc126f50118d82066"
609609
integrity sha512-0RGbEe4hBpafbLSIIBYGFPRLZ7FRJ+S6PjdVfRkpZlNpe6T1QXxgdg6M5/ETQXNVqfdUhMLdNFZ1heMk4uXhzg==
610610

611-
"@bazel/[email protected]-beta.0":
612-
version "4.0.0-beta.0"
613-
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-4.0.0-beta.0.tgz#2ca1c59e1e109e2f3b0c561b534730a035844a26"
614-
integrity sha512-qGDLsmg2ekEojDHrTEiPJd0bdqbCPT2/YImsZhg1swpLEFnFCLCUNVnESt62Wd6bKonzvQeFo8zpKaCK326e4g==
611+
"@bazel/[email protected]":
612+
version "4.0.0"
613+
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-4.0.0.tgz#9ef0c4635ba0191965f0b6c26eb0cc348c8c1f5e"
614+
integrity sha512-sktDTfEBFD6LIv+g7W0l9nt5pih7N7aQVA09lv09rbTWD/JGX1LSSjG2p16af297XMxCP6GoHyVaxOVXS3IPYA==
615615

616-
"@bazel/[email protected]-beta.0":
617-
version "4.0.0-beta.0"
618-
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-4.0.0-beta.0.tgz#daf2fb0d0bdcd3df331d4320463b1a4beca6031c"
619-
integrity sha512-dfI3QLQ5bLyK3BIrrwxuH9cLbMHuku0UZH7nwjHjXwQX70O0MSGN6yXx2Vrqatj2iw/UfHX/akPuhGlNqrDFRw==
616+
"@bazel/[email protected]":
617+
version "4.0.0"
618+
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-4.0.0.tgz#71a6f0f5e340c6b8516b21fbc0f0853e74055d0c"
619+
integrity sha512-+Le9q+5IR9gEnSH8sXyxDB5dD6NJx2kbm6AL+cijYVat2MczpGV4sI1mu0mdLzYsEX5Tjt5iHkaNb7sFESjnYA==
620620
dependencies:
621621
protobufjs "6.8.8"
622622
semver "5.6.0"

0 commit comments

Comments
 (0)