Skip to content
This repository was archived by the owner on Nov 22, 2024. It is now read-only.

Commit 891cbbd

Browse files
authored
build: update to TypeScript 4.6 (#2582)
* build: update to TypeScript 4.6 Closes #2544 * build: update version to 13.1.0 Bumps up the version to 13.1.0-rc.0 so the tooling can pick it up.
1 parent 5219c4d commit 891cbbd

File tree

5 files changed

+1569
-264
lines changed

5 files changed

+1569
-264
lines changed

modules/common/clover/src/transfer-http-cache/transfer-http-cache.interceptor.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ interface TransferHttpResponse {
3232
export class TransferHttpCacheInterceptor implements HttpInterceptor {
3333
private isCacheActive = true;
3434

35-
private makeCacheKey(method: string, url: string, params: HttpParams): StateKey<string> {
35+
private makeCacheKey(
36+
method: string,
37+
url: string,
38+
params: HttpParams,
39+
): StateKey<TransferHttpResponse> {
3640
// make the params encoded same as a url so it's easy to identify
3741
const encodedParams = params
3842
.keys()
@@ -66,7 +70,7 @@ export class TransferHttpCacheInterceptor implements HttpInterceptor {
6670

6771
if (this.transferState.hasKey(storeKey)) {
6872
// Request found in cache. Respond using it.
69-
const response = this.transferState.get<TransferHttpResponse>(storeKey, {});
73+
const response = this.transferState.get(storeKey, {});
7074

7175
return of(
7276
new HttpResponse<any>({

modules/common/src/transfer_http.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,11 @@ export class TransferHttpCacheInterceptor implements HttpInterceptor {
5656
);
5757
}
5858

59-
private makeCacheKey(method: string, url: string, params: HttpParams): StateKey<string> {
59+
private makeCacheKey(
60+
method: string,
61+
url: string,
62+
params: HttpParams,
63+
): StateKey<TransferHttpResponse> {
6064
// make the params encoded same as a url so it's easy to identify
6165
const encodedParams = params
6266
.keys()
@@ -65,7 +69,7 @@ export class TransferHttpCacheInterceptor implements HttpInterceptor {
6569
.join('&');
6670
const key = (method === 'GET' ? 'G.' : 'H.') + url + '?' + encodedParams;
6771

68-
return makeStateKey<TransferHttpResponse>(key);
72+
return makeStateKey(key);
6973
}
7074

7175
constructor(appRef: ApplicationRef, private transferState: TransferState) {
@@ -97,7 +101,7 @@ export class TransferHttpCacheInterceptor implements HttpInterceptor {
97101

98102
if (this.transferState.hasKey(storeKey)) {
99103
// Request found in cache. Respond using it.
100-
const response = this.transferState.get<TransferHttpResponse>(storeKey, {});
104+
const response = this.transferState.get(storeKey, {});
101105

102106
return observableOf(
103107
new HttpResponse<any>({

package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "nguniversal",
33
"main": "index.js",
4-
"version": "13.0.2",
4+
"version": "13.1.0-rc.0",
55
"private": true,
66
"description": "Universal (isomorphic) JavaScript support for Angular",
77
"homepage": "https://github.com/angular/universal",
@@ -36,23 +36,23 @@
3636
"@types/node": "12.12.37"
3737
},
3838
"devDependencies": {
39-
"@angular-devkit/architect": "0.1301.3",
40-
"@angular-devkit/build-angular": "13.1.3",
41-
"@angular-devkit/core": "13.1.3",
42-
"@angular-devkit/schematics": "13.1.3",
43-
"@angular/animations": "13.1.2",
44-
"@angular/bazel": "13.1.2",
45-
"@angular/cli": "13.1.3",
46-
"@angular/common": "13.1.2",
47-
"@angular/compiler": "13.1.2",
48-
"@angular/compiler-cli": "13.1.2",
49-
"@angular/core": "13.1.2",
39+
"@angular-devkit/architect": "0.1303.0",
40+
"@angular-devkit/build-angular": "13.3.0",
41+
"@angular-devkit/core": "13.3.0",
42+
"@angular-devkit/schematics": "13.3.0",
43+
"@angular/animations": "13.3.0",
44+
"@angular/bazel": "13.3.0",
45+
"@angular/cli": "13.3.0",
46+
"@angular/common": "13.3.0",
47+
"@angular/compiler": "13.3.0",
48+
"@angular/compiler-cli": "13.3.0",
49+
"@angular/core": "13.3.0",
5050
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#002770be8f5bf15c02293da454193bb0846969c1",
51-
"@angular/platform-browser": "13.1.2",
52-
"@angular/platform-browser-dynamic": "13.1.2",
53-
"@angular/platform-server": "13.1.2",
54-
"@angular/router": "13.1.2",
55-
"@angular/service-worker": "13.1.2",
51+
"@angular/platform-browser": "13.3.0",
52+
"@angular/platform-browser-dynamic": "13.3.0",
53+
"@angular/platform-server": "13.3.0",
54+
"@angular/router": "13.3.0",
55+
"@angular/service-worker": "13.3.0",
5656
"@bazel/bazelisk": "1.11.0",
5757
"@bazel/buildifier": "4.2.4",
5858
"@bazel/esbuild": "4.4.6",
@@ -62,7 +62,7 @@
6262
"@hapi/hapi": "^18.4.0",
6363
"@rollup/plugin-commonjs": "^21.0.0",
6464
"@rollup/plugin-node-resolve": "^13.0.5",
65-
"@schematics/angular": "13.1.3",
65+
"@schematics/angular": "13.3.0",
6666
"@types/browser-sync": "^2.26.1",
6767
"@types/express": "~4.17.6",
6868
"@types/fs-extra": "^9.0.0",
@@ -104,7 +104,7 @@
104104
"ts-node": "10.4.0",
105105
"tslib": "~2.3.0",
106106
"tsutils": "^3.0.0",
107-
"typescript": "~4.5.4",
107+
"typescript": "~4.6.2",
108108
"xhr2": "^0.2.0",
109109
"zone.js": "^0.11.0"
110110
}

tools/defaults.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ def ts_library(
4646
**kwargs
4747
)
4848

49-
NG_VERSION = "^13.1.0"
49+
NG_VERSION = "^13.3.0"
5050
RXJS_VERSION = "^6.5.5"
5151
HAPI_VERSION = "^18.4.0"
5252
EXPRESS_VERSION = "^4.15.2"
5353
EXPRESS_TYPES_VERSION = "^4.17.0"
54-
DEVKIT_CORE_VERSION = "^13.1.0"
55-
DEVKIT_ARCHITECT_VERSION = "^0.1301.0"
56-
DEVKIT_BUILD_ANGULAR_VERSION = "^13.1.0"
54+
DEVKIT_CORE_VERSION = "^13.3.0"
55+
DEVKIT_ARCHITECT_VERSION = "^0.1303.0"
56+
DEVKIT_BUILD_ANGULAR_VERSION = "^13.3.0"
5757
TSLIB_VERSION = "^2.3.0"
5858

5959
NGUNIVERSAL_SCOPED_PACKAGES = ["@nguniversal/%s" % p for p in [

0 commit comments

Comments
 (0)