Skip to content

Commit 3cc9254

Browse files
crisbetocrisbeto
committed
build: update to TypeScript 4.8 final (#25536)
Updates to the latest stable version of TS and removes some workaround. (cherry picked from commit e63390c)
1 parent ce65a4b commit 3cc9254

File tree

19 files changed

+1016
-926
lines changed

19 files changed

+1016
-926
lines changed

‎integration/harness-e2e-cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"karma-jasmine-html-reporter": "~1.7.0",
4545
"selenium-webdriver": "3.6.0",
4646
"ts-node": "~10.7.0",
47-
"typescript": "~4.7.2",
47+
"typescript": "file:../../node_modules/typescript",
4848
"wait-on": "^6.0.0"
4949
}
5050
}

‎integration/harness-e2e-cli/yarn.lock

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7700,10 +7700,8 @@ typed-assert@^1.0.8:
77007700
resolved "https://registry.yarnpkg.com/typed-assert/-/typed-assert-1.0.8.tgz#4bf9f1ce7f3f974d09c3afd7c68d12e1391a233c"
77017701
integrity sha512-5NkbXZUlmCE73Fs7gvkp1XXJWHYetPkg60QnQ2NXQmBYNFxbBr2zA8GCtaH4K2s2WhOmSlgiSTmrjrcm5tnM5g==
77027702

7703-
typescript@~4.7.2:
7704-
version "4.7.4"
7705-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
7706-
integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
7703+
"typescript@file:../../node_modules/typescript":
7704+
version "4.8.2"
77077705

77087706
ua-parser-js@^0.7.30:
77097707
version "0.7.31"

‎integration/ng-add-standalone/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@
3737
"karma-coverage": "~2.0.3",
3838
"karma-jasmine": "~4.0.0",
3939
"karma-jasmine-html-reporter": "~1.7.0",
40-
"typescript": "~4.7.2"
40+
"typescript": "file:../../node_modules/typescript"
4141
}
4242
}

‎integration/ng-add-standalone/yarn.lock

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7682,10 +7682,8 @@ typed-assert@^1.0.8:
76827682
resolved "https://registry.yarnpkg.com/typed-assert/-/typed-assert-1.0.8.tgz#4bf9f1ce7f3f974d09c3afd7c68d12e1391a233c"
76837683
integrity sha512-5NkbXZUlmCE73Fs7gvkp1XXJWHYetPkg60QnQ2NXQmBYNFxbBr2zA8GCtaH4K2s2WhOmSlgiSTmrjrcm5tnM5g==
76847684

7685-
typescript@~4.7.2:
7686-
version "4.7.4"
7687-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
7688-
integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
7685+
"typescript@file:../../node_modules/typescript":
7686+
version "4.8.2"
76897687

76907688
ua-parser-js@^0.7.28:
76917689
version "0.7.28"

‎integration/ng-add/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@
3737
"karma-coverage": "~2.0.3",
3838
"karma-jasmine": "~4.0.0",
3939
"karma-jasmine-html-reporter": "~1.7.0",
40-
"typescript": "~4.7.2"
40+
"typescript": "file:../../node_modules/typescript"
4141
}
4242
}

‎integration/ng-add/yarn.lock

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7388,10 +7388,8 @@ typed-assert@^1.0.8:
73887388
resolved "https://registry.yarnpkg.com/typed-assert/-/typed-assert-1.0.8.tgz#4bf9f1ce7f3f974d09c3afd7c68d12e1391a233c"
73897389
integrity sha512-5NkbXZUlmCE73Fs7gvkp1XXJWHYetPkg60QnQ2NXQmBYNFxbBr2zA8GCtaH4K2s2WhOmSlgiSTmrjrcm5tnM5g==
73907390

7391-
typescript@~4.7.2:
7392-
version "4.7.4"
7393-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
7394-
integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
7391+
"typescript@file:../../node_modules/typescript":
7392+
version "4.8.2"
73957393

73967394
ua-parser-js@^0.7.28:
73977395
version "0.7.28"

