From 8f2addb16b1027ac4ff2f00d4a23b4e2b1ede9f9 Mon Sep 17 00:00:00 2001
From: Bartosz Herba <bherba@vuestorefront.io>
Date: Thu, 20 Jan 2022 21:01:51 +0100
Subject: [PATCH 1/3] Test performance improvement commit

---
 .../composables/src/factories/useStoreFactory.ts   |  2 +-
 packages/theme/components/CurrencySelector.vue     |  2 +-
 .../theme/composables/useMagentoConfiguration.ts   | 14 ++++++++------
 packages/theme/layouts/default.vue                 |  9 ++++-----
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/packages/composables/src/factories/useStoreFactory.ts b/packages/composables/src/factories/useStoreFactory.ts
index 318f1ff4b..7f4ea7a5f 100644
--- a/packages/composables/src/factories/useStoreFactory.ts
+++ b/packages/composables/src/factories/useStoreFactory.ts
@@ -38,7 +38,7 @@ export function useStoreFactory<STORES, STORE,
     const change = async (store: ComposableFunctionArgs<STORE>): Promise<void> => {
       loading.value = true;
       try {
-        await _factoryParams.change(store);
+        _factoryParams.change(store);
       } finally {
         loading.value = false;
       }
diff --git a/packages/theme/components/CurrencySelector.vue b/packages/theme/components/CurrencySelector.vue
index 46f4f7726..e834cd773 100644
--- a/packages/theme/components/CurrencySelector.vue
+++ b/packages/theme/components/CurrencySelector.vue
@@ -104,7 +104,7 @@ export default defineComponent({
 
     const isCurrencyModalOpen = ref(false);
 
-    const availableCurrencies = computed(() => currencies.value?.available_currency_codes);
+    const availableCurrencies = computed(() => currencies.value?.available_currency_codes || []);
 
     return {
       currentCurrencySymbol,
diff --git a/packages/theme/composables/useMagentoConfiguration.ts b/packages/theme/composables/useMagentoConfiguration.ts
index c9346f666..3b93a2d7c 100644
--- a/packages/theme/composables/useMagentoConfiguration.ts
+++ b/packages/theme/composables/useMagentoConfiguration.ts
@@ -44,7 +44,7 @@ export const useMagentoConfiguration: UseMagentoConfiguration = () => {
 
   const selectedStore = computed<string | undefined>(() => app.$cookies.get(cookieNames.storeCookieName));
 
-  const loadConfiguration: (params: { updateCookies: boolean; updateLocale: boolean; }) => Promise<void> = async (params = {
+  const loadConfiguration: (params: { updateCookies: boolean; updateLocale: boolean; }) => void = (params = {
     updateCookies: false,
     updateLocale: false,
   }) => {
@@ -52,11 +52,12 @@ export const useMagentoConfiguration: UseMagentoConfiguration = () => {
       updateCookies,
       updateLocale,
     } = params;
-    await Promise.all([
-      loadConfig(),
-      loadStores(),
-      loadCurrencies(),
-    ]);
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    loadConfig();
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    loadStores();
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    loadCurrencies();
 
     if (!app.$cookies.get(cookieNames.storeCookieName) || updateCookies) {
       app.$cookies.set(cookieNames.storeCookieName, storeConfigGetters.getCode(storeConfig.value));
@@ -71,6 +72,7 @@ export const useMagentoConfiguration: UseMagentoConfiguration = () => {
     }
 
     if (updateLocale) {
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       app.i18n.setLocale(storeConfigGetters.getLocale(storeConfig.value));
     }
   };
diff --git a/packages/theme/layouts/default.vue b/packages/theme/layouts/default.vue
index c38521c29..3f0f53b8b 100644
--- a/packages/theme/layouts/default.vue
+++ b/packages/theme/layouts/default.vue
@@ -24,7 +24,7 @@
 <script>
 import LazyHydrate from 'vue-lazy-hydration';
 import { onSSR } from '@vue-storefront/core';
-import { useRoute, defineComponent } from '@nuxtjs/composition-api';
+import { useRoute, defineComponent, onMounted } from '@nuxtjs/composition-api';
 import {
   useUser,
 } from '@vue-storefront/magento';
@@ -56,12 +56,11 @@ export default defineComponent({
   setup() {
     const route = useRoute();
     const { load: loadUser } = useUser();
-
     const { loadConfiguration } = useMagentoConfiguration();
 
-    onSSR(async () => {
-      await loadConfiguration();
-      await loadUser();
+    onMounted(() => {
+      loadConfiguration();
+      loadUser();
     });
 
     return {

From 6b8fd9407b0dade5b7a6ad32c2484f9e2750cd89 Mon Sep 17 00:00:00 2001
From: Marcin Kwiatkowski <marcin.kwiatkowski@vuestorefront.io>
Date: Fri, 21 Jan 2022 12:10:31 +0100
Subject: [PATCH 2/3] chore(deployment): changed deployment config to allow A-B
 testing on stage

---
 .github/workflows/deploy-vue-storefront-cloud.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-vue-storefront-cloud.yml b/.github/workflows/deploy-vue-storefront-cloud.yml
index b72bd0865..637350a56 100644
--- a/.github/workflows/deploy-vue-storefront-cloud.yml
+++ b/.github/workflows/deploy-vue-storefront-cloud.yml
@@ -5,6 +5,7 @@ on:
       - main
       - develop
       - release/*
+      - performance/test-approach
 
 jobs:
   build:
@@ -75,7 +76,7 @@ jobs:
             exit 1
           fi
       - name: Deploy on demo-magento2-dev.europe-west1.gcp.storefrontcloud.io
-        if: startsWith(github.ref, 'refs/heads/release')
+        if: startsWith(github.ref, 'refs/heads/performance/test-approach')
         run: |
           if curl -s -H 'X-User-Id: ${{ secrets.CLOUD_USERNAME }}'  -H 'X-Api-Key: ${{ secrets.CLOUD_PASSWORD }}' -H 'Content-Type: application/json' -X POST -d '{
               "code":"demo-magento2-dev",

From a022fdf9504a21f4e274db66ce9baffc68cb9d39 Mon Sep 17 00:00:00 2001
From: Marcin Kwiatkowski <marcin.kwiatkowski@vuestorefront.io>
Date: Fri, 21 Jan 2022 12:58:13 +0100
Subject: [PATCH 3/3] refactor: changed default layout hydration

---
 packages/theme/layouts/default.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/theme/layouts/default.vue b/packages/theme/layouts/default.vue
index 3f0f53b8b..764d16e3f 100644
--- a/packages/theme/layouts/default.vue
+++ b/packages/theme/layouts/default.vue
@@ -8,14 +8,13 @@
 
     <div id="layout">
       <nuxt :key="route.fullPath" />
-
+    </div>
+    <LazyHydrate when-visible>
       <BottomNavigation />
       <CartSidebar />
       <WishlistSidebar />
       <LoginModal />
       <Notification />
-    </div>
-    <LazyHydrate when-visible>
       <AppFooter />
     </LazyHydrate>
   </div>