Skip to content

Commit 51cb606

Browse files
Get rid of BrowserTransferStateModule (#1395)
* Get rid of BrowserTransferStateModule * Update package version
1 parent 7372124 commit 51cb606

19 files changed

+55
-30
lines changed

packages/devextreme-angular-generator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"author": "Developer Express Inc.",
33
"name": "devextreme-angular-generator",
4-
"version": "2.0.2",
4+
"version": "2.0.3",
55
"description": "Angular UI and visualization components based on DevExtreme widgets",
66
"repository": {
77
"type": "git",

packages/devextreme-angular-generator/src/templates/component.tst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ it.isEditor && implementedInterfaces.push('ControlValueAccessor');
1111
collectionProperties.length && implementedInterfaces.push('OnChanges', 'DoCheck');
1212
#>
1313

14-
import { BrowserTransferStateModule } from '@angular/platform-browser';
1514
import { TransferState } from '@angular/platform-browser';
1615

1716
import {
@@ -233,8 +232,7 @@ export class <#= it.className #>Component extends <#= baseClass #> <#? implement
233232
imports: [<#~ it.nestedComponents :component:i #>
234233
<#= component.className #>Module,<#~#>
235234
DxIntegrationModule,
236-
DxTemplateModule,
237-
BrowserTransferStateModule
235+
DxTemplateModule
238236
],
239237
declarations: [
240238
<#= it.className #>Component

packages/devextreme-angular/src/core/transfer-state.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@ import { PLATFORM_ID, Inject, NgModule } from '@angular/core';
22
import { isPlatformServer } from '@angular/common';
33
import ajax from 'devextreme/core/utils/ajax';
44
import { Deferred } from 'devextreme/core/utils/deferred';
5-
import { TransferState, makeStateKey, BrowserTransferStateModule } from '@angular/platform-browser';
5+
import { TransferState, makeStateKey } from '@angular/platform-browser';
66

7-
@NgModule({
8-
imports: [
9-
BrowserTransferStateModule
10-
]
11-
})
7+
@NgModule({})
128

139
export class DxServerTransferStateModule {
1410
constructor(private state: TransferState, @Inject(PLATFORM_ID) private platformId: any) {

packages/devextreme-angular/tests/src/server/ssr-ajax.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { Deferred } from 'devextreme/core/utils/deferred';
1212
import ajax from 'devextreme/core/utils/ajax';
1313

1414
import { ServerModule, ServerTransferStateModule } from '@angular/platform-server';
15-
import { BrowserModule, TransferState, makeStateKey } from '@angular/platform-browser';
15+
import { BrowserModule, TransferState, makeStateKey, BrowserTransferStateModule } from '@angular/platform-browser';
1616

1717
import {
1818
TestBed
@@ -50,6 +50,7 @@ describe('Universal', () => {
5050
ServerModule,
5151
DxServerTransferStateModule,
5252
ServerTransferStateModule,
53+
BrowserTransferStateModule,
5354
BrowserModule.withServerTransition({appId: 'appid'})]
5455
});
5556
});

packages/devextreme-angular/tests/src/server/ssr-components.spec.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import {
1111
DevExtremeModule
1212
} from 'devextreme-angular';
1313

14+
import { BrowserTransferStateModule } from '@angular/platform-browser';
15+
1416
import { DxServerModule } from 'devextreme-angular/server';
1517

1618
import {
@@ -31,7 +33,8 @@ describe('Universal', () => {
3133
declarations: [TestContainerComponent],
3234
imports: [
3335
DxServerModule,
34-
DevExtremeModule
36+
DevExtremeModule,
37+
BrowserTransferStateModule
3538
]
3639
});
3740
});

packages/devextreme-angular/tests/src/server/ssr-is-platform-server.spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77

88
import { isPlatformServer } from '@angular/common';
99

10-
import { TransferState } from '@angular/platform-browser';
10+
import { TransferState, BrowserTransferStateModule } from '@angular/platform-browser';
1111

1212
import { DxServerModule } from 'devextreme-angular/server';
1313

@@ -38,7 +38,8 @@ describe('Universal', () => {
3838
declarations: [TestContainerComponent],
3939
imports: [
4040
DxServerModule,
41-
DxDataGridModule
41+
DxDataGridModule,
42+
BrowserTransferStateModule
4243
]
4344
});
4445
});

packages/devextreme-angular/tests/src/ui/chart.spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import {
55
ViewChild
66
} from '@angular/core';
77

8+
import { BrowserTransferStateModule } from '@angular/platform-browser';
9+
810
import {
911
TestBed
1012
} from '@angular/core/testing';
@@ -44,7 +46,7 @@ describe('DxChart', () => {
4446
TestBed.configureTestingModule(
4547
{
4648
declarations: [TestContainerComponent],
47-
imports: [DxChartModule, DxScrollViewModule]
49+
imports: [DxChartModule, DxScrollViewModule, BrowserTransferStateModule]
4850
});
4951
});
5052

packages/devextreme-angular/tests/src/ui/custom-value-accessor-implementation.spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import {
1212
FormControl
1313
} from '@angular/forms';
1414

15+
import { BrowserTransferStateModule } from '@angular/platform-browser';
16+
1517
import {
1618
TestBed
1719
} from '@angular/core/testing';
@@ -51,7 +53,7 @@ describe('DxTextBox value accessor', () => {
5153
TestBed.configureTestingModule(
5254
{
5355
declarations: [TestContainerComponent],
54-
imports: [DxTextBoxModule, ReactiveFormsModule]
56+
imports: [DxTextBoxModule, ReactiveFormsModule, BrowserTransferStateModule]
5557
});
5658
});
5759

packages/devextreme-angular/tests/src/ui/data-grid.spec.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import {
77
ViewChild
88
} from '@angular/core';
99

10+
import { BrowserTransferStateModule } from '@angular/platform-browser';
11+
1012
import {
1113
TestBed
1214
} from '@angular/core/testing';
@@ -71,7 +73,7 @@ describe('DxDataGrid', () => {
7173
TestBed.configureTestingModule(
7274
{
7375
declarations: [TestContainerComponent],
74-
imports: [DxDataGridModule]
76+
imports: [DxDataGridModule, BrowserTransferStateModule]
7577
});
7678
});
7779

@@ -290,7 +292,7 @@ describe('DxDataGrid', () => {
290292

291293
TestBed.configureTestingModule({
292294
declarations: [TestGridComponent],
293-
imports: [DxDataGridModule]
295+
imports: [DxDataGridModule, BrowserTransferStateModule]
294296
});
295297

296298
TestBed.overrideComponent(TestGridComponent, {
@@ -350,7 +352,7 @@ describe('DxDataGrid', () => {
350352

351353
TestBed.configureTestingModule({
352354
declarations: [TestGridComponent],
353-
imports: [DxDataGridModule]
355+
imports: [DxDataGridModule, BrowserTransferStateModule]
354356
});
355357

356358
TestBed.overrideComponent(TestGridComponent, {
@@ -400,7 +402,7 @@ describe('Nested DxDataGrid', () => {
400402
TestBed.configureTestingModule(
401403
{
402404
declarations: [TestContainerComponent],
403-
imports: [DxDataGridModule]
405+
imports: [DxDataGridModule, BrowserTransferStateModule]
404406
});
405407

406408
originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;

packages/devextreme-angular/tests/src/ui/events.spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import {
88
TestBed
99
} from '@angular/core/testing';
1010

11+
import { BrowserTransferStateModule } from '@angular/platform-browser';
12+
1113
import {
1214
DxDataGridModule
1315
} from 'devextreme-angular';
@@ -36,7 +38,7 @@ describe('global events', () => {
3638

3739
TestBed.configureTestingModule({
3840
declarations: [TestContainerComponent],
39-
imports: [DxDataGridModule]
41+
imports: [DxDataGridModule, BrowserTransferStateModule]
4042
});
4143

4244
TestBed.overrideComponent(TestContainerComponent, {

0 commit comments

Comments
 (0)