Skip to content

Commit 845b679

Browse files
authored
fix(ls): update to changes in master of Angular (#6)
1 parent 1f49dad commit 845b679

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

.travis.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@ sudo: false
33
node_js:
44
- '6.6.0'
55

6-
cache:
7-
directories:
8-
- ./node_modules
9-
- ./client/node_modules
10-
- ./server/node_modules
11-
126
env:
137
matrix:
148
# Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete.

server/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"@angular/core": "github:angular/core-builds",
2424
"@angular/tsc-wrapped": "^0.4.0",
2525
"@types/node": "^6.0.46",
26-
"rxjs": "5.0.0-beta.12",
27-
"zone.js": "^0.6.25"
26+
"rxjs": "5.0.0-rc.4",
27+
"zone.js": "^0.7.2"
2828
},
2929
"repository": {
3030
"type": "git",

server/src/editorServices.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2033,7 +2033,7 @@ export class CompilerService {
20332033
this.languageService = ts.createLanguageService(this.host, this.documentRegistry);
20342034

20352035
this.ng = this.resolveLanguageServiceModule();
2036-
this.ngHost = new this.ng.TypeScriptServiceHost(ts, this.host, this.languageService);
2036+
this.ngHost = new this.ng.TypeScriptServiceHost(this.host, this.languageService);
20372037
this.ngService = logServiceTimes(logger, this.ng.createLanguageService(this.ngHost));
20382038
this.ngHost.setSite(this.ngService);
20392039
this.classifier = ts.createClassifier();

0 commit comments

Comments
 (0)