diff --git a/.stylelintrc.json b/.stylelintrc.json index f01755d7..ceabd5a3 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -41,7 +41,6 @@ "declaration-no-important": true, "declaration-block-no-duplicate-properties": true, - "declaration-block-no-ignored-properties": true, "declaration-block-trailing-semicolon": "always", "declaration-block-single-line-max-declarations": 1, "declaration-block-semicolon-space-before": "never", diff --git a/package.json b/package.json index 91dfd1ad..39ed5675 100644 --- a/package.json +++ b/package.json @@ -12,35 +12,35 @@ "@ngrx/store-log-monitor": "3.0.2", "@types/core-js": "0.9.35", "@types/electron": "^1.4.29", - "@types/jquery": "2.0.39", - "@types/node": "6.0.52", + "@types/jquery": "^2.0.40", + "@types/node": "^7.0.5", "@types/usb": "^1.1.2", "copy-webpack-plugin": "^4.0.1", "electron": "1.4.15", "electron-rebuild": "^1.5.5", "expose-loader": "^0.7.1", "html-loader": "0.4.4", - "node-sass": "^4.3.0", + "node-sass": "^4.5.0", "npm-run-all": "4.0.1", "path": "^0.12.7", "raw-loader": "^0.5.1", "sass-loader": "^4.1.0", - "stylelint": "^7.0.3", + "stylelint": "^7.8.0", "ts-loader": "^1.3.2", - "tslint": "~4.3.1", + "tslint": "~4.4.2", "webpack": "^1.14.0", - "webpack-dev-server": "^1.16.2", + "webpack-dev-server": "^1.16.3", "webpack-fail-plugin": "^1.0.5", "webpack-svgstore-plugin": "^3.0.6" }, "dependencies": { - "@angular/common": "2.4.4", - "@angular/compiler": "2.4.4", - "@angular/core": "2.4.4", - "@angular/forms": "2.4.4", - "@angular/platform-browser": "2.4.4", - "@angular/platform-browser-dynamic": "2.4.4", - "@angular/router": "3.4.4", + "@angular/common": "2.4.6", + "@angular/compiler": "2.4.6", + "@angular/core": "2.4.6", + "@angular/forms": "2.4.6", + "@angular/platform-browser": "2.4.6", + "@angular/platform-browser-dynamic": "2.4.6", + "@angular/router": "3.4.6", "@ngrx/core": "1.2.0", "@ngrx/effects": "2.0.0", "@ngrx/store": "2.2.1", @@ -52,8 +52,8 @@ "jquery": "3.1.1", "json-loader": "^0.5.4", "ng2-dragula": "1.3.0", - "ng2-select2": "1.0.0-beta.6", - "rxjs": "5.0.3", + "ng2-select2": "1.0.0-beta.7", + "rxjs": "5.1.0", "select2": "^4.0.3", "typescript": "2.1.5", "usb": "git+https://github.com/aktary/node-usb.git", diff --git a/shared/src/config-serializer/config-items/macro-action/MacroAction.ts b/shared/src/config-serializer/config-items/macro-action/MacroAction.ts index 2eba32f5..b5ac97e6 100644 --- a/shared/src/config-serializer/config-items/macro-action/MacroAction.ts +++ b/shared/src/config-serializer/config-items/macro-action/MacroAction.ts @@ -16,7 +16,7 @@ export enum MacroActionId { */ LastKeyMacroAction = 8, MouseButtonMacroAction = 9, - /* + /* 9 - 11 are reserved for MouseButtonMacroAction PressMouseButtonsMacroAction = 9, HoldMouseButtonsMacroAction = 10, diff --git a/tslint.json b/tslint.json index 68d2da05..cc4eed07 100644 --- a/tslint.json +++ b/tslint.json @@ -6,7 +6,6 @@ "static-before-instance", "variables-before-functions" ], - "no-inferrable-types": true, "no-internal-module": true, "class-name": true, "curly": true,