Skip to content

Commit 24f4e8f

Browse files
committed
Convert core to standalone
1 parent 89b9f06 commit 24f4e8f

28 files changed

Lines changed: 143 additions & 278 deletions

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,22 @@ import {
1818
DaffAuthorizeNetStateModule,
1919
} from '@daffodil/authorizenet/state';
2020
import { daffCartProvideRetrievalActions } from '@daffodil/cart/state';
21+
import { DaffNavigationStateModule } from '@daffodil/navigation/state';
2122
import { DaffPaymentStateModule } from '@daffodil/payment/state';
2223

2324
import { AppRoutingModule } from './app-routing.module';
2425
import { AppComponent } from './app.component';
2526
import { DemoCartRootModule } from './cart/cart-root.module';
2627
import { CategoryModule } from './category/category.module';
2728
import { DemoCheckoutStepActionTypes } from './checkout/actions/checkout-step.actions';
28-
import { TemplateModule } from './core/template/template/template.module';
29+
import { provideDemoImageGalleryState } from './core/image-gallery/image-gallery-state.provider';
30+
import { TemplateComponent } from './core/template/template/template.component';
2931
import { DemoDriverModule } from './drivers/driver.module';
3032
import { NotFoundModule } from './misc/not-found/not-found.module';
3133
import { ProductModule } from './product/product.module';
3234
import { DemoRoutingComponentModule } from './routing/routing-component.module';
3335
import { environment } from '../environments/environment';
36+
import { provideDemoSidebarState } from './core/sidebar/sidebar-state.provider';
3437

