Merge pull request #104 from ngrx/cli-beta-26

feat(build): Updated Angular CLI to 1.0.0-beta.26

Author: krjordan

.editorconfig

@@ -1,16 +1,13 @@
-# @TheLarkInn
-# http://editorconfig.org
-
+# Editor configuration, see http://editorconfig.org
 root = true
 
 [*]
 charset = utf-8
 indent_style = space
 indent_size = 2
-end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
 [*.md]
-insert_final_newline = false
+max_line_length = off
 trim_trailing_whitespace = false

.gitignore

@@ -1,58 +1,40 @@
-# Logs
-logs
-*.log
+# See http://help.github.com/ignore-files/ for more about ignoring files.
 
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
+# compiled output
+/dist
+/tmp
 
-# Users Environment Variables
-.lock-wscript
+# dependencies
+/node_modules
 
-# OS generated files #
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage/*
+/libpeerconnection.log
+npm-debug.log
+testem.log
+/typings
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+#System Files
 .DS_Store
-ehthumbs.db
-Icon?
 Thumbs.db
-
-# Node Files #
-/node_modules
-/bower_components
-
-# Typing TSD #
-/src/typings/tsd/
-/typings/
-/tsd_typings/
-
-# Dist #
-/dist
-/public/__build__/
-/src/*/__build__/
-__build__/**
-.webpack.json
-
-#doc
-/doc
-
-# IDE #
-.idea/
-*.swp
-!/typings/custom.d.ts
-
-# Build Artifacts #
-release
-distout
-*.ngfactory.ts

angular-cli.json

@@ -1,13 +1,16 @@
 {
   "project": {
-    "version": "1.0.0-beta.17",
-    "name": "example"
+    "version": "1.0.0-beta.26",
+    "name": "example-app"
   },
   "apps": [
     {
       "root": "src",
       "outDir": "dist",
-      "assets": "assets",
+      "assets": [
+        "assets",
+        "favicon.ico"
+      ],
       "index": "index.html",
       "main": "main.ts",
       "test": "test.ts",
@@ -25,8 +28,6 @@
       }
     }
   ],
-  "addons": [],
-  "packages": [],
   "e2e": {
     "protractor": {
       "config": "./protractor.conf.js"
@@ -39,6 +40,18 @@
   },
   "defaults": {
     "styleExt": "css",
-    "prefixInterfaces": false
+    "prefixInterfaces": false,
+    "inline": {
+      "style": false,
+      "template": false
+    },
+    "spec": {
+      "class": false,
+      "component": true,
+      "directive": true,
+      "module": false,
+      "pipe": true,
+      "service": true
+    }
   }
 }

e2e/app.e2e-spec.ts

@@ -0,0 +1,14 @@
+import { ExampleAppPage } from './app.po';
+
+describe('example-app App', function() {
+  let page: ExampleAppPage;
+
+  beforeEach(() => {
+    page = new ExampleAppPage();
+  });
+
+  it('should display message saying app works', () => {
+    page.navigateTo();
+    expect(page.getParagraphText()).toEqual('app works!');
+  });
+});

e2e/app.po.ts

@@ -0,0 +1,11 @@
+import { browser, element, by } from 'protractor';
+
+export class ExampleAppPage {
+  navigateTo() {
+    return browser.get('/');
+  }
+
+  getParagraphText() {
+    return element(by.css('app-root h1')).getText();
+  }
+}

e2e/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "declaration": false,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "outDir": "../dist/out-tsc-e2e",
+    "sourceMap": true,
+    "target": "es5",
+    "typeRoots": [
+      "../node_modules/@types"
+    ]
+  }
+}

karma.conf.js

@@ -17,6 +17,9 @@ module.exports = function (config) {
     preprocessors: {
       './src/test.ts': ['angular-cli']
     },
+    mime: {
+      'text/x-typescript': ['ts','tsx']
+    },
     remapIstanbulReporter: {
       reports: {
         html: 'coverage',
@@ -27,7 +30,9 @@ module.exports = function (config) {
       config: './angular-cli.json',
       environment: 'dev'
     },
-    reporters: ['progress', 'karma-remap-istanbul'],
+    reporters: config.angularCli && config.angularCli.codeCoverage
+              ? ['progress', 'karma-remap-istanbul']
+              : ['progress'],
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,

package.json

@@ -3,17 +3,21 @@
   "version": "1.0.0",
   "description": "Example application demoing the @ngrx platform",
   "main": "index.ts",
+  "angular-cli": {},
   "scripts": {
-    "build": "ng build --prod",
+    "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",
-    "ng": "ng"
+    "pree2e": "webdriver-manager update --standalone false --gecko false",
+    "e2e": "protractor",
+    "build": "ng build --prod"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ngrx/example-app.git"
   },
-  "author": "Sean Larkin",
+  "author": "Mike Ryan",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/ngrx/example-app/issues"
@@ -23,46 +27,47 @@
     "node": ">= 4.2.1",
     "npm": ">= 3"
   },
+  "private": true,
   "dependencies": {
-    "@angular/common": "^2.1.0",
-    "@angular/compiler": "^2.1.0",
-    "@angular/compiler-cli": "^2.1.0",
-    "@angular/core": "^2.1.0",
-    "@angular/forms": "^2.1.0",
-    "@angular/http": "^2.1.0",
+    "@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/material": "latest",
-    "@angular/platform-browser": "^2.1.0",
-    "@angular/platform-browser-dynamic": "^2.1.0",
-    "@angular/platform-server": "^2.1.0",
-    "@angular/router": "^3.1.0",
+    "@angular/platform-browser": "^2.3.1",
+    "@angular/platform-browser-dynamic": "^2.3.1",
+    "@angular/router": "^3.3.1",
     "@ngrx/core": "^1.0.0",
     "@ngrx/db": "^2.0.0",
     "@ngrx/effects": "^2.0.0",
     "@ngrx/router-store": "^1.1.0",
     "@ngrx/store": "^2.0.0",
     "@ngrx/store-devtools": "^3.1.0",
-    "core-js": "^2.2.2",
+    "core-js": "^2.4.1",
+    "hammerjs": "^2.0.8",
     "reselect": "^2.5.4",
-    "rxjs": "^5.0.0-beta.12",
+    "rxjs": "^5.0.1",
     "ts-helpers": "^1.1.1",
-    "zone.js": "^0.6.25"
+    "zone.js": "^0.7.2"
   },
   "devDependencies": {
-    "@types/jasmine": "^2.2.30",
+    "@angular/compiler-cli": "^2.3.1",
+    "@types/jasmine": "2.5.38",
     "@types/node": "^6.0.42",
-    "angular-cli": "1.0.0-beta.17",
-    "codelyzer": "~0.0.26",
-    "jasmine-core": "2.4.1",
+    "angular-cli": "1.0.0-beta.26",
+    "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-jasmine": "^1.0.2",
     "karma-remap-istanbul": "^0.2.1",
     "ngrx-store-freeze": "^0.1.6",
-    "protractor": "4.0.9",
+    "protractor": "~4.0.13",
     "ts-node": "1.2.1",
-    "tslint": "3.13.0",
-    "typescript": "2.0.2"
+    "tslint": "^4.3.0",
+    "typescript": "~2.0.3"
   }
 }

protractor.conf.js

@@ -1,5 +1,5 @@
 // Protractor configuration file, see link for more information
-// https://github.com/angular/protractor/blob/master/docs/referenceConf.js
+// https://github.com/angular/protractor/blob/master/lib/config.ts
 
 /*global jasmine */
 var SpecReporter = require('jasmine-spec-reporter');

src/app/actions/collection.ts

@@ -90,4 +90,4 @@ export type Actions
   | RemoveBookFailAction
   | LoadAction
   | LoadSuccessAction
-  | LoadFailAction
+  | LoadFailAction;