Merge branch 'release/6.2.0'

.vscode/launch.json

@@ -12,7 +12,7 @@
       "webRoot": "${workspaceRoot}/src",
       "userDataDir": "${workspaceRoot}/.chrome",
       "sourceMapPathOverrides": {
-        "webpack:///./src/*": "${webRoot}/*"
+        "webpack:///*": "${webRoot}/*"
       }
     }
   ]

package-scripts.js

@@ -18,8 +18,8 @@ module.exports = {
           rimraf('test/coverage-karma'),
           'karma start test/karma.conf.js'
         ),
-        watch: 'karma start test/karma.conf.js --no-single-run',
-        debug: 'karma start test/karma.conf.js --no-single-run --debug'
+        watch: 'karma start test/karma.conf.js --auto-watch --no-single-run',
+        debug: 'karma start test/karma.conf.js --auto-watch --no-single-run --debug'
       },
       all: concurrent({
         browser: series.nps('test.karma', 'e2e'),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aurelia-typescript-boilerplate",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "title": "Aurelia Typescript Boilerplate",
   "description": "A starter kit for building a standard navigation-style app with Aurelia and Webpack.",
   "main": "dist/app.bundle.js",
@@ -56,7 +56,7 @@
     ],
     "testEnvironment": "node",
     "moduleNameMapper": {
-      "aurelia-(.*)": "<rootDir>/node_modules/$1"
+      "aurelia-(.*)": "<rootDir>/node_modules/aurelia-$1"
     },
     "collectCoverage": true,
     "collectCoverageFrom": [
@@ -77,82 +77,82 @@
   "devDependencies": {
     "@types/cordova": "^0.0.34",
     "@types/i18next-browser-languagedetector": "^2.0.0",
-    "@types/jest": "^20.0.4",
-    "@types/jquery": "^3.2.9",
-    "@types/lodash": "^4.14.71",
-    "@types/node": "^8.0.15",
-    "@types/webpack": "^3.0.5",
+    "@types/jest": "^20.0.8",
+    "@types/jquery": "^3.2.12",
+    "@types/lodash": "^4.14.74",
+    "@types/node": "^8.0.26",
+    "@types/webpack": "^3.0.10",
     "aurelia-loader-nodejs": "^1.0.1",
-    "aurelia-pal-nodejs": "1.0.0-beta.1.0.0",
+    "aurelia-pal-nodejs": "^1.0.0-beta.2.0.0",
     "aurelia-protractor-plugin": "^1.0.3",
     "aurelia-template-lint-webpack-loader": "^1.0.3",
     "aurelia-testing": "^1.0.0-beta.3.0.1",
-    "aurelia-webpack-plugin": "^2.0.0-rc.2",
-    "autoprefixer": "^7.1.2",
-    "awesome-typescript-loader": "^3.2.1",
+    "aurelia-webpack-plugin": "^2.0.0-rc.5",
+    "autoprefixer": "^7.1.3",
+    "awesome-typescript-loader": "^3.2.3",
     "case-sensitive-paths-webpack-plugin": "^2.1.1",
-    "chalk": "^2.0.1",
+    "chalk": "^2.1.0",
     "compression-webpack-plugin": "^1.0.0",
     "copy-webpack-plugin": "^4.0.1",
     "cordova": "^7.0.1",
-    "cross-env": "^5.0.1",
-    "css-loader": "^0.28.4",
+    "cross-env": "^5.0.5",
+    "css-loader": "^0.28.7",
     "expose-loader": "^0.7.3",
     "extract-text-webpack-plugin": "^3.0.0",
     "favicons-webpack-plugin": "^0.0.7",
-    "file-loader": "^0.11.2",
-    "html-webpack-plugin": "^2.29.0",
+    "file-loader": "^1.1.5",
+    "html-webpack-plugin": "^2.30.1",
     "http-server": "^0.10.0",
     "img-loader": "^2.0.0",
-    "istanbul-instrumenter-loader": "^2.0.0",
-    "jasmine-core": "^2.6.4",
+    "istanbul-instrumenter-loader": "^3.0.0",
+    "jasmine-core": "^2.8.0",
     "jest": "^20.0.4",
     "jest-cli": "^20.0.4",
     "json-loader": "^0.5.7",
-    "karma": "^1.7.0",
+    "karma": "^1.7.1",
     "karma-chrome-launcher": "^2.2.0",
     "karma-coverage-istanbul-reporter": "^1.3.0",
     "karma-jasmine": "^1.1.0",
-    "karma-mocha-reporter": "^2.2.3",
+    "karma-mocha-reporter": "^2.2.4",
     "karma-webpack": "^2.0.4",
     "loader-utils": "^1.1.0",
     "ncp": "^2.0.0",
     "node-sass": "^4.5.3",
-    "nps": "^5.6.0",
-    "nps-utils": "^1.2.0",
+    "nps": "^5.7.1",
+    "nps-utils": "^1.3.0",
     "postcss-loader": "^2.0.6",
     "protractor": "^5.1.2",
     "sass-loader": "^6.0.6",
-    "style-loader": "^0.18.2",
-    "ts-jest": "^20.0.7",
-    "ts-node": "^3.2.1",
+    "style-loader": "^0.19.0",
+    "ts-jest": "^20.0.14",
+    "ts-node": "^3.3.0",
     "tslib": "^1.7.1",
-    "tslint": "^5.5.0",
+    "tslint": "^5.7.0",
     "tslint-loader": "^3.5.3",
-    "typescript": "^2.4.2",
-    "url-loader": "^0.5.9",
+    "typescript": "^2.5.2",
+    "url-loader": "^0.6.2",
     "wait-on": "^2.0.2",
-    "webpack": "^3.3.0",
-    "webpack-dev-server": "^2.6.1",
+    "webpack": "^3.5.5",
+    "webpack-dev-server": "^2.7.1",
     "webpack-notifier": "^1.5.0"
   },
   "dependencies": {
     "animate.css": "^3.5.2",
     "aurelia-animator-css": "^1.0.2",
     "aurelia-bootstrapper": "^2.1.1",
     "aurelia-dialog": "^1.0.0-rc.1.0.3",
-    "aurelia-fetch-client": "^1.1.2",
+    "aurelia-fetch-client": "^1.1.3",
     "aurelia-framework": "^1.1.4",
     "aurelia-history-browser": "^1.0.0",
-    "aurelia-i18n": "^1.6.2",
+    "aurelia-i18n": "^2.0.0",
     "aurelia-loader-webpack": "^2.1.0",
     "aurelia-logging-console": "^1.0.0",
     "aurelia-pal-browser": "^1.2.1",
     "aurelia-polyfills": "^1.2.2",
     "aurelia-router": "^1.3.0",
     "aurelia-templating": "^1.4.2",
     "aurelia-templating-binding": "^1.3.0",
-    "aurelia-templating-resources": "^1.4.0",
+    "aurelia-templating-resources": "^1.5.4",
     "aurelia-templating-router": "^1.1.0",
     "aurelia-validation": "^1.1.1",
     "bluebird": "^3.5.0",

src/app/main.ts

@@ -66,6 +66,7 @@ export async function configure(aurelia: Aurelia): Promise<void> {
           'de-DE': ['de-CH', 'en-US'],
           'default': ['en-US']
         },
+        lng: 'en-US',
         debug: false,
         detection: {
           order: ['localStorage', 'navigator'],

test/jest-pretest.ts

@@ -1,7 +1,7 @@
 import 'aurelia-polyfills';
 import 'isomorphic-fetch';
 import {Options} from 'aurelia-loader-nodejs';
-import {globalize} from 'aurelia-pal-nodejs';
+import {initialize} from 'aurelia-pal-nodejs';
 import * as path from 'path';
 Options.relativeToDir = path.join(__dirname, 'unit');
-globalize();
+initialize();

test/protractor.conf.js

@@ -32,7 +32,21 @@ exports.config = {
   capabilities: {
     'browserName': 'chrome',
     'chromeOptions': {
-      'args': ['show-fps-counter=true']
+      'args': [
+        '--show-fps-counter',
+        '--no-default-browser-check',
+        '--no-first-run',
+        '--disable-default-apps',
+        '--disable-popup-blocking',
+        '--disable-translate',
+        '--disable-background-timer-throttling',
+        '--disable-renderer-backgrounding',
+        '--disable-device-discovery-notifications',
+        /* enable these if you'd like to test using Chrome Headless
+          '--no-gpu',
+          '--headless'
+        */
+      ]
     }
   },
 

test/unit/app.spec.ts

@@ -89,7 +89,7 @@ describe('the App module', () => {
     expect(sut.router.routes).toContainEqual({
       route: 'users',
       name: 'users',
-      moduleId: './modules/users/users.vm',
+      moduleId: PLATFORM.moduleName('./modules/users/users.vm'),
       nav: true,
       title: 'Github Users'
     });
@@ -99,7 +99,7 @@ describe('the App module', () => {
     expect(sut.router.routes).toContainEqual({
       route: 'child-router',
       name: 'child-router',
-      moduleId: './modules/child-router/child-router.vm',
+      moduleId: PLATFORM.moduleName('./modules/child-router/child-router.vm'),
       nav: true,
       title: 'Child Router'
     });

test/unit/child-router.spec.ts

@@ -1,3 +1,5 @@
+import { PLATFORM } from 'aurelia-framework';
+
 import { ChildRouterViewModel } from '../../src/app/modules/child-router/child-router.vm';
 
 class RouterStub {
@@ -34,7 +36,7 @@ describe('the Child Router module', () => {
 		expect(sut.router.routes).toContainEqual({
 			route: ['', 'welcome'],
 			name: 'welcome',
-			moduleId: './../welcome/welcome.vm',
+			moduleId: PLATFORM.moduleName('./../welcome/welcome.vm'),
 			nav: true,
 			title: 'Welcome'
 		});
@@ -44,7 +46,7 @@ describe('the Child Router module', () => {
 		expect(sut.router.routes).toContainEqual({
 			route: 'users',
 			name: 'users',
-			moduleId: './../users/users.vm',
+			moduleId: PLATFORM.moduleName('./../users/users.vm'),
 			nav: true,
 			title: 'Github Users'
 		});
@@ -54,7 +56,7 @@ describe('the Child Router module', () => {
 		expect(sut.router.routes).toContainEqual({
 			route: 'child-router',
 			name: 'child-router',
-			moduleId: './../child-router/child-router.vm',
+			moduleId: PLATFORM.moduleName('./../child-router/child-router.vm'),
 			nav: true,
 			title: 'Child Router'
 		});

test/unit/welcome.spec.ts

@@ -1,14 +1,15 @@
 import { bootstrap } from 'aurelia-bootstrapper';
 import { StageComponent } from 'aurelia-testing';
+import { PLATFORM } from 'aurelia-framework';
 
 describe('WelcomeComponent', () => {
   let component;
 
   beforeEach(async () => {
     component = StageComponent
       .withResources([
-        '../../src/app/modules/welcome/welcome.vm',
-        '../../src/app/resources/converters/date-format.converter'
+        PLATFORM.moduleName('../../src/app/modules/welcome/welcome.vm'),
+        PLATFORM.moduleName('../../src/app/resources/converters/date-format.converter')
       ])
       .inView('<welcome-view-model></welcome-view-model>');
       await component.create(bootstrap);

tsconfig.json

@@ -1,4 +1,5 @@
 {
+  "compileOnSave": false,
   "compilerOptions": {
     "target": "es5",
     "module": "es6",