From 1917d79564b103621bd0523d92bef29cad8f60d5 Mon Sep 17 00:00:00 2001
From: Filip Drozd <fpdrozd@gmail.com>
Date: Mon, 20 Mar 2023 16:25:47 +0100
Subject: [PATCH 1/4] feat: update storefront core packages to 2.5.7

---
 packages/api-client/package.json              |  2 +-
 packages/composables/package.json             |  2 +-
 packages/theme/components/AppFooter.vue       |  2 +-
 .../HeaderNavigation/DesktopMenu.vue          |  2 +-
 .../HeaderNavigation/MobileMenu.vue           |  2 +-
 packages/theme/nuxt.config.js                 |  3 +-
 packages/theme/package.json                   |  6 ++--
 packages/theme/pages/Home.vue                 |  5 ---
 yarn.lock                                     | 32 +++++++++----------
 9 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index 549e515e..fa5ef613 100644
--- a/packages/api-client/package.json
+++ b/packages/api-client/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "@spree/axios-fetcher": "^1.0.0",
     "@spree/storefront-api-v2-sdk": "6.0.1",
-    "@vue-storefront/core": "^2.5.0"
+    "@vue-storefront/core": "2.5.7"
   },
   "files": [
     "lib/**/*"
diff --git a/packages/composables/package.json b/packages/composables/package.json
index f8cd196e..3797d385 100644
--- a/packages/composables/package.json
+++ b/packages/composables/package.json
@@ -13,7 +13,7 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@vue-storefront/core": "^2.5.0",
+    "@vue-storefront/core": "2.5.7",
     "@vue-storefront/spree-api": "1.3.0",
     "lodash": "^4.17.21"
   },
diff --git a/packages/theme/components/AppFooter.vue b/packages/theme/components/AppFooter.vue
index f6460097..807dd0a9 100644
--- a/packages/theme/components/AppFooter.vue
+++ b/packages/theme/components/AppFooter.vue
@@ -1,5 +1,5 @@
 <template>
-  <SfFooter v-if="!menu.isDisabled" :column="parseInt(menuSize)" multiple class="footer">
+  <SfFooter v-if="menu && !menu.isDisabled" :column="parseInt(menuSize)" multiple class="footer">
     <SfFooterColumn
       v-for="(column, i) in menu && menu.items"
       :key="i"
