From 95d6a04f999b94c9df45863c4b789b26bbc3d152 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 18 Sep 2017 14:35:41 +0100 Subject: [PATCH] [ADF-1548] deprecate the usage of the "forRoot" methods in modules (#2344) * remove CoreModule.forRoot * remove forRoot methods * fix form issues (lint) --- demo-shell-ng2/app/app.module.ts | 32 +++++++++---------- .../ng2-activiti-analytics/index.ts | 13 ++------ .../analytics-generator.component.spec.ts | 4 +-- ...nalytics-report-heat-map.component.spec.ts | 4 +-- .../components/analytics.component.spec.ts | 4 +-- .../src/services/analytics.service.spec.ts | 2 +- ng2-components/ng2-activiti-diagrams/index.ts | 14 ++------ .../src/components/diagram.component.spec.ts | 2 +- ng2-components/ng2-activiti-form/index.ts | 13 ++------ .../components/form-list.component.spec.ts | 2 +- .../components/start-form.component.spec.ts | 3 +- .../widgets/amount/amount.widget.spec.ts | 2 +- .../widgets/attach/attach.widget.spec.ts | 2 +- .../container/container.widget.spec.ts | 2 +- .../widgets/content/content.widget.spec.ts | 2 +- .../widgets/date/date.widget.spec.ts | 2 +- .../dynamic-table.widget.spec.ts | 2 +- .../widgets/text/text.widget.spec.ts | 2 +- .../widgets/upload/upload.widget.spec.ts | 2 +- .../widgets/widget.component.spec.ts | 2 +- .../services/activiti-content.service.spec.ts | 2 +- .../src/services/ecm-model.service.spec.ts | 2 +- .../src/services/node.service.spec.ts | 2 +- .../widget-visibility.service.spec.ts | 2 +- .../ng2-activiti-processlist/index.ts | 13 ++------ ...reate-process-attachment.component.spec.ts | 2 +- .../process-attachment-list.component.spec.ts | 4 +-- .../process-audit.directive.spec.ts | 2 +- .../process-instance-header.component.spec.ts | 2 +- .../process-instance-tasks.component.spec.ts | 2 +- .../components/processlist.component.spec.ts | 4 +-- .../start-process.component.spec.ts | 4 +-- .../src/services/process.service.spec.ts | 2 +- ng2-components/ng2-activiti-tasklist/index.ts | 13 ++------ .../components/checklist.component.spec.ts | 2 +- .../components/comment-list.component.spec.ts | 2 +- .../src/components/comments.component.spec.ts | 4 +-- .../create-task-attachment.component.spec.ts | 2 +- .../components/people-list.component.spec.ts | 2 +- .../people-search.component.spec.ts | 2 +- .../src/components/people.component.spec.ts | 2 +- .../components/start-task.component.spec.ts | 2 +- .../task-attachment-list.component.spec.ts | 4 +-- .../components/task-audit.directive.spec.ts | 2 +- .../components/task-details.component.spec.ts | 4 +-- .../components/task-header.component.spec.ts | 2 +- .../src/services/people.service.spec.ts | 2 +- .../src/services/tasklist.service.spec.ts | 2 +- ng2-components/ng2-alfresco-core/index.ts | 15 ++------- .../pagination/pagination.component.spec.ts | 2 +- .../ng2-alfresco-datatable/index.ts | 12 ++----- .../datatable/empty-list.component.spec.ts | 2 +- .../ng2-alfresco-documentlist/index.ts | 15 ++------- .../content-node-selector.component.spec.ts | 4 +-- .../sites-dropdown.component.spec.ts | 2 +- .../src/data/share-datatable-adapter.spec.ts | 4 +-- ng2-components/ng2-alfresco-login/index.ts | 10 ++---- ng2-components/ng2-alfresco-search/index.ts | 13 ++------ ng2-components/ng2-alfresco-social/index.ts | 13 ++------ .../src/components/like.component.spec.ts | 2 +- .../src/components/rating.component.spec.ts | 2 +- .../src/services/rating.service.spec.ts | 2 +- ng2-components/ng2-alfresco-tag/index.ts | 13 ++------ ng2-components/ng2-alfresco-upload/index.ts | 10 ++---- .../upload-button.component.spec.ts | 2 +- .../upload-drag-area.component.spec.ts | 2 +- ng2-components/ng2-alfresco-userinfo/index.ts | 26 ++------------- .../components/user-info.component.spec.ts | 2 +- .../src/services/bpm-user.service.spec.ts | 2 +- .../src/services/ecm-user.service.spec.ts | 2 +- ng2-components/ng2-alfresco-viewer/index.ts | 17 ++-------- .../extension-viewer.directive.spec.ts | 2 +- .../ng2-alfresco-webscript/index.ts | 25 +++------------ 73 files changed, 120 insertions(+), 282 deletions(-) diff --git a/demo-shell-ng2/app/app.module.ts b/demo-shell-ng2/app/app.module.ts index df75368448..e01a6ca653 100644 --- a/demo-shell-ng2/app/app.module.ts +++ b/demo-shell-ng2/app/app.module.ts @@ -76,23 +76,23 @@ import { routing, CoreModule, MaterialModule, - LoginModule.forRoot(), - SearchModule.forRoot(), - DataTableModule.forRoot(), - DocumentListModule.forRoot(), - UploadModule.forRoot(), - TagModule.forRoot(), - SocialModule.forRoot(), - WebScriptModule.forRoot(), - ViewerModule.forRoot(), - ActivitiFormModule.forRoot(), - ActivitiTaskListModule.forRoot(), - ActivitiProcessListModule.forRoot(), - UserInfoModule.forRoot(), - AnalyticsModule.forRoot(), - DiagramsModule.forRoot(), + LoginModule, + SearchModule, + DataTableModule, + DocumentListModule, + UploadModule, + TagModule, + SocialModule, + WebScriptModule, + ViewerModule, + ActivitiFormModule, + ActivitiTaskListModule, + ActivitiProcessListModule, + UserInfoModule, + AnalyticsModule, + DiagramsModule, CustomEditorsModule, - Editor3DModule.forRoot(), + Editor3DModule, ChartsModule, ThemePickerModule, FlexLayoutModule diff --git a/ng2-components/ng2-activiti-analytics/index.ts b/ng2-components/ng2-activiti-analytics/index.ts index 900da038e1..79c784c9e9 100644 --- a/ng2-components/ng2-activiti-analytics/index.ts +++ b/ng2-components/ng2-activiti-analytics/index.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ModuleWithProviders, NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { DiagramsModule } from 'ng2-activiti-diagrams'; import { CoreModule, TRANSLATION_PROVIDER } from 'ng2-alfresco-core'; @@ -75,13 +75,4 @@ export const ANALYTICS_PROVIDERS: any[] = [ MaterialModule ] }) -export class AnalyticsModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: AnalyticsModule, - providers: [ - ...ANALYTICS_PROVIDERS - ] - }; - } -} +export class AnalyticsModule {} diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.spec.ts index 9e8e2e5218..7fd900666d 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.spec.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.spec.ts @@ -58,10 +58,10 @@ describe('AnalyticsGeneratorComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), + CoreModule, MaterialModule, ChartsModule, - DiagramsModule.forRoot() + DiagramsModule ], declarations: [ ...ANALYTICS_DIRECTIVES diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.spec.ts index f431fade43..19c077177e 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.spec.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.spec.ts @@ -46,8 +46,8 @@ describe('AnalyticsReportHeatMapComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), - DiagramsModule.forRoot(), + CoreModule, + DiagramsModule, MaterialModule ], declarations: [ diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts index 0daf0f310c..26852bc6a0 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts @@ -56,9 +56,9 @@ describe('AnalyticsComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), + CoreModule, ChartsModule, - DiagramsModule.forRoot() + DiagramsModule ], declarations: [ ...ANALYTICS_DIRECTIVES diff --git a/ng2-components/ng2-activiti-analytics/src/services/analytics.service.spec.ts b/ng2-components/ng2-activiti-analytics/src/services/analytics.service.spec.ts index 9fbebcf01f..3fa4d8c5ef 100644 --- a/ng2-components/ng2-activiti-analytics/src/services/analytics.service.spec.ts +++ b/ng2-components/ng2-activiti-analytics/src/services/analytics.service.spec.ts @@ -30,7 +30,7 @@ describe('Activiti Analytics Service', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], providers: [ AnalyticsService diff --git a/ng2-components/ng2-activiti-diagrams/index.ts b/ng2-components/ng2-activiti-diagrams/index.ts index 1ad4392dbc..9da9f97655 100644 --- a/ng2-components/ng2-activiti-diagrams/index.ts +++ b/ng2-components/ng2-activiti-diagrams/index.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ModuleWithProviders, NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { CoreModule, TRANSLATION_PROVIDER } from 'ng2-alfresco-core'; import { DIAGRAM_DIRECTIVES, DIAGRAM_PROVIDERS } from './src/components/index'; @@ -52,14 +52,4 @@ export * from './src/models/index'; ...DIAGRAM_DIRECTIVES ] }) -export class DiagramsModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: DiagramsModule, - providers: [ - ...DIAGRAM_PROVIDERS, - ...RAPHAEL_PROVIDERS - ] - }; - } -} +export class DiagramsModule {} diff --git a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts index 5edf92c6c7..601b3d7eab 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts @@ -47,7 +47,7 @@ describe('Test ng2-activiti-diagrams ', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], declarations: [ ...DIAGRAM_DIRECTIVES, diff --git a/ng2-components/ng2-activiti-form/index.ts b/ng2-components/ng2-activiti-form/index.ts index b1f33bd006..2c4c88c06a 100644 --- a/ng2-components/ng2-activiti-form/index.ts +++ b/ng2-components/ng2-activiti-form/index.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ModuleWithProviders, NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { HttpModule } from '@angular/http'; import { CoreModule, TRANSLATION_PROVIDER } from 'ng2-alfresco-core'; import { DataTableModule } from 'ng2-alfresco-datatable'; @@ -114,13 +114,4 @@ export const ACTIVITI_FORM_PROVIDERS: any[] = [ MaterialModule ] }) -export class ActivitiFormModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: ActivitiFormModule, - providers: [ - ...ACTIVITI_FORM_PROVIDERS - ] - }; - } -} +export class ActivitiFormModule {} diff --git a/ng2-components/ng2-activiti-form/src/components/form-list.component.spec.ts b/ng2-components/ng2-activiti-form/src/components/form-list.component.spec.ts index c767e5258f..1036d0b174 100644 --- a/ng2-components/ng2-activiti-form/src/components/form-list.component.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/form-list.component.spec.ts @@ -34,7 +34,7 @@ describe('TaskAttachmentList', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), + CoreModule, DataTableModule, MaterialModule ], diff --git a/ng2-components/ng2-activiti-form/src/components/start-form.component.spec.ts b/ng2-components/ng2-activiti-form/src/components/start-form.component.spec.ts index 7a5c0495cd..1f41c6dac5 100644 --- a/ng2-components/ng2-activiti-form/src/components/start-form.component.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/start-form.component.spec.ts @@ -44,7 +44,8 @@ describe('ActivitiStartForm', () => { TestBed.configureTestingModule({ imports: [ MaterialModule, - CoreModule.forRoot()], + CoreModule + ], declarations: [ StartFormComponent, FormFieldComponent, diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.spec.ts index 4e1fc16c1e..38f1a7e45b 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.spec.ts @@ -33,7 +33,7 @@ describe('AmountWidgetComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), + CoreModule, MdInputModule ], declarations: [ diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.spec.ts index 6cbea1a663..b82227906f 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.spec.ts @@ -41,7 +41,7 @@ describe('AttachWidgetComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), + CoreModule, MaterialModule ], declarations: [ diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.spec.ts index 4b0f5eb8a7..d5d8d07584 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.spec.ts @@ -44,7 +44,7 @@ describe('ContainerWidgetComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), + CoreModule, MaterialModule ], declarations: [FormFieldComponent, ContentWidgetComponent, WIDGET_DIRECTIVES, MASK_DIRECTIVE], diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/content/content.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/content/content.widget.spec.ts index 53a2e81992..bf9eb9bbae 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/content/content.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/content/content.widget.spec.ts @@ -66,7 +66,7 @@ describe('ContentWidgetComponent', () => { TestBed.configureTestingModule({ imports: [ MdTabsModule, - CoreModule.forRoot() + CoreModule ], declarations: [ ContentWidgetComponent diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.spec.ts index bdb7703b8b..aa2fe2fdc9 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.spec.ts @@ -37,7 +37,7 @@ describe('DateWidgetComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), + CoreModule, MaterialModule ], declarations: [ diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.spec.ts index 3b623b4efc..85d31962f4 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.spec.ts @@ -86,7 +86,7 @@ describe('DynamicTableWidgetComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), + CoreModule, MaterialModule ], declarations: [DynamicTableWidgetComponent, RowEditorComponent, diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/text/text.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/text/text.widget.spec.ts index 861fa90646..0d3a9603c7 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/text/text.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/text/text.widget.spec.ts @@ -38,7 +38,7 @@ describe('TextWidgetComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), + CoreModule, MaterialModule ], declarations: [ diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.spec.ts index 690395a261..da961239d8 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.spec.ts @@ -116,7 +116,7 @@ describe('UploadWidgetComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [CoreModule.forRoot(), MaterialModule], + imports: [CoreModule, MaterialModule], declarations: [UploadWidgetComponent, ErrorWidgetComponent], providers: [FormService, EcmModelService] }).compileComponents().then(() => { diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.spec.ts index 6229376088..9e4f39038b 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.spec.ts @@ -34,7 +34,7 @@ describe('WidgetComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], declarations: [WidgetComponent], providers: [ diff --git a/ng2-components/ng2-activiti-form/src/services/activiti-content.service.spec.ts b/ng2-components/ng2-activiti-form/src/services/activiti-content.service.spec.ts index d6b14c365f..acae686c85 100644 --- a/ng2-components/ng2-activiti-form/src/services/activiti-content.service.spec.ts +++ b/ng2-components/ng2-activiti-form/src/services/activiti-content.service.spec.ts @@ -28,7 +28,7 @@ describe('ActivitiContentService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], providers: [ ActivitiContentService diff --git a/ng2-components/ng2-activiti-form/src/services/ecm-model.service.spec.ts b/ng2-components/ng2-activiti-form/src/services/ecm-model.service.spec.ts index 1ded14171a..ae348d434e 100644 --- a/ng2-components/ng2-activiti-form/src/services/ecm-model.service.spec.ts +++ b/ng2-components/ng2-activiti-form/src/services/ecm-model.service.spec.ts @@ -30,7 +30,7 @@ describe('EcmModelService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], providers: [ EcmModelService diff --git a/ng2-components/ng2-activiti-form/src/services/node.service.spec.ts b/ng2-components/ng2-activiti-form/src/services/node.service.spec.ts index 53cfeb2f58..2d8a9cda0b 100644 --- a/ng2-components/ng2-activiti-form/src/services/node.service.spec.ts +++ b/ng2-components/ng2-activiti-form/src/services/node.service.spec.ts @@ -30,7 +30,7 @@ describe('NodeService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], providers: [ NodeService, diff --git a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts index 43ccfb1321..1ca0c57287 100644 --- a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts +++ b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts @@ -39,7 +39,7 @@ describe('WidgetVisibilityService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], providers: [ WidgetVisibilityService diff --git a/ng2-components/ng2-activiti-processlist/index.ts b/ng2-components/ng2-activiti-processlist/index.ts index 5ac3c0408f..e5b1192794 100644 --- a/ng2-components/ng2-activiti-processlist/index.ts +++ b/ng2-components/ng2-activiti-processlist/index.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ModuleWithProviders, NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { MdButtonModule, MdCardModule, @@ -147,13 +147,4 @@ export const ACTIVITI_PROCESSLIST_PROVIDERS: [any] = [ ...ACTIVITI_PROCESSLIST_DIRECTIVES ] }) -export class ActivitiProcessListModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: ActivitiProcessListModule, - providers: [ - ...ACTIVITI_PROCESSLIST_PROVIDERS - ] - }; - } -} +export class ActivitiProcessListModule {} diff --git a/ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.spec.ts index 23bc50e502..bf6e6f6b09 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.spec.ts @@ -52,7 +52,7 @@ describe('Activiti Process Create Attachment', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], declarations: [ CreateProcessAttachmentComponent diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts index 105668c495..bbde7d3718 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts @@ -42,8 +42,8 @@ describe('ProcessAttachmentListComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), - DataTableModule.forRoot(), + CoreModule, + DataTableModule, MdProgressSpinnerModule ], declarations: [ diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-audit.directive.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-audit.directive.spec.ts index ba369c664c..6e06bd039f 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-audit.directive.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/process-audit.directive.spec.ts @@ -55,7 +55,7 @@ describe('ProcessAuditDirective', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [CoreModule.forRoot()], + imports: [CoreModule], declarations: [BasicButtonComponent, ProcessAuditDirective], providers: [ProcessService] }); diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.spec.ts index e912505514..3bb5b7b4ea 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.spec.ts @@ -34,7 +34,7 @@ describe('ProcessInstanceHeaderComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], declarations: [ ProcessInstanceHeaderComponent diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.spec.ts index 7913ebdda5..fe51194d07 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.spec.ts @@ -43,7 +43,7 @@ describe('ProcessInstanceTasksComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], declarations: [ ProcessInstanceTasksComponent diff --git a/ng2-components/ng2-activiti-processlist/src/components/processlist.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/processlist.component.spec.ts index 7f03b6629b..ad286b6213 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/processlist.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/processlist.component.spec.ts @@ -39,8 +39,8 @@ describe('ProcessInstanceListComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), - DataTableModule.forRoot(), + CoreModule, + DataTableModule, MdProgressSpinnerModule ], declarations: [ ProcessInstanceListComponent ], diff --git a/ng2-components/ng2-activiti-processlist/src/components/start-process.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/start-process.component.spec.ts index b95511be24..51b47dc31e 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/start-process.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/start-process.component.spec.ts @@ -48,8 +48,8 @@ describe('StartProcessInstanceComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), - ActivitiFormModule.forRoot(), + CoreModule, + ActivitiFormModule, MdButtonModule, MdCardModule, MdInputModule, diff --git a/ng2-components/ng2-activiti-processlist/src/services/process.service.spec.ts b/ng2-components/ng2-activiti-processlist/src/services/process.service.spec.ts index 2a7c830326..4662babc77 100644 --- a/ng2-components/ng2-activiti-processlist/src/services/process.service.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/services/process.service.spec.ts @@ -43,7 +43,7 @@ describe('ProcessService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], providers: [ ProcessService diff --git a/ng2-components/ng2-activiti-tasklist/index.ts b/ng2-components/ng2-activiti-tasklist/index.ts index 34e012a1b4..b88f55c39d 100644 --- a/ng2-components/ng2-activiti-tasklist/index.ts +++ b/ng2-components/ng2-activiti-tasklist/index.ts @@ -16,7 +16,7 @@ */ import { DatePipe } from '@angular/common'; -import { ModuleWithProviders, NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { FlexLayoutModule } from '@angular/flex-layout'; import { ActivitiFormModule } from 'ng2-activiti-form'; @@ -180,13 +180,4 @@ export const ACTIVITI_TASKLIST_PROVIDERS: any[] = [ MaterialModule ] }) -export class ActivitiTaskListModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: ActivitiTaskListModule, - providers: [ - ...ACTIVITI_TASKLIST_PROVIDERS - ] - }; - } -} +export class ActivitiTaskListModule {} diff --git a/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.spec.ts index 67c781a747..503493bb4e 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.spec.ts @@ -42,7 +42,7 @@ describe('ChecklistComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), + CoreModule, MaterialModule ], declarations: [ diff --git a/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.spec.ts index b7ad3751ff..c16340dc48 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.spec.ts @@ -46,7 +46,7 @@ describe('CommentListComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), + CoreModule, DataTableModule ], declarations: [ diff --git a/ng2-components/ng2-activiti-tasklist/src/components/comments.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/comments.component.spec.ts index 062f06e8d8..1a571c62c2 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/comments.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/comments.component.spec.ts @@ -44,8 +44,8 @@ describe('CommentsComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), - ActivitiFormModule.forRoot(), + CoreModule, + ActivitiFormModule, DataTableModule, MdInputModule ], diff --git a/ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.spec.ts index eff62db3f3..0c90fd6db8 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.spec.ts @@ -36,7 +36,7 @@ describe('Activiti Task Create Attachment', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], declarations: [ AttachmentComponent diff --git a/ng2-components/ng2-activiti-tasklist/src/components/people-list.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/people-list.component.spec.ts index fd8dde829f..d61a23946b 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/people-list.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/people-list.component.spec.ts @@ -43,7 +43,7 @@ describe('PeopleListComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), + CoreModule, DataTableModule ], declarations: [ diff --git a/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.spec.ts index 9866599a0d..1ddfd94b5f 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.spec.ts @@ -54,7 +54,7 @@ describe('PeopleSearchComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), + CoreModule, DataTableModule, MdButtonModule, MdInputModule diff --git a/ng2-components/ng2-activiti-tasklist/src/components/people.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/people.component.spec.ts index 469d81aabd..8eb7ab9ca8 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/people.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/people.component.spec.ts @@ -56,7 +56,7 @@ describe('PeopleComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), + CoreModule, DataTableModule, MdButtonModule, MdInputModule diff --git a/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.spec.ts index 13c4f28f3a..1e0cfa3e8d 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.spec.ts @@ -53,7 +53,7 @@ describe('StartTaskComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), + CoreModule, MdInputModule, MdIconModule, MdButtonModule, diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.spec.ts index 7d9eff4a0b..230fa4344d 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.spec.ts @@ -43,8 +43,8 @@ describe('TaskAttachmentList', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), - DataTableModule.forRoot(), + CoreModule, + DataTableModule, MdProgressSpinnerModule ], declarations: [ diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-audit.directive.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-audit.directive.spec.ts index 7cead66b56..a13e1dfaa8 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-audit.directive.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-audit.directive.spec.ts @@ -55,7 +55,7 @@ describe('TaskAuditDirective', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [CoreModule.forRoot()], + imports: [CoreModule], declarations: [BasicButtonComponent, TaskAuditDirective], providers: [TaskListService] }); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.spec.ts index 08e8f37f2e..36a4e1be27 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.spec.ts @@ -61,8 +61,8 @@ describe('TaskDetailsComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), - ActivitiFormModule.forRoot(), + CoreModule, + ActivitiFormModule, MdButtonModule, MdInputModule ], diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-header.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-header.component.spec.ts index 3f12d4ce90..3e1677e6cd 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-header.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-header.component.spec.ts @@ -38,7 +38,7 @@ describe('TaskHeaderComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], declarations: [ TaskHeaderComponent diff --git a/ng2-components/ng2-activiti-tasklist/src/services/people.service.spec.ts b/ng2-components/ng2-activiti-tasklist/src/services/people.service.spec.ts index 0798c22020..c97e242c9d 100644 --- a/ng2-components/ng2-activiti-tasklist/src/services/people.service.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/services/people.service.spec.ts @@ -46,7 +46,7 @@ describe('PeopleService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], providers: [ PeopleService, diff --git a/ng2-components/ng2-activiti-tasklist/src/services/tasklist.service.spec.ts b/ng2-components/ng2-activiti-tasklist/src/services/tasklist.service.spec.ts index 605391665c..39b88e5240 100644 --- a/ng2-components/ng2-activiti-tasklist/src/services/tasklist.service.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/services/tasklist.service.spec.ts @@ -55,7 +55,7 @@ describe('Activiti TaskList Service', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], providers: [ TaskListService, diff --git a/ng2-components/ng2-alfresco-core/index.ts b/ng2-components/ng2-alfresco-core/index.ts index e0801caff3..05ed203172 100644 --- a/ng2-components/ng2-alfresco-core/index.ts +++ b/ng2-components/ng2-alfresco-core/index.ts @@ -16,7 +16,7 @@ */ import { CommonModule } from '@angular/common'; -import { ModuleWithProviders, NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { Http, HttpModule } from '@angular/http'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @@ -310,15 +310,4 @@ export function createTranslateLoader(http: Http, logService: LogService) { DownloadZipDialogComponent ] }) -export class CoreModule { - /** @deprecated in 1.9.0 */ - static forRoot(opts: any = {}): ModuleWithProviders { - console.log('CoreModule.forRoot is deprecated and will be removed in future versions'); - return { - ngModule: CoreModule, - providers: [ - ...providers() - ] - }; - } -} +export class CoreModule {} diff --git a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.spec.ts b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.spec.ts index 13772f3173..548bc7a6db 100644 --- a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.spec.ts @@ -44,7 +44,7 @@ class TestConfig { constructor() { this.testBed = TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), + CoreModule, MaterialModule ], schemas: [ NO_ERRORS_SCHEMA ] diff --git a/ng2-components/ng2-alfresco-datatable/index.ts b/ng2-components/ng2-alfresco-datatable/index.ts index 31d861bf0f..16b3193e94 100644 --- a/ng2-components/ng2-alfresco-datatable/index.ts +++ b/ng2-components/ng2-alfresco-datatable/index.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ModuleWithProviders, NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { CoreModule, TRANSLATION_PROVIDER } from 'ng2-alfresco-core'; import { MaterialModule } from './src/material.module'; @@ -79,12 +79,4 @@ export function directives() { RouterModule ] }) -export class DataTableModule { - /** @deprecated in 1.9.0 */ - static forRoot(): ModuleWithProviders { - console.log('DataTableModule.forRoot is deprecated and will be removed in future versions'); - return { - ngModule: DataTableModule - }; - } -} +export class DataTableModule {} diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.spec.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.spec.ts index df148ad7d2..315560e9d8 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.spec.ts +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.spec.ts @@ -26,7 +26,7 @@ describe('EmptyListComponentComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], declarations: [ EmptyListComponent diff --git a/ng2-components/ng2-alfresco-documentlist/index.ts b/ng2-components/ng2-alfresco-documentlist/index.ts index eeb252bdee..c46e136feb 100644 --- a/ng2-components/ng2-alfresco-documentlist/index.ts +++ b/ng2-components/ng2-alfresco-documentlist/index.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ModuleWithProviders, NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { CoreModule, TRANSLATION_PROVIDER } from 'ng2-alfresco-core'; import { DataTableModule } from 'ng2-alfresco-datatable'; @@ -113,15 +113,4 @@ export const DOCUMENT_LIST_PROVIDERS: any[] = [ MaterialModule ] }) -export class DocumentListModule { - /** @deprecated in 1.8.0 */ - static forRoot(): ModuleWithProviders { - console.log('DocumentListModule.forRoot is deprecated and will be removed in future versions'); - return { - ngModule: DocumentListModule, - providers: [ - ...DOCUMENT_LIST_PROVIDERS - ] - }; - } -} +export class DocumentListModule {} diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.spec.ts index 26351f63e9..11c879aae1 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.spec.ts @@ -69,8 +69,8 @@ describe('ContentNodeSelectorComponent', () => { function setupTestbed(plusProviders) { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), - DataTableModule.forRoot(), + CoreModule, + DataTableModule, MaterialModule ], declarations: [ diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/site-dropdown/sites-dropdown.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/site-dropdown/sites-dropdown.component.spec.ts index 9d9353c0d6..7812cdc0ce 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/site-dropdown/sites-dropdown.component.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/site-dropdown/sites-dropdown.component.spec.ts @@ -71,7 +71,7 @@ describe('DropdownSitesComponent', () => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), + CoreModule, MaterialModule ], declarations: [ diff --git a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts index c874698933..7f6093eae4 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts @@ -29,7 +29,7 @@ describe('ShareDataTableAdapter', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], providers: [ DocumentListService @@ -352,7 +352,7 @@ describe('ShareDataRow', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], providers: [ DocumentListService diff --git a/ng2-components/ng2-alfresco-login/index.ts b/ng2-components/ng2-alfresco-login/index.ts index e97b662933..ff1ccd186b 100644 --- a/ng2-components/ng2-alfresco-login/index.ts +++ b/ng2-components/ng2-alfresco-login/index.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ModuleWithProviders, NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { CoreModule, TRANSLATION_PROVIDER } from 'ng2-alfresco-core'; @@ -65,10 +65,4 @@ export const ALFRESCO_LOGIN_DIRECTIVES: any[] = [ MaterialModule ] }) -export class LoginModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: LoginModule - }; - } -} +export class LoginModule {} diff --git a/ng2-components/ng2-alfresco-search/index.ts b/ng2-components/ng2-alfresco-search/index.ts index c6abde3a92..b6fe75c304 100644 --- a/ng2-components/ng2-alfresco-search/index.ts +++ b/ng2-components/ng2-alfresco-search/index.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ModuleWithProviders, NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { CoreModule, SearchService, TRANSLATION_PROVIDER } from 'ng2-alfresco-core'; import { DocumentListModule } from 'ng2-alfresco-documentlist'; @@ -82,13 +82,4 @@ export const ALFRESCO_SEARCH_PROVIDERS: [any] = [ ...ALFRESCO_SEARCH_DIRECTIVES ] }) -export class SearchModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: SearchModule, - providers: [ - ...ALFRESCO_SEARCH_PROVIDERS - ] - }; - } -} +export class SearchModule {} diff --git a/ng2-components/ng2-alfresco-social/index.ts b/ng2-components/ng2-alfresco-social/index.ts index aacac81f99..b429ea0d95 100644 --- a/ng2-components/ng2-alfresco-social/index.ts +++ b/ng2-components/ng2-alfresco-social/index.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ModuleWithProviders, NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { CoreModule } from 'ng2-alfresco-core'; import { LikeComponent } from './src/components/like.component'; @@ -51,13 +51,4 @@ export const RATING_PROVIDERS: any[] = [ ...RATING_DIRECTIVES ] }) -export class SocialModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: SocialModule, - providers: [ - ...RATING_DIRECTIVES - ] - }; - } -} +export class SocialModule {} diff --git a/ng2-components/ng2-alfresco-social/src/components/like.component.spec.ts b/ng2-components/ng2-alfresco-social/src/components/like.component.spec.ts index aa7793fe6d..28e760fec8 100644 --- a/ng2-components/ng2-alfresco-social/src/components/like.component.spec.ts +++ b/ng2-components/ng2-alfresco-social/src/components/like.component.spec.ts @@ -33,7 +33,7 @@ describe('Like component', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], declarations: [ LikeComponent diff --git a/ng2-components/ng2-alfresco-social/src/components/rating.component.spec.ts b/ng2-components/ng2-alfresco-social/src/components/rating.component.spec.ts index 4c3f9b6027..45d2acde40 100644 --- a/ng2-components/ng2-alfresco-social/src/components/rating.component.spec.ts +++ b/ng2-components/ng2-alfresco-social/src/components/rating.component.spec.ts @@ -33,7 +33,7 @@ describe('Rating component', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], declarations: [ RatingComponent diff --git a/ng2-components/ng2-alfresco-social/src/services/rating.service.spec.ts b/ng2-components/ng2-alfresco-social/src/services/rating.service.spec.ts index 63f1e1c374..47007c05b2 100644 --- a/ng2-components/ng2-alfresco-social/src/services/rating.service.spec.ts +++ b/ng2-components/ng2-alfresco-social/src/services/rating.service.spec.ts @@ -28,7 +28,7 @@ describe('Rating service', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], providers: [ RatingService diff --git a/ng2-components/ng2-alfresco-tag/index.ts b/ng2-components/ng2-alfresco-tag/index.ts index c42ca91ff5..aa7001e422 100644 --- a/ng2-components/ng2-alfresco-tag/index.ts +++ b/ng2-components/ng2-alfresco-tag/index.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ModuleWithProviders, NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { CoreModule, TRANSLATION_PROVIDER } from 'ng2-alfresco-core'; import { MaterialModule } from './src/components/material.module'; @@ -69,13 +69,4 @@ export const TAG_PROVIDERS: any[] = [ MaterialModule ] }) -export class TagModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: TagModule, - providers: [ - ...TAG_DIRECTIVES - ] - }; - } -} +export class TagModule {} diff --git a/ng2-components/ng2-alfresco-upload/index.ts b/ng2-components/ng2-alfresco-upload/index.ts index 3833d62175..667931d537 100644 --- a/ng2-components/ng2-alfresco-upload/index.ts +++ b/ng2-components/ng2-alfresco-upload/index.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ModuleWithProviders, NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { CoreModule, TRANSLATION_PROVIDER } from 'ng2-alfresco-core'; import { MaterialModule } from './src/material.module'; @@ -66,10 +66,4 @@ export const UPLOAD_DIRECTIVES: any[] = [ ...UPLOAD_DIRECTIVES ] }) -export class UploadModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: UploadModule - }; - } -} +export class UploadModule {} diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts index 950b74dd9e..7aa0c7ffdf 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts @@ -61,7 +61,7 @@ describe('UploadButtonComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], declarations: [ UploadButtonComponent diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts index 49a99a07a0..942c81876b 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts @@ -68,7 +68,7 @@ describe('UploadDragAreaComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], declarations: [ FileDraggableDirective, diff --git a/ng2-components/ng2-alfresco-userinfo/index.ts b/ng2-components/ng2-alfresco-userinfo/index.ts index 4cd39a118b..1125a0d2be 100644 --- a/ng2-components/ng2-alfresco-userinfo/index.ts +++ b/ng2-components/ng2-alfresco-userinfo/index.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ModuleWithProviders, NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { CoreModule, TRANSLATION_PROVIDER } from 'ng2-alfresco-core'; import { MaterialModule } from './src/material.module'; @@ -59,26 +59,4 @@ export const USER_INFO_PROVIDERS: any[] = [ ...USER_INFO_DIRECTIVES ] }) - -export class UserInfoModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: UserInfoModule, - providers: [ - ...USER_INFO_PROVIDERS - ] - }; - } -} - -/** @deprecated in 1.9.0 */ -export class UserInfoComponentModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: UserInfoComponentModule, - providers: [ - ...USER_INFO_PROVIDERS - ] - }; - } -} +export class UserInfoModule {} diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts index 1d6b1a792a..71f4f8f6fa 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts @@ -48,7 +48,7 @@ describe('User info component', () => { window['componentHandler'] = componentHandler; TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot(), + CoreModule, MaterialModule ], declarations: [ diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts index 53c5a21b5b..956b2171d0 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts @@ -29,7 +29,7 @@ describe('Bpm user service', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], providers: [ BpmUserService diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.spec.ts b/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.spec.ts index 8d8e4116b8..f41e6a5384 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.spec.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.spec.ts @@ -31,7 +31,7 @@ describe('EcmUserService', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule ], providers: [ EcmUserService diff --git a/ng2-components/ng2-alfresco-viewer/index.ts b/ng2-components/ng2-alfresco-viewer/index.ts index 8b46aa36ac..276bee5c2f 100644 --- a/ng2-components/ng2-alfresco-viewer/index.ts +++ b/ng2-components/ng2-alfresco-viewer/index.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ModuleWithProviders, NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { CoreModule } from 'ng2-alfresco-core'; import { MaterialModule } from './src/material.module'; @@ -63,22 +63,11 @@ export const VIEWER_DIRECTIVES: any[] = [ ViewerService ], exports: [ + MaterialModule, ...VIEWER_DIRECTIVES ], entryComponents: [ ViewerDialogComponent ] }) -export class ViewerModule { - /** @deprecated in 1.8.0 */ - static forRoot(): ModuleWithProviders { - console.log('ViewerModule.forRoot is deprecated and will be removed in future versions'); - return { - ngModule: ViewerModule, - providers: [ - RenderingQueueServices, - ViewerService - ] - }; - } -} +export class ViewerModule {} diff --git a/ng2-components/ng2-alfresco-viewer/src/directives/extension-viewer.directive.spec.ts b/ng2-components/ng2-alfresco-viewer/src/directives/extension-viewer.directive.spec.ts index e24422523a..398406e3ce 100644 --- a/ng2-components/ng2-alfresco-viewer/src/directives/extension-viewer.directive.spec.ts +++ b/ng2-components/ng2-alfresco-viewer/src/directives/extension-viewer.directive.spec.ts @@ -35,7 +35,7 @@ describe('ExtensionViewerComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [CoreModule.forRoot()], + imports: [CoreModule], providers: [ ExtensionViewerDirective, {provide: ElementRef, useClass: MockElementRef}, diff --git a/ng2-components/ng2-alfresco-webscript/index.ts b/ng2-components/ng2-alfresco-webscript/index.ts index ba4cc6556b..f56acb06f9 100644 --- a/ng2-components/ng2-alfresco-webscript/index.ts +++ b/ng2-components/ng2-alfresco-webscript/index.ts @@ -15,21 +15,12 @@ * limitations under the License. */ -import { ModuleWithProviders, NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { CoreModule } from 'ng2-alfresco-core'; import { DataTableModule } from 'ng2-alfresco-datatable'; import { WebscriptComponent } from './src/webscript.component'; - -/** - * ng2-alfresco-webscript, provide components get data from webscript and visualize in a table. - */ - -export * from './src/webscript.component'; - -export const WEBSCRIPT_DIRECTIVES: any[] = [ - WebscriptComponent -]; +export { WebscriptComponent } from './src/webscript.component'; @NgModule({ imports: [ @@ -37,16 +28,10 @@ export const WEBSCRIPT_DIRECTIVES: any[] = [ DataTableModule ], declarations: [ - ...WEBSCRIPT_DIRECTIVES + WebscriptComponent ], exports: [ - ...WEBSCRIPT_DIRECTIVES + WebscriptComponent ] }) -export class WebScriptModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: WebScriptModule - }; - } -} +export class WebScriptModule {}