Merge branch 'release/10.0.0'

w3tecch · Jul 15, 2018 · d952d3a · d952d3a
2 parents 0e274e4 + ba1f1ea
commit d952d3a
Show file tree

Hide file tree

Showing 4 changed files with 1,448 additions and 3,707 deletions.
diff --git a/package.json b/package.json
@@ -79,7 +79,7 @@
   "devDependencies": {
     "@types/cordova": "^0.0.34",
     "@types/i18next-browser-languagedetector": "^2.0.0",
-    "@types/jest": "^22.1.2",
+    "@types/jest": "^23.1.6",
     "@types/jquery": "^3.2.12",
     "@types/lodash-es": "^4.17.0",
     "@types/node": "^8.0.26",
@@ -98,15 +98,17 @@
     "compression-webpack-plugin": "^1.0.0",
     "copy-webpack-plugin": "^4.0.1",
     "cordova": "^8.0.0",
-    "css-loader": "^0.28.7",
+    "css-loader": "^1.0.0",
     "expose-loader": "^0.7.3",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "file-loader": "^1.1.5",
     "html-webpack-plugin": "^3.0.6",
     "http-server": "^0.11.1",
-    "img-loader": "^2.0.0",
-    "jest": "^22.3.0",
-    "jest-cli": "^22.3.0",
+    "imagemin": "^5.3.1",
+    "img-loader": "^3.0.0",
+    "jest": "^23.4.1",
+    "jest-cli": "^23.4.1",
+    "jsdom": "^11.11.0",
     "loader-utils": "^1.1.0",
     "mini-css-extract-plugin": "^0.4.0",
     "ncp": "^2.0.0",
@@ -119,8 +121,8 @@
     "sass-loader": "^7.0.1",
     "style-loader": "^0.21.0",
     "template-gen": "^2.0.0",
-    "ts-jest": "^22.0.4",
-    "ts-node": "^6.0.0",
+    "ts-jest": "^23.0.0",
+    "ts-node": "^7.0.0",
     "tslib": "^1.7.1",
     "tslint": "^5.7.0",
     "tslint-loader": "^3.6.0",
@@ -130,7 +132,7 @@
     "webapp-webpack-plugin": "^2.0.1",
     "webpack": "^4.0.1",
     "webpack-bundle-analyzer": "^2.11.1",
-    "webpack-cli": "^2.0.9",
+    "webpack-cli": "^3.0.8",
     "webpack-dev-server": "^3.0.0",
     "webpack-notifier": "^1.5.0"
   },

diff --git a/src/app/app.vm.ts b/src/app/app.vm.ts
@@ -1,15 +1,15 @@
-import { Lazy, inject } from 'aurelia-framework';
-import { Router, RouterConfiguration } from 'aurelia-router';
-import { I18N } from 'aurelia-i18n';
 import { HttpClient } from 'aurelia-fetch-client';
-import moment from 'moment';
+import { inject, Lazy } from 'aurelia-framework';
+import { I18N } from 'aurelia-i18n';
+import { Router, RouterConfiguration } from 'aurelia-router';
+import * as moment from 'moment';
 
-import { LogManager, Logger } from './services/logger.service';
+import { ExampleStep } from './pipelines/example.step';
 import { AppConfigService } from './services/app-config.service';
 import { CordovaService } from './services/cordova.service';
-import { EventBusService, EventBusEvents } from './services/event-bus.service';
+import { EventBusEvents, EventBusService } from './services/event-bus.service';
 import { LanguageService } from './services/language.service';
-import { ExampleStep } from './pipelines/example.step';
+import { Logger, LogManager } from './services/logger.service';
 import { RouteGeneratorService } from './services/route-generator.service';
 
 @inject(I18N, AppConfigService, Lazy.of(CordovaService), EventBusService, LanguageService, HttpClient, RouteGeneratorService)

diff --git a/test/unit/app.spec.ts b/test/unit/app.spec.ts
@@ -9,8 +9,10 @@ import { EventBusService } from '../../src/app/services/event-bus.service';
 import { LanguageService } from '../../src/app/services/language.service';
 import { RouteGeneratorService } from '../../src/app/services/route-generator.service';
 
-let en_Translation = require('./../../src/locales/en.json');
-let de_Translation = require('./../../src/locales/de.json');
+// tslint:disable-next-line:no-var-requires
+const enTranslation = require('./../../src/locales/en.json');
+// tslint:disable-next-line:no-var-requires
+const deTranslation = require('./../../src/locales/de.json');
 
 class RouterStub {
   public routes;
@@ -52,11 +54,11 @@ describe('the App module', () => {
     i18nMock = new I18N(new EventAggregator(), new BindingSignaler());
     i18nMock.setup({
       resources: {
-        'en': {
-          translation: en_Translation
+        en: {
+          translation: enTranslation
         },
-        'de': {
-          translation: de_Translation
+        de: {
+          translation: deTranslation
         }
       },
       lng: 'en',
@@ -66,7 +68,7 @@ describe('the App module', () => {
     const appConfigSub = new AppConfigStub();
     const routeGeneratorService = new RouteGeneratorService(undefined as any);
     const languageService = new LanguageService(i18nMock, undefined as any);
-    const eventBusService = new EventBusService(new EventAggregator);
+    const eventBusService = new EventBusService(new EventAggregator());
 
     sut = new AppViewModel(
       i18nMock, appConfigSub as any, AnyMock, eventBusService, languageService, new HttpClient(), routeGeneratorService