Skip to content

Commit b80d11b

Browse files
authored
build: update to TypeScript 4.7 (#24880)
Bumps up our version of TypeScript to 4.7 and resolves a couple of build errors.
1 parent d3fac0b commit b80d11b

File tree

12 files changed

+5741
-4089
lines changed

12 files changed

+5741
-4089
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ var_2: &docker-browser-image cimg/node:16.14.0-browsers
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 v9-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-{{ checksum "WORKSPACE" }}-{{ checksum "yarn.lock" }}
16+
var_3: &cache_key v10-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 v9-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-
21+
var_4: &cache_fallback_key v10-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-
2222

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

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"[typescript]": {
2020
"editor.defaultFormatter": "esbenp.prettier-vscode",
2121
"editor.formatOnSave": true
22-
}
22+
},
23+
"typescript.tsdk": "node_modules/typescript/lib"
2324
}

integration/yarn-pnp-compat/.yarn/releases/yarn-3.2.0.cjs

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

integration/yarn-pnp-compat/.yarn/releases/yarn-4.0.0-rc.4.cjs

Lines changed: 780 additions & 0 deletions
Large diffs are not rendered by default.
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.0.cjs
3+
yarnPath: .yarn/releases/yarn-4.0.0-rc.4.cjs

integration/yarn-pnp-compat/package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@
1010
},
1111
"private": true,
1212
"dependencies": {
13-
"@angular/animations": "~14.0.0-next.6",
13+
"@angular/animations": "~14.0.0-next.16",
1414
"@angular/cdk": "file:../../dist/releases/cdk",
15-
"@angular/common": "~14.0.0-next.6",
16-
"@angular/compiler": "~14.0.0-next.6",
17-
"@angular/core": "~14.0.0-next.6",
18-
"@angular/forms": "~14.0.0-next.6",
15+
"@angular/common": "~14.0.0-next.16",
16+
"@angular/compiler": "~14.0.0-next.16",
17+
"@angular/core": "~14.0.0-next.16",
18+
"@angular/forms": "~14.0.0-next.16",
1919
"@angular/material": "file:../../dist/releases/material",
20-
"@angular/material-experimental": "~14.0.0-next.6",
21-
"@angular/platform-browser": "~14.0.0-next.6",
22-
"@angular/platform-browser-dynamic": "~14.0.0-next.6",
23-
"@angular/router": "~14.0.0-next.6",
20+
"@angular/material-experimental": "~14.0.0-next.13",
21+
"@angular/platform-browser": "~14.0.0-next.16",
22+
"@angular/platform-browser-dynamic": "~14.0.0-next.16",
23+
"@angular/router": "~14.0.0-next.16",
2424
"rxjs": "~7.5.0",
2525
"tslib": "^2.3.0",
2626
"zone.js": "~0.11.4"
2727
},
2828
"devDependencies": {
29-
"@angular-devkit/build-angular": "~14.0.0-next.5",
30-
"@angular/cli": "~14.0.0-next.5",
31-
"@angular/compiler-cli": "~14.0.0-next.6",
29+
"@angular-devkit/build-angular": "~14.0.0-next.13",
30+
"@angular/cli": "~14.0.0-next.13",
31+
"@angular/compiler-cli": "~14.0.0-next.16",
3232
"@types/jasmine": "~3.10.0",
3333
"@types/node": "^12.11.1",
3434
"jasmine-core": "~4.0.0",
@@ -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.6.2"
40+
"typescript": "4.7.0-beta"
4141
},
42-
"packageManager": "yarn@3.2.0"
42+
"packageManager": "yarn@4.0.0-rc.4"
4343
}

0 commit comments

Comments
 (0)