Skip to content

Commit 8449eb8

Browse files
chuckjazkara
chuckjaz
authored and
kara
committed
build: upgrade to TypeScript 2.7 (angular#22669)
Fixes: angular#21571 PR Close angular#22669
1 parent a225b48 commit 8449eb8

File tree

30 files changed

+222
-162
lines changed

30 files changed

+222
-162
lines changed

‎integration/cli-hello-world/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
"protractor": "~5.1.2",
4444
"ts-node": "~4.1.0",
4545
"tslint": "~5.9.1",
46-
"typescript": "2.4.2"
46+
"typescript": "file:../../node_modules/typescript"
4747
}
4848
}

‎integration/cli-hello-world/yarn.lock

+30-31
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
rxjs "^5.5.6"
2929

3030
"@angular/animations@file:../../dist/packages-dist/animations":
31-
version "6.0.0-beta.1-b36cc7db7"
31+
version "6.0.0-beta.7-2027ec8895"
3232
dependencies:
33-
tslib "^1.7.1"
33+
tslib "^1.9.0"
3434

3535
"@angular/[email protected]":
3636
version "1.6.6"
@@ -97,55 +97,55 @@
9797
node-sass "^4.7.2"
9898

9999
"@angular/common@file:../../dist/packages-dist/common":
100-
version "6.0.0-beta.1-b36cc7db7"
100+
version "6.0.0-beta.7-2027ec8895"
101101
dependencies:
102-
tslib "^1.7.1"
102+
tslib "^1.9.0"
103103

104104
"@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli":
105-
version "6.0.0-beta.1-b36cc7db7"
105+
version "6.0.0-beta.7-2027ec8895"
106106
dependencies:
107107
chokidar "^1.4.2"
108108
minimist "^1.2.0"
109109
reflect-metadata "^0.1.2"
110-
tsickle "^0.26.0"
110+
tsickle "^0.27.2"
111111

112112
"@angular/compiler@file:../../dist/packages-dist/compiler":
113-
version "6.0.0-beta.1-b36cc7db7"
113+
version "6.0.0-beta.7-2027ec8895"
114114
dependencies:
115-
tslib "^1.7.1"
115+
tslib "^1.9.0"
116116

117117
"@angular/core@file:../../dist/packages-dist/core":
118-
version "6.0.0-beta.1-b36cc7db7"
118+
version "6.0.0-beta.7-2027ec8895"
119119
dependencies:
120-
tslib "^1.7.1"
120+
tslib "^1.9.0"
121121

122122
"@angular/forms@file:../../dist/packages-dist/forms":
123-
version "6.0.0-beta.1-b36cc7db7"
123+
version "6.0.0-beta.7-2027ec8895"
124124
dependencies:
125-
tslib "^1.7.1"
125+
tslib "^1.9.0"
126126

127127
"@angular/http@file:../../dist/packages-dist/http":
128-
version "6.0.0-beta.1-b36cc7db7"
128+
version "6.0.0-beta.7-2027ec8895"
129129
dependencies:
130-
tslib "^1.7.1"
130+
tslib "^1.9.0"
131131

132132
"@angular/language-service@file:../../dist/packages-dist/language-service":
133-
version "6.0.0-beta.1-b36cc7db7"
133+
version "6.0.0-beta.7-2027ec8895"
134134

135135
"@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic":
136-
version "6.0.0-beta.1-b36cc7db7"
136+
version "6.0.0-beta.7-2027ec8895"
137137
dependencies:
138-
tslib "^1.7.1"
138+
tslib "^1.9.0"
139139

140140
"@angular/platform-browser@file:../../dist/packages-dist/platform-browser":
141-
version "6.0.0-beta.1-b36cc7db7"
141+
version "6.0.0-beta.7-2027ec8895"
142142
dependencies:
143-
tslib "^1.7.1"
143+
tslib "^1.9.0"
144144

145145
"@angular/router@file:../../dist/packages-dist/router":
146-
version "6.0.0-beta.1-b36cc7db7"
146+
version "6.0.0-beta.7-2027ec8895"
147147
dependencies:
148-
tslib "^1.7.1"
148+
tslib "^1.9.0"
149149

