Skip to content

Commit f707b25

Browse files
joannalauujoannalauu
committed
Convert drivers to standalone
1 parent 836b998 commit f707b25

7 files changed

Lines changed: 40 additions & 56 deletions

File tree

‎angular.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
"sourceMap": true,
6262
"fileReplacements": [
6363
{
64-
"replace": "apps/demo/src/app/drivers/driver.module.ts",
65-
"with": "apps/demo/src/app/drivers/in-memory.module.ts"
64+
"replace": "apps/demo/src/app/drivers/driver.providers.ts",
65+
"with": "apps/demo/src/app/drivers/in-memory.providers.ts"
6666
}
6767
]
6868
},
@@ -86,8 +86,8 @@
8686
"with": "apps/demo/src/environments/environment.prod.ts"
8787
},
8888
{
89-
"replace": "apps/demo/src/app/drivers/driver.module.ts",
90-
"with": "apps/demo/src/app/drivers/in-memory.module.ts"
89+
"replace": "apps/demo/src/app/drivers/driver.providers.ts",
90+
"with": "apps/demo/src/app/drivers/in-memory.providers.ts"
9191
}
9292
]
9393
},
@@ -98,8 +98,8 @@
9898
"with": "apps/demo/src/environments/environment.magento.ts"
9999
},
100100
{
101-
"replace": "apps/demo/src/app/drivers/driver.module.ts",
102-
"with": "apps/demo/src/app/drivers/magento.module.ts"
101+
"replace": "apps/demo/src/app/drivers/driver.providers.ts",
102+
"with": "apps/demo/src/app/drivers/magento.providers.ts"
103103
}
104104
]
105105
},
@@ -110,8 +110,8 @@
110110
"with": "apps/demo/src/environments/environment.venia.ts"
111111
},
112112
{
113-
"replace": "apps/demo/src/app/drivers/driver.module.ts",
114-
"with": "apps/demo/src/app/drivers/magento.module.ts"
113+
"replace": "apps/demo/src/app/drivers/driver.providers.ts",
114+
"with": "apps/demo/src/app/drivers/magento.providers.ts"
115115
}
116116
]
117117
},
@@ -122,8 +122,8 @@
122122
"with": "apps/demo/src/environments/environment.shopify.ts"
123123
},
124124
{
125-
"replace": "apps/demo/src/app/drivers/driver.module.ts",
126-
"with": "apps/demo/src/app/drivers/shopify.module.ts"
125+
"replace": "apps/demo/src/app/drivers/driver.providers.ts",
126+
"with": "apps/demo/src/app/drivers/shopify.providers.ts"
127127
}
128128
]
129129
}

‎apps/demo/src/app/app.module.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ import {
22
provideHttpClient,
33
withInterceptorsFromDi,
44
} from '@angular/common/http';
5-
import {
6-
importProvidersFrom,
7-
NgModule,
8-
} from '@angular/core';
5+
import { NgModule } from '@angular/core';
96
import { BrowserModule } from '@angular/platform-browser';
107
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
118
import { EffectsModule } from '@ngrx/effects';
@@ -25,7 +22,7 @@ import { AppComponent } from './app.component';
2522
import { DemoCartRootModule } from './cart/cart-root.module';
2623
import { DemoCheckoutStepActionTypes } from './checkout/actions/checkout-step.actions';
2724
import { TemplateModule } from './core/template/template/template.module';
28-
import { DemoDriverModule } from './drivers/driver.module';
25+
import { provideDemoDrivers } from './drivers/driver.providers';
2926
import { NotFoundModule } from './misc/not-found/not-found.module';
3027
import { ProductModule } from './product/product.module';
3128
import { DemoRoutingComponentModule } from './routing/routing-component.module';
@@ -80,7 +77,7 @@ import { environment } from '../environments/environment';
8077
// importing modules. therefore, the in memory web API
8178
// will not be able override the HTTP client backend
8279
// when imported as a module
83-
importProvidersFrom(DemoDriverModule),
80+
provideDemoDrivers(),
8481
//
8582
],
8683
bootstrap: [AppComponent],

‎apps/demo/src/app/drivers/driver.module.ts‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎apps/demo/src/app/drivers/driver.providers.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const provideDemoDrivers = () => [];

apps/demo/src/app/drivers/in-memory.module.ts renamed to apps/demo/src/app/drivers/in-memory.providers.ts

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {
2-
NgModule,
32
inject,
3+
importProvidersFrom,
44
} from '@angular/core';
55

66
import { DaffAuthInMemoryDriverModule } from '@daffodil/auth/driver/in-memory';
@@ -24,8 +24,8 @@ import { DaffConfigurableProductInMemoryDriverModule } from '@daffodil/product-c
2424

2525
import { DEMO_EXTERNAL_ROUTER_DRIVER_IN_MEMORY_CONFIG } from './in-memory/external-router.config.token';
2626

