Upgrade to ngrx v4 (#378)

* Update ngrx to v4

* package.json files

* release: Remove zadic references from release script

* fix(user-config): Fix user-config loading

* build: Lock package dependencies

* build: fix app version

* ci: remove build:test step

* fix(user-config): Revert switch-keymap-action modifications

* test(user-config): xit keystroke-action test

* fix(user-config): Fix user config loading

* fix(user-config): Fix user config loading
This commit is contained in:
József Farkas
2017-10-08 18:31:16 +02:00
committed by László Monda
parent ba1fff788d
commit 50e0b64f6e
40 changed files with 3323 additions and 3283 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -14,18 +14,19 @@
"npm": ">=5.1.0 <6.0.0"
},
"dependencies": {
"command-line-args": "4.0.6",
"electron": "1.7.5",
"command-line-args": "4.0.7",
"electron": "1.7.8",
"electron-is-dev": "0.1.2",
"electron-log": "2.2.6",
"electron-log": "2.2.9",
"electron-rebuild": "1.6.0",
"electron-settings": "3.0.14",
"electron-updater": "2.2.0",
"electron-settings": "3.1.2",
"electron-updater": "2.10.1",
"node-hid": "0.5.4",
"sudo-prompt": "^7.0.0",
"sudo-prompt": "7.0.0",
"uhk-usb": "1.0.0"
},
"devDependencies": {
"@types/node": "8.0.33",
"uhk-common": "^1.0.0"
},
"scripts": {

View File

@@ -19,7 +19,7 @@ import { AppService } from './services/app.service';
import { SudoService } from './services/sudo.service';
const optionDefinitions = [
{ name: 'addons', type: Boolean, defaultOption: false }
{name: 'addons', type: Boolean, defaultOption: false}
];
const options: CommandLineArgs = commandLineArgs(optionDefinitions);

View File

@@ -1,7 +1,6 @@
import { ipcMain, BrowserWindow } from 'electron';
import { autoUpdater } from 'electron-updater';
import { ProgressInfo } from 'electron-builder-http/out/ProgressCallbackTransform';
import { VersionInfo } from 'electron-builder-http/out/publishOptions';
import { VersionInfo, ProgressInfo } from 'builder-util-runtime';
import * as settings from 'electron-settings';
import * as isDev from 'electron-is-dev';