150150
"@ngtools/[email protected]", "@ngtools/json-schema@^1.1.0":
151151
version "1.1.0"
@@ -6366,7 +6366,7 @@ source-map-resolve@^0.5.0:
63666366
source-map-url "^0.4.0"
63676367
urix "^0.1.0"
63686368

6369-
source-map-support@^0.4.1, source-map-support@^0.4.2, source-map-support@~0.4.0:
6369+
source-map-support@^0.4.1, source-map-support@~0.4.0:
63706370
version "0.4.18"
63716371
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
63726372
dependencies:
@@ -6854,16 +6854,16 @@ tsconfig@^7.0.0:
68546854
strip-bom "^3.0.0"
68556855
strip-json-comments "^2.0.0"
68566856

6857-
tsickle@^0.26.0:
6858-
version "0.26.0"
6859-
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.%3Cspan%20class="x x-first x-last">26.0.tgz#40b30a2dd6abcb33b182e37596674bd1cfe4039c"
6857+
tsickle@^0.27.2:
6858+
version "0.27.2"
6859+
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.%3Cspan%20class="x x-first x-last">27.2.tgz#f33d46d046f73dd5c155a37922e422816e878736"
68606860
dependencies:
68616861
minimist "^1.2.0"
68626862
mkdirp "^0.5.1"
6863-
source-map "^0.5.6"
6864-
source-map-support "^0.4.2"
6863+
source-map "^0.6.0"
6864+
source-map-support "^0.5.0"
68656865

6866-
tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1:
6866+
tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
68676867
version "1.9.0"
68686868
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
68696869

@@ -6929,9 +6929,8 @@ typedarray@^0.0.6, typedarray@~0.0.5:
69296929
version "0.0.6"
69306930
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
69316931

6932-
[email protected]:
6933-
version "2.4.2"
6934-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.2.tgz#f8395f85d459276067c988aa41837a8f82870844"
6932+
"typescript@file:../../node_modules/typescript":
6933+
version "2.7.2"
69356934

69366935
typescript@~2.6.2:
69376936
version "2.6.2"

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"dependencies": {
2929
"core-js": "^2.4.1",
3030
"reflect-metadata": "^0.1.3",
31-
"rxjs": "5.5.5",
31+
"rxjs": "5.5.6",
3232
"tslib": "^1.7.1",
3333
"zone.js": "^0.8.12"
3434
},
@@ -104,7 +104,7 @@
104104
"tslint": "5.7.0",
105105
"tslint-eslint-rules": "4.1.1",
106106
"tsutils": "2.20.0",
107-
"typescript": "2.6.x",
107+
"typescript": "2.7.x",
108108
"uglify-js": "2.8.29",
109109
"universal-analytics": "0.4.15",
110110
"vlq": "0.2.2",

