chore: upgrade dependencies, work around angular-cli/issues/11673

simontonsoftware · Jul 26, 2018 · 943e7b1 · 943e7b1
1 parent 3d8d86f
commit 943e7b1
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 121 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,6 +22,8 @@ install:
 script:
   - yarn test ng-app-state --code-coverage --watch=false --progress=false --browsers=ChromeHeadlessCI
   - yarn build ng-app-state --prod
+  # workaround for https://github.com/angular/angular-cli/issues/11673
+  - mv dist/lib dist/ng-app-state
   - yarn e2e --protractor-config=./e2e/protractor-ci.conf.js
 
 after_success:

diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
   "devDependencies": {
     "@angular-devkit/build-angular": "~0.6.0",
     "@angular-devkit/build-ng-packagr": "~0.6.0",
-    "@angular/cli": "~6.0.0",
+    "@angular/cli": "~6.1.0",
     "@angular/compiler-cli": "^6.0.0",
     "@angular/language-service": "^6.0.0",
     "@types/jasmine": "~2.8.6",
@@ -58,4 +58,4 @@
     "tslint-config-prettier": "^1.12.0",
     "typescript": "~2.7.2"
   }
-}
+}
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -25,7 +25,7 @@ export class AppComponent {
   chooseToCheck() {
     this.store('checkMany').set(
       mapValues(
-        keyBy(this.store.state().chooseMany, (city) => city),
+        keyBy<string>(this.store.state().chooseMany, (city) => city),
         () => true,
       ),
     );