Skip to content

Commit 146b091

Browse files
committed
feat(@angular/cli): support TypeScript 2.4
1 parent 64e6b94 commit 146b091

File tree

10 files changed

+24
-24
lines changed

10 files changed

+24
-24
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"raw-loader": "^0.5.1",
8484
"resolve": "^1.1.7",
8585
"rsvp": "^3.0.17",
86-
"rxjs": "^5.0.1",
86+
"rxjs": "^5.4.2",
8787
"sass-loader": "^6.0.3",
8888
"script-loader": "^0.7.0",
8989
"semver": "^5.3.0",
@@ -94,7 +94,7 @@
9494
"stylus": "^0.54.5",
9595
"stylus-loader": "^3.0.1",
9696
"temp": "0.8.3",
97-
"typescript": "~2.3.1",
97+
"typescript": "~2.4.0",
9898
"url-loader": "^0.5.7",
9999
"walk-sync": "^0.3.1",
100100
"webpack": "~2.4.0",

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

Lines changed: 2 additions & 2 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.12"
3030
},
3131
"devDependencies": {
@@ -47,6 +47,6 @@
4747
"protractor": "~5.1.2",
4848
"ts-node": "~3.0.4",
4949
"tslint": "~5.3.2",<% } %>
50-
"typescript": "~2.3.3"
50+
"typescript": "~2.4.0"
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
@@ -68,7 +68,7 @@
6868
"raw-loader": "^0.5.1",
6969
"resolve": "^1.1.7",
7070
"rsvp": "^3.0.17",
71-
"rxjs": "^5.0.1",
71+
"rxjs": "^5.4.2",
7272
"sass-loader": "^6.0.3",
7373
"script-loader": "^0.7.0",
7474
"semver": "^5.1.0",
@@ -79,7 +79,7 @@
7979
"stylus": "^0.54.5",
8080
"stylus-loader": "^3.0.1",
8181
"temp": "0.8.3",
82-
"typescript": ">=2.0.0 <2.4.0",
82+
"typescript": ">=2.0.0 <2.5.0",
8383
"url-loader": "^0.5.7",
8484
"walk-sync": "^0.3.1",
8585
"webpack": "~2.4.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

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
@@ -71,7 +71,7 @@ export default function build(packagesToBuild: string[], _opts: any,
7171
.then(() => {
7272
const input = path.join(root, 'packages/@angular/cli/lib/config/schema.json');
7373
const output = path.join(root, 'packages/@angular/cli/lib/config/schema.d.ts');
74-
fs.writeFileSync(output, buildSchema(input, logger), 'utf-8');
74+
fs.writeFileSync(output, buildSchema(input, logger), { encoding: 'utf-8' });
7575
})
7676
.then(() => logger.info('Compiling packages...'))
7777
.then(() => {

yarn.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4355,16 +4355,16 @@ right-align@^0.1.1:
43554355
dependencies:
43564356
align-text "^0.1.1"
43574357

4358-
rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1:
4358+
rimraf@2, rimraf@^2.2.8, rimraf@~2.2.6:
4359+
version "2.2.8"
4360+
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
4361+
4362+
rimraf@^2.5.1, rimraf@^2.6.1:
43594363
version "2.6.1"
43604364
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
43614365
dependencies:
43624366
glob "^7.0.5"
43634367

4364-
rimraf@~2.2.6:
4365-
version "2.2.8"
4366-
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
4367-
43684368
ripemd160@^2.0.0, ripemd160@^2.0.1:
43694369
version "2.0.1"
43704370
resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
@@ -4406,9 +4406,9 @@ rx-lite@^3.1.2:
44064406
version "3.1.2"
44074407
resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
44084408

4409-
rxjs@^5.0.1:
4410-
version "5.4.1"
4411-
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.1.tgz#b62f757f279445d265a18a58fb0a70dc90e91626"
4409+
rxjs@^5.4.2:
4410+
version "5.4.2"
4411+
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.2.tgz#2a3236fcbf03df57bae06fd6972fd99e5c08fcf7"
44124412
dependencies:
44134413
symbol-observable "^1.0.1"
44144414

@@ -5106,9 +5106,9 @@ typedarray@^0.0.6:
51065106
version "0.0.6"
51075107
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
51085108

5109-
typescript@~2.3.1:
5110-
version "2.3.4"
5111-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.4.tgz#3d38321828231e434f287514959c37a82b629f42"
5109+
typescript@~2.4.0:
5110+
version "2.4.1"
5111+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.1.tgz#c3ccb16ddaa0b2314de031e7e6fee89e5ba346bc"
51125112

51135113
uglify-js@3.0.x:
51145114
version "3.0.19"

0 commit comments

Comments
 (0)