Merge branch 'release/3.2.0'

Author: dweber019

.travis.yml

@@ -7,13 +7,13 @@ before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
 install:
-  - npm install
-  - npm install -g typings
-before_script:
-  - typings install
+  - npm run install:dev
 script:
+  - npm run lint
   - npm test
   - npm run build:prod
+  - npm run build:docs
+  - npm run mobile:setup
 notifications:
   email: false
   hipchat: 861e4f14f03ed33d069f1083a6c9f5@2679708

README.md

@@ -19,7 +19,7 @@ Before you start, make sure you have a recent version of [NodeJS](http://nodejs.
 From the project folder, execute the following commands:
 
 ```shell
-npm install
+npm run install:dev
 ```
 
 This will install all required dependencies, including a local version of Webpack that is going to

config/setup-mobile.js

@@ -7,7 +7,8 @@ const path = require('path');
 const pkg = require(path.join(process.cwd(), 'package.json'));
 // const cordovaTemp = path.join(process.cwd(), 'cordova');
 const root = path.join(process.cwd());
-const cmd = `cordova create cordova ${pkg.identifier} "${pkg.title}"`;
+const localNodeBin = path.join(process.cwd(), 'node_modules/.bin/')
+const cmd = `${localNodeBin}cordova create cordova ${pkg.identifier} "${pkg.title}"`;
 
 // Run command to create cordova in a temporary directory
 exec(cmd, (error) => {

package.json

@@ -1,9 +1,10 @@
 {
   "name": "aurelia-ts-boilerplate",
   "title": "Aurelia TS Boilerplate",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "A starter kit for building a standard navigation-style app with Aurelia, typescript and webpack.",
   "main": "dist/app.js",
+  "identifier": "ch.w3tec.app",
   "scripts": {
     "install:dev": "npm i && npm run install:typings",
     "install:typings": "./node_modules/.bin/typings i",
@@ -33,7 +34,7 @@
     "server:dev:hmr": "npm run server:dev -- --hot",
     "server:prod": "http-server dist --cors",
     "server:docs": "http-server docs --cors",
-    "lint": "lint:app && lint:test",
+    "lint": "npm run lint:app && npm run lint:test",
     "lint:app": "tslint -c ./tslint.json './src/app/**/*.ts'",
     "lint:test": "tslint -c ./tslint.json './test/unit/**/*.ts'",
     "webpack": "cross-env TS_NODE_PROJECT=tsconfig.tsnode.json TS_NODE_FAST=true ./node_modules/.bin/webpack",
@@ -44,9 +45,10 @@
     "mobile:link": "node ./config/link-mobile.js",
     "mobile:build": "npm run build:dev -- --env.platform mobile",
     "mobile:release": "npm run build:prod -- --env.platform mobile",
-    "ci:build:dev": "npm run mobile:link && npm run mobile:build && npm run cordova:prepare && npm run cordova:build",
+    "ci:build:dev": "npm run codrova:clean && npm run mobile:link && npm run mobile:build && npm run cordova:prepare && npm run cordova:build",
     "cordova:prepare": "cd ./cordova && ./../node_modules/.bin/cordova prepare",
-    "cordova:build": "cd ./cordova && ./../node_modules/.bin/cordova build"
+    "cordova:build": "cd ./cordova && ./../node_modules/.bin/cordova build",
+    "codrova:clean": "rimraf ./cordova/plaforms && rimraf ./cordova/plugins"
   },
   "repository": {
     "type": "git",
@@ -105,7 +107,7 @@
     "moment": "^2.17.1"
   },
   "devDependencies": {
-    "@easy-webpack/config-aurelia": "2.2.3",
+    "@easy-webpack/config-aurelia": "2.2.4",
     "@easy-webpack/config-common-chunks-simple": "2.0.3",
     "@easy-webpack/config-env-development": "2.1.6",
     "@easy-webpack/config-env-production": "3.0.0",
@@ -115,7 +117,7 @@
     "@easy-webpack/config-global-jquery": "2.1.1",
     "@easy-webpack/config-html": "3.1.0",
     "@easy-webpack/config-json": "3.1.0",
-    "@easy-webpack/config-sass": "4.0.0",
+    "@easy-webpack/config-sass": "5.0.0",
     "@easy-webpack/config-source-map-support": "1.0.2",
     "@easy-webpack/config-test-coverage-istanbul": "3.2.0",
     "@easy-webpack/config-tslint": "4.0.0",
@@ -125,7 +127,8 @@
     "aurelia-template-lint-loader": "1.0.1",
     "chalk": "^1.1.3",
     "compression-webpack-plugin": "0.3.2",
-    "concurrently": "3.1.0",
+    "concurrently": "3.2.0",
+    "cordova": "^6.5.0",
     "cross-env": "3.1.4",
     "electron": "1.4.15",
     "favicons-webpack-plugin": "0.0.7",
@@ -134,24 +137,25 @@
     "ignore-loader": "0.1.2",
     "intl": "1.2.5",
     "jasmine-core": "2.5.2",
-    "karma": "1.4.0",
+    "karma": "1.4.1",
     "karma-coverage": "1.1.1",
     "karma-electron": "^5.1.1",
     "karma-jasmine": "1.1.0",
     "karma-mocha-reporter": "2.2.2",
-    "karma-remap-istanbul": "0.4.0",
+    "karma-remap-istanbul": "0.6.0",
     "karma-sourcemap-loader": "0.3.7",
     "karma-webpack": "2.0.2",
     "ncp": "^2.0.0",
     "rimraf": "^2.5.4",
-    "ts-node": "^2.0.0",
+    "ts-node": "^2.1.0",
     "typedoc": "^0.5.5",
     "typedoc-webpack-plugin": "^1.1.3",
     "typescript": "^2.1",
+    "typings": "^2.1.0",
     "wait-on": "2.0.1",
-    "wallaby-webpack": "0.0.32",
-    "webpack": "2.2.0",
-    "webpack-dev-server": "2.2.0",
+    "wallaby-webpack": "0.0.33",
+    "webpack": "2.2.1",
+    "webpack-dev-server": "2.3.0",
     "webpack-notifier": "1.5.0"
   }
 }

src/app/main.ts

@@ -1,4 +1,5 @@
-/**
+
+/**
  * Import the main sass file for all the styles
  */
 import '../scss/main.scss';

src/index.ejs

@@ -12,7 +12,7 @@
   <meta name="version" content="<%= htmlWebpackPlugin.options.version %>">
   <meta name="author" content="<%= htmlWebpackPlugin.options.author %>">
 
-  <% if (htmlWebpackPlugin.options.platform === 'web') { %>
+  <% if (htmlWebpackPlugin.options.platform === 'browser') { %>
     <base href="<%= htmlWebpackPlugin.options.baseUrl %>">
   <% } %>
 </head>