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

View File

@@ -1,29 +1,41 @@
import { ErrorHandler, NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { BrowserModule } from '@angular/platform-browser';
import { LogService } from 'uhk-common';
import { ElectronDataStorageRepositoryService } from './services/electron-datastorage-repository.service';
import { ElectronLogService } from './services/electron-log.service';
import { ElectronErrorHandlerService } from './services/electron-error-handler.service';
import { WebModule } from '../app/web.module';
import { routing } from '../app/app.routes';
import { MainAppComponent } from '../app/app.component';
import { IpcUhkRenderer } from './services/ipc-uhk-renderer';
import { IpcCommonRenderer } from '../app/services/ipc-common-renderer';
import { DataStorageRepositoryService } from '../app/services/datastorage-repository.service';
import { SharedModule } from '../app/shared.module';
import { reducers } from '../app/store';
import { EffectsModule } from '@ngrx/effects';
import { StoreRouterConnectingModule } from '@ngrx/router-store';
import { StoreModule } from '@ngrx/store';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
import { effects } from '../app/store/effects';
@NgModule({
imports: [
CommonModule,
WebModule,
routing
],
providers: [
{ provide: DataStorageRepositoryService, useClass: ElectronDataStorageRepositoryService },
{ provide: IpcCommonRenderer, useClass: IpcUhkRenderer },
{ provide: LogService, useClass: ElectronLogService },
{ provide: ErrorHandler, useClass: ElectronErrorHandlerService }
],
bootstrap: [MainAppComponent]
imports: [
BrowserModule,
SharedModule,
routing,
StoreModule.forRoot(reducers),
StoreRouterConnectingModule,
StoreDevtoolsModule.instrument({
maxAge: 10
}),
EffectsModule.forRoot(effects)
],
providers: [
{provide: DataStorageRepositoryService, useClass: ElectronDataStorageRepositoryService},
{provide: IpcCommonRenderer, useClass: IpcUhkRenderer},
{provide: LogService, useClass: ElectronLogService},
{provide: ErrorHandler, useClass: ElectronErrorHandlerService}
],
bootstrap: [MainAppComponent]
})
export class UhkRendererModule {
}