skills/angular__angular
1
0
Fork 0
mirror of https://github.com/angular/angular.git synced 2026-09-14 13:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: update to typescript 3.2 (#15587)

Browse Source 
Updates to TypeScript 3.2 and fixes some compilation errors.
This commit is contained in:
Kristiyan Kostadinov
2019-03-28 17:53:34 +01:00
committed by Jeremy Elbourn
parent e91ceaf244
commit 297760f3cc
17 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+1 -1
View File
@@ -137,7 +137,7 @@
"tsconfig-paths": "^2.3.0",
"tslint": "^5.12.0",
"tsutils": "^3.0.0",
"typescript": "~3.1.1",
"typescript": "~3.2.0",
"uglify-js": "^2.8.14"
}
}
src/cdk/schematics/ng-update/upgrade-rules/attribute-selectors/attributeSelectorsStylesheetRule.ts
+3 -1
View File
@@ -9,6 +9,8 @@
import {green, red} from 'chalk';
import {IOptions, Replacement, RuleFailure, Rules} from 'tslint';
import * as ts from 'typescript';
import {AttributeSelectorUpgradeData} from '../../data';
import {ExternalResource} from '../../tslint/component-file';
import {ComponentWalker} from '../../tslint/component-walker';
import {findAllSubstringIndices} from '../../typescript/literal';
@@ -28,7 +30,7 @@ export class Rule extends Rules.AbstractRule {
export class Walker extends ComponentWalker {
/** Change data that upgrades to the specified target version. */
data = getUpgradeDataFromWalker(this, 'attributeSelectors');
data: AttributeSelectorUpgradeData[] = getUpgradeDataFromWalker(this, 'attributeSelectors');
constructor(sourceFile: ts.SourceFile, options: IOptions) {
super(sourceFile, options);
src/cdk/schematics/ng-update/upgrade-rules/attribute-selectors/attributeSelectorsTemplateRule.ts
+3 -1
View File
@@ -9,6 +9,8 @@
import {green, red} from 'chalk';
import {Replacement, RuleFailure, Rules} from 'tslint';
import * as ts from 'typescript';
import {AttributeSelectorUpgradeData} from '../../data';
import {ExternalResource} from '../../tslint/component-file';
import {ComponentWalker} from '../../tslint/component-walker';
import {findAllSubstringIndices} from '../../typescript/literal';
@@ -27,7 +29,7 @@ export class Rule extends Rules.AbstractRule {
export class Walker extends ComponentWalker {
/** Change data that upgrades to the specified target version. */
data = getUpgradeDataFromWalker(this, 'attributeSelectors');
data: AttributeSelectorUpgradeData[] = getUpgradeDataFromWalker(this, 'attributeSelectors');
visitInlineTemplate(node: ts.StringLiteralLike) {
this._createReplacementsForContent(node, node.getText()).forEach(data => {
src/cdk/schematics/ng-update/upgrade-rules/class-names/classNamesIdentifierRule.ts
+3 -1
View File
@@ -9,6 +9,8 @@
import {green, red} from 'chalk';
import {RuleFailure, Rules, RuleWalker} from 'tslint';
import * as ts from 'typescript';
import {ClassNameUpgradeData} from '../../data';
import {
isExportSpecifierNode,
isImportSpecifierNode,
@@ -34,7 +36,7 @@ export class Rule extends Rules.AbstractRule {
export class Walker extends RuleWalker {
/** Change data that upgrades to the specified target version. */
data = getUpgradeDataFromWalker(this, 'classNames');
data: ClassNameUpgradeData[] = getUpgradeDataFromWalker(this, 'classNames');
/**
* List of identifier names that have been imported from `@angular/material` or `@angular/cdk`
src/cdk/schematics/ng-update/upgrade-rules/css-selectors/cssSelectorsStylesheetRule.ts
+3 -1
View File
@@ -9,6 +9,8 @@
import {green, red} from 'chalk';
import {IOptions, Replacement, RuleFailure, Rules} from 'tslint';
import * as ts from 'typescript';
import {CssSelectorUpgradeData} from '../../data';
import {ExternalResource} from '../../tslint/component-file';
import {ComponentWalker} from '../../tslint/component-walker';
import {findAllSubstringIndices} from '../../typescript/literal';
@@ -27,7 +29,7 @@ export class Rule extends Rules.AbstractRule {
export class Walker extends ComponentWalker {
/** Change data that upgrades to the specified target version. */
data = getUpgradeDataFromWalker(this, 'cssSelectors');
data: CssSelectorUpgradeData[] = getUpgradeDataFromWalker(this, 'cssSelectors');
constructor(sourceFile: ts.SourceFile, options: IOptions) {
super(sourceFile, options);
src/cdk/schematics/ng-update/upgrade-rules/css-selectors/cssSelectorsTemplateRule.ts
+3 -1
View File
@@ -9,6 +9,8 @@
import {green, red} from 'chalk';
import {Replacement, RuleFailure, Rules} from 'tslint';
import * as ts from 'typescript';
import {CssSelectorUpgradeData} from '../../data';
import {ExternalResource} from '../../tslint/component-file';
import {ComponentWalker} from '../../tslint/component-walker';
import {findAllSubstringIndices} from '../../typescript/literal';
@@ -27,7 +29,7 @@ export class Rule extends Rules.AbstractRule {
export class Walker extends ComponentWalker {
/** Change data that upgrades to the specified target version. */
data = getUpgradeDataFromWalker(this, 'cssSelectors');
data: CssSelectorUpgradeData[] = getUpgradeDataFromWalker(this, 'cssSelectors');
visitInlineTemplate(node: ts.StringLiteralLike) {
this._createReplacementsForContent(node, node.getText()).forEach(data => {
src/cdk/schematics/ng-update/upgrade-rules/element-selectors/elementSelectorsStylesheetRule.ts
+3 -1
View File
@@ -9,6 +9,8 @@
import {green, red} from 'chalk';
import {IOptions, Replacement, RuleFailure, Rules} from 'tslint';
import * as ts from 'typescript';
import {ElementSelectorUpgradeData} from '../../data';
import {ExternalResource} from '../../tslint/component-file';
import {ComponentWalker} from '../../tslint/component-walker';
import {findAllSubstringIndices} from '../../typescript/literal';
@@ -27,7 +29,7 @@ export class Rule extends Rules.AbstractRule {
export class Walker extends ComponentWalker {
/** Change data that upgrades to the specified target version. */
data = getUpgradeDataFromWalker(this, 'elementSelectors');
data: ElementSelectorUpgradeData[] = getUpgradeDataFromWalker(this, 'elementSelectors');
constructor(sourceFile: ts.SourceFile, options: IOptions) {
super(sourceFile, options);
src/cdk/schematics/ng-update/upgrade-rules/element-selectors/elementSelectorsTemplateRule.ts
+3 -1
View File
@@ -9,6 +9,8 @@
import {green, red} from 'chalk';
import {Replacement, RuleFailure, Rules} from 'tslint';
import * as ts from 'typescript';
import {ElementSelectorUpgradeData} from '../../data';
import {ExternalResource} from '../../tslint/component-file';
import {ComponentWalker} from '../../tslint/component-walker';
import {findAllSubstringIndices} from '../../typescript/literal';
@@ -27,7 +29,7 @@ export class Rule extends Rules.AbstractRule {
export class Walker extends ComponentWalker {
/** Change data that upgrades to the specified target version. */
data = getUpgradeDataFromWalker(this, 'elementSelectors');
data: ElementSelectorUpgradeData[] = getUpgradeDataFromWalker(this, 'elementSelectors');
visitInlineTemplate(node: ts.StringLiteralLike) {
this._createReplacementsForContent(node, node.getText()).forEach(data => {
src/cdk/schematics/ng-update/upgrade-rules/input-names/inputNamesStylesheetRule.ts
+3 -1
View File
@@ -9,6 +9,8 @@
import {green, red} from 'chalk';
import {IOptions, Replacement, RuleFailure, Rules} from 'tslint';
import * as ts from 'typescript';
import {InputNameUpgradeData} from '../../data';
import {ExternalResource} from '../../tslint/component-file';
import {ComponentWalker} from '../../tslint/component-walker';
import {findAllSubstringIndices} from '../../typescript/literal';
@@ -32,7 +34,7 @@ export class Rule extends Rules.AbstractRule {
export class Walker extends ComponentWalker {
/** Change data that upgrades to the specified target version. */
data = getUpgradeDataFromWalker(this, 'inputNames');
data: InputNameUpgradeData[] = getUpgradeDataFromWalker(this, 'inputNames');
constructor(sourceFile: ts.SourceFile, options: IOptions) {
super(sourceFile, options);
src/cdk/schematics/ng-update/upgrade-rules/input-names/inputNamesTemplateRule.ts
+3 -1
View File
@@ -9,6 +9,8 @@
import {green, red} from 'chalk';
import {Replacement, RuleFailure, Rules} from 'tslint';
import * as ts from 'typescript';
import {InputNameUpgradeData} from '../../data';
import {findInputsOnElementWithAttr, findInputsOnElementWithTag} from '../../html-parsing/angular';
import {ExternalResource} from '../../tslint/component-file';
import {ComponentWalker} from '../../tslint/component-walker';
@@ -27,7 +29,7 @@ export class Rule extends Rules.AbstractRule {
export class Walker extends ComponentWalker {
/** Change data that upgrades to the specified target version. */
data = getUpgradeDataFromWalker(this, 'inputNames');
data: InputNameUpgradeData[] = getUpgradeDataFromWalker(this, 'inputNames');
visitInlineTemplate(node: ts.StringLiteralLike) {
this._createReplacementsForContent(node, node.getText()).forEach(data => {
src/cdk/schematics/ng-update/upgrade-rules/output-names/outputNamesTemplateRule.ts
+3 -1
View File
@@ -9,6 +9,8 @@
import {green, red} from 'chalk';
import {Replacement, RuleFailure, Rules} from 'tslint';
import * as ts from 'typescript';
import {OutputNameUpgradeData} from '../../data';
import {
findOutputsOnElementWithAttr,
findOutputsOnElementWithTag,
@@ -30,7 +32,7 @@ export class Rule extends Rules.AbstractRule {
export class Walker extends ComponentWalker {
/** Change data that upgrades to the specified target version. */
data = getUpgradeDataFromWalker(this, 'outputNames');
data: OutputNameUpgradeData[] = getUpgradeDataFromWalker(this, 'outputNames');
visitInlineTemplate(node: ts.StringLiteralLike) {
this._createReplacementsForContent(node, node.getText()).forEach(data => {
src/cdk/schematics/ng-update/upgrade-rules/property-names/propertyNamesAccessRule.ts
+3 -1
View File
@@ -9,6 +9,8 @@
import {green, red} from 'chalk';
import {ProgramAwareRuleWalker, RuleFailure, Rules} from 'tslint';
import * as ts from 'typescript';
import {PropertyNameUpgradeData} from '../../data';
import {getUpgradeDataFromWalker} from '../../upgrade-data';
/**
@@ -24,7 +26,7 @@ export class Rule extends Rules.TypedRule {
export class Walker extends ProgramAwareRuleWalker {
/** Change data that upgrades to the specified target version. */
data = getUpgradeDataFromWalker(this, 'propertyNames');
data: PropertyNameUpgradeData[] = getUpgradeDataFromWalker(this, 'propertyNames');
visitPropertyAccessExpression(node: ts.PropertyAccessExpression) {
const hostType = this.getTypeChecker().getTypeAtLocation(node.expression);
src/cdk/schematics/ng-update/upgrade-rules/signature-check/methodCallsCheckRule.ts
+3 -1
View File
@@ -9,6 +9,8 @@
import {bold} from 'chalk';
import {ProgramAwareRuleWalker, RuleFailure, Rules} from 'tslint';
import * as ts from 'typescript';
import {MethodCallUpgradeData} from '../../data';
import {getUpgradeDataFromWalker} from '../../upgrade-data';
/**
@@ -24,7 +26,7 @@ export class Rule extends Rules.TypedRule {
export class Walker extends ProgramAwareRuleWalker {
/** Change data that upgrades to the specified target version. */
data = getUpgradeDataFromWalker(this, 'methodCallChecks');
data: MethodCallUpgradeData[] = getUpgradeDataFromWalker(this, 'methodCallChecks');
visitCallExpression(node: ts.CallExpression) {
if (ts.isPropertyAccessExpression(node.expression)) {
src/cdk/schematics/testing/test-case-setup.ts
+3 -3
View File
@@ -9,8 +9,8 @@
import {getSystemPath, normalize} from '@angular-devkit/core';
import {TempScopedNodeJsSyncHost} from '@angular-devkit/core/node/testing';
import * as virtualFs from '@angular-devkit/core/src/virtual-fs/host';
import {SchematicTestRunner} from '@angular-devkit/schematics/testing';
import {mkdirpSync, readFileSync, writeFileSync, removeSync} from 'fs-extra';
import {SchematicTestRunner, UnitTestTree} from '@angular-devkit/schematics/testing';
import {mkdirpSync, readFileSync, removeSync, writeFileSync} from 'fs-extra';
import {sync as globSync} from 'glob';
import {dirname, join, extname, basename, relative, sep} from 'path';
import {createTestApp, runPostScheduledTasks} from '../testing';
@@ -32,7 +32,7 @@ export function readFileContent(filePath: string): string {
*/
export function createFileSystemTestApp(runner: SchematicTestRunner) {
const tempFileSystemHost = new TempScopedNodeJsSyncHost();
const appTree = createTestApp(runner, {name: 'cdk-testing'});
const appTree: UnitTestTree = createTestApp(runner, {name: 'cdk-testing'});
const tempPath = getSystemPath(tempFileSystemHost.root);
// Since the TSLint fix task expects all files to be present on the real file system, we
src/cdk/schematics/utils/ast.ts
+3 -4
View File
@@ -15,17 +15,16 @@ import {getWorkspace} from '@schematics/angular/utility/config';
import {findModuleFromOptions as internalFindModule} from '@schematics/angular/utility/find-module';
import {getAppModulePath} from '@schematics/angular/utility/ng-ast-utils';
import {getProjectMainFile} from './project-main-file';
import {ts} from './version-agnostic-typescript';
import {ts, typescript} from './version-agnostic-typescript';
/** Reads file given path and returns TypeScript source file. */
export function getSourceFile(host: Tree, path: string) {
export function getSourceFile(host: Tree, path: string): typescript.SourceFile {
const buffer = host.read(path);
if (!buffer) {
throw new SchematicsException(`Could not find file for path: ${path}`);
}
const content = buffer.toString();
return ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);
return ts.createSourceFile(path, buffer.toString(), ts.ScriptTarget.Latest, true);
}
/** Import and add module to root app module. */
src/cdk/schematics/utils/version-agnostic-typescript.ts
+1 -1
View File
@@ -36,4 +36,4 @@ try {
}
}
export {ts};
export {ts, typescript};
yarn.lock
+2 -2
View File
@@ -10504,7 +10504,7 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
typescript@3.2.4:
typescript@3.2.4, typescript@~3.2.0:
version "3.2.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==
@@ -10514,7 +10514,7 @@ typescript@^3.2.2:
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5"
integrity sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==
typescript@~3.1.1, typescript@~3.1.6:
typescript@~3.1.6:
version "3.1.6"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==