From 3738cb62187e4ce50ea79c06a9d8292f09f10efa Mon Sep 17 00:00:00 2001 From: Johannes Ballmann <574988+fibsifan@users.noreply.github.com> Date: Thu, 13 Jun 2024 15:08:59 +0200 Subject: [PATCH] Remove unneeded patches (keeping only package.json patch) --- .../bootstrap/patches/environments.patch | 20 --------------- .../bootstrap/patches/index.html.patch | 11 -------- .../smart-edit-feature.module.ts.patch | 24 ------------------ .../spartacus-configuration.module.ts.patch | 25 ------------------- 4 files changed, 80 deletions(-) delete mode 100644 js-storefront/bootstrap/patches/environments.patch delete mode 100644 js-storefront/bootstrap/patches/index.html.patch delete mode 100644 js-storefront/bootstrap/patches/smart-edit-feature.module.ts.patch delete mode 100644 js-storefront/bootstrap/patches/spartacus-configuration.module.ts.patch diff --git a/js-storefront/bootstrap/patches/environments.patch b/js-storefront/bootstrap/patches/environments.patch deleted file mode 100644 index 4041402..0000000 --- a/js-storefront/bootstrap/patches/environments.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/environments/environment.prod.ts 2021-04-23 11:57:19.000000000 +0200 -+++ src/environments/environment.prod.ts 2021-04-23 12:17:50.000000000 +0200 -@@ -1,3 +1,4 @@ - export const environment = { -- production: true -+ production: true, -+ occBaseUrl: undefined - }; ---- src/environments/environment.ts 2021-04-23 11:57:19.000000000 +0200 -+++ src/environments/environment.ts 2021-04-23 12:17:59.000000000 +0200 -@@ -3,7 +3,8 @@ - // The list of file replacements can be found in `angular.json`. - - export const environment = { -- production: false -+ production: false, -+ occBaseUrl: 'https://localhost:9002' - }; - - /* diff --git a/js-storefront/bootstrap/patches/index.html.patch b/js-storefront/bootstrap/patches/index.html.patch deleted file mode 100644 index 84fcffa..0000000 --- a/js-storefront/bootstrap/patches/index.html.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/index.html 2021-04-23 12:00:23.000000000 +0200 -+++ src/index.html 2021-04-23 12:27:23.000000000 +0200 -@@ -6,7 +6,7 @@ - - - -- -+ - - - diff --git a/js-storefront/bootstrap/patches/smart-edit-feature.module.ts.patch b/js-storefront/bootstrap/patches/smart-edit-feature.module.ts.patch deleted file mode 100644 index 0d4187c..0000000 --- a/js-storefront/bootstrap/patches/smart-edit-feature.module.ts.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- src/app/spartacus/features/smartedit/smart-edit-feature.module.ts 2021-07-16 09:53:45.000000000 +0200 -+++ src/app/spartacus/features/smartedit/smart-edit-feature.module.ts 2021-07-16 09:52:35.000000000 +0200 -@@ -1,6 +1,6 @@ - import { NgModule } from '@angular/core'; - import { CmsConfig, provideConfig } from "@spartacus/core"; --import { SmartEditRootModule, SMART_EDIT_FEATURE } from "@spartacus/smartedit/root"; -+import { SmartEditConfig, SmartEditRootModule, SMART_EDIT_FEATURE } from "@spartacus/smartedit/root"; - - @NgModule({ - declarations: [], -@@ -14,6 +14,12 @@ - import('@spartacus/smartedit').then((m) => m.SmartEditModule), - }, - } -- })] -+ }), -+ provideConfig({ -+ smartEdit: { -+ allowOrigin: 'localhost:9002, *.*.model-t.cc.commerce.ondemand.com:443', -+ }, -+ }) -+ ] - }) - export class SmartEditFeatureModule { } diff --git a/js-storefront/bootstrap/patches/spartacus-configuration.module.ts.patch b/js-storefront/bootstrap/patches/spartacus-configuration.module.ts.patch deleted file mode 100644 index ce719a8..0000000 --- a/js-storefront/bootstrap/patches/spartacus-configuration.module.ts.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- src/app/spartacus/spartacus-configuration.module.ts 2021-09-11 07:58:00.000000000 +0200 -+++ src/app/spartacus/spartacus-configuration.module.ts 2021-09-11 08:03:48.000000000 +0200 -@@ -2,6 +2,7 @@ - import { translationChunksConfig, translations } from "@spartacus/assets"; - import { FeaturesConfig, I18nConfig, OccConfig, provideConfig, SiteContextConfig } from "@spartacus/core"; - import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacus/storefront"; -+import { environment } from 'src/environments/environment'; - - @NgModule({ - declarations: [], -@@ -10,10 +11,14 @@ - providers: [provideConfig(layoutConfig), provideConfig(mediaConfig), ...defaultCmsContentProviders, provideConfig({ - backend: { - occ: { -+ baseUrl: environment.occBaseUrl - } - }, - }), provideConfig({ - context: { -+ // TODO: adjust parameters and site -+ // urlParameters: ['baseSite', 'language', 'currency'], -+ // baseSite: ['electronics-spa'], - currency: ['USD'], - language: ['en'], - },