Merge branch 'feature/GH-12789' into feature/GH-12621

.vscode/launch.json

@@ -42,6 +42,22 @@
       "args": ["add", "@spartacus/schematics@latest"],
       "console": "integratedTerminal",
       "outFiles": ["${workspaceFolder}/**/*.js"]
+    },
+
+    // to debug a schematics Jest test, make sure that a spec.ts file is currently opened.
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Debug project/schematics Jest test",
+      "program": "${workspaceFolder}/node_modules/.bin/jest",
+      "args": [
+        "${fileBasenameNoExtension}",
+        "--config",
+        "projects/schematics/jest.schematics.config.js"
+      ],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "disableOptimisticBPs": true
     }
   ]
 }

docs/migration/4_0.md

@@ -289,14 +289,40 @@ Lib: @spartacus/core
 Class: UserAddressService
 Change: Two new required constructor parameters `userAddressConnector: UserAddressConnector` and `command: CommandService`
 
+
+## New Checkout Library
+
+Spartacus 4.0 introduces the checkout library.  The checkout related code is moved out of `@spartacus/core` and `@spartacus/storefrontlib` into one of the checkout lib's entry points.  The checkout library is split into these entry points:
+
+```
+@spartacus/checkout/assets 
+( checkout related i18n keys are moved here )
+
+@spartacus/checkout/components
+( checkout related UI codee is moved here. This includes components, guards and ui services )
+
+@spartacus/checkout/core
+The checkout facade API implementation are moved here, as well as connectors, event builder, event listener, models, other services, and state management.
+
+@spartacus/checkout/occ
+The checkout related OCC code is moved here. This includes the checkout related adapters and converters.
+
+@spartacus/checkout/root
+The root entry point is, by convention, meant to always be eager loaded.  It contains the config, events, facades, http interceptors and models.
+
+@spartacus/checkout/styles
+The checkout related scss styles are moved here.
+
+```
+
+Most of the code is moved unchanged, but some classes required changes after they were moved.  See the section below for the list:
+
 ## (start) Changes in the classes carried over to the @spartacus/checkout lib 
 
 ### CheckoutEventModule
-Class: CheckoutEventModule
 Change: One new required constructor parameters `_checkoutEventListener: CheckoutEventListener`
 
 ### PaymentFormComponent
-Class: PaymentFormComponent
 Changes: 
 - PaymentFormComponent does not implement `OnDestroy` anymore
 - method `ngOnDestroy()` removed.
@@ -619,6 +645,10 @@ The display of the guest checkout button relies on the presence of the `forced`
 
 - `platformId` is now required constructor dependency.
 
+### ProductListComponentService
+- `ProductListComponentService` now also requires `ViewConfig`.
+- The `defaultPageSize` property was removed. To modify default page size use `provideConfig(<ViewConfig>{ view: { defaultPageSize: <your_default_page_size_value }})` in module.
+
 ### Product configurator
 
 `ConfiguratorCartEntryInfoComponent` now also requires `CommonConfiguratorUtilsService`.
@@ -717,6 +747,10 @@ What was removed:
 - configuration (`storageSync` from `StateConfig`)
 - default config and default keys (`defaultStateConfig`, `DEFAULT_LOCAL_STORAGE_KEY` and `DEFAULT_SESSION_STORAGE_KEY`)
 
+### DefaultScrollConfig
+
+- `defaultScrollConfig` was renamed to `defaultViewConfig`
+
 ### LanguageService
 
 - `LanguageService` no longer uses `WindowRef`. The language initialization from the state was moved to `LanguageInitializer`.

feature-libs/asm/jest.schematics.config.js

@@ -8,7 +8,7 @@ module.exports = {
   },
   globals: {
     'ts-jest': {
-      tsconfig: './tsconfig.schematics.json',
+      tsconfig: '<rootDir>/tsconfig.schematics.json',
     },
   },
   collectCoverage: false,

feature-libs/cart/jest.schematics.config.js

@@ -8,7 +8,7 @@ module.exports = {
   },
   globals: {
     'ts-jest': {
-      tsconfig: './tsconfig.schematics.json',
+      tsconfig: '<rootDir>/tsconfig.schematics.json',
     },
   },
   collectCoverage: false,

feature-libs/cart/saved-cart/components/add-to-saved-cart/add-to-saved-cart.component.spec.ts