3538
@NgModule({
3639
declarations: [
@@ -54,10 +57,11 @@ import { environment } from '../environments/environment';
5457
DemoCartRootModule,
5558
ProductModule,
5659
CategoryModule,
57-
TemplateModule,
60+
TemplateComponent,
5861
NotFoundModule,
5962
DaffAuthorizeNetPaymentStateModule,
6063
DaffAuthorizeNetStateModule,
64+
DaffNavigationStateModule,
6165
DaffPaymentStateModule,
6266
],
6367
providers: [
@@ -73,6 +77,8 @@ import { environment } from '../environments/environment';
7377
},
7478
),
7579
provideRouterStore(),
80+
provideDemoSidebarState(),
81+
provideDemoImageGalleryState(),
7682
// network providers
7783
provideHttpClient(withInterceptorsFromDi()),
7884
// this must be after http client! ^

apps/demo/src/app/core/footer/footer.component.spec.ts

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ import {
44
TestBed,
55
} from '@angular/core/testing';
66
import { By } from '@angular/platform-browser';
7-
import { RouterTestingModule } from '@angular/router/testing';
8-
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
9-
10-
import { DaffContainerModule } from '@daffodil/design/container';
11-
import { DaffListModule } from '@daffodil/design/list';
7+
import { provideRouter } from '@angular/router';
128

139
import { FooterComponent } from './footer.component';
1410

@@ -18,14 +14,11 @@ describe('FooterComponent', () => {
1814

1915
beforeEach(waitForAsync(() => {
2016
TestBed.configureTestingModule({
21-
declarations: [
17+
imports: [
2218
FooterComponent,
2319
],
24-
imports: [
25-
RouterTestingModule,
26-
DaffContainerModule,
27-
DaffListModule,
28-
FontAwesomeModule,
20+
providers: [
21+
provideRouter([]),
2922
],
3023
})
3124
.compileComponents();

apps/demo/src/app/core/footer/footer.component.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,27 @@
11
import { Component } from '@angular/core';
2+
import { RouterModule } from '@angular/router';
3+
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
24
import {
35
faTwitter,
46
faFacebookF,
57
faInstagram,
68
} from '@fortawesome/free-brands-svg-icons';
79

10+
import { DAFF_BUTTON_COMPONENTS } from '@daffodil/design/button';
11+
import { DAFF_CONTAINER_COMPONENTS } from '@daffodil/design/container';
12+
import { DAFF_LIST_COMPONENTS } from '@daffodil/design/list';
13+
814
@Component({
915
selector: 'demo-footer',
1016
templateUrl: './footer.component.html',
1117
styleUrls: ['./footer.component.scss'],
12-
standalone: false,
18+
imports: [
19+
RouterModule,
20+
DAFF_LIST_COMPONENTS,
21+
DAFF_BUTTON_COMPONENTS,
22+
DAFF_CONTAINER_COMPONENTS,
23+
FaIconComponent,
24+
],
1325
})
1426
export class FooterComponent {
1527
faTwitter = faTwitter;

apps/demo/src/app/core/footer/footer.module.ts

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

apps/demo/src/app/core/header/components/header/header.component.spec.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import {
44
TestBed,
55
} from '@angular/core/testing';
66
import { By } from '@angular/platform-browser';
7-
import { Router } from '@angular/router';
8-
import { RouterTestingModule } from '@angular/router/testing';
9-
10-
import { DaffNavbarModule } from '@daffodil/design/navbar';
7+
import {
8+
Router,
9+
provideRouter,
10+
} from '@angular/router';
1111

1212
import { DemoHeaderComponent } from './header.component';
1313

@@ -19,12 +19,11 @@ describe('DemoHeaderComponent', () => {
1919
beforeEach(waitForAsync(() => {
2020
TestBed.configureTestingModule({
2121
imports: [
22-
DaffNavbarModule,
23-
RouterTestingModule,
24-
],
25-
declarations: [
2622
DemoHeaderComponent,
2723
],
24+
providers: [
25+
provideRouter([]),
26+
],
2827
})
2928
.compileComponents();
3029
}));

apps/demo/src/app/core/header/components/header/header.component.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
import { Component } from '@angular/core';
22
import { Router } from '@angular/router';
33

4+
import { DAFF_NAVBAR_COMPONENTS } from '@daffodil/design/navbar';
5+
46
@Component({
57
selector: 'demo-header',
68
templateUrl: './header.component.html',
79
styleUrls: ['./header.component.scss'],
8-
standalone: false,
10+
imports: [
11+
DAFF_NAVBAR_COMPONENTS,
12+
],
913
})
1014
export class DemoHeaderComponent {
1115

apps/demo/src/app/core/header/containers/header/header.component.spec.ts

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
1-
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
21
import {
32
waitForAsync,
43
ComponentFixture,
54
TestBed,
65
} from '@angular/core/testing';
76
import { By } from '@angular/platform-browser';
8-
import { RouterTestingModule } from '@angular/router/testing';
9-
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
7+
import { provideRouter } from '@angular/router';
108
import {
119
StoreModule,
1210
Store,
1311
} from '@ngrx/store';
1412

1513
import { DemoHeaderContainer } from './header.component';
16-
import { LogoModule } from '../../../logo/logo.module';
1714
import { ToggleSidebar } from '../../../sidebar/actions/sidebar.actions';
1815
import * as fromSidebar from '../../../sidebar/reducers/index';
19-
import { DemoHeaderComponent } from '../../components/header/header.component';
2016

2117
describe('DemoHeaderContainer', () => {
2218
let component: DemoHeaderContainer;
@@ -28,16 +24,10 @@ describe('DemoHeaderContainer', () => {
2824
TestBed.configureTestingModule({
2925
imports: [
3026
StoreModule.forRoot({}),
31-
RouterTestingModule,
32-
LogoModule,
33-
FontAwesomeModule,
34-
],
35-
declarations: [
3627
DemoHeaderContainer,
37-
DemoHeaderComponent,
3828
],
39-
schemas: [
40-
CUSTOM_ELEMENTS_SCHEMA,
29+
providers: [
30+
provideRouter([]),
4131
],
4232
})
4333
.compileComponents();

apps/demo/src/app/core/header/containers/header/header.component.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,29 @@
11
import { Component } from '@angular/core';
2+
import { RouterModule } from '@angular/router';
3+
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
24
import {
35
faBars,
46
faShoppingCart,
57
} from '@fortawesome/free-solid-svg-icons';
68
import { Store } from '@ngrx/store';
79

10+
import { DAFF_BUTTON_COMPONENTS } from '@daffodil/design/button';
11+
12+
import { LogoComponent } from '../../../logo/logo.component';
813
import { ToggleSidebar } from '../../../sidebar/actions/sidebar.actions';
14+
import { DemoHeaderComponent } from '../../components/header/header.component';
915

1016

1117
@Component({
1218
selector: 'demo-header-container',
1319
templateUrl: './header.component.html',
14-
standalone: false,
20+
imports: [
21+
RouterModule,
22+
FaIconComponent,
23+
DAFF_BUTTON_COMPONENTS,
24+
DemoHeaderComponent,
25+
LogoComponent,
26+
],
1527
})
1628
export class DemoHeaderContainer {
1729
faBars = faBars;

apps/demo/src/app/core/header/header.module.ts

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

apps/demo/src/app/core/image-gallery/components/image-gallery.component.spec.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ import {
1010
MockStore,
1111
} from '@ngrx/store/testing';
1212

13-
import { DAFF_IMAGE_COMPONENTS } from '@daffodil/design/image';
14-
import { DAFF_MEDIA_GALLERY_COMPONENTS } from '@daffodil/design/media-gallery';
15-
1613
import { ImageGalleryComponent } from './image-gallery.component';
1714

1815
const stubImages = [
@@ -22,7 +19,9 @@ const stubImages = [
2219

2320
@Component({
2421
template: '<demo-image-gallery-container [images]="imagesValue"></demo-image-gallery-container>',
25-
standalone: false,
22+
imports: [
23+
ImageGalleryComponent,
24+
],
2625
})
2726
class WrapperComponent {
2827
imagesValue: Record<string, any>[] = stubImages;
@@ -38,12 +37,7 @@ describe('ImageGalleryComponent', () => {
3837
beforeEach(waitForAsync(() => {
3938
TestBed.configureTestingModule({
4039
imports: [
41-
DAFF_MEDIA_GALLERY_COMPONENTS,
42-
DAFF_IMAGE_COMPONENTS,
43-
],
44-
declarations: [
4540
WrapperComponent,
46-
ImageGalleryComponent,
4741
],
4842
providers: [
4943
provideMockStore({}),

0 commit comments

Comments
 (0)