‎packages/bazel/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"peerDependencies": {
1515
"@angular/compiler-cli": "0.0.0-PLACEHOLDER",
16-
"typescript": ">=2.4.2 <2.7"
16+
"typescript": ">=2.7.2 <2.8"
1717
},
1818
"repository": {
1919
"type": "git",

‎packages/compiler-cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"chokidar": "^1.4.2"
1616
},
1717
"peerDependencies": {
18-
"typescript": ">=2.4.2 <2.7",
18+
"typescript": ">=2.7.2 <2.8",
1919
"@angular/compiler": "0.0.0-PLACEHOLDER"
2020
},
2121
"repository": {

‎packages/compiler-cli/src/diagnostics/typescript_symbols.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ export function getClassMembers(
4646
if (declaration) {
4747
const type = checker.getTypeAtLocation(declaration);
4848
const node = program.getSourceFile(staticSymbol.filePath);
49-
return new TypeWrapper(type, {node, program, checker}).members();
49+
if (node) {
50+
return new TypeWrapper(type, {node, program, checker}).members();
51+
}
5052
}
5153
}
5254

‎packages/compiler-cli/src/transformers/lower_expressions.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,12 @@ export function getExpressionLoweringTransformFactory(
190190
// Return the factory
191191
return (context: ts.TransformationContext) => (sourceFile: ts.SourceFile): ts.SourceFile => {
192192
// We need to use the original SourceFile for reading metadata, and not the transformed one.
193-
const requests = requestsMap.getRequests(program.getSourceFile(sourceFile.fileName));
194-
if (requests && requests.size) {
195-
return transformSourceFile(sourceFile, requests, context);
193+
const originalFile = program.getSourceFile(sourceFile.fileName);
194+
if (originalFile) {
195+
const requests = requestsMap.getRequests(originalFile);
196+
if (requests && requests.size) {
197+
return transformSourceFile(sourceFile, requests, context);
198+
}
196199
}
197200
return sourceFile;
198201
};

‎packages/compiler-cli/src/transformers/program.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ class AngularCompilerProgram implements Program {
7373
private host: CompilerHost, oldProgram?: Program) {
7474
this.rootNames = [...rootNames];
7575

76-
if (ts.version < '2.4.2' || (ts.version >= '2.7.0' && !options.disableTypeScriptVersionCheck)) {
76+
if (ts.version < '2.7.2' || (ts.version >= '2.8.0' && !options.disableTypeScriptVersionCheck)) {
7777
throw new Error(
78-
`The Angular Compiler requires TypeScript >=2.4.2 and <2.7 but ${ts.version} was found instead.`);
78+
`The Angular Compiler requires TypeScript >=2.7.2 and <2.8.0 but ${ts.version} was found instead.`);
7979
}
8080

8181
this.oldTsProgram = oldProgram ? oldProgram.getTsProgram() : undefined;
@@ -304,7 +304,10 @@ class AngularCompilerProgram implements Program {
304304
genFile = genFileByFileName.get(sourceFile.fileName);
305305
if (!sourceFile.isDeclarationFile && !GENERATED_FILES.test(sourceFile.fileName)) {
306306
// Note: sourceFile is the transformed sourcefile, not the original one!
307-
emittedSourceFiles.push(this.tsProgram.getSourceFile(sourceFile.fileName));
307+
const originalFile = this.tsProgram.getSourceFile(sourceFile.fileName);
308+
if (originalFile) {
309+
emittedSourceFiles.push(originalFile);
310+
}
308311
}
309312
}
310313
this.writeFile(outFileName, outData, writeByteOrderMark, onError, genFile, sourceFiles);

‎packages/compiler-cli/test/diagnostics/mocks.ts

+12-10
Original file line numberDiff line numberDiff line change
@@ -240,16 +240,18 @@ export function getDiagnosticTemplateInfo(
240240
const members = getClassMembers(context.program, context.checker, type);
241241
if (members) {
242242
const sourceFile = context.program.getSourceFile(type.filePath);
243-
const query = getSymbolQuery(
244-
context.program, context.checker, sourceFile,
245-
() =>
246-
getPipesTable(sourceFile, context.program, context.checker, compiledTemplate.pipes));
247-
return {
248-
fileName: templateFile,
249-
offset: 0, query, members,
250-
htmlAst: compiledTemplate.htmlAst,
251-
templateAst: compiledTemplate.templateAst
252-
};
243+
if (sourceFile) {
244+
const query = getSymbolQuery(
245+
context.program, context.checker, sourceFile,
246+
() => getPipesTable(
247+
sourceFile, context.program, context.checker, compiledTemplate.pipes));
248+
return {
249+
fileName: templateFile,
250+
offset: 0, query, members,
251+
htmlAst: compiledTemplate.htmlAst,
252+
templateAst: compiledTemplate.templateAst
253+
};
254+
}
253255
}
254256
}
255257
}

‎packages/compiler-cli/test/diagnostics/symbol_query_spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ describe('symbol query', () => {
4141
const service = ts.createLanguageService(host, registry);
4242
program = service.getProgram();
4343
checker = program.getTypeChecker();
44-
sourceFile = program.getSourceFile('/quickstart/app/app.component.ts');
44+
sourceFile = program.getSourceFile('/quickstart/app/app.component.ts') !;
4545
const options: CompilerOptions = Object.create(host.getCompilationSettings());
4646
options.genDir = '/dist';
4747
options.basePath = '/quickstart';

0 commit comments

Comments
 (0)