‎integration/ng-update-v13/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@
3838
"karma-coverage": "~2.0.3",
3939
"karma-jasmine": "~4.0.0",
4040
"karma-jasmine-html-reporter": "~1.7.0",
41-
"typescript": "~4.7.2"
41+
"typescript": "file:../../node_modules/typescript"
4242
}
4343
}

‎integration/ng-update-v13/yarn.lock

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7398,10 +7398,8 @@ typed-assert@^1.0.8:
73987398
resolved "https://registry.yarnpkg.com/typed-assert/-/typed-assert-1.0.8.tgz#4bf9f1ce7f3f974d09c3afd7c68d12e1391a233c"
73997399
integrity sha512-5NkbXZUlmCE73Fs7gvkp1XXJWHYetPkg60QnQ2NXQmBYNFxbBr2zA8GCtaH4K2s2WhOmSlgiSTmrjrcm5tnM5g==
74007400

7401-
typescript@~4.7.2:
7402-
version "4.7.4"
7403-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
7404-
integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
7401+
"typescript@file:../../node_modules/typescript":
7402+
version "4.8.2"
74057403

74067404
ua-parser-js@^0.7.28:
74077405
version "0.7.28"

‎integration/yarn-pnp-compat/.yarn/releases/yarn-3.2.1.cjs

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

‎integration/yarn-pnp-compat/.yarn/releases/yarn-3.2.3.cjs

Lines changed: 783 additions & 0 deletions
Large diffs are not rendered by default.

‎integration/yarn-pnp-compat/.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
nodeLinker: pnp
22

3-
yarnPath: .yarn/releases/yarn-3.2.1.cjs
3+
yarnPath: .yarn/releases/yarn-3.2.3.cjs

‎integration/yarn-pnp-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"karma-coverage": "~2.1.0",
3838
"karma-jasmine": "~4.0.0",
3939
"karma-jasmine-html-reporter": "~1.7.0",
40-
"typescript": "~4.7.2"
40+
"typescript": "file:../../node_modules/typescript"
4141
},
42-
"packageManager": "[email protected].1"
42+
"packageManager": "[email protected].3"
4343
}

‎integration/yarn-pnp-compat/yarn.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10890,23 +10890,23 @@ __metadata:
1089010890
languageName: node
1089110891
linkType: hard
1089210892

10893-
"typescript@npm:~4.7.2":
10894-
version: 4.7.4
10895-
resolution: "typescript@npm:4.7.4"
10893+
"typescript@file:../../node_modules/typescript::locator=yarn-pnp-compat%40workspace%3A.":
10894+
version: 4.8.2
10895+
resolution: "typescript@file:../../node_modules/typescript#../../node_modules/typescript::hash=028f88&locator=yarn-pnp-compat%40workspace%3A."
1089610896
bin:
10897-
tsc: bin/tsc
10898-
tsserver: bin/tsserver
10899-
checksum: 5750181b1cd7e6482c4195825547e70f944114fb47e58e4aa7553e62f11b3f3173766aef9c281783edfd881f7b8299cf35e3ca8caebe73d8464528c907a164df
10897+
tsc: ./bin/tsc
10898+
tsserver: ./bin/tsserver
10899+
checksum: 6f49363af8af2fe480da1d5fa68712644438785208b06690a3cbe5e7365fd652c3a0f1e587bc8684d78fb69de3dde4de185c0bad7bb4f3664ddfc813ce8caad6
1090010900
languageName: node
1090110901
linkType: hard
1090210902