diff --git a/packages/theme/components/HeaderNavigation/DesktopMenu.vue b/packages/theme/components/HeaderNavigation/DesktopMenu.vue
index f006640f..e0438b58 100644
--- a/packages/theme/components/HeaderNavigation/DesktopMenu.vue
+++ b/packages/theme/components/HeaderNavigation/DesktopMenu.vue
@@ -33,7 +33,7 @@ export default {
     }
   },
   setup(props) {
-    const isMenuAvailable = computed(() => !props.menu.isDisabled);
+    const isMenuAvailable = computed(() => props.menu && !props.menu.isDisabled);
 
     return {
       isMenuAvailable
diff --git a/packages/theme/components/HeaderNavigation/MobileMenu.vue b/packages/theme/components/HeaderNavigation/MobileMenu.vue
index 91da6fe9..9170087a 100644
--- a/packages/theme/components/HeaderNavigation/MobileMenu.vue
+++ b/packages/theme/components/HeaderNavigation/MobileMenu.vue
@@ -72,7 +72,7 @@ export default {
   },
   setup(props) {
     const { isMobileMenuOpen, toggleMobileMenu } = useUiState();
-    const isMenuAvailable = computed(() => !props.menu.isDisabled);
+    const isMenuAvailable = computed(() => props.menu && !props.menu.isDisabled);
 
     return {
       isMenuAvailable,
diff --git a/packages/theme/nuxt.config.js b/packages/theme/nuxt.config.js
index 82350110..051d4dee 100644
--- a/packages/theme/nuxt.config.js
+++ b/packages/theme/nuxt.config.js
@@ -189,6 +189,7 @@ export default {
       { code: 'USD', label: 'Dollar' },
       { code: 'EUR', label: 'Euro' }
     ],
-    backendUrl: process.env.BACKEND_URL
+    backendUrl: process.env.BACKEND_URL,
+    middlewareUrl: 'http://localhost:3000/api/'
   }
 };
diff --git a/packages/theme/package.json b/packages/theme/package.json
index 103fca3c..190e33ec 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -16,9 +16,9 @@
     "@nuxtjs/style-resources": "^1.2.1",
     "@storefront-ui/vue": "^0.11.0",
     "@stripe/stripe-js": "^1.20.3",
-    "@vue-storefront/middleware": "^2.5.0",
-    "@vue-storefront/nuxt": "^2.5.0",
-    "@vue-storefront/nuxt-theme": "^2.5.0",
+    "@vue-storefront/middleware": "2.5.7",
+    "@vue-storefront/nuxt": "2.5.7",
+    "@vue-storefront/nuxt-theme": "2.5.7",
     "@vue-storefront/spree": "1.3.0",
     "cookie-universal-nuxt": "^2.1.5",
     "nuxt": "^2.15.8",
diff --git a/packages/theme/pages/Home.vue b/packages/theme/pages/Home.vue
index 761e86e4..c84b309b 100644
--- a/packages/theme/pages/Home.vue
+++ b/packages/theme/pages/Home.vue
@@ -154,14 +154,9 @@ import NewsletterModal from '~/components/NewsletterModal.vue';
 import LazyHydrate from 'vue-lazy-hydration';
 import { useUiState } from '../composables';
 import { useContent } from '@vue-storefront/spree';
-import cacheControl from './../helpers/cacheControl';
 
 export default {
   name: 'Home',
-  middleware: cacheControl({
-    'max-age': 60,
-    'stale-when-revalidate': 5
-  }),
   components: {
     InstagramFeed,
     SfHero,
diff --git a/yarn.lock b/yarn.lock
index d427be90..774a4ce0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3748,10 +3748,10 @@
     "@typescript-eslint/types" "4.33.0"
     eslint-visitor-keys "^2.0.0"
 
-"@vue-storefront/core@^2.5.0":
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/@vue-storefront/core/-/core-2.5.1.tgz#fa7f091ecaed6e5523dae5c54b4b2955b4139cca"
-  integrity sha512-uht8QUS37JQ0+Y9sunZpcrs+kygqTpNJ8W4tqasOFiGy/KHVZcVZku4cOib0eMVHhOsBKrpXK5rg6CH7OE7UOQ==
+"@vue-storefront/core@2.5.7":
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/@vue-storefront/core/-/core-2.5.7.tgz#3c59c95b1693dd8fbf342d452fe57cf9b560dfd0"
+  integrity sha512-OhkzN3FUGD6JCMDvWcdlgOy5I5F7A8MeTIswY9TnY8KdArG25CRNmJA2w45cIqjtohBqUhVZabJVa5ahhGTH7A==
   dependencies:
     axios "0.21.1"
     express "^4.17.1"
@@ -3759,30 +3759,30 @@
     lodash-es "^4.17.15"
     vue "^2.6.11"
 
-"@vue-storefront/middleware@^2.5.0":
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/@vue-storefront/middleware/-/middleware-2.5.1.tgz#940a522e1336a42bd34ba3ffcf0f062a216601ee"
-  integrity sha512-wBB5UeXBfjCzisdOhaxVizYogemyMO3gnfP9sdiWOH1frv4KPumcY2Qlc8srP5FX/eroGmgNciTPdFIqzk60qQ==
+"@vue-storefront/middleware@2.5.7":
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/@vue-storefront/middleware/-/middleware-2.5.7.tgz#eabcb6c0a6b89ac1f62163396478adcacc297d0c"
+  integrity sha512-03bpga+7soADMZLCONqq+N1Rbz7a1G/y++ryKXreiQBYedywnpvt0HNjU3Od/DYlnKIJbVniVrd2n1aZ6qVXcA==
   dependencies:
     consola "2.15.3"
     cookie-parser "^1.4.5"
     cors "^2.8.5"
     express "^4.17.1"
 
-"@vue-storefront/nuxt-theme@^2.5.0":
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/@vue-storefront/nuxt-theme/-/nuxt-theme-2.5.1.tgz#31beec8b177989e90ea876f2ff2fd794979b54e1"
-  integrity sha512-BV2XpYCUBXw24cXyv56qNcGDaQo8jK1+kmnK1bNpTm1kvdVdPENglGBmwOA3iNfMfVMASusnnObx7tc+/2LcTA==
+"@vue-storefront/nuxt-theme@2.5.7":
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/@vue-storefront/nuxt-theme/-/nuxt-theme-2.5.7.tgz#7980f4d758cc32db054897886d683f73268d6f21"
+  integrity sha512-YSP3TX3g+xDeTlgrBjFb+kxLcJErcpKimsG29hkLbOFyT/1JAQxfaVNBwWd+axrX/GMAnWZOKpGU51L38rFPSQ==
   dependencies:
     ejs "^3.0.2"
     lodash.debounce "^4.0.8"
     lodash.merge "^4.6.2"
     vue-lazy-hydration "^2.0.0-beta.4"
 
-"@vue-storefront/nuxt@^2.5.0":
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/@vue-storefront/nuxt/-/nuxt-2.5.1.tgz#01535f9cd251745f97d141bb1fdfde31c95f56b3"
-  integrity sha512-U3jcKSMD49RyxvRFN7B7TFO/nQZG/KnjhXdFi6Cefj0FNpQ2oTAsU7iaz/Swa6OoBtz8OyDq9W/h1NO3Mgcw1w==
+"@vue-storefront/nuxt@2.5.7":
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/@vue-storefront/nuxt/-/nuxt-2.5.7.tgz#0ab898b0d0c321c30cb45f196c1bc552a590d51b"
+  integrity sha512-g+dJ7O0sw4XsybBtqrt+Yp63IZgECSu6RWW5zO+iyJEbDXuSTYWA1O/M7pr6MNYrv/y0HBuSqZvTSgx2wuRA7Q==
   dependencies:
     "@nuxt/typescript-build" "^2.0.0"
     "@nuxtjs/composition-api" "^0.29.3"

From 515ce7e4cc26a3db7edf48f60d1c5443d46f972c Mon Sep 17 00:00:00 2001
From: Filip Drozd <fpdrozd@gmail.com>
Date: Mon, 20 Mar 2023 16:26:55 +0100
Subject: [PATCH 2/4] feat: add env based server config to nuxt.config.js

---
 packages/theme/nuxt.config.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/theme/nuxt.config.js b/packages/theme/nuxt.config.js
index 051d4dee..9e5c262f 100644
--- a/packages/theme/nuxt.config.js
+++ b/packages/theme/nuxt.config.js
@@ -5,11 +5,17 @@ import * as dotenv from 'dotenv';
 
 dotenv.config({ path: `./../../.env.${process.env.NODE_ENV}` });
 
+const serverConfig = {
+  port: process.env.PORT || 3000,
+  host: process.env.HOST || '0.0.0.0',
+  baseUrl: process.env.BASE_URL || 'http://localhost:3000'
+};
+
 export default {
   ssr: true,
   server: {
-    port: process.env.PORT || 3000,
-    host: process.env.HOST || '0.0.0.0'
+    port: serverConfig.port,
+    host: serverConfig.host
   },
   head: {
     title: 'Vue Storefront',
@@ -96,7 +102,7 @@ export default {
       }
     }],
     ['nuxt-i18n', {
-      baseUrl: process.env.BASE_URL || 'http://localhost:3000'
+      baseUrl: serverConfig.baseUrl
     }],
     'cookie-universal-nuxt',
     'vue-scrollto/nuxt',
@@ -190,6 +196,6 @@ export default {
       { code: 'EUR', label: 'Euro' }
     ],
     backendUrl: process.env.BACKEND_URL,
-    middlewareUrl: 'http://localhost:3000/api/'
+    middlewareUrl: new URL('/api', serverConfig.baseUrl).href
   }
 };

From cebbc0a7ff6767359630666a3aa4f8450041a5e2 Mon Sep 17 00:00:00 2001
From: Filip Drozd <fpdrozd@gmail.com>
Date: Tue, 21 Mar 2023 09:28:00 +0100
Subject: [PATCH 3/4] refactor: remove cache control helper

---
 packages/theme/pages/Category.vue | 5 -----
 packages/theme/pages/Product.vue  | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/packages/theme/pages/Category.vue b/packages/theme/pages/Category.vue
index 299da35b..dcde5fcc 100644
--- a/packages/theme/pages/Category.vue
+++ b/packages/theme/pages/Category.vue
@@ -218,16 +218,11 @@ import { useCart, useWishlist, productGetters, useFacet, facetGetters, useUser,
 import { useUiHelpers, useUiState } from '~/composables';
 import { onSSR } from '@vue-storefront/core';
 import LazyHydrate from 'vue-lazy-hydration';
-import cacheControl from './../helpers/cacheControl';
 import CategoryPageHeader from '~/components/CategoryPageHeader';
 
 // TODO(addToCart qty, horizontal): https://github.com/vuestorefront/storefront-ui/issues/1606
 export default {
   transition: 'fade',
-  middleware: cacheControl({
-    'max-age': 60,
-    'stale-when-revalidate': 5
-  }),
   setup() {
     const th = useUiHelpers();
     const uiState = useUiState();
diff --git a/packages/theme/pages/Product.vue b/packages/theme/pages/Product.vue
index 3847b8c8..c7797a48 100644
--- a/packages/theme/pages/Product.vue
+++ b/packages/theme/pages/Product.vue
@@ -138,15 +138,10 @@ import { ref, computed, useRoute, useRouter, useContext } from '@nuxtjs/composit
 import { useProduct, useCart, productGetters } from '@vue-storefront/spree';
 import { onSSR } from '@vue-storefront/core';
 import LazyHydrate from 'vue-lazy-hydration';
-import cacheControl from './../helpers/cacheControl';
 
 export default {
   name: 'Product',
   transition: 'fade',
-  middleware: cacheControl({
-    'max-age': 60,
-    'stale-when-revalidate': 5
-  }),
   setup() {
     const qty = ref(1);
     const route = useRoute();

From 5f834411ef4c7128e1b5f922b98eabb73ccde018 Mon Sep 17 00:00:00 2001
From: Filip Drozd <fpdrozd@gmail.com>
Date: Tue, 21 Mar 2023 12:51:37 +0100
Subject: [PATCH 4/4] revert: remove additional menu checks

---
 packages/theme/components/HeaderNavigation/DesktopMenu.vue | 2 +-
 packages/theme/components/HeaderNavigation/MobileMenu.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/theme/components/HeaderNavigation/DesktopMenu.vue b/packages/theme/components/HeaderNavigation/DesktopMenu.vue
index e0438b58..f006640f 100644
--- a/packages/theme/components/HeaderNavigation/DesktopMenu.vue
+++ b/packages/theme/components/HeaderNavigation/DesktopMenu.vue
@@ -33,7 +33,7 @@ export default {
     }
   },
   setup(props) {
-    const isMenuAvailable = computed(() => props.menu && !props.menu.isDisabled);
+    const isMenuAvailable = computed(() => !props.menu.isDisabled);
 
     return {
       isMenuAvailable
diff --git a/packages/theme/components/HeaderNavigation/MobileMenu.vue b/packages/theme/components/HeaderNavigation/MobileMenu.vue
index 9170087a..91da6fe9 100644
--- a/packages/theme/components/HeaderNavigation/MobileMenu.vue
+++ b/packages/theme/components/HeaderNavigation/MobileMenu.vue
@@ -72,7 +72,7 @@ export default {
   },
   setup(props) {
     const { isMobileMenuOpen, toggleMobileMenu } = useUiState();
-    const isMenuAvailable = computed(() => props.menu && !props.menu.isDisabled);
+    const isMenuAvailable = computed(() => !props.menu.isDisabled);
 
     return {
       isMenuAvailable,