Merge pull request #113 from ngrx/chore/update-deps

brandonroberts · web-flow · commit a75b3c176c80 · 2017-02-15T11:20:50.000-06:00
chore(deps): Upgrade @angular/cli to beta.31
diff --git a/README.md b/README.md
@@ -1,16 +1,16 @@
 #@ngrx example application
 
-Example application utilizing @ngrx libraries, showcasing common patterns and best practices. 
-You can find the live app [here](http://ngrx.github.io/example-app/).
+Example application utilizing @ngrx libraries, showcasing common patterns and best practices.
+Take a look at the [live app](http://ngrx.github.io/example-app/).
 
-This app is a book collection manager. Using the Google Books API, the user can search for 
-books and add them to their collection. This application utilizes [@ngrx/db](https://github.com/ngrx/db) 
-to persist the collection across sessions; [@ngrx/store](https://github.com/ngrx/store) to manage 
-the state of the app and to cache requests made to the Google Books API; 
-[@angular/router](https://github.com/angular/angular) to manage navigation between routes; 
-[@ngrx/effects](https://github.com/ngrx/effects) to isolate side effects. 
+This app is a book collection manager. Using the Google Books API, the user can search for
+books and add them to their collection. This application utilizes [@ngrx/db](https://github.com/ngrx/db)
+to persist the collection across sessions; [@ngrx/store](https://github.com/ngrx/store) to manage
+the state of the app and to cache requests made to the Google Books API;
+[@angular/router](https://github.com/angular/angular) to manage navigation between routes;
+[@ngrx/effects](https://github.com/ngrx/effects) to isolate side effects.
 
-Built with [angular-cli](https://github.com/angular/angular-cli)
+Built with [@angular/cli](https://github.com/angular/angular-cli)
 
 ### Included
  - [ngrx/store](https://github.com/ngrx/store) - RxJS powered state management for Angular apps, inspired by Redux
@@ -43,5 +43,5 @@ ng serve
 
 Navigate to [http://localhost:4200/](http://localhost:4200/) in your browser
 
-_NOTE:_ The above setup instructions assume you have added local npm bin folders to your path. 
-If this is not the case you will need to install the angular-cli globally.
+_NOTE:_ The above setup instructions assume you have added local npm bin folders to your path.
+If this is not the case you will need to install the Angular CLI globally.
diff --git a/angular-cli.json b/angular-cli.json
@@ -1,6 +1,7 @@
 {
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "project": {
-    "version": "1.0.0-beta.30",
+    "version": "1.0.0-beta.31",
     "name": "example-app"
   },
   "apps": [
@@ -13,10 +14,10 @@
       ],
       "index": "index.html",
       "main": "main.ts",
+      "polyfills": "polyfills.ts",
       "test": "test.ts",
       "tsconfig": "tsconfig.json",
       "prefix": "app",
-      "mobile": false,
       "styles": [
         "styles.css"
       ],
@@ -33,6 +34,16 @@
       "config": "./protractor.conf.js"
     }
   },
+  "lint": [
+    {
+      "files": "src/**/*.ts",
+      "project": "src/tsconfig.json"
+    },
+    {
+      "files": "e2e/**/*.ts",
+      "project": "e2e/tsconfig.json"
+    }
+  ],
   "test": {
     "karma": {
       "config": "./karma.conf.js"
diff --git a/circle.yml b/circle.yml
@@ -4,4 +4,5 @@ machine:
 ## Customize test commands
 test:
   override:
-    - ng test --watch false # single test run
+    - ng lint
+    - ng test --watch false # single test run
diff --git a/karma.conf.js b/karma.conf.js
@@ -8,7 +8,7 @@ module.exports = function (config) {
     plugins: [
       require('karma-jasmine'),
       require('karma-chrome-launcher'),
-      require('karma-remap-istanbul'),
+      require('karma-coverage-istanbul-reporter'),
       require('@angular/cli/plugins/karma')
     ],
     files: [
@@ -20,18 +20,16 @@ module.exports = function (config) {
     mime: {
       'text/x-typescript': ['ts','tsx']
     },
-    remapIstanbulReporter: {
-      reports: {
-        html: 'coverage',
-        lcovonly: './coverage/coverage.lcov'
-      }
+    coverageIstanbulReporter: {
+      reports: [ 'html', 'lcovonly' ],
+      fixWebpackSourcePaths: true
     },
     angularCli: {
       config: './angular-cli.json',
       environment: 'dev'
     },
     reporters: config.angularCli && config.angularCli.codeCoverage
-              ? ['progress', 'karma-remap-istanbul']
+              ? ['progress', 'coverage-istanbul']
               : ['progress'],
     port: 9876,
     colors: true,
diff --git a/package.json b/package.json
@@ -7,10 +7,9 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
-    "lint": "tslint \"src/**/*.ts\" --project src/tsconfig.json --type-check && tslint \"e2e/**/*.ts\" --project e2e/tsconfig.json --type-check",
-    "test": "ng test",
-    "pree2e": "webdriver-manager update --standalone false --gecko false",
-    "e2e": "protractor",
+    "lint": "ng lint",
+    "test": "ng test --code-coverage",
+    "e2e": "ng e2e",
     "build": "ng build --prod"
   },
   "repository": {
@@ -29,15 +28,15 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/common": "^2.3.1",
-    "@angular/compiler": "^2.3.1",
-    "@angular/core": "^2.3.1",
-    "@angular/forms": "^2.3.1",
-    "@angular/http": "^2.3.1",
+    "@angular/common": "^2.4.0",
+    "@angular/compiler": "^2.4.0",
+    "@angular/core": "^2.4.0",
+    "@angular/forms": "^2.4.0",
+    "@angular/http": "^2.4.0",
     "@angular/material": "latest",
-    "@angular/platform-browser": "^2.3.1",
-    "@angular/platform-browser-dynamic": "^2.3.1",
-    "@angular/router": "^3.3.1",
+    "@angular/platform-browser": "^2.4.0",
+    "@angular/platform-browser-dynamic": "^2.4.0",
+    "@angular/router": "^3.4.0",
     "@ngrx/core": "^1.0.0",
     "@ngrx/db": "^2.0.0",
     "@ngrx/effects": "^2.0.0",
@@ -52,20 +51,20 @@
     "zone.js": "^0.7.2"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "^2.3.1",
+    "@angular/cli": "1.0.0-beta.31",
+    "@angular/compiler-cli": "^2.4.0",
     "@types/jasmine": "2.5.38",
     "@types/node": "^6.0.42",
-    "@angular/cli": "1.0.0-beta.30",
     "codelyzer": "~2.0.0-beta.1",
     "jasmine-core": "2.5.2",
     "jasmine-spec-reporter": "2.5.0",
     "karma": "1.2.0",
     "karma-chrome-launcher": "^2.0.0",
     "karma-cli": "^1.0.1",
+    "karma-coverage-istanbul-reporter": "^0.2.0",
     "karma-jasmine": "^1.0.2",
-    "karma-remap-istanbul": "^0.2.1",
     "ngrx-store-freeze": "^0.1.6",
-    "protractor": "~4.0.13",
+    "protractor": "~5.1.0",
     "ts-node": "1.2.1",
     "tslint": "^4.3.0",
     "typescript": "~2.0.3"
diff --git a/src/app/effects/book.spec.ts b/src/app/effects/book.spec.ts
@@ -1,10 +1,10 @@
+import 'rxjs/add/observable/of';
+import 'rxjs/add/observable/throw';
 import { EffectsTestingModule, EffectsRunner } from '@ngrx/effects/testing';
 import { TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { BookEffects } from './book';
 import { GoogleBooksService } from '../services/google-books';
 import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/Observable/of'
-import 'rxjs/add/Observable/throw'
 import { SearchAction, SearchCompleteAction } from '../actions/book';
 import { Book } from '../models/book';
 
diff --git a/src/app/effects/collection.spec.ts b/src/app/effects/collection.spec.ts
@@ -1,12 +1,12 @@
+import 'rxjs/add/observable/of';
+import 'rxjs/add/observable/throw';
 import { EffectsTestingModule, EffectsRunner } from '@ngrx/effects/testing';
 import { TestBed } from '@angular/core/testing';
 import { CollectionEffects } from './collection';
 import { Database } from '@ngrx/db';
 import { Book } from '../models/book';
 import * as collection from '../actions/collection';
 import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/Observable/of'
-import 'rxjs/add/Observable/throw'
 
 describe('CollectionEffects', () => {
   beforeEach(() => TestBed.configureTestingModule({
diff --git a/src/test.ts b/src/test.ts
@@ -1,7 +1,5 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
-import './polyfills.ts';
-
 import 'zone.js/dist/long-stack-trace-zone';
 import 'zone.js/dist/proxy.js';
 import 'zone.js/dist/sync-test';
diff --git a/src/tsconfig.json b/src/tsconfig.json
@@ -4,17 +4,18 @@
     "declaration": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "lib": ["es6", "dom"],
+    "lib": [
+      "es2016",
+      "dom"
+      ],
     "mapRoot": "./",
-    "module": "es6",
+    "module": "es2015",
     "moduleResolution": "node",
     "outDir": "../dist/out-tsc",
     "sourceMap": true,
     "target": "es5",
     "typeRoots": [
       "../node_modules/@types"
-    ],
-    "noUnusedLocals": true,
-    "noUnusedParameters": true
+    ]
   }
 }
diff --git a/tslint.json b/tslint.json
@@ -1,4 +1,7 @@
 {
+  "rulesDirectory": [
+    "node_modules/codelyzer"
+  ],
   "rules": {
     "class-name": true,
     "comment-format": [
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`	`{`
	`2`	`+ "rulesDirectory": [`
	`3`	`+ "node_modules/codelyzer"`
	`4`	`+ ],`
`2`	`5`	`"rules": {`
`3`	`6`	`"class-name": true,`
`4`	`7`	`"comment-format": [`