10903-
"typescript@patch:typescript@~4.7.2#~builtin<compat/typescript>":
10904-
version: 4.7.4
10905-
resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin<compat/typescript>::version=4.7.4&hash=7ad353"
10903+
"typescript@patch:typescript@file%3A../../node_modules/typescript#~builtin<compat/typescript>":
10904+
version: 4.8.2
10905+
resolution: "typescript@patch:typescript@file%3A../../node_modules/typescript%23../../node_modules/typescript%3A%3Ahash=028f88&locator=yarn-pnp-compat%2540workspace%253A.#~builtin<compat/typescript>::version=4.8.2&hash=7ad353"
1090610906
bin:
10907-
tsc: bin/tsc
10908-
tsserver: bin/tsserver
10909-
checksum: 9096d8f6c16cb80ef3bf96fcbbd055bf1c4a43bd14f3b7be45a9fbe7ada46ec977f604d5feed3263b4f2aa7d4c7477ce5f9cd87de0d6feedec69a983f3a4f93e
10907+
tsc: ./bin/tsc
10908+
tsserver: ./bin/tsserver
10909+
checksum: 6f49363af8af2fe480da1d5fa68712644438785208b06690a3cbe5e7365fd652c3a0f1e587bc8684d78fb69de3dde4de185c0bad7bb4f3664ddfc813ce8caad6
1091010910
languageName: node
1091110911
linkType: hard
1091210912

@@ -11453,7 +11453,7 @@ __metadata:
1145311453
karma-jasmine-html-reporter: ~1.7.0
1145411454
rxjs: ~7.5.0
1145511455
tslib: ^2.3.0
11456-
typescript: ~4.7.2
11456+
typescript: "file:../../node_modules/typescript"
1145711457
zone.js: ~0.11.4
1145811458
languageName: unknown
1145911459
linkType: soft

‎package.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@
5656
},
5757
"version": "14.2.0",
5858
"dependencies": {
59-
"@angular/animations": "^14.2.0-rc.0",
60-
"@angular/common": "^14.2.0-rc.0",
61-
"@angular/compiler": "^14.2.0-rc.0",
62-
"@angular/core": "^14.2.0-rc.0",
63-
"@angular/forms": "^14.2.0-rc.0",
64-
"@angular/platform-browser": "^14.2.0-rc.0",
59+
"@angular/animations": "^14.2.0",
60+
"@angular/common": "^14.2.0",
61+
"@angular/compiler": "^14.2.0",
62+
"@angular/core": "^14.2.0",
63+
"@angular/forms": "^14.2.0",
64+
"@angular/platform-browser": "^14.2.0",
6565
"@types/google.maps": "^3.47.3",
6666
"@types/youtube": "^0.0.46",
6767
"rxjs": "^6.6.7",
@@ -70,18 +70,18 @@
7070
"zone.js": "~0.11.5"
7171
},
7272
"devDependencies": {
73-
"@angular-devkit/build-angular": "^14.2.0-rc.0",
74-
"@angular-devkit/core": "^14.2.0-rc.0",
75-
"@angular-devkit/schematics": "^14.2.0-rc.0",
76-
"@angular/bazel": "^14.2.0-rc.0",
73+
"@angular-devkit/build-angular": "^14.2.0",
74+
"@angular-devkit/core": "^14.2.0",
75+
"@angular-devkit/schematics": "^14.2.0",
76+
"@angular/bazel": "^14.2.0",
7777
"@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#6a13e27f2109b241bf020d5f225e8f4cdeb8c0a5",
78-
"@angular/cli": "^14.2.0-rc.0",
79-
"@angular/compiler-cli": "^14.2.0-rc.0",
80-
"@angular/localize": "^14.2.0-rc.0",
78+
"@angular/cli": "^14.2.0",
79+
"@angular/compiler-cli": "^14.2.0",
80+
"@angular/localize": "^14.2.0",
8181
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#da938be2693c1c05ad7ab74b5f6c0dedc2ffa5ca",
82-
"@angular/platform-browser-dynamic": "^14.2.0-rc.0",
83-
"@angular/platform-server": "^14.2.0-rc.0",
84-
"@angular/router": "^14.2.0-rc.0",
82+
"@angular/platform-browser-dynamic": "^14.2.0",
83+
"@angular/platform-server": "^14.2.0",
84+
"@angular/router": "^14.2.0",
8585
"@axe-core/webdriverjs": "^4.3.2",
8686
"@babel/core": "^7.16.12",
8787
"@bazel/bazelisk": "1.12.1",
@@ -146,7 +146,7 @@
146146
"@octokit/rest": "18.3.5",
147147
"@rollup/plugin-commonjs": "^21.0.0",
148148
"@rollup/plugin-node-resolve": "^13.1.3",
149-
"@schematics/angular": "^14.2.0-rc.0",
149+
"@schematics/angular": "^14.2.0",
150150
"@types/babel__core": "^7.1.18",
151151
"@types/browser-sync": "^2.26.3",
152152
"@types/fs-extra": "^9.0.13",
@@ -217,17 +217,17 @@
217217
"tsickle": "0.39.1",
218218
"tslint": "^6.1.3",
219219
"tsutils": "^3.21.0",
220-
"typescript": "4.8.1-rc",
220+
"typescript": "~4.8.2",
221221
"vrsource-tslint-rules": "6.0.0",
222222
"yaml": "^1.10.2",
223223
"yargs": "^17.3.1",
224224
"zx": "^6.2.4"
225225
},
226226
"resolutions": {
227-
"@angular/build-tooling/typescript": "4.8.1-rc",
228-
"@angular/ng-dev/typescript": "4.8.1-rc",
227+
"@angular/build-tooling/typescript": "~4.8.2",
228+
"@angular/ng-dev/typescript": "~4.8.2",
229229
"browser-sync-client": "2.26.13",
230-
"dgeni-packages/typescript": "4.8.1-rc",
230+
"dgeni-packages/typescript": "~4.8.2",
231231
"**/https-proxy-agent": "5.0.0"
232232
}
233233
}

