From 06af7204f32cf671302d21078f2766b5d83cf91e Mon Sep 17 00:00:00 2001
From: kpawelczak <42094017+kpawelczak@users.noreply.github.com>
Date: Tue, 25 Jul 2023 09:04:14 +0200
Subject: [PATCH] feat: update order of BaseStorefrontModule in SpartacusModule
 (#17634)

---
 projects/schematics/src/add-spartacus/spartacus.ts              | 1 +
 .../__snapshots__/scaffold-app-structure_spec.ts.snap           | 2 +-
 .../scaffold-app-structure/scaffold-app-structure_spec.ts       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/projects/schematics/src/add-spartacus/spartacus.ts b/projects/schematics/src/add-spartacus/spartacus.ts
index d9c87f147a8..a4f1f036e6e 100644
--- a/projects/schematics/src/add-spartacus/spartacus.ts
+++ b/projects/schematics/src/add-spartacus/spartacus.ts
@@ -68,6 +68,7 @@ function configureSpartacusModules(
         namedImports: [BASE_STOREFRONT_MODULE],
       },
       content: BASE_STOREFRONT_MODULE,
+      order: 0,
     });
     addModuleExport(sourceFile, {
       import: {
diff --git a/projects/schematics/src/migrations/mechanism/scaffold-app-structure/__snapshots__/scaffold-app-structure_spec.ts.snap b/projects/schematics/src/migrations/mechanism/scaffold-app-structure/__snapshots__/scaffold-app-structure_spec.ts.snap
index 1c8d5272a7b..c55722cb110 100644
--- a/projects/schematics/src/migrations/mechanism/scaffold-app-structure/__snapshots__/scaffold-app-structure_spec.ts.snap
+++ b/projects/schematics/src/migrations/mechanism/scaffold-app-structure/__snapshots__/scaffold-app-structure_spec.ts.snap
@@ -84,9 +84,9 @@ import { SpartacusFeaturesModule } from './spartacus-features.module';
   declarations: [],
   imports: [
     MyFeature,
+    BaseStorefrontModule,
     SpartacusFeaturesModule,
     SpartacusConfigurationModule,
-    BaseStorefrontModule
   ],
   exports: [BaseStorefrontModule]
 })
diff --git a/projects/schematics/src/migrations/mechanism/scaffold-app-structure/scaffold-app-structure_spec.ts b/projects/schematics/src/migrations/mechanism/scaffold-app-structure/scaffold-app-structure_spec.ts
index 1389f5bf70d..3d5f3e33ccc 100644
--- a/projects/schematics/src/migrations/mechanism/scaffold-app-structure/scaffold-app-structure_spec.ts
+++ b/projects/schematics/src/migrations/mechanism/scaffold-app-structure/scaffold-app-structure_spec.ts
@@ -24,9 +24,9 @@ import { SpartacusFeaturesModule } from './spartacus-features.module';
   declarations: [],
   imports: [
     MyFeature,
+    BaseStorefrontModule,
     SpartacusFeaturesModule,
     SpartacusConfigurationModule,
-    BaseStorefrontModule
   ],
   exports: [BaseStorefrontModule]
 })