Update to webpack 2.x

This commit is contained in:
Farkas J??zsef
2017-02-04 20:37:05 +01:00
committed by József Farkas
parent 908c7e1e8c
commit 67c8b12eac
8 changed files with 28 additions and 42 deletions

View File

@@ -54,8 +54,8 @@ export class DataStorage {
initUHKJson() {
this.defaultUserConfiguration = new UserConfiguration()
.fromJsonObject(require('json!../../config-serializer/user-config.json'));
this.uhkPresets = (<any[]>require('json!../../config-serializer/preset-keymaps.json'))
.fromJsonObject(require('json-loader!../../config-serializer/user-config.json'));
this.uhkPresets = (<any[]>require('json-loader!../../config-serializer/preset-keymaps.json'))
.map(keymap => new Keymap().fromJsonObject(keymap));
}