Skip to content

Commit fbd281c

Browse files
atscottalxhub
atscott
authored and
alxhub
committed
build: remove typescript 3.6 and 3.7 support (angular#36329)
Remove TypeScript 3.6 and 3.7 support from Angular along with tests that ensure those TS versions work. BREAKING CHANGE: typescript 3.6 and 3.7 are no longer supported, please update to typescript 3.8 PR Close angular#36329
1 parent 420c179 commit fbd281c

13 files changed

Lines changed: 13 additions & 289 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ version: 2.1
2222
# **NOTE 1 **: If you change the cache key prefix, also sync the cache_key_fallback to match.
2323
# **NOTE 2 **: Keep the static part of the cache key as prefix to enable correct fallbacks.
2424
# See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
25-
var_3: &cache_key v6-angular-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
25+
var_3: &cache_key v7-angular-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
2626
# We invalidate the cache if the Bazel version changes because otherwise the `bazelisk` cache
2727
# folder will contain all previously used versions and ultimately cause the cache restoring to
2828
# be slower due to its growing size.
29-
var_4: &cache_key_fallback v6-angular-node-12-{{ checksum ".bazelversion" }}
30-
var_3_win: &cache_key_win v6-angular-win-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
31-
var_4_win: &cache_key_win_fallback v6-angular-win-node-12-{{ checksum ".bazelversion" }}
29+
var_4: &cache_key_fallback v7-angular-node-12-{{ checksum ".bazelversion" }}
30+
var_3_win: &cache_key_win v7-angular-win-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
31+
var_4_win: &cache_key_win_fallback v7-angular-win-node-12-{{ checksum ".bazelversion" }}
3232

3333
# Cache key for the `components-repo-unit-tests` job. **Note** when updating the SHA in the
3434
# cache keys also update the SHA for the "COMPONENTS_REPO_COMMIT" environment variable.
35-
var_5: &components_repo_unit_tests_cache_key v6-angular-components-598db096e668aa7e9debd56eedfd127b7a55e371
36-
var_6: &components_repo_unit_tests_cache_key_fallback v6-angular-components-
35+
var_5: &components_repo_unit_tests_cache_key v7-angular-components-15efb677a751f41cc7ca109e734b58abdee8d8a3
36+
var_6: &components_repo_unit_tests_cache_key_fallback v7-angular-components-
3737

3838
# Workspace initially persisted by the `setup` job, and then enhanced by `build-npm-packages` and
3939
# `build-ivy-npm-packages`.

‎.circleci/env.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ setPublicVar COMPONENTS_REPO_TMP_DIR "/tmp/angular-components-repo"
7474
setPublicVar COMPONENTS_REPO_URL "https://github.com/angular/components.git"
7575
setPublicVar COMPONENTS_REPO_BRANCH "master"
7676
# **NOTE**: When updating the commit SHA, also update the cache key in the CircleCI `config.yml`.
77-
setPublicVar COMPONENTS_REPO_COMMIT "598db096e668aa7e9debd56eedfd127b7a55e371"
77+
setPublicVar COMPONENTS_REPO_COMMIT "15efb677a751f41cc7ca109e734b58abdee8d8a3"
7878

7979

8080
####################################################################################################

‎integration/BUILD.bazel‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,18 +80,6 @@ INTEGRATION_TESTS = {
8080
"service-worker-schema": {},
8181
"side-effects": {"tags": ["no-ivy-aot"]},
8282
"terser": {},
83-
"typings_test_ts36": {
84-
# Special case for `typings_test_ts36` test as we want to pin
85-
# `typescript` at version 3.6.x for that test and not link to the
86-
# root @npm//typescript package.
87-
"pinned_npm_packages": ["typescript"],
88-
},
89-
"typings_test_ts37": {
90-
# Special case for `typings_test_ts37` test as we want to pin
91-
# `typescript` at version 3.7.x for that test and not link to the
92-
# root @npm//typescript package.
93-
"pinned_npm_packages": ["typescript"],
94-
},
9583
}
9684

9785
[

‎integration/typings_test_ts36/include-all.ts‎

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

‎integration/typings_test_ts36/package.json‎

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

‎integration/typings_test_ts36/tsconfig.json‎

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

‎integration/typings_test_ts37/include-all.ts‎

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

‎integration/typings_test_ts37/package.json‎

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

‎integration/typings_test_ts37/tsconfig.json‎

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

‎packages/bazel/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"@angular/compiler-cli": "0.0.0-PLACEHOLDER",
3535
"@bazel/typescript": ">=1.0.0",
3636
"terser": "^4.3.1",
37-
"typescript": ">=3.6 <3.9",
37+
"typescript": ">=3.8 <3.9",
3838
"rollup": ">=1.20.0",
3939
"rollup-plugin-commonjs": ">=9.0.0",
4040
"rollup-plugin-node-resolve": ">=4.2.0",

0 commit comments

Comments
 (0)