chore: merge remote-tracking branch 'upstream/master'

Author: tsvetomir

karma.conf.js

@@ -3,21 +3,17 @@
 'use strict';
 
 var argv = require('yargs').argv;
-var minimatch = require("minimatch");
+var minimatch = require('minimatch');
 
-
-module.exports = function (config) {
+module.exports = function(config) {
   config.set({
-
     // base path that will be used to resolve all patterns (eg. files, exclude)
     basePath: './',
 
-
     // frameworks to use
     // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
     frameworks: ['jasmine'],
 
-
     // list of files / patterns to load in the browser
     files: [
       // Polyfills.
@@ -69,10 +65,7 @@ module.exports = function (config) {
     },
 
     // list of files to exclude
-    exclude: [
-      'node_modules/**/*spec.js'
-    ],
-
+    exclude: ['node_modules/**/*spec.js'],
 
     // preprocess matching files before serving them to the browser
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
@@ -82,30 +75,22 @@ module.exports = function (config) {
     // available reporters: https://npmjs.org/browse/keyword/karma-reporter
     reporters: ['mocha'],
 
-
     // web server port
     port: 9876,
 
-
     // enable / disable colors in the output (reporters and logs)
     colors: true,
 
-
     // level of logging
     // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
     logLevel: config.LOG_INFO,
 
-
     // enable / disable watching file and executing tests whenever any file changes
     autoWatch: true,
 
-
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    browsers: [
-      'Chrome'
-    ],
-
+    browsers: ['Chrome'],
 
     customLaunchers: {
       Chrome_travis_ci: {
@@ -120,7 +105,7 @@ module.exports = function (config) {
 
     // Passing command line arguments to tests
     client: {
-      files:  argv.files ? minimatch.makeRe(argv.files).source : null
+      files: argv.files ? minimatch.makeRe(argv.files).source : null
     }
   });
 

package.json

@@ -44,7 +44,7 @@
     "e2e.ci": "gulp build.prod.rollup.aot --color && gulp build.e2e --color && gulp e2e --color",
     "tests.all": "npm test && npm run e2e.ci",
     "webdriver-start": "node ./node_modules/protractor/bin/webdriver-manager start",
-    "webdriver-update": "node ./node_modules/protractor/bin/webdriver-manager update",
+    "webdriver-update": "node ./node_modules/protractor/bin/webdriver-manager update --standalone false --gecko false",
     "compodoc": "./node_modules/.bin/compodoc -p src/client/tsconfig.json",
     "serve.compodoc": "./node_modules/.bin/compodoc -s"
   },
@@ -55,31 +55,31 @@
     "npm": ">=3.10.3"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "^5.0.1",
-    "@angular/language-service": "^5.0.1",
-    "@angular/platform-server": "^5.0.1",
-    "@compodoc/compodoc": "^1.0.4",
-    "@types/async": "^2.0.45",
+    "@angular/compiler-cli": "^5.2.3",
+    "@angular/language-service": "^5.2.3",
+    "@angular/platform-server": "^5.2.3",
+    "@compodoc/compodoc": "^1.0.5",
+    "@types/async": "^2.0.47",
     "@types/browser-sync": "^0.0.38",
-    "@types/express": "^4.0.39",
+    "@types/express": "^4.11.1",
     "@types/gulp": "^4.0.5",
     "@types/gulp-filter": "^3.0.31",
     "@types/gulp-htmlmin": "^1.3.31",
     "@types/gulp-load-plugins": "^0.0.31",
     "@types/gulp-protractor": "^1.0.31",
     "@types/gulp-sass": "^0.0.31",
     "@types/gulp-util": "^3.0.34",
-    "@types/jasmine": "^2.8.2",
-    "@types/node": "^8.0.53",
+    "@types/jasmine": "^2.8.6",
+    "@types/node": "^9.3.0",
     "@types/rimraf": "2.0.2",
     "@types/run-sequence": "^0.0.30",
     "@types/selenium-webdriver": "^3.0.8",
     "@types/systemjs": "^0.20.6",
     "@types/yargs": "^10.0.0",
     "async": "^2.6.0",
-    "autoprefixer": "^7.1.6",
-    "browser-sync": "^2.18.13",
-    "codelyzer": "^4.0.1",
+    "autoprefixer": "^8.0.0",
+    "browser-sync": "^2.23.6",
+    "codelyzer": "^4.1.0",
     "connect-history-api-fallback": "^1.5.0",
     "cssnano": "^3.10.0",
     "deep-extend": "^0.5.0",
@@ -88,83 +88,82 @@
     "express-history-api-fallback": "^2.2.1",
     "gulp": "^3.9.1",
     "gulp-cached": "^1.1.1",
-    "gulp-cheerio": "^0.6.2",
+    "gulp-cheerio": "^0.6.3",
     "gulp-concat": "^2.6.1",
     "gulp-concat-css": "^3.0.0",
-    "gulp-filter": "^5.0.1",
+    "gulp-filter": "^5.1.0",
     "gulp-htmlmin": "^4.0.0",
     "gulp-inject": "^4.3.0",
-    "gulp-inline-ng2-template": "^4.0.0",
+    "gulp-inline-ng2-template": "^4.1.0",
     "gulp-load-plugins": "^1.5.0",
     "gulp-plumber": "~1.2.0",
-    "gulp-postcss": "^7.0.0",
-    "gulp-progeny": "^0.4.0",
+    "gulp-postcss": "^7.0.1",
+    "gulp-progeny": "^0.4.1",
     "gulp-protractor": "^4.1.0",
     "gulp-rename": "^1.2.2",
     "gulp-replace": "^0.6.1",
     "gulp-sass": "^3.1.0",
-    "gulp-sourcemaps": "2.6.3",
+    "gulp-sourcemaps": "2.6.4",
     "gulp-template": "^5.0.0",
     "gulp-tslint": "^8.1.2",
-    "gulp-typescript": "~3.2.3",
     "gulp-uglify": "^3.0.0",
     "gulp-util": "^3.0.8",
     "gulp-watch": "^5.0.0",
-    "is-ci": "^1.0.10",
+    "is-ci": "^1.1.0",
     "isstream": "^0.1.2",
-    "jasmine-core": "~2.8.0",
+    "jasmine-core": "~2.99.0",
     "jasmine-spec-reporter": "^4.2.1",
     "karma": "~2.0.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage": "^1.1.1",
-    "karma-jasmine": "~1.1.0",
+    "karma-jasmine": "^1.1.1",
     "karma-mocha-reporter": "^2.2.5",
     "karma-remap-istanbul": "^0.6.0",
     "merge-stream": "^1.0.1",
     "minimatch": "^3.0.4",
     "open": "0.0.5",
-    "protractor": "^5.2.0",
-    "remap-istanbul": "^0.9.5",
+    "protractor": "^5.3.0",
+    "remap-istanbul": "^0.10.0",
     "rimraf": "^2.6.2",
-    "rollup": "~0.53.0",
-    "rollup-plugin-commonjs": "^8.2.6",
+    "rollup": "~0.55.0",
+    "rollup-plugin-commonjs": "^8.3.0",
     "rollup-plugin-includepaths": "0.2.2",
-    "rollup-plugin-node-resolve": "^3.0.0",
-    "run-sequence": "^2.2.0",
-    "semver": "^5.4.1",
+    "rollup-plugin-node-resolve": "^3.0.2",
+    "run-sequence": "^2.2.1",
+    "semver": "^5.5.0",
     "serve-static": "^1.13.1",
     "slash": "~1.0.0",
     "source-map-explorer": "^1.5.0",
-    "supports-color": "^5.0.0",
+    "supports-color": "^5.1.0",
     "systemjs-builder": "0.16.12",
     "temp": "^0.8.3",
     "tildify": "^1.2.0",
     "traceur": "^0.0.111",
     "ts-node": "^4.0.1",
-    "tslint": "^5.8.0",
-    "typescript": "^2.6.1",
+    "tslint": "^5.9.1",
+    "typescript": "^2.7.1",
     "walk": "^2.3.9",
-    "yargs": "^10.0.3"
+    "yargs": "^11.0.0"
   },
   "dependencies": {
-    "@angular/animations": "^5.0.2",
-    "@angular/common": "^5.0.0",
-    "@angular/compiler": "^5.0.0",
-    "@angular/core": "^5.0.0",
-    "@angular/forms": "^5.0.0",
-    "@angular/http": "^5.0.0",
-    "@angular/platform-browser": "^5.0.0",
-    "@angular/platform-browser-dynamic": "^5.0.0",
-    "@angular/router": "^5.0.0",
-    "@angular/service-worker": "^5.0.0",
+    "@angular-devkit/build-optimizer": "^0.3.0",
+    "@angular/animations": "^5.2.3",
+    "@angular/common": "^5.2.3",
+    "@angular/compiler": "^5.2.3",
+    "@angular/core": "^5.2.3",
+    "@angular/forms": "^5.2.3",
+    "@angular/platform-browser": "^5.2.3",
+    "@angular/platform-browser-dynamic": "^5.2.3",
+    "@angular/router": "^5.2.3",
+    "@angular/service-worker": "^5.2.3",
     "@progress/kendo-angular-buttons": "^2.0.0",
     "@progress/kendo-angular-l10n": "^1.0.5",
-    "@angular-devkit/build-optimizer": "0.0.36",
-    "core-js": "^2.5.1",
+    "core-js": "^2.5.3",
+    "gulp-typescript": "^4.0.0",
     "hammerjs": "^2.0.8",
     "intl": "^1.2.5",
     "rxjs": "^5.5.3",
-    "systemjs": "0.20.19",
-    "zone.js": "0.8.19"
+    "systemjs": "0.21.0",
+    "zone.js": "0.8.20"
   }
 }

src/client/app/main-prod.ts

@@ -11,13 +11,13 @@ enableProdMode();
 
 platformBrowser().bootstrapModuleFactory(AppModuleNgFactory);
 
-// In order to start the Service Worker located at "/worker-basic.min.js"
+// In order to start the Service Worker located at "/ngsw-worker.js"
 // uncomment this line. More about Service Workers here
 // https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API/Using_Service_Workers
-//
+
 // if ('serviceWorker' in navigator) {
-//   (<any>navigator).serviceWorker.register('/worker-basic.min.js').then((registration: any) =>
-//       console.log('ServiceWorker registration successful with scope: ', registration.scope))
-//     .catch((err: any) =>
-//       console.log('ServiceWorker registration failed: ', err));
+//   (<any>navigator).serviceWorker
+//     .register('/ngsw-worker.js')
+//     .then((registration: any) => console.log('ServiceWorker registration successful with scope: ', registration.scope))
+//     .catch((err: any) => console.log('ServiceWorker registration failed: ', err));
 // }

src/client/app/main.ts

@@ -11,25 +11,25 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 // The app module
 import { AppModule } from './app.module';
 
-if (String('<%= BUILD_TYPE %>') === 'prod') { enableProdMode(); }
+if (String('<%= BUILD_TYPE %>') === 'prod') {
+  enableProdMode();
+}
 
 // Compile and launch the module with i18n providers
 // let TP = new TranslationProviders();
 // TP.getTranslationFile().then((providers: any) => {
-  // const options: any = { providers };
-  platformBrowserDynamic().bootstrapModule(AppModule/*, options*/);
+// const options: any = { providers };
+platformBrowserDynamic().bootstrapModule(AppModule /*, options*/);
 // });
 
-// In order to start the Service Worker located at "/worker-basic.[min.]js"
+// In order to start the Service Worker located at "/ngsw-worker.js"
 // uncomment this line. More about Service Workers here
 // https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API/Using_Service_Workers
 //
 // if ('serviceWorker' in navigator) {
-//   let workerScript = '/worker-basic';
-//   if (String('<%= BUILD_TYPE %>') === 'prod') { workerScript = workerScript + '.min'; }
-//   workerScript = workerScript + '.js';
-//   (<any>navigator).serviceWorker.register(workerScript).then((registration: any) =>
-//       console.log('ServiceWorker registration successful with scope: ', registration.scope))
-//     .catch((err: any) =>
-//       console.log('ServiceWorker registration failed: ', err));
+//   const workerScript = '/ngsw-worker.js';
+//   (<any>navigator).serviceWorker
+//     .register(workerScript)
+//     .then((registration: any) => console.log('ServiceWorker registration successful with scope: ', registration.scope))
+//     .catch((err: any) => console.log('ServiceWorker registration failed: ', err));
 // }