diff --git a/electron/src/electron-main.ts b/electron/src/electron-main.ts index 94f53580..778413a2 100644 --- a/electron/src/electron-main.ts +++ b/electron/src/electron-main.ts @@ -168,15 +168,15 @@ function sendIpcToWindow(message: string, arg?: any) { } function allowPreRelease() { - const settings = getAutoUpdateSettings(); + const autoUpdateSettings = getAutoUpdateSettings(); - return settings && settings.usePreReleaseUpdate; + return autoUpdateSettings && autoUpdateSettings.usePreReleaseUpdate; } function checkForUpdateAtStartup() { - const settings = getAutoUpdateSettings(); + const autoUpdateSettings = getAutoUpdateSettings(); - return settings && settings.checkForUpdateOnStartUp; + return autoUpdateSettings && autoUpdateSettings.checkForUpdateOnStartUp; } function getAutoUpdateSettings() { diff --git a/electron/src/services/electron-error-handler.service.ts b/electron/src/services/electron-error-handler.service.ts index 6e44c538..08005ef0 100644 --- a/electron/src/services/electron-error-handler.service.ts +++ b/electron/src/services/electron-error-handler.service.ts @@ -1,9 +1,9 @@ import { ErrorHandler, Injectable } from '@angular/core'; -import { LogService} from '../shared/services/logger.service'; +import { LogService } from '../shared/services/logger.service'; @Injectable() export class ElectronErrorHandlerService implements ErrorHandler { - constructor(private logService: LogService) {} + constructor(private logService: LogService) { } handleError(error: any) { this.logService.error(error); diff --git a/electron/src/services/uhk-lib-usb-api.service.ts b/electron/src/services/uhk-lib-usb-api.service.ts index 7ff956a3..2ca9f99b 100644 --- a/electron/src/services/uhk-lib-usb-api.service.ts +++ b/electron/src/services/uhk-lib-usb-api.service.ts @@ -14,7 +14,7 @@ import 'rxjs/add/operator/do'; import { Device, findByIds, InEndpoint, Interface, on, OutEndpoint } from 'usb'; -import { LogService} from '../shared/services/logger.service'; +import { LogService } from '../shared/services/logger.service'; import { Constants } from '../shared/util'; import { UhkDeviceService } from './uhk-device.service'; @@ -27,8 +27,7 @@ export class UhkLibUsbApiService extends UhkDeviceService implements OnDestroy { device.deviceDescriptor.idProduct === Constants.PRODUCT_ID; } - constructor(zone: NgZone, - protected logService: LogService) { + constructor(zone: NgZone, protected logService: LogService) { super(logService); this.initialize(); diff --git a/package-lock.json b/package-lock.json index bbc4f692..1b12fecf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,65 +5,65 @@ "requires": true, "dependencies": { "@angular/animations": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.2.3.tgz", - "integrity": "sha1-aGkmpp0MnCapvK0mzW+9AkW7bBs=", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.2.6.tgz", + "integrity": "sha1-nZyAoRmwwDaTy9I7uvcosVMf/8c=", "requires": { "tslib": "1.7.1" } }, "@angular/common": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.2.3.tgz", - "integrity": "sha1-4Bc2EutqnPjdUL00yKky286R0r8=", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.2.6.tgz", + "integrity": "sha1-IQrOS9JON1+LQbpS/rNLGKiH1do=", "requires": { "tslib": "1.7.1" } }, "@angular/compiler": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.2.3.tgz", - "integrity": "sha1-6c3tR5lM9K23Ui13jEax98UmMwI=", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.2.6.tgz", + "integrity": "sha1-ZndW1JXKDUXSBhJooQ1Sr4Ofr/Q=", "requires": { "tslib": "1.7.1" } }, "@angular/core": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.2.3.tgz", - "integrity": "sha1-q3MpwY1P0wWHK4Jxj/rj525NRUk=", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.2.6.tgz", + "integrity": "sha1-DByP8BV/B29KfAtyHKFCPxu+Fk4=", "requires": { "tslib": "1.7.1" } }, "@angular/forms": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.2.3.tgz", - "integrity": "sha1-/3cPCkXzfNmafCDO3OVg0BjJyjs=", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.2.6.tgz", + "integrity": "sha1-nTI5lgjkYDu/GXQXqluU6ApGfrA=", "requires": { "tslib": "1.7.1" } }, "@angular/platform-browser": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.2.3.tgz", - "integrity": "sha1-mhrM/J6TqVYQErugN6BLQc7cAlU=", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.2.6.tgz", + "integrity": "sha1-oTH/WSIl/mSWvKLJr/YSpNvd9Dc=", "requires": { "tslib": "1.7.1" } }, "@angular/platform-browser-dynamic": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.2.3.tgz", - "integrity": "sha1-h85B9XedMcvGjHHba/66IW0TVVQ=", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.2.6.tgz", + "integrity": "sha1-TmyK0s1c/BeIBBf3fyo0E895HCY=", "requires": { "tslib": "1.7.1" } }, "@angular/router": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.2.3.tgz", - "integrity": "sha1-RJJDGxsFr4X+ttzCspg4IAazqdo=", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.2.6.tgz", + "integrity": "sha1-ppGdm2HEX/wV++5ZM5jj/VMtq0Y=", "requires": { "tslib": "1.7.1" } @@ -101,9 +101,9 @@ "dev": true }, "@types/core-js": { - "version": "0.9.35", - "resolved": "https://registry.npmjs.org/@types/core-js/-/core-js-0.9.35.tgz", - "integrity": "sha1-REBk5jcRzcxi6oRNJ2QvbvwihfI=", + "version": "0.9.42", + "resolved": "https://registry.npmjs.org/@types/core-js/-/core-js-0.9.42.tgz", + "integrity": "sha512-AiEZz42jF2f4nkcJ2OhKWxIbXU62pEHmFoaGoGo83seUzDEncxEZtBPX2i2DLUpcVpaVVxAsqAAZzTyrV0A/RQ==", "dev": true }, "@types/electron-devtools-installer": { @@ -118,7 +118,7 @@ "integrity": "sha1-ixuKArfpLRDOibzRbnroza5xKZ8=", "dev": true, "requires": { - "@types/node": "6.0.79" + "@types/node": "8.0.9" } }, "@types/file-saver": { @@ -128,15 +128,15 @@ "dev": true }, "@types/jquery": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.2.1.tgz", - "integrity": "sha512-GKqrdd++ADesGEsiZ3zuhlBpOONCeHI5//ShzbReEyoIaKavi0ZPHQSbYH/WaLg8Hxu5ezlqTB8S0GFKyop0qA==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.2.6.tgz", + "integrity": "sha512-uF/ymNUqAFoiC4NpsuXrBwy4l7yoH/0V/BXpL9yi17HfyDlqei+pL1JxyQr84yCzFAjxoLcUciPMe5DyqwRVJA==", "dev": true }, "@types/node": { - "version": "6.0.79", - "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.79.tgz", - "integrity": "sha512-7F3/P6MkTPA0QxOstRqfcnoReCUy5V/QG92cyBoZSPnqdX44L8TtNELSVfN56gAttm3YWj9cEi8FRIPVq0WmeQ==", + "version": "8.0.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.9.tgz", + "integrity": "sha512-UkiiJp6Iz2h4xzapN8BPKjhq+/BlyXcISwPVk2Kd7VJ/I1TREFokjBtvM6hftANXdsfo1IoWMXhmg8G8X+SS8Q==", "dev": true }, "@types/node-hid": { @@ -166,7 +166,7 @@ "integrity": "sha1-+9YF06q7WccUFqj1ku7krinppuE=", "dev": true, "requires": { - "@types/node": "6.0.79" + "@types/node": "8.0.9" } }, "7zip": { @@ -1981,6 +1981,15 @@ "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.0.tgz", "integrity": "sha1-LkYovhncSyFLXAJjDFlx6BFhgGI=" }, + "d": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", + "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", + "dev": true, + "requires": { + "es5-ext": "0.10.23" + } + }, "dargs": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz", @@ -2935,12 +2944,70 @@ "is-symbol": "1.0.1" } }, + "es5-ext": { + "version": "0.10.23", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.23.tgz", + "integrity": "sha1-dXi1G+l0IHpUh4IbVlOMIk5Oezg=", + "dev": true, + "requires": { + "es6-iterator": "2.0.1", + "es6-symbol": "3.1.1" + } + }, + "es6-iterator": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz", + "integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.23", + "es6-symbol": "3.1.1" + } + }, + "es6-map": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", + "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.23", + "es6-iterator": "2.0.1", + "es6-set": "0.1.5", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" + } + }, "es6-promise": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz", "integrity": "sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng==", "dev": true }, + "es6-set": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", + "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.23", + "es6-iterator": "2.0.1", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" + } + }, + "es6-symbol": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", + "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.23" + } + }, "es6-templates": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/es6-templates/-/es6-templates-0.2.3.tgz", @@ -2951,6 +3018,18 @@ "through": "2.3.8" } }, + "es6-weak-map": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", + "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.23", + "es6-iterator": "2.0.1", + "es6-symbol": "3.1.1" + } + }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -2963,11 +3042,39 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, + "escope": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", + "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", + "dev": true, + "requires": { + "es6-map": "0.1.5", + "es6-weak-map": "2.0.2", + "esrecurse": "4.2.0", + "estraverse": "4.2.0" + } + }, "esprima": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==" }, + "esrecurse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz", + "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=", + "dev": true, + "requires": { + "estraverse": "4.2.0", + "object-assign": "4.1.1" + } + }, + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "dev": true + }, "esutils": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", @@ -2980,6 +3087,16 @@ "integrity": "sha1-b2Ma7zNtbEY2K1F2QETOIWvjwFE=", "dev": true }, + "event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.23" + } + }, "event-stream": { "version": "3.3.4", "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", @@ -8148,12 +8265,6 @@ } } }, - "source-list-map": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz", - "integrity": "sha1-mIkBnRAkzOVc3AaUmDN+9hhqEaE=", - "dev": true - }, "source-map": { "version": "0.5.6", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", @@ -8950,9 +9061,9 @@ "integrity": "sha1-vIAEFkaRkjp5/oN4u+s9ogF1OOw=" }, "tslint": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.4.3.tgz", - "integrity": "sha1-dhyEArgONHt3M6BDkKdXslNYBGc=", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.5.0.tgz", + "integrity": "sha1-EOjas+MGH6YelELozuOYKs8gpqo=", "dev": true, "requires": { "babel-code-frame": "6.22.0", @@ -9034,6 +9145,81 @@ "dev": true, "optional": true }, + "uglifyjs-webpack-plugin": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz", + "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=", + "dev": true, + "requires": { + "source-map": "0.5.6", + "uglify-js": "2.8.29", + "webpack-sources": "1.0.1" + }, + "dependencies": { + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true + }, + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "dev": true, + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + } + }, + "source-list-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", + "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==", + "dev": true + }, + "uglify-js": { + "version": "2.8.29", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "dev": true, + "requires": { + "source-map": "0.5.6", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + } + }, + "webpack-sources": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz", + "integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==", + "dev": true, + "requires": { + "source-list-map": "2.0.0", + "source-map": "0.5.6" + } + }, + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "dev": true + }, + "yargs": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "dev": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" + } + } + } + }, "uid-number": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz", @@ -9252,69 +9438,53 @@ } }, "webpack": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.6.1.tgz", - "integrity": "sha1-LgRX8KuxrF3zqxBsacZy8jZ4Xwc=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.1.0.tgz", + "integrity": "sha512-BWF3vW30ZpqscTpIsqUi6gTnXdvoeS+uEcmoAjtg5Yq0xtxebjz8xjDl3AWV4P5Mi3RqS5Xhq+Q5vvcjU3iUAw==", "dev": true, "requires": { "acorn": "5.1.1", "acorn-dynamic-import": "2.0.2", - "ajv": "4.11.8", - "ajv-keywords": "1.5.1", + "ajv": "5.2.1", + "ajv-keywords": "2.1.0", "async": "2.5.0", "enhanced-resolve": "3.3.0", + "escope": "3.6.0", "interpret": "1.0.3", "json-loader": "0.5.4", "json5": "0.5.1", "loader-runner": "2.3.0", - "loader-utils": "0.2.17", + "loader-utils": "1.1.0", "memory-fs": "0.4.1", "mkdirp": "0.5.1", "node-libs-browser": "2.0.0", "source-map": "0.5.6", "supports-color": "3.2.3", "tapable": "0.2.6", - "uglify-js": "2.8.29", + "uglifyjs-webpack-plugin": "0.4.6", "watchpack": "1.3.1", - "webpack-sources": "0.2.3", + "webpack-sources": "1.0.1", "yargs": "6.6.0" }, "dependencies": { - "ajv-keywords": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz", - "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=", - "dev": true + "ajv": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.1.tgz", + "integrity": "sha1-3NAwRRdYg7obY25a6ew9+auFMjo=", + "dev": true, + "requires": { + "co": "4.6.0", + "fast-deep-equal": "1.0.0", + "json-schema-traverse": "0.3.1", + "json-stable-stringify": "1.0.1" + } }, "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", "dev": true }, - "cliui": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, - "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", - "wordwrap": "0.0.2" - } - }, - "loader-utils": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", - "dev": true, - "requires": { - "big.js": "3.1.3", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" - } - }, "os-locale": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", @@ -9324,6 +9494,12 @@ "lcid": "1.0.0" } }, + "source-list-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", + "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==", + "dev": true + }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", @@ -9333,29 +9509,14 @@ "has-flag": "1.0.0" } }, - "uglify-js": { - "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "webpack-sources": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz", + "integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==", "dev": true, "requires": { - "source-map": "0.5.6", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" - }, - "dependencies": { - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, - "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", - "window-size": "0.1.0" - } - } + "source-list-map": "2.0.0", + "source-map": "0.5.6" } }, "which-module": { @@ -9364,12 +9525,6 @@ "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", "dev": true }, - "wordwrap": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "dev": true - }, "yargs": { "version": "6.6.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", @@ -9389,25 +9544,6 @@ "which-module": "1.0.0", "y18n": "3.2.1", "yargs-parser": "4.2.1" - }, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "dev": true, - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" - } - } } }, "yargs-parser": { @@ -9417,14 +9553,6 @@ "dev": true, "requires": { "camelcase": "3.0.0" - }, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true - } } } } @@ -9552,16 +9680,6 @@ } } }, - "webpack-sources": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz", - "integrity": "sha1-F8Yr+vE8cH+dAsR54Nzd6DgGl/s=", - "dev": true, - "requires": { - "source-list-map": "1.1.2", - "source-map": "0.5.6" - } - }, "webpack-svgstore-plugin": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/webpack-svgstore-plugin/-/webpack-svgstore-plugin-4.0.1.tgz", diff --git a/package.json b/package.json index 92a181f5..a8508a00 100644 --- a/package.json +++ b/package.json @@ -16,12 +16,12 @@ "devDependencies": { "@ngrx/store-devtools": "3.2.4", "@ngrx/store-log-monitor": "3.0.2", - "@types/core-js": "0.9.35", + "@types/core-js": "0.9.42", "@types/electron-devtools-installer": "^2.0.2", "@types/electron-settings": "^3.0.0", "@types/file-saver": "0.0.1", - "@types/jquery": "3.2.1", - "@types/node": "^6.0.78", + "@types/jquery": "^3.2.6", + "@types/node": "^8.0.9", "@types/node-hid": "^0.5.2", "@types/usb": "^1.1.3", "angular2-template-loader": "0.6.2", @@ -44,20 +44,20 @@ "standard-version": "^4.0.0", "stylelint": "^7.12.0", "ts-loader": "^2.0.3", - "tslint": "~5.4.3", - "webpack": "^2.4.1", - "webpack-dev-server": "^2.4.4", + "tslint": "~5.5.0", + "webpack": "^3.1.0", + "webpack-dev-server": "^2.5.1", "webpack-svgstore-plugin": "4.0.1" }, "dependencies": { - "@angular/animations": "4.2.3", - "@angular/common": "4.2.3", - "@angular/compiler": "4.2.3", - "@angular/core": "4.2.3", - "@angular/forms": "4.2.3", - "@angular/platform-browser": "4.2.3", - "@angular/platform-browser-dynamic": "4.2.3", - "@angular/router": "4.2.3", + "@angular/animations": "4.2.6", + "@angular/common": "4.2.6", + "@angular/compiler": "4.2.6", + "@angular/core": "4.2.6", + "@angular/forms": "4.2.6", + "@angular/platform-browser": "4.2.6", + "@angular/platform-browser-dynamic": "4.2.6", + "@angular/router": "4.2.6", "@ngrx/core": "1.2.0", "@ngrx/effects": "2.0.3", "@ngrx/router-store": "^1.2.6", @@ -81,7 +81,7 @@ "ngrx-store-freeze": "^0.1.9", "node-hid": "0.5.4", "reselect": "3.0.1", - "rxjs": "^5.4.1", + "rxjs": "^5.4.2", "select2": "^4.0.3", "sudo-prompt": "^7.0.0", "typescript": "2.3.4", diff --git a/shared/src/config-serializer/config-items/key-action/key-action.ts b/shared/src/config-serializer/config-items/key-action/key-action.ts index 8b93595a..e4664e73 100644 --- a/shared/src/config-serializer/config-items/key-action/key-action.ts +++ b/shared/src/config-serializer/config-items/key-action/key-action.ts @@ -1,5 +1,3 @@ -/// - import { Macro } from '../macro'; import { UhkBuffer } from '../../uhk-buffer'; diff --git a/shared/src/config-serializer/function.d.ts b/shared/src/config-serializer/function.d.ts deleted file mode 100644 index 972f81ba..00000000 --- a/shared/src/config-serializer/function.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -interface Function { - name: string; -} diff --git a/shared/src/pipes/safe-style.pipe.ts b/shared/src/pipes/safe-style.pipe.ts index 4dbb4b6f..50f7e4e4 100644 --- a/shared/src/pipes/safe-style.pipe.ts +++ b/shared/src/pipes/safe-style.pipe.ts @@ -1,12 +1,12 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { SafeStyle, DomSanitizer} from '@angular/platform-browser'; +import { SafeStyle, DomSanitizer } from '@angular/platform-browser'; @Pipe({ name: 'safeStyle' }) export class SafeStylePipe implements PipeTransform { - constructor(private sanitizer: DomSanitizer) {} + constructor(private sanitizer: DomSanitizer) { } transform(style: string): SafeStyle { return this.sanitizer.bypassSecurityTrustStyle(style); diff --git a/shared/src/polyfills.ts b/shared/src/polyfills.ts index 212b227b..d1d8b348 100644 --- a/shared/src/polyfills.ts +++ b/shared/src/polyfills.ts @@ -1,3 +1,4 @@ +import 'core-js/es7/array'; import 'core-js/es7/object'; import 'core-js/es7/reflect'; import 'zone.js/dist/zone'; diff --git a/shared/src/services/logger.service.ts b/shared/src/services/logger.service.ts index 0843d646..ba093a89 100644 --- a/shared/src/services/logger.service.ts +++ b/shared/src/services/logger.service.ts @@ -1,4 +1,4 @@ -import {Injectable} from '@angular/core'; +import { Injectable } from '@angular/core'; @Injectable() export class LogService { diff --git a/shared/src/store/actions/app.action.ts b/shared/src/store/actions/app.action.ts index 3c7d9679..e6ea9318 100644 --- a/shared/src/store/actions/app.action.ts +++ b/shared/src/store/actions/app.action.ts @@ -1,7 +1,7 @@ import { Action } from '@ngrx/store'; import { type } from '../../util'; -import {Notification} from '../../models/notification'; +import { Notification } from '../../models/notification'; const PREFIX = '[app] '; @@ -23,7 +23,7 @@ export class AppStartedAction implements Action { export class ShowNotificationAction implements Action { type = ActionTypes.APP_SHOW_NOTIFICATION; - constructor(public payload: Notification) {} + constructor(public payload: Notification) { } } export type Actions diff --git a/shared/src/store/reducers/user-configuration.ts b/shared/src/store/reducers/user-configuration.ts index c2639dcb..ce8de5c8 100644 --- a/shared/src/store/reducers/user-configuration.ts +++ b/shared/src/store/reducers/user-configuration.ts @@ -17,9 +17,6 @@ import { ActionTypes } from '../actions/user-config'; const initialState: UserConfiguration = new UserConfiguration(); -/* tslint:disable:no-switch-case-fall-through */ -// tslint bug: https://github.com/palantir/tslint/issues/1538 - export default function (state = initialState, action: Action): UserConfiguration { const changedUserConfiguration: UserConfiguration = Object.assign(new UserConfiguration(), state); diff --git a/test-serializer/tsconfig.json b/test-serializer/tsconfig.json index 70aa257f..0ea161d9 100644 --- a/test-serializer/tsconfig.json +++ b/test-serializer/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "target": "es5", + "target": "es6", "module": "commonjs", "moduleResolution": "node", "experimentalDecorators": true, @@ -12,4 +12,4 @@ "core-js" ] } -} \ No newline at end of file +} diff --git a/tsconfig.base.json b/tsconfig.base.json index 2226a65a..68494980 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -8,7 +8,14 @@ "experimentalDecorators": true, "removeComments": false, "noImplicitAny": true, - "suppressImplicitAnyIndexErrors": true + "suppressImplicitAnyIndexErrors": true, + "lib": [ + "es6", + "es2016.array.include", + "dom", + "dom.iterable", + "scripthost" + ] }, "exclude": [ "./dist",