Skip to content

Commit 37505c1

Browse files
filipesilvafilipesilva
committed
feat(@angular/cli): support TypeScript 2.4
1 parent d5d0b07 commit 37505c1

File tree

14 files changed

+34
-26
lines changed

14 files changed

+34
-26
lines changed

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"raw-loader": "^0.5.1",
8686
"resolve": "^1.1.7",
8787
"rsvp": "^3.0.17",
88-
"rxjs": "^5.0.1",
88+
"rxjs": "^5.4.2",
8989
"sass-loader": "^6.0.3",
9090
"script-loader": "^0.7.0",
9191
"semver": "^5.3.0",
@@ -96,7 +96,7 @@
9696
"stylus": "^0.54.5",
9797
"stylus-loader": "^3.0.1",
9898
"temp": "0.8.3",
99-
"typescript": "~2.3.1",
99+
"typescript": "~2.4.2",
100100
"url-loader": "^0.5.7",
101101
"walk-sync": "^0.3.1",
102102
"webpack": "~3.3.0",
@@ -111,15 +111,15 @@
111111
"@angular/core": "^4.0.0",
112112
"@types/chalk": "^0.4.28",
113113
"@types/common-tags": "^1.2.4",
114-
"@types/denodeify": "^1.2.29",
114+
"@types/denodeify": "^1.2.30",
115115
"@types/express": "^4.0.32",
116116
"@types/fs-extra": "~3.0.2",
117117
"@types/glob": "^5.0.29",
118118
"@types/jasmine": "2.5.45",
119119
"@types/lodash": "4.14.50",
120120
"@types/minimist": "^1.2.0",
121121
"@types/mock-fs": "^3.6.30",
122-
"@types/node": "^6.0.36",
122+
"@types/node": "^6.0.84",
123123
"@types/request": "0.0.39",
124124
"@types/semver": "^5.3.30",
125125
"@types/source-map": "^0.5.0",

‎packages/@angular/cli/blueprints/ng/files/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@angular/platform-browser-dynamic": "^4.2.4",
2626
"@angular/router": "^4.2.4",
2727
"core-js": "^2.4.1",
28-
"rxjs": "^5.4.1",
28+
"rxjs": "^5.4.2",
2929
"zone.js": "^0.8.14"
3030
},
3131
"devDependencies": {
@@ -45,8 +45,8 @@
4545
"karma-jasmine": "~1.1.0",
4646
"karma-jasmine-html-reporter": "^0.2.2",
4747
"protractor": "~5.1.2",
48-
"ts-node": "~3.0.4",
48+
"ts-node": "~3.2.0",
4949
"tslint": "~5.3.2",<% } %>
50-
"typescript": "~2.3.3"
50+
"typescript": "~2.4.2"
5151
}
5252
}

