Skip to content

Commit 33c910d

Browse files
ert78gbmondalaci
authored andcommitted
chore: upgrade angular => 7.x (#925)
* Merge branch 'master' into chore-upgrade-angular-to-7 * reformat files of the store * set preserveWhitespaces = true * delete console.log from AutoGrowInputComponent * fix null pinter exception when set the keyaction on an undefined key * speed tuning * delete svg-keyboard-key animation * revert electron logger upgrade * improve animation speed of scg-keyboard-key component * fix: popover keymap tab visibility * fix: remove btn-line css class
1 parent b1b2f1d commit 33c910d

File tree

84 files changed

+8497
-10084
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+8497
-10084
lines changed

package-lock.json

+1,835-766
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+9-6
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"autoprefixer": "6.5.3",
3535
"buffer": "5.0.6",
3636
"check-node-version": "^3.2.0",
37-
"copy-webpack-plugin": "4.0.1",
37+
"copy-webpack-plugin": "5.0.0",
3838
"copyfiles": "^2.0.0",
3939
"core-js": "2.4.1",
4040
"cross-env": "5.0.5",
@@ -53,28 +53,31 @@
5353
"file-loader": "0.10.0",
5454
"fs-extra": "5.0.0",
5555
"gh-pages": "2.0.1",
56+
"html-webpack-plugin": "3.2.0",
5657
"jasmine": "2.8.0",
5758
"jasmine-core": "2.8.0",
5859
"jasmine-node": "2.0.1",
5960
"jasmine-ts": "0.3.0",
6061
"jsonfile": "4.0.0",
61-
"lerna": "^3.13.0",
62+
"lerna": "3.13.0",
6263
"lodash": "4.17.11",
6364
"mkdirp": "0.5.1",
6465
"node-hid": "0.7.3",
6566
"npm-run-all": "4.0.2",
6667
"nrf-intel-hex": "1.3.0",
68+
"postcss-url": "8.0.0",
6769
"pre-commit": "1.2.2",
6870
"request": "2.88.0",
6971
"rimraf": "2.6.1",
7072
"source-map-support": "0.5.9",
7173
"stylelint": "9.6.0",
7274
"svg-sprite": "1.5.0",
73-
"ts-loader": "2.3.1",
75+
"ts-loader": "5.3.3",
7476
"ts-node": "7.0.1",
75-
"tslint": "5.9.1",
76-
"typescript": "2.8.4",
77-
"webpack": "3.12.0"
77+
"tslint": "5.13.0",
78+
"typescript": "3.3.3",
79+
"webpack": "4.29.5",
80+
"webpack-cli": "3.2.3"
7881
},
7982
"pre-commit": [
8083
"precommit-msg"

packages/kboot/tsconfig.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"extends": "../../tsconfig.json"
2+
"extends": "../../tsconfig.json",
3+
"compilerOptions": {
4+
"baseUrl": "./"
5+
}
36
}

packages/uhk-agent/src/services/device.service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
UpdateFirmwareData
1515
} from 'uhk-common';
1616
import { snooze, UhkHidDevice, UhkOperations } from 'uhk-usb';
17-
import { Subscription } from 'rxjs/Subscription';
17+
import { Subscription } from 'rxjs';
1818
import { interval } from 'rxjs/observable/interval';
1919
import { fromPromise } from 'rxjs/observable/fromPromise';
2020
import { distinctUntilChanged, startWith, switchMap, tap } from 'rxjs/operators';

packages/uhk-common/package-lock.json

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/uhk-common/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"lint": "tslint --project tsconfig.json"
2121
},
2222
"dependencies": {
23+
"buffer": "5.2.1",
2324
"tslib": "1.9.3"
2425
},
2526
"license": "GPL-3.0",

packages/uhk-common/src/config-serializer/config-items/key-action/keystroke-action.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ describe('keystroke-action', () => {
5252

5353
it('should not change the "type" to "shortMedia" when is "longMedia" if scancode < 256', () => {
5454
const action = new KeystrokeAction();
55-
action.type = KeystrokeType.longMedia;
55+
action.type = KeystrokeType.longMedia as any;
5656
action.scancode = 125;
5757
expect(action.type).toEqual(KeystrokeType.shortMedia);
5858
});
@@ -67,7 +67,7 @@ describe('keystroke-action', () => {
6767

6868
it('should not change the "type" to "longMedia" when is "shortMedia" if scancode >= 256', () => {
6969
const action = new KeystrokeAction();
70-
action.type = KeystrokeType.shortMedia;
70+
action.type = KeystrokeType.shortMedia as any;
7171
action.scancode = 256;
7272
expect(action.type).toEqual(KeystrokeType.longMedia);
7373
});
@@ -145,7 +145,7 @@ describe('keystroke-action', () => {
145145
});
146146

147147
it('should change the value to "longMedia" if scancode >= 256 and value "shortMedia"', () => {
148-
const value = KeystrokeType.shortMedia;
148+
const value = KeystrokeType.shortMedia as any;
149149
const scancode = 256;
150150
const action = new KeystrokeAction();
151151
action.scancode = scancode;
@@ -165,7 +165,7 @@ describe('keystroke-action', () => {
165165
});
166166

167167
it('should change the value to "shortMedia" if scancode < 256 and value "longMedia"', () => {
168-
const value = KeystrokeType.longMedia;
168+
const value = KeystrokeType.longMedia as any;
169169
const scancode = 100;
170170
const action = new KeystrokeAction();
171171
action.scancode = scancode;

packages/uhk-common/src/config-serializer/uhk-buffer.ts

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// / need to load the buffer package from dependency instead of use node default buffer
2+
import { Buffer } from 'buffer/';
3+
14
export class UhkBuffer {
25

36
static simpleElementWriter<T>(buffer: UhkBuffer, element: T): void {

packages/uhk-web/.angular-cli.json

-70
This file was deleted.

0 commit comments

Comments
 (0)