Merge branch 'feature/update-dependencies' into develop

Author: dweber019

package-scripts.js

@@ -5,26 +5,11 @@ module.exports = {
   scripts: {
     default: 'nps webpack',
     test: {
-      default: 'nps test.jest',
-      jest: {
-        default: series(
-          rimraf('test/coverage-jest'),
-          'jest'
-        ),
-        watch: 'jest --watch',
-      },
-      karma: {
-        default: series(
-          rimraf('test/coverage-karma'),
-          'karma start test/karma.conf.js'
-        ),
-        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'),
-        jest: 'nps test.jest',
-      })
+      default: series(
+        rimraf('test/coverage-jest'),
+        'jest'
+      ),
+      watch: 'jest --watch'
     },
     e2e: {
       default: concurrent({

package.json

@@ -94,24 +94,20 @@
     "chalk": "^2.1.0",
     "compression-webpack-plugin": "^1.0.0",
     "copy-webpack-plugin": "^4.0.1",
-    "cordova": "^7.0.1",
-    "cross-env": "^5.0.5",
+    "cordova": "^8.0.0",
     "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": "^1.1.5",
     "html-webpack-plugin": "^2.30.1",
-    "http-server": "^0.10.0",
+    "http-server": "^0.11.1",
     "img-loader": "^2.0.0",
     "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.1",
     "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage-istanbul-reporter": "^1.3.0",
     "karma-jasmine": "^1.1.0",
     "karma-mocha-reporter": "^2.2.4",
     "karma-webpack": "^2.0.4",
@@ -123,9 +119,9 @@
     "postcss-loader": "^2.0.6",
     "protractor": "^5.1.2",
     "sass-loader": "^6.0.6",
-    "style-loader": "^0.19.0",
+    "style-loader": "^0.20.1",
     "ts-jest": "^20.0.14",
-    "ts-node": "^3.3.0",
+    "ts-node": "^4.1.0",
     "tslib": "^1.7.1",
     "tslint": "^5.7.0",
     "tslint-loader": "^3.5.3",

test/karma-bundle.js

@@ -39,7 +39,7 @@ const cssRules = [
  */
 module.exports = ({ production, server, extractCss, coverage, platform, config } = {}) => {
 
-  const PLATFORM = platform || 'browser';
+  const PLATFORM = platform || 'browser'; // possibilities browser, mobile
   const CONFIG = config || 'development';
 
   console.log('');
@@ -67,7 +67,7 @@ module.exports = ({ production, server, extractCss, coverage, platform, config }
     },
     output: {
       path: outDir,
-      publicPath: baseUrl,
+      publicPath: PLATFORM === 'mobile' ? '' : baseUrl,
       filename: production ? '[name].[chunkhash].bundle.js' : '[name].[hash].bundle.js',
       sourceMapFilename: production ? '[name].[chunkhash].bundle.map' : '[name].[hash].bundle.map',
       chunkFilename: production ? '[name].[chunkhash].chunk.js' : '[name].[hash].chunk.js',