Dependency update and two small fixes (#220)

* Update package dependencies

* Prevent multiple, potentially inconsistent versions of TypeScript

* Update debugging configuration

Author: chuckjaz

server/.vscode/launch.json

@@ -5,10 +5,9 @@
       "name": "Attach",
       "type": "node",
       "request": "attach",
-      "port": 6009,
-      "sourceMaps": true,
-      "outFiles": [ "${workspaceRoot}/../client/server/**/*.js" ],
-      "protocol": "legacy"
+      "port": 9229,
+      "sourceMaps": false,
+      "outFiles": [ "${workspaceRoot}/../client/server/**/*.js" ]
     },
     {
       "name": "Attach (tests)",

server/package.json

@@ -13,15 +13,15 @@
     "test": "tsc -p . && jasmine dist/**/*_spec.js"
   },
   "dependencies": {
-    "@angular/language-service": "5.1.x",
-    "typescript": "2.5.x",
+    "@angular/language-service": "5.2.x",
+    "typescript": "2.6.x",
     "vscode-jsonrpc": "^3.2.0",
     "vscode-languageserver": "^3.2.2"
   },
   "devDependencies": {
-    "@angular/compiler": "5.1.x",
-    "@angular/compiler-cli": "5.1.x",
-    "@angular/core": "5.1.x",
+    "@angular/compiler": "5.2.x",
+    "@angular/compiler-cli": "5.2.x",
+    "@angular/core": "5.2.x",
     "@types/jasmine": "^2.5.38",
     "@types/node": "^6.0.46",
     "jasmine": "^2.5.2",

server/src/editorServices.ts

@@ -524,7 +524,7 @@ export class LSHost implements ts.LanguageServiceHost {
     //   }
   }
 
-  private resolveNamesWithLocalCache<T extends Timestamped & { failedLookupLocations?: string[] }, R>(
+  private resolveNamesWithLocalCache<T extends Timestamped & { failedLookupLocations?: ReadonlyArray<string> }, R>(
       names: string[],
       containingFile: string,
       cache: Map<ts.Path, ts.Map<T>>,
@@ -2055,8 +2055,8 @@ export class CompilerService {
       }
       if (typeof result === 'function') {
           // The language service bundle exposes a function to allow hooking module dependencies
-          // such as TypeScript. However, using require() here is sufficient for us.
-          result = result();
+          // such as TypeScript.
+          result = result({typescript: ts});
       }
       return result;
   }

server/yarn.lock

@@ -2,30 +2,30 @@
 # yarn lockfile v1
 
 
-"@angular/compiler-cli@5.1.x":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.1.2.tgz#70addc11b6528f087abe809f94acedecdfc9c8f6"
+"@angular/compiler-cli@5.2.x":
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.2.1.tgz#9ee3431d937767a4f4ae401f172b507b5db6456e"
   dependencies:
     chokidar "^1.4.2"
     minimist "^1.2.0"
     reflect-metadata "^0.1.2"
-    tsickle "^0.25.5"
+    tsickle "^0.26.0"
 
-"@angular/compiler@5.1.x":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.1.2.tgz#4dfd0dd7fab39a14a1a104097c2f6af470ddabdb"
+"@angular/compiler@5.2.x":
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.2.1.tgz#758ed236c361cff018699e041fabbc4bcb7cdc72"
   dependencies:
     tslib "^1.7.1"
 
-"@angular/core@5.1.x":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.1.2.tgz#751070c0f4e5a8c4e2170204e08eca06391b84b1"
+"@angular/core@5.2.x":
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.2.1.tgz#47347e4098b0e997220d77652f4d9ca44dda8923"
   dependencies:
     tslib "^1.7.1"
 
-"@angular/language-service@5.1.x":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-5.1.2.tgz#0c0579c2feb7dd9afb2576e9b602779d45b30810"
+"@angular/language-service@5.2.x":
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-5.2.1.tgz#438bc1f61bab5ba2e0eeb687ae6be9e6ab0edb18"
 
 "@types/jasmine@^2.5.38":
   version "2.8.3"
@@ -939,9 +939,9 @@ tough-cookie@~2.3.0:
   dependencies:
     punycode "^1.4.1"
 
-tsickle@^0.25.5:
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.25.6.tgz#b595db16b236721824eeeda8bb262365b47ef334"
+tsickle@^0.26.0:
+  version "0.26.0"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.26.0.tgz#40b30a2dd6abcb33b182e37596674bd1cfe4039c"
   dependencies:
     minimist "^1.2.0"
     mkdirp "^0.5.1"
@@ -962,9 +962,9 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
 
-typescript@2.5.x:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.3.tgz#df3dcdc38f3beb800d4bc322646b04a3f6ca7f0d"
+typescript@2.6.x:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
 
 uid-number@^0.0.6:
   version "0.0.6"