Merge branch 'develop' into feature/CXSPA-8386-v2

projects/ssr-tests/jest.config.js

@@ -1,23 +1,14 @@
 const { pathsToModuleNameMapper } = require('ts-jest');
 const { compilerOptions } = require('./tsconfig.json');
-const { defaultTransformerOptions } = require('jest-preset-angular/presets');
 
 /** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
 module.exports = {
- preset: 'jest-preset-angular',
  moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths || {}, {
  prefix: '<rootDir>/',
  }),
- setupFilesAfterEnv: ['<rootDir>/setup-jest.ts'],
  testMatch: ['**/+(*.)+(spec).+(ts)'],
  transform: {
- '^.+\\.(ts|js|mjs|html|svg)$': [
- 'jest-preset-angular',
- {
- ...defaultTransformerOptions,
- tsconfig: '<rootDir>/tsconfig.json',
- },
- ],
+ '^.+\\.(ts|js|mjs)$': ['ts-jest'],
  },
 
  collectCoverage: false,

projects/storefrontstyles/scss/_mixins.scss

@@ -1 +1,2 @@
 @import 'cxbase/mixins';
+@import 'theme/high-contrast/mixins/mixins';

projects/storefrontstyles/scss/_site-theme.scss

@@ -0,0 +1,3 @@
+@import 'theme/high-contrast/dark/variables';
+@import 'theme/high-contrast/light/variables';
+@import 'theme/high-contrast/high-contrast';

projects/storefrontstyles/scss/_theme.scss

@@ -8,9 +8,5 @@
 
 //old theme to be commented out on next major or with impex
 @import 'theme/santorini/variables';
-@import 'theme/high-contrast/dark/variables';
-@import 'theme/high-contrast/light/variables';
-@import 'theme/high-contrast/high-contrast';
-@import 'theme/high-contrast/mixins/mixins';
 // new theme below to uncomment on next major or with impex
 // @import 'theme/santorini-updated/variables';

projects/storefrontstyles/scss/app.scss

@@ -45,3 +45,4 @@
 @import 'misc/hamburger';
 @import 'misc/dialog';
 @import 'misc/table';
+@import 'site-theme';

projects/storefrontstyles/scss/components/myaccount/_consent-management.scss

@@ -1,5 +1,3 @@
-@import '../../theme';
-
 %cx-consent-management {
  .cx-consent-action-links {
  text-align: end;

projects/storefrontstyles/scss/components/myaccount/_cx-my-account-v2-notification-preference.scss

@@ -1,5 +1,3 @@
-@import '../../theme';
-
 %cx-my-account-v2-notification-preference {
  .np-content-center {
  -ms-flex-pack: center;

projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-dialog.scss

@@ -1,5 +1,3 @@
-@import '../../../theme';
-
 %cx-anonymous-consent-dialog {
  color: var(--cx-color-text);
  background-color: rgba(0, 0, 0, 0.5);

projects/storefrontstyles/scss/components/product/search/_searchbox.scss

@@ -1,5 +1,3 @@
-@import '../../../theme';
-
 // To control visual effects while searching the searchbox requires
 // some CSS rules to the outer elements.
 %cx-searchbox__body {

projects/storefrontstyles/scss/components/pwa/add-to-home-screen-banner/_add-to-home-screen-banner.scss

@@ -1,5 +1,3 @@
-@import '../../../theme';
-
 %cx-add-to-home-screen-banner {
  .cx-add-to-home-screen-banner {
  background-color: var(--cx-color-background);

projects/storefrontstyles/scss/cxbase/_mixins.scss

@@ -2,8 +2,6 @@
 // lower level bootstrap variables. Hence we import the variables here,
 // to make the mixins reusable. In order to have the right variables
 // we load variables through the theme import. */
-@import '../theme';
-
 @import 'bootstrap/scss/_mixins';
 
 @import './mixins/reset';

projects/storefrontstyles/scss/cxbase/blocks/accordion.scss

@@ -1,4 +1,3 @@
-@import '../../theme';
 @import '../../functions';
 @import '../../mixins';
 .accordion {

projects/storefrontstyles/scss/cxbase/blocks/alert.scss

@@ -1,4 +1,3 @@
-@import '../../theme';
 @import '../../mixins';
 @import 'bootstrap/scss/alert';
 

projects/storefrontstyles/scss/cxbase/blocks/buttons.scss

@@ -1,4 +1,3 @@
-@import '../../theme';
 @import 'bootstrap/scss/buttons';
 
 button {

projects/storefrontstyles/scss/cxbase/blocks/card.scss

@@ -1,4 +1,3 @@
-@import '../../theme';
 @import 'bootstrap/scss/card';
 
 .card {

projects/storefrontstyles/scss/cxbase/blocks/carousel.scss

@@ -1,4 +1,3 @@
-@import '../../theme';
 @import '../../mixins';
 
 // None of the styles here below are customizable at component level

projects/storefrontstyles/scss/cxbase/blocks/dropdown.scss

@@ -1,4 +1,3 @@
-@import '../../theme';
 @import 'bootstrap/scss/dropdown';
 
 $cx-dropdown-toggle-border-color: 'inverse' !important;

projects/storefrontstyles/scss/cxbase/blocks/forms.scss

@@ -1,4 +1,3 @@
-@import '../../theme';
 @import 'bootstrap/scss/forms';
 @import 'bootstrap/scss/custom-forms';
 

projects/storefrontstyles/scss/cxbase/blocks/message.scss

@@ -1,4 +1,3 @@
-@import '../../theme';
 @import '../../mixins';
 
 .cx-message {

projects/storefrontstyles/scss/cxbase/blocks/modal.scss

@@ -1,4 +1,3 @@
-@import '../../theme';
 @import 'bootstrap/scss/modal';
 @import 'bootstrap/scss/close';
 

projects/storefrontstyles/scss/cxbase/blocks/tables.scss

@@ -1,5 +1,3 @@
-@import '../../theme';
-
 .table {
  width: 100%;
 

projects/storefrontstyles/scss/cxbase/blocks/tabs.scss

@@ -1,5 +1,3 @@
-@import '../../theme';
-
 ul[role='tablist'] {
  .nav-link {
  border: none;

projects/storefrontstyles/scss/cxbase/blocks/tooltip.scss

@@ -1,4 +1,3 @@
-@import '../../theme';
 @import 'bootstrap/scss/tooltip';
 
 .bs-tooltip-left {

projects/storefrontstyles/scss/cxbase/layout/app.scss

@@ -1,4 +1,3 @@
-@import '../../theme';
 @import '../../functions';
 @import '../../mixins';
 

projects/storefrontstyles/scss/cxbase/layout/page.scss

@@ -1,5 +1,3 @@
-@import '../../theme';
-
 .cx-page {
  padding-bottom: 120px;
 }

projects/storefrontstyles/scss/cxbase/layout/section.scss

@@ -1,5 +1,3 @@
-@import '../../theme';
-
 .cx-section {
  margin-bottom: var(--cx-margin-bottom, 50px);
  &:last-child {

projects/storefrontstyles/scss/root.scss

@@ -1,5 +1,3 @@
-@import 'theme';
-
 :root {
  @each $color, $value in $theme-colors {
  --cx-color-#{$color}: #{$value};