Skip to content

build: update to TypeScript 4.7 #24880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ var_2: &docker-browser-image cimg/node:16.14.0-browsers
# **Note**: When updating the beginning of the cache key, also update the cache key to match
# the new cache key prefix. This allows us to take advantage of CircleCI's fallback caching.
# Read more here: https://circleci.com/docs/2.0/caching/#restoring-cache.
var_3: &cache_key v9-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-{{ checksum "WORKSPACE" }}-{{ checksum "yarn.lock" }}
var_3: &cache_key v10-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-{{ checksum "WORKSPACE" }}-{{ checksum "yarn.lock" }}
# We want to invalidate the cache if the postinstall patches change. In order to apply new
# patches, a clean version of the node modules is needed. Additionally, we invalidate the cache
# if the Bazel version changes. We do this because otherwise the `bazelisk` cache folder will
# contain all previously used versions and ultimately cause the cache restoring to be slower.
var_4: &cache_fallback_key v9-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-
var_4: &cache_fallback_key v10-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-

# Settings common to each job
var_5: &job_defaults
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
}
},
"typescript.tsdk": "node_modules/typescript/lib"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one was added by vscode automatically. I don't mind reverting it, but it seems reasonable. It tells vscode to use the local version.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, good idea 👍

}
785 changes: 0 additions & 785 deletions integration/yarn-pnp-compat/.yarn/releases/yarn-3.2.0.cjs

This file was deleted.

780 changes: 780 additions & 0 deletions integration/yarn-pnp-compat/.yarn/releases/yarn-4.0.0-rc.4.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion integration/yarn-pnp-compat/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeLinker: pnp

yarnPath: .yarn/releases/yarn-3.2.0.cjs
yarnPath: .yarn/releases/yarn-4.0.0-rc.4.cjs
28 changes: 14 additions & 14 deletions integration/yarn-pnp-compat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~14.0.0-next.6",
"@angular/animations": "~14.0.0-next.16",
"@angular/cdk": "file:../../dist/releases/cdk",
"@angular/common": "~14.0.0-next.6",
"@angular/compiler": "~14.0.0-next.6",
"@angular/core": "~14.0.0-next.6",
"@angular/forms": "~14.0.0-next.6",
"@angular/common": "~14.0.0-next.16",
"@angular/compiler": "~14.0.0-next.16",
"@angular/core": "~14.0.0-next.16",
"@angular/forms": "~14.0.0-next.16",
"@angular/material": "file:../../dist/releases/material",
"@angular/material-experimental": "~14.0.0-next.6",
"@angular/platform-browser": "~14.0.0-next.6",
"@angular/platform-browser-dynamic": "~14.0.0-next.6",
"@angular/router": "~14.0.0-next.6",
"@angular/material-experimental": "~14.0.0-next.13",
"@angular/platform-browser": "~14.0.0-next.16",
"@angular/platform-browser-dynamic": "~14.0.0-next.16",
"@angular/router": "~14.0.0-next.16",
"rxjs": "~7.5.0",
"tslib": "^2.3.0",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "~14.0.0-next.5",
"@angular/cli": "~14.0.0-next.5",
"@angular/compiler-cli": "~14.0.0-next.6",
"@angular-devkit/build-angular": "~14.0.0-next.13",
"@angular/cli": "~14.0.0-next.13",
"@angular/compiler-cli": "~14.0.0-next.16",
"@types/jasmine": "~3.10.0",
"@types/node": "^12.11.1",
"jasmine-core": "~4.0.0",
Expand All @@ -37,7 +37,7 @@
"karma-coverage": "~2.1.0",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "~1.7.0",
"typescript": "~4.6.2"
"typescript": "4.7.0-beta"
},
"packageManager": "yarn@3.2.0"
"packageManager": "yarn@4.0.0-rc.4"
}
Loading