Skip to content

Commit 7612d3e

Browse files
filipesilvavikerman
authored andcommitted
build: use TS 3.6.4
1 parent 012929a commit 7612d3e

File tree

17 files changed

+8337
-4727
lines changed

17 files changed

+8337
-4727
lines changed

etc/api/angular_devkit/core/src/_golden-api.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ export declare function parseJsonPointer(pointer: JsonPointer): string[];
689689
export declare class PartiallyOrderedSet<T> implements Set<T> {
690690
readonly [Symbol.toStringTag]: 'Set';
691691
readonly size: number;
692-
[Symbol.iterator](): IterableIterator<T>;
692+
[Symbol.iterator](): Generator<T, void, unknown>;
693693
protected _checkCircularDependencies(item: T, deps: Set<T>): void;
694694
add(item: T, deps?: (Set<T> | T[])): this;
695695
clear(): void;

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"quicktype-core": "^6.0.15",
7878
"temp": "^0.9.0",
7979
"tslint": "^5.15.0",
80-
"typescript": "3.5.3"
80+
"typescript": "3.6.4"
8181
},
8282
"devDependencies": {
8383
"@angular/compiler": "9.0.0-next.11",

packages/angular_devkit/build_angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,6 @@
9898
},
9999
"peerDependencies": {
100100
"@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",
101-
"typescript": ">=3.1 < 3.6"
101+
"typescript": ">=3.1 < 3.7"
102102
}
103103
}

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": "1.2.3",
1313
"source-map": "0.7.3",
1414
"tslib": "1.10.0",
15-
"typescript": "3.5.3",
15+
"typescript": "3.6.4",
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
@@ -29,13 +29,13 @@
2929
},
3030
"peerDependencies": {
3131
"@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",
32-
"typescript": ">=3.4 < 3.6",
32+
"typescript": ">=3.4 < 3.7",
3333
"webpack": "^4.0.0"
3434
},
3535
"devDependencies": {
3636
"@angular/compiler": "9.0.0-next.11",
3737
"@angular/compiler-cli": "9.0.0-next.11",
38-
"typescript": "3.5.3",
38+
"typescript": "3.6.4",
3939
"webpack": "4.41.1"
4040
}
4141
}

packages/ngtools/webpack/src/transformers/ctor-parameters_spec.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ describe('Constructor Parameter Transformer', () => {
2929
`;
3030

3131
const output = `
32-
import * as tslib_1 from "tslib";
32+
import { __decorate } from "tslib";
3333
export class ClassInject { } ;
3434
let MyService = class MyService { constructor(v) { } };
3535
MyService.ctorParameters = () => [ { type: ClassInject } ];
36-
MyService = tslib_1.__decorate([ Injectable() ], MyService);
36+
MyService = __decorate([ Injectable() ], MyService);
3737
export { MyService };
3838
`;
3939

@@ -78,13 +78,13 @@ describe('Constructor Parameter Transformer', () => {
7878
`;
7979

8080
const output = `
81-
import * as tslib_1 from "tslib";
81+
import { __decorate } from "tslib";
8282
let RootProvidedService = class RootProvidedService { constructor() { } };
83-
RootProvidedService = tslib_1.__decorate([ Injectable({ providedIn: 'root' }) ], RootProvidedService);
83+
RootProvidedService = __decorate([ Injectable({ providedIn: 'root' }) ], RootProvidedService);
8484
export { RootProvidedService };
8585
let MyService = class MyService { constructor(v) { } };
8686
MyService.ctorParameters = () => [ { type: RootProvidedService } ];
87-
MyService = tslib_1.__decorate([ Injectable() ], MyService);
87+
MyService = __decorate([ Injectable() ], MyService);
8888
export { MyService };
8989
`;
9090

@@ -115,14 +115,14 @@ describe('Constructor Parameter Transformer', () => {
115115
`;
116116

117117
const output = `
118-
import * as tslib_1 from "tslib";
118+
import { __decorate } from "tslib";
119119
import { RootProvidedService } from './root-provided-service';
120120
121121
let MyService = class MyService {
122122
constructor(v) { }
123123
};
124124
MyService.ctorParameters = () => [ { type: RootProvidedService } ];
125-
MyService = tslib_1.__decorate([ Injectable() ], MyService);
125+
MyService = __decorate([ Injectable() ], MyService);
126126
export { MyService };
127127
`;
128128

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

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

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

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

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

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

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ describe('@ngtools/webpack transformers', () => {
5757
}
5858
`;
5959
const output = `
60-
import * as tslib_1 from "tslib";
60+
import { __decorate } from "tslib";
6161
import { Component } from 'another-lib';
6262
let AppComponent = class AppComponent {
6363
constructor() {
6464
this.title = 'app';
6565
}
6666
};
67-
AppComponent = tslib_1.__decorate([
67+
AppComponent = __decorate([
6868
Component({
6969
selector: 'app-root',
7070
templateUrl: './app.component.html',
@@ -105,7 +105,7 @@ describe('@ngtools/webpack transformers', () => {
105105
}
106106
`;
107107
const output = tags.stripIndent`
108-
import * as tslib_1 from "tslib";
108+
import { __decorate } from "tslib";
109109
import { AnotherDecorator } from 'another-lib';
110110
111111
export class AppComponent {
@@ -117,7 +117,7 @@ describe('@ngtools/webpack transformers', () => {
117117
console.log('run');
118118
}
119119
}
120-
tslib_1.__decorate([
120+
__decorate([
121121
AnotherDecorator()
122122
], AppComponent.prototype, "onEscape", null);
123123
`;
@@ -148,15 +148,15 @@ describe('@ngtools/webpack transformers', () => {
148148
}
149149
`;
150150
const output = tags.stripIndent`
151-
import * as tslib_1 from "tslib";
151+
import { __decorate } from "tslib";
152152
import { AnotherDecorator } from 'another-lib';
153153
154154
let AppComponent = class AppComponent {
155155
constructor() {
156156
this.title = 'app';
157157
}
158158
};
159-
AppComponent = tslib_1.__decorate([
159+
AppComponent = __decorate([
160160
AnotherDecorator()
161161
], AppComponent);
162162
export { AppComponent };

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ export function replaceResources(
3939
};
4040

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

0 commit comments

Comments
 (0)