build: update to @angular/[email protected] and [email protected] (#42)

refactor: update for `[email protected]`
fix: don't crash on unknown url styles

Fixes #41

Author: chuckjaz

client/package.json

@@ -2,7 +2,7 @@
   "name": "ng-template",
   "displayName": "Angular Language Service",
   "description": "Editor services for Angular templates",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "publisher": "Google",
   "engines": {
     "vscode": "^1.4.0"

server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ng-language-service",
-  "description": "Angular temlate language service.",
-  "version": "0.0.9",
+  "description": "Angular template language service.",
+  "version": "0.0.12",
   "author": "Google",
   "license": "MIT",
   "engines": {
@@ -13,9 +13,9 @@
     "test": "tsc -p . && jasmine -- dist/**/*_spec.js"
   },
   "dependencies": {
-    "@angular/language-service": "^2.3.1",
+    "@angular/language-service": "^2.4.6",
     "reflect-metadata": "^0.1.8",
-    "typescript": "2.0.2",
+    "typescript": "2.1",
     "vscode-languageserver": "^2.4.0-next.9"
   },
   "devDependencies": {
@@ -25,7 +25,7 @@
     "@types/jasmine": "^2.5.38",
     "@types/node": "^6.0.46",
     "jasmine": "^2.5.2",
-    "rxjs": "5.0.0-rc.4",
+    "rxjs": "^5.0",
     "zone.js": "^0.7.2"
   },
   "repository": {

server/src/documents.ts

@@ -186,24 +186,26 @@ export class TextDocuments {
 
     connection.onDidChangeTextDocument(event => {
       const file = uriToFileName(event.textDocument.uri);
-      const positions = this.projectService.lineOffsetsToPositions(file,
-        ([] as {line: number, col: number}[]).concat(...event.contentChanges.map(change => [{
-          // VSCode is 0 based, editor services is 1 based.
-          line: change.range.start.line + 1,
-          col: change.range.start.character + 1
-        }, {
-          line: change.range.end.line + 1,
-          col: change.range.end.character + 1
-        }])));
-      if (positions) {
-        this.changeNumber++;
-        const mappedChanges = event.contentChanges.map((change, i) => {
-          const start = positions[i * 2];
-          const end = positions[i * 2 + 1];
-          return {start, end, insertText: change.text};
-        });
-        this.projectService.clientFileChanges(file, mappedChanges);
-        this.changeNumber++;
+      if (file) {
+        const positions = this.projectService.lineOffsetsToPositions(file,
+          ([] as {line: number, col: number}[]).concat(...event.contentChanges.map(change => [{
+            // VSCode is 0 based, editor services is 1 based.
+            line: change.range.start.line + 1,
+            col: change.range.start.character + 1
+          }, {
+            line: change.range.end.line + 1,
+            col: change.range.end.character + 1
+          }])));
+        if (positions) {
+          this.changeNumber++;
+          const mappedChanges = event.contentChanges.map((change, i) => {
+            const start = positions[i * 2];
+            const end = positions[i * 2 + 1];
+            return {start, end, insertText: change.text};
+          });
+          this.projectService.clientFileChanges(file, mappedChanges);
+          this.changeNumber++;
+        }
       }
     });
 

server/src/editorServices.ts

@@ -282,7 +282,7 @@ export function parseAndReEmitConfigJSONFile(content: string) {
     const options: ts.TranspileOptions = {
         fileName: "config.js",
         compilerOptions: {
-            target: ts.ScriptTarget.ES6,
+            target: ts.ScriptTarget.Latest,
             removeComments: true
         },
         reportDiagnostics: true

server/yarn.lock

@@ -18,9 +18,9 @@
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/@angular/core/-/core-2.3.1.tgz#be6e91fdfdd7498506604263e051797cf67a47be"
 
-"@angular/language-service@^2.3.1":
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-2.3.1.tgz#a78242024d2ea51ee6e510305b829cc923a9b4ae"
+"@angular/language-service@^2.4.6":
+  version "2.4.6"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-2.4.6.tgz#83ba96dea955b04c6c5898a72f4b4e590d7f3506"
 
 "@angular/[email protected]":
   version "0.5.0"
@@ -127,9 +127,9 @@ reflect-metadata@^0.1.2, reflect-metadata@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.8.tgz#72426d570b60776e3688968bd5ab9537a15cecf6"
 
-[email protected].0-rc.4:
-  version "5.0.0-rc.4"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.0.0-rc.4.tgz#a4d08bc5d7f30d48ed7130e2995490c326a325c4"
+[email protected]:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.0.3.tgz#fc8bdf464ebf938812748e4196788f392fef9754"
   dependencies:
     symbol-observable "^1.0.1"
 
@@ -156,9 +156,9 @@ tsickle@^0.2:
     source-map "^0.5.6"
     source-map-support "^0.4.2"
 
-typescript@2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.0.2.tgz#a63f848074498a4dfa7f293afda0835d501d9540"
+typescript@2.1:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.1.5.tgz#6fe9479e00e01855247cea216e7561bafcdbcd4a"
 
 vscode-jsonrpc@^2.4.0:
   version "2.4.0"