@@ -35,7 +35,7 @@ class MockAuthService implements Partial<AuthService> {
 }
 
 class MockRoutingService implements Partial<RoutingService> {
-  go(): void {}
+  go = () => Promise.resolve(true);
 }
 
 class MockLaunchDialogService implements Partial<LaunchDialogService> {

feature-libs/cart/saved-cart/components/details/saved-cart-details-action/saved-cart-details-action.component.spec.ts

@@ -37,7 +37,7 @@ class MockSavedCartFacade implements Partial<SavedCartFacade> {
 }
 
 class MockRoutingService implements Partial<RoutingService> {
-  go(): void {}
+  go = () => Promise.resolve(true);
 }
 
 class MockGlobalMessageService implements Partial<GlobalMessageService> {

feature-libs/cart/saved-cart/components/details/saved-cart-details-items/saved-cart-details-items.component.spec.ts

@@ -78,7 +78,7 @@ class MockSavedCartFacade implements Partial<SavedCartFacade> {
 }
 
 class MockRoutingService implements Partial<RoutingService> {
-  go(): void {}
+  go = () => Promise.resolve(true);
 }
 class MockGlobalMessageService implements Partial<GlobalMessageService> {
   add(

feature-libs/cart/saved-cart/components/list/saved-cart-list.component.spec.ts

@@ -65,7 +65,7 @@ class MockTranslationService {
 }
 
 class MockRoutingService implements Partial<RoutingService> {
-  go(): void {}
+  go = () => Promise.resolve(true);
 }
 
 describe('SavedCartListComponent', () => {

feature-libs/cart/saved-cart/components/saved-cart-form-dialog/saved-cart-form-dialog.component.spec.ts

@@ -55,7 +55,7 @@ class MockLaunchDialogService implements Partial<LaunchDialogService> {
 }
 
 class MockRoutingService implements Partial<RoutingService> {
-  go(): void {}
+  go = () => Promise.resolve(true);
 }
 
 class MockSavedCartFacade implements Partial<SavedCartFacade> {

feature-libs/checkout/jest.schematics.config.js

@@ -8,7 +8,7 @@ module.exports = {
   },
   globals: {
     'ts-jest': {
-      tsconfig: './tsconfig.schematics.json',
+      tsconfig: '<rootDir>/tsconfig.schematics.json',
     },
   },
   collectCoverage: false,

feature-libs/organization/jest.schematics.config.js

@@ -8,7 +8,7 @@ module.exports = {
   },
   globals: {
     'ts-jest': {
-      tsconfig: './tsconfig.schematics.json',
+      tsconfig: '<rootDir>/tsconfig.schematics.json',
     },
   },
   collectCoverage: false,

feature-libs/product-configurator/common/components/configure-product/configure-product.component.spec.ts

@@ -50,7 +50,7 @@ class MockUrlPipe implements PipeTransform {
 }
 
 class MockRoutingService implements Partial<RoutingService> {
-  go() {}
+  go = () => Promise.resolve(true);
 }
 
 let component: ConfigureProductComponent;

feature-libs/product-configurator/jest.schematics.config.js

@@ -8,7 +8,7 @@ module.exports = {
   },
   globals: {
     'ts-jest': {
-      tsconfig: './tsconfig.schematics.json',
+      tsconfig: '<rootDir>/tsconfig.schematics.json',
     },
   },
 

feature-libs/product/jest.schematics.config.js

@@ -8,7 +8,7 @@ module.exports = {
   },
   globals: {
     'ts-jest': {
-      tsconfig: './tsconfig.schematics.json',
+      tsconfig: '<rootDir>/tsconfig.schematics.json',
     },
   },
   collectCoverage: false,

feature-libs/qualtrics/jest.schematics.config.js

@@ -8,7 +8,7 @@ module.exports = {
   },
   globals: {
     'ts-jest': {
-      tsconfig: './tsconfig.schematics.json',
+      tsconfig: '<rootDir>/tsconfig.schematics.json',
     },
   },
   collectCoverage: false,

feature-libs/smartedit/jest.schematics.config.js

@@ -8,7 +8,7 @@ module.exports = {
   },
   globals: {
     'ts-jest': {
-      tsconfig: './tsconfig.schematics.json',
+      tsconfig: '<rootDir>/tsconfig.schematics.json',
     },
   },
   collectCoverage: false,

feature-libs/storefinder/core/facade/store-finder.service.spec.ts

@@ -1,38 +1,32 @@
 import { inject, TestBed } from '@angular/core/testing';
 import * as NgrxStore from '@ngrx/store';
 import { MemoizedSelector, Store, StoreModule } from '@ngrx/store';
-import { StoreFinderActions } from '../store/actions/index';
-import * as fromStoreReducers from '../store/reducers/index';
-import {
-  FindStoresState,
-  StoresState,
-  StateWithStoreFinder,
-  STORE_FINDER_FEATURE,
-} from '../store/store-finder-state';
-import { StoreFinderService } from './store-finder.service';
-import { NavigationExtras } from '@angular/router';
-import { StoreFinderConfig } from '../config/store-finder-config';
 import {
   GeoPoint,
   GlobalMessageService,
   PointOfService,
   RoutingService,
-  UrlCommands,
   WindowRef,
 } from '@spartacus/core';
 import { BehaviorSubject, EMPTY, of } from 'rxjs';
+import { StoreFinderConfig } from '../config/store-finder-config';
 import { StoreFinderSelectors } from '../store';
+import { StoreFinderActions } from '../store/actions/index';
+import * as fromStoreReducers from '../store/reducers/index';
+import {
+  FindStoresState,
+  StateWithStoreFinder,
+  StoresState,
+  STORE_FINDER_FEATURE,
+} from '../store/store-finder-state';
+import { StoreFinderService } from './store-finder.service';
 
 const routerParam$: BehaviorSubject<{
   [key: string]: string;
 }> = new BehaviorSubject({});
 
 class MockRoutingService implements Partial<RoutingService> {
-  go(
-    _commands: any[] | UrlCommands,
-    _query?: object,
-    _extras?: NavigationExtras
-  ): void {}
+  go = () => Promise.resolve(true);
 
   getParams = () => routerParam$.asObservable();
 }

feature-libs/storefinder/jest.schematics.config.js

@@ -8,7 +8,7 @@ module.exports = {
   },
   globals: {
     'ts-jest': {
-      tsconfig: './tsconfig.schematics.json',
+      tsconfig: '<rootDir>/tsconfig.schematics.json',
     },
   },
   collectCoverage: false,

feature-libs/tracking/jest.schematics.config.js

@@ -8,7 +8,7 @@ module.exports = {
   },
   globals: {
     'ts-jest': {
-      tsconfig: './tsconfig.schematics.json',
+      tsconfig: '<rootDir>/tsconfig.schematics.json',
     },
   },
   collectCoverage: false,

feature-libs/user/jest.schematics.config.js

@@ -8,7 +8,7 @@ module.exports = {
   },
   globals: {
     'ts-jest': {
-      tsconfig: './tsconfig.schematics.json',
+      tsconfig: '<rootDir>/tsconfig.schematics.json',
     },
   },
   collectCoverage: false,

feature-libs/user/profile/components/close-account/components/close-account-modal/close-account-modal.component.spec.ts

@@ -7,9 +7,9 @@ import {
   RoutingService,
 } from '@spartacus/core';
 import { ICON_TYPE, ModalService } from '@spartacus/storefront';
+import { UserProfileFacade } from '@spartacus/user/profile/root';
 import { Observable, of, throwError } from 'rxjs';
 import { CloseAccountModalComponent } from './close-account-modal.component';
-import { UserProfileFacade } from '@spartacus/user/profile/root';
 import createSpy = jasmine.createSpy;
 
 class MockGlobalMessageService implements Partial<GlobalMessageService> {
@@ -31,7 +31,7 @@ class MockAuthService implements Partial<AuthService> {
 }
 
 class MockRoutingService implements Partial<RoutingService> {
-  go() {}
+  go = () => Promise.resolve(true);
 }
 
 @Component({

integration-libs/cdc/jest.schematics.config.js

@@ -8,7 +8,7 @@ module.exports = {
   },
   globals: {
     'ts-jest': {
-      tsconfig: './tsconfig.schematics.json',
+      tsconfig: '<rootDir>/tsconfig.schematics.json',
     },
   },
   collectCoverage: false,

integration-libs/cds/jest.schematics.config.js

@@ -8,7 +8,7 @@ module.exports = {
   },
   globals: {
     'ts-jest': {
-      tsconfig: './tsconfig.schematics.json',
+      tsconfig: '<rootDir>/tsconfig.schematics.json',
     },
   },
   collectCoverage: false,

projects/schematics/jest.schematics.config.js

@@ -8,7 +8,7 @@ module.exports = {
   },
   globals: {
     'ts-jest': {
-      tsconfig: './tsconfig.schematics.json',
+      tsconfig: '<rootDir>/tsconfig.schematics.json',
     }
   },
   collectCoverage: false,

projects/schematics/src/migrations/4_0/constructor-deprecations/constructor-deprecations.ts

@@ -115,6 +115,7 @@ import { UNIT_USER_LIST_COMPONENT_MIGRATION } from './data/unit-user-list.compon
 import { USER_ADDRESS_SERVICE_MIGRATION } from './data/user-address-service.migration';
 import { USER_GROUP_USER_LIST_COMPONENT_MIGRATION } from './data/user-group-user-list.component.migration';
 import { WINDOW_REF_MIGRATION } from './data/window-ref.migration';
+import { PRODUCT_LIST_COMPONENT_SERVICE_MIGRATION } from './data/product-list-component.service.migration';
 
 export const CONSTRUCTOR_DEPRECATION_DATA: ConstructorDeprecation[] = [
   UNIT_CHILDREN_COMPONENT_MIGRATION,
@@ -195,6 +196,7 @@ export const CONSTRUCTOR_DEPRECATION_DATA: ConstructorDeprecation[] = [
   AUTH_REDIRECT_SERVICE_MIGRATION,
   PROTECTED_ROUTES_SERVICE_MIGRATION,
   PRODUCT_LIST_ITEM_COMPONENT_MIGRATION,
+  PRODUCT_LIST_COMPONENT_SERVICE_MIGRATION,
   PRODUCT_GRID_ITEM_COMPONENT_MIGRATION,
   CART_ITEM_COMPONENT_MIGRATION,
   CONFIGURATOR_CART_ENTRY_INFO_COMPONENT_MIGRATION,