Skip to content

Commit 425b160

Browse files
alan-agius4clydin
authored andcommitted
build: update to TypeScript 4
1 parent c885981 commit 425b160

File tree

9 files changed

+20
-20
lines changed

9 files changed

+20
-20
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,10 @@
219219
"ts-api-guardian": "0.5.0",
220220
"ts-node": "^5.0.0",
221221
"tslib": "^2.0.0",
222-
"tslint": "^6.0.0",
222+
"tslint": "^6.1.3",
223223
"tslint-no-circular-imports": "^0.7.0",
224224
"tslint-sonarts": "1.9.0",
225-
"typescript": "3.9.7",
225+
"typescript": "4.0.2",
226226
"verdaccio": "4.8.1",
227227
"verdaccio-auth-memory": "^9.7.2",
228228
"webpack": "4.44.1",

packages/angular_devkit/build_angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"@angular/compiler-cli": ">=10.1.0-next.0 < 11",
7878
"@angular/localize": ">=10.1.0-next.0 < 11",
7979
"ng-packagr": "^10.0.0",
80-
"typescript": ">=3.9 < 3.10"
80+
"typescript": ">=3.9 < 4.1"
8181
},
8282
"peerDependenciesMeta": {
8383
"@angular/localize": {

packages/angular_devkit/build_optimizer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"loader-utils": "2.0.0",
1313
"source-map": "0.7.3",
1414
"tslib": "2.0.1",
15-
"typescript": "~4.0.0-dev.20200721",
15+
"typescript": "4.0.2",
1616
"webpack-sources": "1.4.3"
1717
}
1818
}

packages/ngtools/webpack/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
},
2828
"peerDependencies": {
2929
"@angular/compiler-cli": ">=10.1.0-next.0 < 11",
30-
"typescript": ">=3.9 < 3.10",
30+
"typescript": ">=3.9 < 4.1",
3131
"webpack": "^4.0.0"
3232
},
3333
"devDependencies": {
3434
"@angular/compiler": "10.1.0-next.8",
3535
"@angular/compiler-cli": "10.1.0-next.8",
36-
"typescript": "3.9.7",
36+
"typescript": "4.0.2",
3737
"webpack": "4.44.1"
3838
}
3939
}

packages/ngtools/webpack/src/transformers/elide_imports_spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ describe('@ngtools/webpack transformers', () => {
5353
const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
5454
const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
5555

56-
expect(tags.oneLine`${result}`).toEqual('');
56+
expect(tags.oneLine`${result}`).toEqual('export {};');
5757
});
5858

5959
it('should remove unused aliased imports', () => {
@@ -65,7 +65,7 @@ describe('@ngtools/webpack transformers', () => {
6565
const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
6666
const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
6767

68-
expect(tags.oneLine`${result}`).toEqual('');
68+
expect(tags.oneLine`${result}`).toEqual('export {};');
6969
});
7070

7171
it('should retain used aliased imports', () => {
@@ -115,7 +115,7 @@ describe('@ngtools/webpack transformers', () => {
115115
const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
116116
const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
117117

118-
expect(tags.oneLine`${result}`).toEqual('');
118+
expect(tags.oneLine`${result}`).toEqual('export {};');
119119
});
120120

121121
it('should drop unused imports in export specifier', () => {
@@ -127,7 +127,7 @@ describe('@ngtools/webpack transformers', () => {
127127
const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
128128
const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
129129

130-
expect(tags.oneLine`${result}`).toEqual('');
130+
expect(tags.oneLine`${result}`).toEqual('export {};');
131131
});
132132

133133
it('should retain used imports in export specifier', () => {
@@ -158,7 +158,7 @@ describe('@ngtools/webpack transformers', () => {
158158
const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
159159
const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
160160

161-
expect(tags.oneLine`${result}`).toEqual('');
161+
expect(tags.oneLine`${result}`).toEqual('export {};');
162162
});
163163

164164
it('should retain used imports in shorthand property assignment', () => {
@@ -189,7 +189,7 @@ describe('@ngtools/webpack transformers', () => {
189189
const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
190190
const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
191191

192-
expect(tags.oneLine`${result}`).toEqual('');
192+
expect(tags.oneLine`${result}`).toEqual('export {};');
193193
});
194194

195195
it('should retain used default import', () => {

packages/schematics/angular/utility/latest-versions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export const latestVersions = {
1111
Angular: '~10.1.0-next.7',
1212
RxJs: '~6.6.0',
1313
ZoneJs: '~0.10.2',
14-
TypeScript: '~3.9.5',
14+
TypeScript: '~4.0.2',
1515
TsLib: '^2.0.0',
1616

1717
// The versions below must be manually updated when making a new devkit release.

packages/schematics/schematics/blank/project-files/package.json.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"dependencies": {
1616
"@angular-devkit/core": "^<%= coreVersion %>",
1717
"@angular-devkit/schematics": "^<%= schematicsVersion %>",
18-
"typescript": "~3.9.7"
18+
"typescript": "~4.0.2"
1919
},
2020
"devDependencies": {
2121
"@types/node": "^12.11.1",

packages/schematics/schematics/schematic/files/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"dependencies": {
1616
"@angular-devkit/core": "^<%= coreVersion %>",
1717
"@angular-devkit/schematics": "^<%= schematicsVersion %>",
18-
"typescript": "~3.9.7"
18+
"typescript": "~4.0.2"
1919
},
2020
"devDependencies": {
2121
"@types/node": "^12.11.1",

yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12154,7 +12154,7 @@ [email protected]:
1215412154
dependencies:
1215512155
immutable "^3.8.2"
1215612156

12157-
tslint@^6.0.0:
12157+
tslint@^6.1.3:
1215812158
version "6.1.3"
1215912159
resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904"
1216012160
integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==
@@ -12271,10 +12271,10 @@ typedarray@^0.0.6:
1227112271
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
1227212272
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
1227312273

12274-
typescript@3.9.7:
12275-
version "3.9.7"
12276-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
12277-
integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
12274+
typescript@4.0.2:
12275+
version "4.0.2"
12276+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2"
12277+
integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==
1227812278

1227912279
1228012280
version "0.7.21"

0 commit comments

Comments
 (0)