‎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.8.1-rc",
14+
"typescript": "~4.8.2",
1515
"firebase-tools": "^8.6.0"
1616
},
1717
"private": true

‎scripts/caretaking/firebase-functions/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4547,10 +4547,10 @@ typedarray-to-buffer@^3.1.5:
45474547
dependencies:
45484548
is-typedarray "^1.0.0"
45494549

4550-
[email protected].1-rc:
4551-
version "4.8.1-rc"
4552-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.1-rc.tgz#2baff2b14b916f06a97effbfcf59e46bab93e48a"
4553-
integrity sha512-ZoXadPUeEe1XOZe6CHG/QHZ6IFeRjrfzkpraRi9HOpGH0UOG/WaUrKvtSwDFigG8GuDA4zsDQHEZyqhmlCIyEw==
4550+
typescript@~4.8.2:
4551+
version "4.8.2"
4552+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790"
4553+
integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==
45544554

45554555
unique-filename@^1.1.1:
45564556
version "1.1.1"

‎src/material/schematics/ng-update/migrations/hammer-gestures-v9/hammer-gestures-migration.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ export class HammerGesturesMigration extends DevkitMigration<null> {
754754
const recorder = this.fileSystem.edit(filePath);
755755
const providersField = getMetadataField(metadata[0] as Ts48MigrationAny, 'providers')[0];
756756
const providerIdentifiers = providersField
757-
? findMatchingChildNodes(providersField, ts.isIdentifier)
757+
? findMatchingChildNodes(providersField as Ts48MigrationAny, ts.isIdentifier)
758758
: null;
759759
const gestureConfigExpr = this._importManager.addImportToSourceFile(
760760
sourceFile,
@@ -848,7 +848,7 @@ export class HammerGesturesMigration extends DevkitMigration<null> {
848848

849849
const importsField = getMetadataField(metadata[0] as Ts48MigrationAny, 'imports')[0];
850850
const importIdentifiers = importsField
851-
? findMatchingChildNodes(importsField, ts.isIdentifier)
851+
? findMatchingChildNodes(importsField as Ts48MigrationAny, ts.isIdentifier)
852852
: null;
853853
const recorder = this.fileSystem.edit(this.fileSystem.resolve(sourceFile.fileName));
854854
const hammerModuleExpr = this._importManager.addImportToSourceFile(

‎tools/integration.bzl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ CLI_PROJECT_PACKAGES = [pkg.module_name for pkg in ANGULAR_PACKAGES] + [
1010
"@angular/cli",
1111
"@angular/compiler-cli",
1212
"@angular-devkit/build-angular",
13-
# TODO(crisbeto): temporarily disabled until TS 4.8 support lands in the CLI.
14-
# "typescript",
13+
"typescript",
1514
"rxjs",
1615
]
1716

0 commit comments

Comments
 (0)