‎packages/@angular/cli/commands/new.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ const NewCommand = Command.extend({
176176
}
177177
});
178178
} else {
179-
createDirectory = mkdir(directoryName)
180-
.catch(err => {
179+
createDirectory = (mkdir as any)(directoryName)
180+
.catch((err: any) => {
181181
if (err.code === 'EEXIST') {
182182
if (this.isProject(directoryName)) {
183183
throw new SilentError(oneLine`

‎packages/@angular/cli/models/config/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export class CliConfig<JsonType> {
3030
get config(): JsonType { return <any>this._config; }
3131

3232
save(path: string = this._configPath) {
33-
return fs.writeFileSync(path, this.serialize(), 'utf-8');
33+
return fs.writeFileSync(path, this.serialize(), {encoding: 'utf-8'});
3434
}
3535
serialize(mimetype = 'application/json'): string {
3636
return this._config.$$serialize(mimetype);

‎packages/@angular/cli/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"raw-loader": "^0.5.1",
7171
"resolve": "^1.1.7",
7272
"rsvp": "^3.0.17",
73-
"rxjs": "^5.0.1",
73+
"rxjs": "^5.4.2",
7474
"sass-loader": "^6.0.3",
7575
"script-loader": "^0.7.0",
7676
"semver": "^5.1.0",
@@ -81,7 +81,7 @@
8181
"stylus": "^0.54.5",
8282
"stylus-loader": "^3.0.1",
8383
"temp": "0.8.3",
84-
"typescript": ">=2.0.0 <2.4.0",
84+
"typescript": ">=2.0.0 <2.5.0",
8585
"url-loader": "^0.5.7",
8686
"walk-sync": "^0.3.1",
8787
"webpack": "~3.3.0",

‎packages/@ngtools/logger/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
"npm": ">= 3.0.0"
2727
},
2828
"dependencies": {
29-
"rxjs": "^5.0.1"
29+
"rxjs": "^5.4.2"
3030
}
3131
}

‎packages/@ngtools/logger/src/logger.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export class Logger extends Observable<LogEntry> {
9797
return `<Logger(${this.name})>`;
9898
}
9999

100-
lift(operator: Operator<LogEntry, LogEntry>): Observable<LogEntry> {
100+
lift<R>(operator: Operator<LogEntry, R>): Observable<R> {
101101
return this._observable.lift(operator);
102102
}
103103

‎packages/@ngtools/webpack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"source-map": "^0.5.6"
3232
},
3333
"peerDependencies": {
34-
"typescript": "^2.0.2",
34+
"typescript": "~2.4.2",
3535
"webpack": "^2.2.0 || ^3.0.0"
3636
}
3737
}

‎tests/e2e/assets/webpack/test-app-weird/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"preprocess-loader": "^0.2.2",
2323
"raw-loader": "^0.5.1",
2424
"sass-loader": "^3.2.0",
25-
"typescript": "~2.1.0",
25+
"typescript": "~2.4.2",
2626
"webpack": "2.2.0"
2727
}
2828
}

‎tests/e2e/assets/webpack/test-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"performance-now": "^0.2.0",
2222
"raw-loader": "^0.5.1",
2323
"sass-loader": "^3.2.0",
24-
"typescript": "~2.0.3",
24+
"typescript": "~2.4.2",
2525
"webpack": "2.2.0"
2626
}
2727
}

‎tests/e2e/assets/webpack/test-server-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"performance-now": "^0.2.0",
2323
"raw-loader": "^0.5.1",
2424
"sass-loader": "^6.0.3",
25-
"typescript": "^2.3.2",
25+
"typescript": "~2.4.2",
2626
"webpack": "2.2.1"
2727
}
2828
}

‎tools/publish/src/build-schema.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export function build(args: string[], _opts: any, logger: Logger): void {
2222

2323
const output = require('./build-schema').buildSchema(inFile, logger);
2424
if (outFile) {
25-
fs.writeFileSync(outFile, output, 'utf-8');
25+
fs.writeFileSync(outFile, output, { encoding: 'utf-8' });
2626
} else {
2727
logger.info(output);
2828
}

‎tools/publish/src/build.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export default function build(packagesToBuild: string[], _opts: any,
7878
.then(() => {
7979
const input = path.join(root, 'packages/@angular/cli/lib/config/schema.json');
8080
const output = path.join(root, 'packages/@angular/cli/lib/config/schema.d.ts');
81-
fs.writeFileSync(output, buildSchema(input, logger), 'utf-8');
81+
fs.writeFileSync(output, buildSchema(input, logger), { encoding: 'utf-8' });
8282
})
8383
.then(() => logger.info('Compiling packages...'))
8484
.then(() => {

‎yarn.lock

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
version "1.2.5"
4646
resolved "https://registry.yarnpkg.com/@types/common-tags/-/common-tags-1.2.5.tgz#14f29893992eb325594b83d739af02f2b6520f46"
4747

48-
"@types/denodeify@^1.2.29":
48+
"@types/denodeify@^1.2.30":
4949
version "1.2.30"
5050
resolved "https://registry.yarnpkg.com/@types/denodeify/-/denodeify-1.2.30.tgz#9e356062b44524e7a399fb446d836fcfe352b9dc"
5151

@@ -107,10 +107,14 @@
107107
dependencies:
108108
"@types/node" "*"
109109

110-
"@types/node@*", "@types/node@^6.0.36":
110+
"@types/node@*":
111111
version "6.0.78"
112112
resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.78.tgz#5d4a3f579c1524e01ee21bf474e6fba09198f470"
113113

114+
"@types/node@^6.0.84":
115+
version "6.0.84"
116+
resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.84.tgz#193ffe5a9f42864d425ffd9739d95b753c6a1eab"
117+
114118
"@types/request@0.0.39":
115119
version "0.0.39"
116120
resolved "https://registry.yarnpkg.com/@types/request/-/request-0.0.39.tgz#168b96cf4253c5d54d403f746f82ee7aed47ce2c"
@@ -4536,9 +4540,9 @@ rx-lite@^3.1.2:
45364540
version "3.1.2"
45374541
resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
45384542

4539-
rxjs@^5.0.1:
4540-
version "5.4.1"
4541-
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.1.tgz#b62f757f279445d265a18a58fb0a70dc90e91626"
4543+
rxjs@^5.4.2:
4544+
version "5.4.2"
4545+
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.2.tgz#2a3236fcbf03df57bae06fd6972fd99e5c08fcf7"
45424546
dependencies:
45434547
symbol-observable "^1.0.1"
45444548

@@ -5251,10 +5255,14 @@ typedarray@^0.0.6:
52515255
version "0.0.6"
52525256
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
52535257

5254-
typescript@^2.3.3, typescript@~2.3.1:
5258+
typescript@^2.3.3:
52555259
version "2.3.4"
52565260
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.4.tgz#3d38321828231e434f287514959c37a82b629f42"
52575261

5262+
typescript@~2.4.1:
5263+
version "2.4.2"
5264+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.2.tgz#f8395f85d459276067c988aa41837a8f82870844"
5265+
52585266
uglify-js@3.0.x:
52595267
version "3.0.19"
52605268
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.19.tgz#ab1dfe2a171361b81fa9ffb3383461ea384557ed"

0 commit comments

Comments
 (0)