Skip to content

Commit a589f85

Browse files
authored
build: update to TypeScript 4.6 (#24565)
Updates the repo to the latest version of Angular and TypeScript 4.6.
1 parent ceae061 commit a589f85

File tree

8 files changed

+296
-215
lines changed

8 files changed

+296
-215
lines changed

WORKSPACE

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,6 @@ node_repositories(
5959
package_json = ["//:package.json"],
6060
)
6161

62-
load("@build_bazel_rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
63-
64-
# This call sets up another repository for Node 12.x used in integration tests. This
65-
# allows us to ensure our schematic code works with NodeJS v12 LTS. The Node v12.x
66-
# version is not fetched unless explicitly requested by the tests.
67-
nodejs_register_toolchains(
68-
name = "node12",
69-
node_version = "12.22.0",
70-
)
71-
7262
load("//tools:integration.bzl", "create_npm_package_archive_build_file")
7363

7464
yarn_install(

integration/ng-add/BUILD.bazel

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,3 @@ node_integration_test(
2929
"requires-network",
3030
],
3131
)
32-
33-
node_integration_test(
34-
name = "test_node12",
35-
srcs = glob(["**/*"]),
36-
commands = [
37-
# Note: We use a cache folder within the integration test as otherwise
38-
# the NPM package mapped archive would be cached in the system.
39-
# See: https://github.com/yarnpkg/yarn/issues/2165.
40-
# TODO(devversion): determine if a solution/workaround could live in the test runner.
41-
"yarn install --cache-folder .yarn_cache_folder/",
42-
"yarn ng add @angular/material",
43-
"yarn test",
44-
],
45-
node_repository = "node12_host",
46-
npm_packages = npmPackageMappings,
47-
setup_chromium = True,
48-
tags = [
49-
# This test relies on `yarn` so there needs to be internet access.
50-
"requires-network",
51-
],
52-
)

integration/ng-update-v13/BUILD.bazel

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,3 @@ node_integration_test(
2727
"requires-network",
2828
],
2929
)
30-
31-
node_integration_test(
32-
name = "test_node12",
33-
srcs = glob(["**/*"]),
34-
commands = [
35-
# Note: We use a cache folder within the integration test as otherwise
36-
# the NPM package mapped archive would be cached in the system.
37-
# See: https://github.com/yarnpkg/yarn/issues/2165.
38-
# TODO(devversion): determine if a solution/workaround could live in the test runner.
39-
"yarn install --cache-folder .yarn_cache_folder/",
40-
"yarn test",
41-
],
42-
node_repository = "node12_host",
43-
npm_packages = npmPackageMappings,
44-
tags = [
45-
# This test relies on `yarn` so there needs to be internet access.
46-
"requires-network",
47-
],
48-
)

integration/ts-compat/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ write_file(
1414
# The list contains NPM module names that resolve to the desired TypeScript version.
1515
typescript_version_packages = [
1616
"typescript-4.4",
17+
"typescript-4.5",
1718
"typescript",
1819
]
1920

package.json

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
},
5353
"version": "14.0.0-next.6",
5454
"dependencies": {
55-
"@angular/animations": "14.0.0-next.5",
56-
"@angular/common": "14.0.0-next.5",
57-
"@angular/compiler": "14.0.0-next.5",
58-
"@angular/core": "14.0.0-next.5",
59-
"@angular/forms": "14.0.0-next.5",
60-
"@angular/platform-browser": "14.0.0-next.5",
55+
"@angular/animations": "14.0.0-next.6",
56+
"@angular/common": "14.0.0-next.6",
57+
"@angular/compiler": "14.0.0-next.6",
58+
"@angular/core": "14.0.0-next.6",
59+
"@angular/forms": "14.0.0-next.6",
60+
"@angular/platform-browser": "14.0.0-next.6",
6161
"@types/google.maps": "^3.47.3",
6262
"@types/youtube": "^0.0.46",
6363
"material-components-web": "14.0.0-canary.9736ddce9.0",
@@ -67,17 +67,17 @@
6767
"zone.js": "~0.11.5"
6868
},
6969
"devDependencies": {
70-
"@angular-devkit/build-angular": "14.0.0-next.4",
71-
"@angular-devkit/core": "14.0.0-next.4",
72-
"@angular-devkit/schematics": "14.0.0-next.4",
73-
"@angular/bazel": "14.0.0-next.5",
74-
"@angular/cli": "14.0.0-next.4",
75-
"@angular/compiler-cli": "14.0.0-next.5",
70+
"@angular-devkit/build-angular": "14.0.0-next.5",
71+
"@angular-devkit/core": "14.0.0-next.5",
72+
"@angular-devkit/schematics": "14.0.0-next.5",
73+
"@angular/bazel": "14.0.0-next.6",
74+
"@angular/cli": "14.0.0-next.5",
75+
"@angular/compiler-cli": "14.0.0-next.6",
7676
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#b6656cffbd46bb3637b09b08561e5f1a147603c9",
77-
"@angular/localize": "14.0.0-next.5",
78-
"@angular/platform-browser-dynamic": "14.0.0-next.5",
79-
"@angular/platform-server": "14.0.0-next.5",
80-
"@angular/router": "14.0.0-next.5",
77+
"@angular/localize": "14.0.0-next.6",
78+
"@angular/platform-browser-dynamic": "14.0.0-next.6",
79+
"@angular/platform-server": "14.0.0-next.6",
80+
"@angular/router": "14.0.0-next.6",
8181
"@axe-core/webdriverjs": "^4.3.2",
8282
"@babel/core": "^7.16.12",
8383
"@bazel/bazelisk": "1.11.0",
@@ -142,7 +142,7 @@
142142
"@octokit/rest": "18.3.5",
143143
"@rollup/plugin-commonjs": "^21.0.0",
144144
"@rollup/plugin-node-resolve": "^13.1.3",
145-
"@schematics/angular": "14.0.0-next.4",
145+
"@schematics/angular": "14.0.0-next.5",
146146
"@types/babel__core": "^7.1.18",
147147
"@types/browser-sync": "^2.26.3",
148148
"@types/fs-extra": "^9.0.13",
@@ -213,16 +213,17 @@
213213
"tsickle": "0.39.1",
214214
"tslint": "^6.1.3",
215215
"tsutils": "^3.21.0",
216-
"typescript": "~4.5.5",
216+
"typescript": "~4.6.2",
217217
"typescript-4.4": "npm:typescript@4.4.2",
218+
"typescript-4.5": "npm:typescript@4.5.5",
218219
"vrsource-tslint-rules": "6.0.0",
219220
"yaml": "^1.10.2",
220221
"yargs": "^17.3.1"
221222
},
222223
"resolutions": {
223-
"@angular/dev-infra-private/typescript": "~4.5.2",
224+
"@angular/dev-infra-private/typescript": "~4.6.2",
224225
"browser-sync-client": "2.26.13",
225-
"dgeni-packages/typescript": "4.5.2",
226+
"dgeni-packages/typescript": "4.6.2",
226227
"**/https-proxy-agent": "5.0.0"
227228
}
228229
}

scripts/caretaking/firebase-functions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"firebase-functions": "^3.11.0"
1212
},
1313
"devDependencies": {
14-
"typescript": "^4.5.2",
14+
"typescript": "^4.6.2",
1515
"firebase-tools": "^8.6.0"
1616
},
1717
"private": true

scripts/caretaking/firebase-functions/yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4546,7 +4546,7 @@ typedarray-to-buffer@^3.1.5:
45464546
dependencies:
45474547
is-typedarray "^1.0.0"
45484548

4549-
typescript@^4.5.2:
4549+
typescript@^4.6.2:
45504550
version "4.6.2"
45514551
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4"
45524552
integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==

0 commit comments

Comments
 (0)