fix(generators): Update angular with root dependencies and update tem…

…plates

fixtures/angular/entity/apps/demo/src/app/app.module.ts

@@ -4,16 +4,14 @@ import { BrowserModule } from '@angular/platform-browser';
 import { PreloadAllModules, RouterModule } from '@angular/router';
 import {
   AccountModule,
-  ContentTypesConfig,
   ErrorsExtractor,
-  GroupsConfig,
   LangModule,
-  PermissionsConfig,
   PermissionsGuard,
   TransferHttpCacheModule,
-  UsersConfig,
-  AuthModule
+  AuthModule,
+  entitiesProviders as coreEntitiesProviders
 } from '@rucken/core';
+import { entitiesProviders } from '@demo/core';
 import { AuthModalModule, NavbarModule, ThemesModule } from '@rucken/web';
 import { BsDatepickerModule, BsLocaleService } from 'ngx-bootstrap/datepicker';
 import { ModalModule } from 'ngx-bootstrap/modal';
@@ -76,12 +74,10 @@ import { TranslateService } from '@ngx-translate/core';
     FontAwesomeModule
   ],
   providers: [
+    ...coreEntitiesProviders,
+    ...entitiesProviders,
     CookieService,
     ErrorsExtractor,
-    GroupsConfig,
-    PermissionsConfig,
-    ContentTypesConfig,
-    UsersConfig,
     BsLocaleService,
     PermissionsGuard
   ],

fixtures/angular/entity/apps/demo/src/app/app.routes.ts

@@ -3,11 +3,11 @@ import {
   ActivatedRouteSnapshot,
   RouterStateSnapshot
 } from '@angular/router';