27-
@NgModule({
28-
imports: [
27+
export const provideDemoDrivers = () => [
28+
importProvidersFrom(
2929
DaffInMemoryDriverModule.forRoot(),
3030
DaffAuthorizeNetInMemoryDriverModule.forRoot(),
3131
DaffAuthInMemoryDriverModule.forRoot(),
@@ -37,16 +37,13 @@ import { DEMO_EXTERNAL_ROUTER_DRIVER_IN_MEMORY_CONFIG } from './in-memory/extern
3737
DaffNewsletterInMemoryDriverModule.forRoot(),
3838
DaffGeographyInMemoryDriverModule.forRoot(),
3939
DaffCategoryInMemoryDriverModule.forRoot(),
40-
],
41-
providers: [
42-
provideDaffExternalRouterInMemoryDriver(DEMO_EXTERNAL_ROUTER_DRIVER_IN_MEMORY_CONFIG),
43-
{
44-
provide: DAFF_NAVIGATION_IN_MEMORY_SEED_DATA_PROVIDER,
45-
useFactory: () => {
46-
const categoryBackend = inject(DaffInMemoryBackendCategoryService);
47-
return () => categoryBackend.categories[0];
48-
},
40+
),
41+
provideDaffExternalRouterInMemoryDriver(DEMO_EXTERNAL_ROUTER_DRIVER_IN_MEMORY_CONFIG),
42+
{
43+
provide: DAFF_NAVIGATION_IN_MEMORY_SEED_DATA_PROVIDER,
44+
useFactory: () => {
45+
const categoryBackend = inject(DaffInMemoryBackendCategoryService);
46+
return () => categoryBackend.categories[0];
4947
},
50-
],
51-
})
52-
export class DemoDriverModule { }
48+
},
49+
];

apps/demo/src/app/drivers/magento.module.ts renamed to apps/demo/src/app/drivers/magento.providers.ts

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { NgModule } from '@angular/core';
1+
import { importProvidersFrom } from '@angular/core';
22
import { provideApollo } from 'apollo-angular';
33

44
import { DaffAuthMagentoDriverModule } from '@daffodil/auth/driver/magento';
@@ -15,9 +15,8 @@ import { demoMagentoApolloOptions } from './magento/apollo-options.factory';
1515
import { environment } from '../../environments/environment';
1616
import { MagentoEnvironmentDriverConfiguration } from '../../environments/environment.interface';
1717

18-
@NgModule({
19-
imports: [
20-
//Magento
18+
export const provideDemoDrivers = () => [
19+
importProvidersFrom(
2120
DaffAuthMagentoDriverModule.forRoot(),
2221
DaffProductMagentoDriverModule.forRoot({
2322
baseMediaUrl: 'https://magento2.test/media/',
@@ -28,10 +27,7 @@ import { MagentoEnvironmentDriverConfiguration } from '../../environments/enviro
2827
DaffGeographyMagentoDriverModule.forRoot(),
2928
DaffCategoryMagentoDriverModule.forRoot(),
3029
DaffMagentoAuthorizeNetDriverModule.forRoot((<MagentoEnvironmentDriverConfiguration>environment.driver).anetConfig),
31-
],
32-
providers: [
33-
provideApollo(demoMagentoApolloOptions),
34-
provideDaffExternalRouterMagentoDriver(),
35-
],
36-
})
37-
export class DemoDriverModule {}
30+
),
31+
provideApollo(demoMagentoApolloOptions),
32+
provideDaffExternalRouterMagentoDriver(),
33+
];

apps/demo/src/app/drivers/shopify.module.ts renamed to apps/demo/src/app/drivers/shopify.providers.ts

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { NgModule } from '@angular/core';
1+
import { importProvidersFrom } from '@angular/core';
22

33
import { DaffAuthorizeNetInMemoryDriverModule } from '@daffodil/authorizenet/driver/in-memory';
44
import { DaffCartInMemoryDriverModule } from '@daffodil/cart/driver/in-memory';
@@ -19,19 +19,16 @@ import { ShopifyEnviromentDriverConfiguration } from '../../environments/environ
1919
const domain = (<ShopifyEnviromentDriverConfiguration>environment.driver).domain;
2020
const accessToken = (<ShopifyEnviromentDriverConfiguration>environment.driver).publicAccessToken;
2121

22-
@NgModule({
23-
imports: [
22+
export const provideDemoDrivers = () => [
23+
importProvidersFrom(
2424
DaffInMemoryDriverModule.forRoot(),
2525
DaffProductShopifyDriverModule.forRoot(),
2626
DaffCartInMemoryDriverModule.forRoot(),
2727
DaffNewsletterInMemoryDriverModule.forRoot(),
2828
DaffCategoryInMemoryDriverModule.forRoot(),
2929
DaffNavigationInMemoryDriverModule.forRoot(),
3030
DaffAuthorizeNetInMemoryDriverModule.forRoot(),
31-
],
32-
providers: [
33-
provideDaffProductExtraFactoryTypes(DaffDefaultProductFactory),
34-
provideShopifyApolloDriver(domain, accessToken),
35-
],
36-
})
37-
export class DemoDriverModule {}
31+
),
32+
provideDaffProductExtraFactoryTypes(DaffDefaultProductFactory),
33+
provideShopifyApolloDriver(domain, accessToken),
34+
];

0 commit comments

Comments
 (0)