Skip to content

build: use TS 3.6.4 #15847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vikerman merged 5 commits into from
Oct 16, 2019
Merged

build: use TS 3.6.4 #15847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a0c04fb
build: use TS 3.6.4
filipesilva Oct 15, 2019
9e2cae4
test: disable typescript version check
filipesilva Oct 16, 2019
cb2cd08
feat(@ngtools/webpack): update peer dependency support
filipesilva Oct 16, 2019
675b608
feat(@angular-devkit/build-angular): update peer dependency support
filipesilva Oct 16, 2019
0a4dd9b
fix(@angular-devkit/build-angular): roll angular app test back to VE
filipesilva Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion etc/api/angular_devkit/core/src/_golden-api.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ export declare function parseJsonPointer(pointer: JsonPointer): string[];
export declare class PartiallyOrderedSet<T> implements Set<T> {
readonly [Symbol.toStringTag]: 'Set';
readonly size: number;
[Symbol.iterator](): IterableIterator<T>;
[Symbol.iterator](): Generator<T, void, unknown>;
protected _checkCircularDependencies(item: T, deps: Set<T>): void;
add(item: T, deps?: (Set<T> | T[])): this;
clear(): void;
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"quicktype-core": "^6.0.15",
"temp": "^0.9.0",
"tslint": "^5.15.0",
"typescript": "3.5.3"
"typescript": "3.6.4"
},
"devDependencies": {
"@angular/compiler": "9.0.0-next.11",
Expand Down
4 changes: 2 additions & 2 deletions packages/angular_devkit/build_angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"zone.js": "^0.10.0"
},
"peerDependencies": {
"@angular/compiler-cli": "^8.0.0-beta.0 || ^8.1.0-beta.0 || ^8.2.0-beta.0 || ^8.3.0-beta.0 || ^8.4.0-beta.0 || >=9.0.0-beta < 9",
"typescript": ">=3.1 < 3.6"
"@angular/compiler-cli": ">=9.0.0-beta < 10",

@clydin clydin Oct 16, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should track this so that it is changed to ^9.0.0 once the final release is out.

"typescript": ">=3.6 < 3.7"
}
}
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_optimizer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"loader-utils": "1.2.3",
"source-map": "0.7.3",
"tslib": "1.10.0",
"typescript": "3.5.3",
"typescript": "3.6.4",
"webpack-sources": "1.4.3"
}
}
6 changes: 3 additions & 3 deletions packages/ngtools/webpack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
"webpack-sources": "1.4.3"
},
"peerDependencies": {
"@angular/compiler-cli": "^8.0.0-beta.0 || ^8.1.0-beta.0 || ^8.2.0-beta.0 || ^8.3.0-beta.0 || ^8.4.0-beta.0 || >=9.0.0-beta < 9",
"typescript": ">=3.4 < 3.6",
"@angular/compiler-cli": ">=9.0.0-beta < 10",
"typescript": ">=3.6 < 3.7",
"webpack": "^4.0.0"
},
"devDependencies": {
"@angular/compiler": "9.0.0-next.11",
"@angular/compiler-cli": "9.0.0-next.11",
"typescript": "3.5.3",
"typescript": "3.6.4",
"webpack": "4.41.1"
}
}
26 changes: 13 additions & 13 deletions packages/ngtools/webpack/src/transformers/ctor-parameters_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ describe('Constructor Parameter Transformer', () => {
`;

const output = `
import * as tslib_1 from "tslib";
import { __decorate } from "tslib";
export class ClassInject { } ;
let MyService = class MyService { constructor(v) { } };
MyService.ctorParameters = () => [ { type: ClassInject } ];
MyService = tslib_1.__decorate([ Injectable() ], MyService);
MyService = __decorate([ Injectable() ], MyService);
export { MyService };
`;

Expand Down Expand Up @@ -78,13 +78,13 @@ describe('Constructor Parameter Transformer', () => {
`;

const output = `
import * as tslib_1 from "tslib";
import { __decorate } from "tslib";
let RootProvidedService = class RootProvidedService { constructor() { } };
RootProvidedService = tslib_1.__decorate([ Injectable({ providedIn: 'root' }) ], RootProvidedService);
RootProvidedService = __decorate([ Injectable({ providedIn: 'root' }) ], RootProvidedService);
export { RootProvidedService };
let MyService = class MyService { constructor(v) { } };
MyService.ctorParameters = () => [ { type: RootProvidedService } ];
MyService = tslib_1.__decorate([ Injectable() ], MyService);
MyService = __decorate([ Injectable() ], MyService);
export { MyService };
`;

Expand Down Expand Up @@ -115,14 +115,14 @@ describe('Constructor Parameter Transformer', () => {
`;

const output = `
import * as tslib_1 from "tslib";
import { __decorate } from "tslib";
import { RootProvidedService } from './root-provided-service';

let MyService = class MyService {
constructor(v) { }
};
MyService.ctorParameters = () => [ { type: RootProvidedService } ];
MyService = tslib_1.__decorate([ Injectable() ], MyService);
MyService = __decorate([ Injectable() ], MyService);
export { MyService };
`;

Expand All @@ -143,11 +143,11 @@ describe('Constructor Parameter Transformer', () => {
`;

const output = `
import * as tslib_1 from "tslib";
import { __decorate, __param } from "tslib";
export const INTERFACE_INJECT = new InjectionToken('interface-inject');
let MyService = class MyService { constructor(v) { } };
MyService.ctorParameters = () => [ { type: undefined, decorators: [{ type: Inject, args: [INTERFACE_INJECT,] }] } ];
MyService = tslib_1.__decorate([ Injectable(), tslib_1.__param(0, Inject(INTERFACE_INJECT)) ], MyService);
MyService = __decorate([ Injectable(), __param(0, Inject(INTERFACE_INJECT)) ], MyService);
export { MyService };
`;

Expand All @@ -168,11 +168,11 @@ describe('Constructor Parameter Transformer', () => {
`;

const output = `
import * as tslib_1 from "tslib";
import { __decorate, __param } from "tslib";
export const INTERFACE_INJECT = new InjectionToken('interface-inject');
let MyService = class MyService { constructor(v) { } };
MyService.ctorParameters = () => [ { type: undefined, decorators: [{ type: Inject, args: [INTERFACE_INJECT,] }] } ];
MyService = tslib_1.__decorate([ Injectable(), tslib_1.__param(0, Inject(INTERFACE_INJECT)) ], MyService);
MyService = __decorate([ Injectable(), __param(0, Inject(INTERFACE_INJECT)) ], MyService);
export { MyService };
`;

Expand All @@ -199,11 +199,11 @@ describe('Constructor Parameter Transformer', () => {
`;

const output = `
import * as tslib_1 from "tslib";
import { __decorate, __param } from "tslib";
import { INTERFACE_INJECT } from './module-inject';
let MyService = class MyService { constructor(v) { } };
MyService.ctorParameters = () => [ { type: undefined, decorators: [{ type: Inject, args: [INTERFACE_INJECT,] }] } ];
MyService = tslib_1.__decorate([ Injectable(), tslib_1.__param(0, Inject(INTERFACE_INJECT)) ], MyService);
MyService = __decorate([ Injectable(), __param(0, Inject(INTERFACE_INJECT)) ], MyService);
export { MyService };
`;

Expand Down
12 changes: 6 additions & 6 deletions packages/ngtools/webpack/src/transformers/remove_decorators_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ describe('@ngtools/webpack transformers', () => {
}
`;
const output = `
import * as tslib_1 from "tslib";
import { __decorate } from "tslib";
import { Component } from 'another-lib';
let AppComponent = class AppComponent {
constructor() {
this.title = 'app';
}
};
AppComponent = tslib_1.__decorate([
AppComponent = __decorate([
Component({
selector: 'app-root',
templateUrl: './app.component.html',
Expand Down Expand Up @@ -105,7 +105,7 @@ describe('@ngtools/webpack transformers', () => {
}
`;
const output = tags.stripIndent`
import * as tslib_1 from "tslib";
import { __decorate } from "tslib";
import { AnotherDecorator } from 'another-lib';

export class AppComponent {
Expand All @@ -117,7 +117,7 @@ describe('@ngtools/webpack transformers', () => {
console.log('run');
}
}
tslib_1.__decorate([
__decorate([
AnotherDecorator()
], AppComponent.prototype, "onEscape", null);
`;
Expand Down Expand Up @@ -148,15 +148,15 @@ describe('@ngtools/webpack transformers', () => {
}
`;
const output = tags.stripIndent`
import * as tslib_1 from "tslib";
import { __decorate } from "tslib";
import { AnotherDecorator } from 'another-lib';

let AppComponent = class AppComponent {
constructor() {
this.title = 'app';
}
};
AppComponent = tslib_1.__decorate([
AppComponent = __decorate([
AnotherDecorator()
], AppComponent);
export { AppComponent };
Expand Down
4 changes: 3 additions & 1 deletion packages/ngtools/webpack/src/transformers/replace_resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,10 @@ export function replaceResources(
};

// emit helper for `import Name from "foo"`
const importDefaultHelper: ts.EmitHelper = {
// importName is marked as an internal property but is needed for the tslib import.
const importDefaultHelper: ts.UnscopedEmitHelper & { importName?: string; } = {
name: 'typescript:commonjsimportdefault',
importName: '__importDefault',
scoped: false,
text: tags.stripIndent`
var __importDefault = (this && this.__importDefault) || function (mod) {
Expand Down
Loading