Skip to content

Commit ff8ab43

Browse files
authored
build: update tooling packages to v18 (angular#28767)
Updates the Tooling packages that previously couldn't be updated to v18. Also switches the integration tests back to using the local dependencies.
1 parent aedeea0 commit ff8ab43

File tree

17 files changed

+5808
-5627
lines changed

17 files changed

+5808
-5627
lines changed

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.18.2
1+
18.19.1

WORKSPACE

+8-8
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
6161
nodejs_register_toolchains(
6262
name = "nodejs",
6363
node_repositories = {
64-
"18.18.2-darwin_arm64": ("node-v18.18.2-darwin-arm64.tar.gz", "node-v18.18.2-darwin-arm64", "9f982cc91b28778dd8638e4f94563b0c2a1da7aba62beb72bd427721035ab553"),
65-
"18.18.2-darwin_amd64": ("node-v18.18.2-darwin-x64.tar.gz", "node-v18.18.2-darwin-x64", "5bb8da908ed590e256a69bf2862238c8a67bc4600119f2f7721ca18a7c810c0f"),
66-
"18.18.2-linux_arm64": ("node-v18.18.2-linux-arm64.tar.xz", "node-v18.18.2-linux-arm64", "2e630e18548627f61eaf573233da7949dc0a1df5eef3f486fa9820c5f6c121aa"),
67-
"18.18.2-linux_ppc64le": ("node-v18.18.2-linux-ppc64le.tar.xz", "node-v18.18.2-linux-ppc64le", "b0adff5cf5938266b711d6c724fb134d802e0dee40b3a3f73d162de1b3d11880"),
68-
"18.18.2-linux_s390x": ("node-v18.18.2-linux-s390x.tar.xz", "node-v18.18.2-linux-s390x", "c70ec2074b5e2b42c55bb4b8105418b67bf8a61c500d9376a07430dfcc341fdb"),
69-
"18.18.2-linux_amd64": ("node-v18.18.2-linux-x64.tar.xz", "node-v18.18.2-linux-x64", "75aba25ae76999309fc6c598efe56ce53fbfc221381a44a840864276264ab8ac"),
70-
"18.18.2-windows_amd64": ("node-v18.18.2-win-x64.zip", "node-v18.18.2-win-x64", "3bb0e51e579a41a22b3bf6cb2f3e79c03801aa17acbe0ca00fc555d1282e7acd"),
64+
"18.19.1-darwin_arm64": ("node-v18.19.1-darwin-arm64.tar.gz", "node-v18.19.1-darwin-arm64", "0c7249318868877032ed21cc0ed450015ee44b31b9b281955521cd3fc39fbfa3"),
65+
"18.19.1-darwin_amd64": ("node-v18.19.1-darwin-x64.tar.gz", "node-v18.19.1-darwin-x64", "ab67c52c0d215d6890197c951e1bd479b6140ab630212b96867395e21d813016"),
66+
"18.19.1-linux_arm64": ("node-v18.19.1-linux-arm64.tar.xz", "node-v18.19.1-linux-arm64", "228ad1eee660fba3f9fd2cccf02f05b8ebccc294d27f22c155d20b233a9d76b3"),
67+
"18.19.1-linux_ppc64le": ("node-v18.19.1-linux-ppc64le.tar.xz", "node-v18.19.1-linux-ppc64le", "2e5812b8fc00548e2e8ab9daa88ace13974c16b6ba5595a7a50c35f848f7d432"),
68+
"18.19.1-linux_s390x": ("node-v18.19.1-linux-s390x.tar.xz", "node-v18.19.1-linux-s390x", "15106acf4c9e3aca02416dd89fb5c71af77097042455a73f9caa064c1988ead5"),
69+
"18.19.1-linux_amd64": ("node-v18.19.1-linux-x64.tar.xz", "node-v18.19.1-linux-x64", "f35f24edd4415cd609a2ebc03be03ed2cfe211d7333d55c752d831754fb849f0"),
70+
"18.19.1-windows_amd64": ("node-v18.19.1-win-x64.zip", "node-v18.19.1-win-x64", "ff08f8fe253fba9274992d7052e9d9a70141342d7b36ddbd6e84cbe823e312c6"),
7171
},
72-
node_version = "18.18.2",
72+
node_version = "18.19.1",
7373
)
7474

7575
load("@build_bazel_rules_nodejs//:index.bzl", "yarn_install")

integration/harness-e2e-cli/BUILD.bazel

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
load("@bazel_skylib//lib:dicts.bzl", "dicts")
2+
load("//tools:integration.bzl", "CLI_PROJECT_MAPPINGS")
23
load("//tools:defaults.bzl", "node_integration_test")
34

45
npmPackageMappings = dicts.add(
5-
# TODO(crisbeto): temporarily disabled until Tooling makes an 18.x release.
6-
# dicts.omit(
7-
# CLI_PROJECT_MAPPINGS,
8-
# # Exclude rxjs, because we want to use the version from the package.json.
9-
# # Version 6.x that the rest of the project uses has some packaging issues. See:
10-
# # https://github.com/angular/components/pull/25241#issuecomment-1178701633
11-
# ["@npm//:rxjs_archive"],
12-
# ),
13-
{},
6+
dicts.omit(
7+
CLI_PROJECT_MAPPINGS,
8+
# Exclude rxjs, because we want to use the version from the package.json.
9+
# Version 6.x that the rest of the project uses has some packaging issues. See:
10+
# https://github.com/angular/components/pull/25241#issuecomment-1178701633
11+
["@npm//:rxjs_archive"],
12+
),
1413
{
1514
"//src/cdk:npm_package_archive": "@angular/cdk",
1615
"//src/material:npm_package_archive": "@angular/material",

integration/harness-e2e-cli/package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@
1313
},
1414
"private": true,
1515
"dependencies": {
16-
"@angular/animations": "^17.3.0",
16+
"@angular/animations": "file:../../node_modules/@angular/animations",
1717
"@angular/cdk": "file:../../dist/releases/cdk",
18-
"@angular/common": "^17.3.0",
19-
"@angular/compiler": "^17.3.0",
20-
"@angular/core": "^17.3.0",
21-
"@angular/forms": "^17.3.0",
18+
"@angular/common": "file:../../node_modules/@angular/common",
19+
"@angular/compiler": "file:../../node_modules/@angular/compiler",
20+
"@angular/core": "file:../../node_modules/@angular/core",
21+
"@angular/forms": "file:../../node_modules/@angular/forms",
2222
"@angular/material": "file:../../dist/releases/material",
23-
"@angular/platform-browser": "^17.3.0",
24-
"@angular/platform-browser-dynamic": "^17.3.0",
25-
"@angular/router": "^17.3.0",
23+
"@angular/platform-browser": "file:../../node_modules/@angular/platform-browser",
24+
"@angular/platform-browser-dynamic": "file:../../node_modules/@angular/platform-browser-dynamic",
25+
"@angular/router": "file:../../node_modules/@angular/router",
2626
"rxjs": "^7.5.5",
2727
"tslib": "^2.3.0",
28-
"zone.js": "~0.13.0"
28+
"zone.js": "~0.14.0"
2929
},
3030
"devDependencies": {
31-
"@angular-devkit/build-angular": "^17.3.0",
32-
"@angular/cli": "^17.3.0",
33-
"@angular/compiler-cli": "^17.3.0",
31+
"@angular-devkit/build-angular": "file:../../node_modules/@angular-devkit/build-angular",
32+
"@angular/cli": "file:../../node_modules/@angular/cli",
33+
"@angular/compiler-cli": "file:../../node_modules/@angular/compiler-cli",
3434
"@types/jasmine": "~3.10.0",
3535
"@types/node": "^12.11.1",
3636
"@types/selenium-webdriver": "3.0.19",

0 commit comments

Comments
 (0)