-import { AccountPageRoutes } from './components/pages/account-page/account-page.routes';
-import { AdminPageRoutes } from './components/pages/admin-page/admin-page.routes';
-import { EntitiesPageRoutes } from './components/pages/entities-page/entities-page.routes';
-import { HomePageRoutes } from './components/pages/home-page/home-page.routes';
-import { ThemesPageRoutes } from './components/pages/themes-page/themes-page.routes';
+import { AccountPageRoutes } from './pages/account-page/account-page.routes';
+import { AdminPageRoutes } from './pages/admin-page/admin-page.routes';
+import { EntitiesPageRoutes } from './pages/entities-page/entities-page.routes';
+import { HomePageRoutes } from './pages/home-page/home-page.routes';
+import { ThemesPageRoutes } from './pages/themes-page/themes-page.routes';
 import { OauthGuard } from '@rucken/core';
 
 export const AppRoutes: Routes = [
@@ -19,31 +19,31 @@ export const AppRoutes: Routes = [
   {
     path: 'home',
     loadChildren:
-      './components/pages/home-page/home-page.module#HomePageModule',
+      './pages/home-page/home-page.module#HomePageModule',
     data: HomePageRoutes[0].data
   },
   {
     path: 'entities',
     loadChildren:
-      './components/pages/entities-page/entities-page.module#EntitiesPageModule',
+      './pages/entities-page/entities-page.module#EntitiesPageModule',
     data: EntitiesPageRoutes[0].data
   },
   {
     path: 'themes',
     loadChildren:
-      './components/pages/themes-page/themes-page.module#ThemesPageModule',
+      './pages/themes-page/themes-page.module#ThemesPageModule',
     data: ThemesPageRoutes[0].data
   },
   {
     path: 'account',
     loadChildren:
-      './components/pages/account-page/account-page.module#AccountPageModule',
+      './pages/account-page/account-page.module#AccountPageModule',
     data: AccountPageRoutes[0].data
   },
   {
     path: 'admin',
     loadChildren:
-      './components/pages/admin-page/admin-page.module#AdminPageModule',
+      './pages/admin-page/admin-page.module#AdminPageModule',
     data: AdminPageRoutes[0].data
   },
   {

fixtures/angular/entity/apps/demo/src/app/components/pages/account-page/account-page.module.ts → fixtures/angular/entity/apps/demo/src/app/pages/account-page/account-page.module.ts

@@ -1,7 +1,7 @@
 import { ModuleWithProviders, NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { NavSidebarModule } from '@rucken/web';
-import { SharedModule } from '../../../shared/shared.module';
+import { SharedModule } from '../../shared/shared.module';
 import { AccountPageComponent } from './account-page.component';
 import { AccountPageRoutes } from './account-page.routes';
 import { NgxPermissionsModule } from 'ngx-permissions';

fixtures/angular/entity/apps/demo/src/app/components/pages/account-page/profile-frame/profile-frame.component.ts → fixtures/angular/entity/apps/demo/src/app/pages/account-page/profile-frame/profile-frame.component.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { environment } from '../../../../../environments/environment';
+import { environment } from '../../../../environments/environment';
 
 @Component({
   selector: 'profile-frame',

fixtures/angular/new/apps/demo/src/app/components/pages/account-page/profile-frame/profile-frame.module.ts → fixtures/angular/entity/apps/demo/src/app/pages/account-page/profile-frame/profile-frame.module.ts

@@ -2,7 +2,7 @@ import { ModuleWithProviders, NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { ProfilePanelModule } from '@rucken/web';
 import { NgxPermissionsModule } from 'ngx-permissions';
-import { SharedModule } from '../../../../shared/shared.module';
+import { SharedModule } from '../../../shared/shared.module';
 import { ProfileFrameComponent } from './profile-frame.component';
 import { ProfileFrameRoutes } from './profile-frame.routes';
 

fixtures/angular/new/apps/demo/src/app/components/pages/admin-page/admin-page.module.ts → fixtures/angular/entity/apps/demo/src/app/pages/admin-page/admin-page.module.ts

@@ -1,7 +1,7 @@
 import { ModuleWithProviders, NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { NavSidebarModule } from '@rucken/web';
-import { SharedModule } from '../../../shared/shared.module';
+import { SharedModule } from '../../shared/shared.module';
 import { AdminPageComponent } from './admin-page.component';
 import { AdminPageRoutes } from './admin-page.routes';
 import { NgxPermissionsModule } from 'ngx-permissions';

fixtures/angular/new/apps/demo/src/app/components/pages/entities-page/content-types-frame/content-types-frame.component.ts → fixtures/angular/entity/apps/demo/src/app/pages/entities-page/content-types-frame/content-types-frame.component.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { environment } from '../../../../../environments/environment';
+import { environment } from '../../../../environments/environment';
 
 @Component({
   selector: 'content-types-frame',

fixtures/angular/entity/apps/demo/src/app/components/pages/entities-page/content-types-frame/content-types-frame.module.ts → fixtures/angular/entity/apps/demo/src/app/pages/entities-page/content-types-frame/content-types-frame.module.ts

@@ -2,7 +2,7 @@ import { ModuleWithProviders, NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 import { ContentTypesGridModule } from '@rucken/web';
-import { SharedModule } from '../../../../shared/shared.module';
+import { SharedModule } from '../../../shared/shared.module';
 import { ContentTypesFrameComponent } from './content-types-frame.component';
 import { ContentTypesFrameRoutes } from './content-types-frame.routes';
 import { NgxPermissionsModule } from 'ngx-permissions';

fixtures/angular/new/apps/demo/src/app/components/pages/entities-page/entities-page.module.ts → fixtures/angular/entity/apps/demo/src/app/pages/entities-page/entities-page.module.ts

@@ -1,7 +1,7 @@
 import { ModuleWithProviders, NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { NavSidebarModule } from '@rucken/web';
-import { SharedModule } from '../../../shared/shared.module';
+import { SharedModule } from '../../shared/shared.module';
 import { EntitiesPageComponent } from './entities-page.component';
 import { EntitiesPageRoutes } from './entities-page.routes';
 import { NgxPermissionsModule } from 'ngx-permissions';

fixtures/angular/entity/apps/demo/src/app/components/pages/entities-page/groups-frame/groups-frame.component.ts → fixtures/angular/entity/apps/demo/src/app/pages/entities-page/groups-frame/groups-frame.component.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { environment } from '../../../../../environments/environment';
+import { environment } from '../../../../environments/environment';
 
 @Component({
   selector: 'groups-frame',

fixtures/angular/new/apps/demo/src/app/components/pages/entities-page/groups-frame/groups-frame.module.ts → fixtures/angular/entity/apps/demo/src/app/pages/entities-page/groups-frame/groups-frame.module.ts

@@ -2,7 +2,7 @@ import { ModuleWithProviders, NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { GroupsGridModule } from '@rucken/web';
 import { NgxPermissionsModule } from 'ngx-permissions';
-import { SharedModule } from '../../../../shared/shared.module';
+import { SharedModule } from '../../../shared/shared.module';
 import { GroupsFrameComponent } from './groups-frame.component';
 import { GroupsFrameRoutes } from './groups-frame.routes';
 

fixtures/angular/new/apps/demo/src/app/components/pages/entities-page/permissions-frame/permissions-frame.component.ts → fixtures/angular/entity/apps/demo/src/app/pages/entities-page/permissions-frame/permissions-frame.component.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { environment } from '../../../../../environments/environment';
+import { environment } from '../../../../environments/environment';
 
 @Component({
   selector: 'permissions-frame',

fixtures/angular/entity/apps/demo/src/app/components/pages/entities-page/permissions-frame/permissions-frame.module.ts → fixtures/angular/entity/apps/demo/src/app/pages/entities-page/permissions-frame/permissions-frame.module.ts

@@ -2,7 +2,7 @@ import { ModuleWithProviders, NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 import { PermissionsGridModule } from '@rucken/web';
-import { SharedModule } from '../../../../shared/shared.module';
+import { SharedModule } from '../../../shared/shared.module';
 import { PermissionsFrameComponent } from './permissions-frame.component';
 import { PermissionsFrameRoutes } from './permissions-frame.routes';
 import { NgxPermissionsModule } from 'ngx-permissions';

fixtures/angular/entity/apps/demo/src/app/components/pages/entities-page/test-entities-frame/test-entities-frame.component.ts → fixtures/angular/entity/apps/demo/src/app/pages/entities-page/test-entities-frame/test-entities-frame.component.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { environment } from '../../../../../environments/environment';
+import { environment } from '../../../../environments/environment';
 
 @Component({
   selector: 'test-entities-frame',

fixtures/angular/entity/apps/demo/src/app/components/pages/entities-page/test-entities-frame/test-entities-frame.module.ts → fixtures/angular/entity/apps/demo/src/app/pages/entities-page/test-entities-frame/test-entities-frame.module.ts

@@ -2,8 +2,7 @@ import { ModuleWithProviders, NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 import { TestEntitiesGridModule } from '@demo/web';
-import { TestEntitiesConfig } from '@demo/core';
-import { SharedModule } from '../../../../shared/shared.module';
+import { SharedModule } from '../../../shared/shared.module';
 import { TestEntitiesFrameComponent } from './test-entities-frame.component';
 import { TestEntitiesFrameRoutes } from './test-entities-frame.routes';
 import { NgxPermissionsModule } from 'ngx-permissions';
@@ -18,9 +17,6 @@ import { NgxPermissionsModule } from 'ngx-permissions';
   ],
   declarations: [
     TestEntitiesFrameComponent
-  ],
-  providers: [
-    TestEntitiesConfig
   ]
 })
 export class TestEntitiesFrameModule {

fixtures/angular/entity/apps/demo/src/app/components/pages/entities-page/users-frame/users-frame.component.ts → fixtures/angular/entity/apps/demo/src/app/pages/entities-page/users-frame/users-frame.component.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { environment } from '../../../../../environments/environment';
+import { environment } from '../../../../environments/environment';
 
 @Component({
   selector: 'users-frame',

fixtures/angular/new/apps/demo/src/app/components/pages/entities-page/users-frame/users-frame.module.ts → fixtures/angular/entity/apps/demo/src/app/pages/entities-page/users-frame/users-frame.module.ts

@@ -2,7 +2,7 @@ import { ModuleWithProviders, NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 import { UsersGridModule } from '@rucken/web';
-import { SharedModule } from '../../../../shared/shared.module';
+import { SharedModule } from '../../../shared/shared.module';
 import { UsersFrameComponent } from './users-frame.component';
 import { UsersFrameRoutes } from './users-frame.routes';
 import { NgxPermissionsModule } from 'ngx-permissions';

fixtures/angular/entity/apps/demo/src/app/components/pages/home-page/home-page.component.ts → fixtures/angular/entity/apps/demo/src/app/pages/home-page/home-page.component.ts

@@ -9,7 +9,7 @@ declare var require: any;
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class HomePageComponent {
-  public readme = require('html-loader!markdown-loader!./../../../../../../../README.md')
+  public readme = require('html-loader!markdown-loader!./../../../../../../README.md')
     .replace('<h1 id="demo">demo</h1>', '');
   constructor(
     public activatedRoute: ActivatedRoute

fixtures/angular/new/apps/demo/src/app/components/pages/home-page/home-page.module.ts → fixtures/angular/entity/apps/demo/src/app/pages/home-page/home-page.module.ts

@@ -1,6 +1,6 @@
 import { ModuleWithProviders, NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { SharedModule } from '../../../shared/shared.module';
+import { SharedModule } from '../../shared/shared.module';
 import { HomePageComponent } from './home-page.component';
 import { HomePageRoutes } from './home-page.routes';
 

fixtures/angular/entity/apps/demo/src/app/components/pages/themes-page/themes-page.module.ts → fixtures/angular/entity/apps/demo/src/app/pages/themes-page/themes-page.module.ts

@@ -1,6 +1,6 @@
 import { ModuleWithProviders, NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { SharedModule } from '../../../shared/shared.module';
+import { SharedModule } from '../../shared/shared.module';
 import { ThemesPageComponent } from './themes-page.component';
 import { ThemesPageRoutes } from './themes-page.routes';
 

fixtures/angular/entity/libs/demo/core/package.json

@@ -2,8 +2,8 @@
   "name": "@demo/core",
   "version": "0.0.0",
   "engines": {
-    "node": ">=8",
-    "npm": ">=6.1.0"
+    "node": ">=10",
+    "npm": ">=6.4.0"
   },
   "description": "Core with base class and entities for application maked on Angular6+",
   "keywords": [
@@ -34,17 +34,18 @@
     }
   ],
   "peerDependencies": {
-    "rxjs": "^6.2.2",
-    "@angular/forms": "^6.1.3",
-    "@angular/common": "^6.1.3",
-    "@angular/compiler": "^6.1.3",
-    "@angular/core": "^6.1.3"
+    "rxjs": "^6.3.2",
+    "@angular/forms": "^6.1.7",
+    "@angular/common": "^6.1.7",
+    "@angular/compiler": "^6.1.7",
+    "@angular/core": "^6.1.7"
   },
   "dependencies": {
     "@ngx-translate/core": "^10.0.2",
     "@types/jsonwebtoken": "^7.2.8",
     "jsonwebtoken": "^8.3.0",
     "ngx-permissions": "^6.0.1",
-    "ngx-repository": "^0.4.1"
+    "ngx-repository": "^0.4.2",
+    "@rucken/core": "^3.1.4"
   }
 }

fixtures/angular/entity/libs/demo/core/src/lib/entities/configs/index.ts

@@ -0,0 +1,10 @@
+import { Provider } from '@angular/core';
+import { TEST_ENTITIES_CONFIG_TOKEN, defaultTestEntitiesConfig } from './test-entities.config';
+
+
+export const entitiesProviders: Provider[] = [
+  {
+    provide: TEST_ENTITIES_CONFIG_TOKEN,
+    useValue: defaultTestEntitiesConfig
+  },
+];

fixtures/angular/entity/libs/demo/core/src/lib/shared/configs/test-entities.config.ts → fixtures/angular/entity/libs/demo/core/src/lib/entities/configs/test-entities.config.ts

@@ -3,15 +3,14 @@ import { plainToClass } from 'class-transformer';
 import { IRestProviderOptions, PaginationMeta, ProviderActionEnum } from 'ngx-repository';
 import { TestEntity } from '../models/test-entity';
 
-@Injectable()
-export class TestEntitiesConfig implements IRestProviderOptions <TestEntity> {
-  name = 'test-entity';
-  pluralName = 'test-entities';
-  autoload = true;
-  paginationMeta = {
+export const defaultTestEntitiesConfig: IRestProviderOptions <TestEntity> = {
+  name: 'test_entity',
+  pluralName: 'test_entities',
+  autoload: true,
+  paginationMeta: {
     perPage: 5
-  };
-  actionOptions = {
+  },
+  actionOptions: {
     responseData: (data: any, action: ProviderActionEnum) => {
       if (action === ProviderActionEnum.Delete) {
         return true;
@@ -26,11 +25,11 @@ export class TestEntitiesConfig implements IRestProviderOptions <TestEntity> {
     responsePaginationMeta: (data: any, action: ProviderActionEnum): PaginationMeta => {
       return { totalResults: data.body.meta.totalResults, perPage: undefined };
     }
-  };
-  restOptions = {
+  },
+  restOptions: {
     limitQueryParam: 'per_page',
     pageQueryParam: 'cur_page',
     searchTextQueryParam: 'q'
-  };
-  constructor() { }
-}
+  }
+};
+export const TEST_ENTITIES_CONFIG_TOKEN = 'TestEntitiesConfig';

fixtures/angular/entity/libs/demo/web/package.json

@@ -2,8 +2,8 @@
   "name": "@demo/web",
   "version": "0.0.0",
   "engines": {
-    "node": ">=8",
-    "npm": ">=6.1.0"
+    "node": ">=10",
+    "npm": ">=6.4.0"
   },
   "description": "Base components and ui for application maked on Angular6+",
   "keywords": [
@@ -33,19 +33,21 @@
     }
   ],
   "peerDependencies": {
-    "rxjs": "^6.2.2",
-    "@angular/forms": "^6.1.3",
-    "@angular/common": "^6.1.3",
-    "@angular/compiler": "^6.1.3",
-    "@angular/core": "^6.1.3"
+    "rxjs": "^6.3.2",
+    "@angular/forms": "^6.1.7",
+    "@angular/common": "^6.1.7",
+    "@angular/compiler": "^6.1.7",
+    "@angular/core": "^6.1.7"
   },
   "dependencies": {
     "@ngx-translate/core": "^10.0.2",
     "@types/object-path": "^0.9.29",
     "ngx-bootstrap": "^3.0.1",
-    "ngx-dynamic-form-builder": "^0.4.3",
+    "ngx-dynamic-form-builder": "^0.4.4",
     "ngx-permissions": "^6.0.1",
-    "ngx-repository": "^0.4.1",
+    "ngx-repository": "^0.4.2",
+    "@rucken/core": "^3.1.4",
+    "@rucken/web": "^3.1.4",
     "object-path": "^0.11.4"
   }
 }