vuestorefront · Frodigo · Mar 8, 2022 · Jan 10, 2022 · Jan 13, 2022 · Jan 17, 2022
@@ -72,11 +72,11 @@ jobs:
             echo "Something went wrong during the update process..."
             exit 1
           fi
-      - name: Deploy on demo-magento2-canary.europe-west1.gcp.storefrontcloud.io/
+      - name: Deploy on demo-magento2-dev.europe-west1.gcp.storefrontcloud.io/
         if: startsWith(github.ref, 'refs/heads/develop')
         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-canary",
+              "code":"demo-magento2-dev",
               "region":"europe-west1.gcp",
               "frontContainerVersion":"${{ github.sha }}"
             }' https://farmer.storefrontcloud.io/instances | grep -q '{"code":200,"result":"Instance updated!"}'; then
@@ -85,11 +85,11 @@ jobs:
             echo "Something went wrong during the update process..."
             exit 1
           fi
-      - name: Deploy on demo-magento2-dev.europe-west1.gcp.storefrontcloud.io
+      - name: Deploy on demo-magento2-canary.europe-west1.gcp.storefrontcloud.io
         if: startsWith(github.ref, 'refs/heads/release')
         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",
+              "code":"demo-magento2-canary",
               "region":"europe-west1.gcp",
               "frontContainerVersion":"${{ github.sha }}"
             }' https://farmer.storefrontcloud.io/instances | grep -q '{"code":200,"result":"Instance updated!"}'; then
@@ -98,6 +98,20 @@ jobs:
             echo "Something went wrong during the update process..."
             exit 1
           fi
+      - name: Deploy on demo-magento2-enterprise.europe-west1.gcp.storefrontcloud.io
+        if: startsWith(github.ref, 'refs/heads/enterprise')
+        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-enterprise",
+              "region":"europe-west1.gcp",
+              "frontContainerVersion":"${{ github.sha }}"
+            }' https://farmer.storefrontcloud.io/instances | grep -q '{"code":200,"result":"Instance updated!"}'; then
+            echo "Instance updated"
+          else
+            echo "Something went wrong during the update process..."
+            exit 1
+          fi
+
       - name: Update deployment status (success)
         if: success()
         uses: chrnorm/deployment-status@releases/v1

@@ -13,6 +13,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          ref: develop
 
       - name: Initialize mandatory git config
         run: |
@@ -41,7 +43,7 @@ jobs:
         with:
           head: release/${{ github.event.inputs.version }}
           base: main
-          title: "chore: release version ${{ github.event.inputs.version }}"
+          title: "chore: release ${{ github.event.inputs.version }}"
           reviewers: ${{ github.actor }}
           body: |
             Hey @${{ github.actor }}!

@@ -35,15 +35,24 @@ jobs:
           name: ${{ env.RELEASE_VERSION }}
           draft: false
           prerelease: false
-
+      - name: Checkout to the develop branch
+        uses: actions/checkout@v2
+        with:
+          ref: develop
+      - name: Create main-dev branch
+        uses: peterjgrainger/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          branch: chore/main-dev-${{ env.RELEASE_VERSION }}
       - name: Merge main into develop branch
         uses: thomaseizinger/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          head: main
+          head: chore/main-dev-${{ env.RELEASE_VERSION }}
           base: develop
-          title: Merge main into develop branch
+          title: Align develop branch with main after release ${{ env.RELEASE_VERSION }}
           body: |
             This PR merges the main branch back into develop.
             This happens to ensure that the updates that happend on the release branch, i.e. CHANGELOG and manifest updates are also present on the develop branch.
@@ -12,7 +12,6 @@ ARG IMAGE_PROVIDER_BASE_URL
 ARG REDIS__HOST
 ARG REDIS__PORT
 ARG REDIS__CACHE_INVALIDATE_KEY
-ARG REDIS__CACHE_INVALIDATE_URL
 ARG RECAPTCHA_ENABLED
 ARG RECAPTCHA_HIDE_BADGE
 ARG RECAPTCHA_VERSION
@@ -21,7 +20,7 @@ ARG RECAPTCHA_MIN_SCORE
 ARG RECAPTCHA_SITE_KEY
 ARG RECAPTCHA_SECRET_KEY
 
-ENV MAGENTO_GRAPHQL=https://magento2-instance.vuestorefront.io/graphql
+ENV MAGENTO_GRAPHQL=https://magento2-instance.vuestorefront.io:8443/graphql
 ENV MAGENTO_EXTERNAL_CHECKOUT_URL=https://magento2-instance.vuestorefront.io
 ENV MAGENTO_EXTERNAL_CHECKOUT=${MAGENTO_EXTERNAL_CHECKOUT}
 ENV MAGENTO_EXTERNAL_CHECKOUT_SYNC_PATH=${MAGENTO_EXTERNAL_CHECKOUT_SYNC_PATH}
@@ -36,7 +35,7 @@ ENV IMAGE_PROVIDER_BASE_URL=${IMAGE_PROVIDER_BASE_URL}
 ENV REDIS__HOST=${REDIS__HOST}
 ENV REDIS__PORT=${REDIS__PORT}
 ENV REDIS__CACHE_INVALIDATE_KEY=${REDIS__CACHE_INVALIDATE_KEY}
-ENV REDIS__CACHE_INVALIDATE_URL=${REDIS__CACHE_INVALIDATE_URL}
+ENV REDIS__CACHE_INVALIDATE_URL=/cache-invalidate
 ENV REDIS__KEY_PREFIX=magento2vsf2
 ENV REDIS__ENABLED=true
 ENV SENTRY_DSN=${SENTRY_DSN}
@@ -61,14 +60,10 @@ RUN mv /var/www/packages/theme/nuxt.config.js /var/www/packages/theme/base.nuxt.
 
 RUN yarn install
 
-RUN npx [email protected] workspace @vue-storefront/magento-theme add @nuxtjs/recaptcha
+RUN npx [email protected] workspace @vue-storefront/magento-theme add @nuxtjs/sentry @sentry/tracing
 
-RUN npx [email protected] workspace @vue-storefront/magento-theme add @nuxtjs/sentry
-
-RUN npx [email protected] workspace @vue-storefront/magento-theme add @sentry/tracing
 
 RUN yarn build && yarn cache clean --all
-
 COPY .vuestorefrontcloud/docker/vue-storefront.sh /usr/local/bin/
 
 RUN chmod a+x /usr/local/bin/vue-storefront.sh

@@ -1,23 +1,17 @@
-import config from '@vue-storefront/magento-theme/config';
 import baseNuxtConfig from '@vue-storefront/magento-theme/base.nuxt.config';
 
-export default {
-  ...baseNuxtConfig,
-  modules: [
-    ...baseNuxtConfig.modules,
-    '@nuxtjs/sentry'
-  ],
-  recaptcha: {
-    hideBadge: config.get('recaptchaHideBadge'), // Hide badge element (v3 & v2 via size=invisible)
-    siteKey: config.get('recaptchaSiteKey'), // Site key for requests
-    version: config.get('recaptchaVersion'), // Version 2 or 3
-    size: config.get('recaptchaSize'), // Size: 'compact', 'normal', 'invisible' (v2)
-  },
-  publicRuntimeConfig: {
-    isRecaptcha: config.get('recaptchaEnabled'),
-  },
-  sentry: {
-    dsn: process.env.SENTRY_DSN,
-    tracing: true,
-  },
-};
+export default () => {
+  const baseDefaults = baseNuxtConfig();
+
+  return {
+    ...baseDefaults,
+    modules: [
+      ...baseDefaults.modules,
+      '@nuxtjs/sentry'
+    ],
+    sentry: {
+      dsn: process.env.SENTRY_DSN,
+      tracing: true,
+    },
+  };
+}
@@ -81,6 +81,14 @@ module.exports = {
           ['/guide/ssr', 'Server Side Rendering Cache'],
         ]
       },
+      {
+        title: 'Performance',
+        collapsable: false,
+        children: [
+          ['/guide/graphql-get', 'Varnish & GET for GraphQL Queries'],
+          ['/guide/ssr', 'Server Side Rendering Cache'],
+        ]
+      },
       {
         title: 'Composables',
         children: [

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@vue-storefront/magento-api](./magento-api.md) &gt; [cartTotalQty](./magento-api.carttotalqty.md)
+
+## cartTotalQty variable
+
+<b>Signature:</b>
+
+```typescript
+_default: (context: Context, cartId: string, customQuery?: CustomQuery) => Promise<ApolloQueryResult<CartQuery>>
+```
@@ -24,6 +24,7 @@ The `@vue-storefront/magento2` library includes everything needed to fetch data
 |  [applyCouponToCart](./magento-api.applycoupontocart.md) |  |
 |  [availableStores](./magento-api.availablestores.md) |  |
 |  [cart](./magento-api.cart.md) |  |
+|  [cartTotalQty](./magento-api.carttotalqty.md) |  |
 |  [categoryList](./magento-api.categorylist.md) |  |
 |  [categorySearch](./magento-api.categorysearch.md) |  |
 |  [changeCustomerPassword](./magento-api.changecustomerpassword.md) |  |
@@ -76,4 +77,5 @@ The `@vue-storefront/magento2` library includes everything needed to fetch data
 |  [upsellProduct](./magento-api.upsellproduct.md) |  |
 |  [urlResolver](./magento-api.urlresolver.md) |  |
 |  [wishlist](./magento-api.wishlist.md) |  |
+|  [wishlistItemsCount](./magento-api.wishlistitemscount.md) |  |
 
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@vue-storefront/magento-api](./magento-api.md) &gt; [wishlistItemsCount](./magento-api.wishlistitemscount.md)
+
+## wishlistItemsCount variable
+
+<b>Signature:</b>
+
+```typescript
+_default: (context: Context, customQuery?: CustomQuery) => Promise<ApolloQueryResult<WishlistQuery>>
+```
@@ -15,5 +15,10 @@ storeConfigGetters: {
     getLocale: (config: StoreConfig) => string;
     allowGuestProductReview: (config: StoreConfig) => string;
     enabledWishlist: (config: StoreConfig) => string;
+    getBaseMediaUrl: (config: StoreConfig) => string;
+    getLogoSrc: (config: StoreConfig) => string;
+    getLogoWidth: (config: StoreConfig) => number;
+    getLogoHeight: (config: StoreConfig) => number;
+    getLogoAlt: (config: StoreConfig) => string;
 }
 ```
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-_default: () => import("@vue-storefront/core").UseCart<import("@vue-storefront/magento-api/lib/types/GraphQL").Cart, import("@vue-storefront/magento-api").CartItemInterface, Product, any>
+_default: () => import("../../factories/useCartFactory").UseCart<import("@vue-storefront/magento-api/lib/types/GraphQL").Cart, import("@vue-storefront/magento-api").CartItemInterface, Product, any>
 ```
@@ -4,27 +4,10 @@ You can activate the reCaptchta feature using these Guidelines.
 
 ## Activate reCaptcha module
 
-Add the `@nuxtjs/recaptcha'` module to `modules` in the `nuxt.config.js` file.
+Add the `@nuxtjs/recaptcha'` module to `dependencies`
 
-```javascript
-modules: [
-  // other modules
-  '@nuxtjs/recaptcha',
-],
-
-```
-
-Add additional config to the `next.config.js`:
-```javascript
-recaptcha: {
-    hideBadge: config.get('recaptchaHideBadge'), // Hide badge element (v3 & v2 via size=invisible)
-    siteKey: config.get('recaptchaSiteKey'), // Site key for requests
-    version: config.get('recaptchaVersion'), // Version 2 or 3
-    size: config.get('recaptchaSize'), // Size: 'compact', 'normal', 'invisible' (v2)
-  },
-  publicRuntimeConfig: {
-    isRecaptcha: config.get('recaptchaEnabled'),
-  },
+```bash
+yarn add @nuxtjs/recaptcha
 ```
 
 ## Configure the reCaptcha
@@ -38,7 +21,7 @@ On the `config` folder update the config file (`dev.json` for example) with your
   "recaptchaHideBadge": "{YOUR_RECAPTCHA_HIDE_BADGE}", // true or false, default value is false
   "recaptchaSize": "{YOUR_RECAPTCHA_SIZE}", // Size: 'compact', 'normal', 'invisible' (v2), default value is 'invisible'
   "recaptchaSiteKey": "{YOUR_RECAPTCHA_SITE_KEY}", // Site key for requests, default value is ''
-  "recaptchaSecretkey": "{YOUR_RECAPTCHA_SECRET_KEY}", // Secret key for requests, default value is ''
+  "recaptchaSecretKey": "{YOUR_RECAPTCHA_SECRET_KEY}", // Secret key for requests, default value is ''
   "recaptchaVersion": "{YOUR_RECAPTCHA_VERSION}", // Version 2 or 3, default value is 3
   "recaptchaMinScore": "{YOUR_RECAPTCHA_MIN_SCORE}" // The min score used for v3, default value is 0.5
   ...
@@ -65,7 +48,7 @@ RECAPTCHA_MIN_SCORE=0.5
   "recaptchaHideBadge": false,
   "recaptchaSize": "invisible",
   "recaptchaSiteKey": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-  "recaptchaSecretkey": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+  "recaptchaSecretKey": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
   "recaptchaVersion": 3,
   "recaptchaMinScore": 0.5
   ...

@@ -2,7 +2,7 @@
 
 ## Introduction
 
-VueStorefront 2 - Magento 2 integrations use @vue-storefront/cache module that adds posibility to cache some server-side
+VueStorefront 2 - Magento 2 integrations use @vue-storefront/cache module that adds possibility to cache some server-side
 rendered pages.
 
 ### What is cached

@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/eslint-config-import",
-  "version": "0.0.1",
+  "version": "1.0.0",
   "author": "Heitor Ramon Ribeiro <[email protected]>",
   "license": "MIT",
   "scripts": {

@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/eslint-config-jest",
-  "version": "0.0.1",
+  "version": "1.0.0",
   "author": "Heitor Ramon Ribeiro <[email protected]>",
   "license": "MIT",
   "scripts": {
@@ -29,7 +29,7 @@
     "rules"
   ],
   "dependencies": {
-    "eslint-plugin-jest": "^25.3.4"
+    "eslint-plugin-jest": "^26.0.0"
   },
   "main": "index.js"
 }
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/eslint-config-typescript",
-  "version": "0.0.1",
+  "version": "1.0.0",
   "author": "Heitor Ramon Ribeiro <[email protected]>",
   "license": "MIT",
   "scripts": {
@@ -29,8 +29,8 @@
     "rules"
   ],
   "dependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.9.1",
-    "@typescript-eslint/parser": "^5.9.1"
+    "@typescript-eslint/eslint-plugin": "^5.10.2",
+    "@typescript-eslint/parser": "^5.10.2"
   },
   "main": "index.js"
 }
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/eslint-config-vue",
-  "version": "0.0.1",
+  "version": "1.0.0",
   "author": "Heitor Ramon Ribeiro <[email protected]>",
   "license": "MIT",
   "scripts": {
@@ -29,7 +29,7 @@
     "rules"
   ],
   "dependencies": {
-    "eslint-plugin-vue": "^8.3.0"
+    "eslint-plugin-vue": "^8.4.0"
   },
   "main": "index.js"
 }
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/eslint-config-base",
-  "version": "0.0.1",
+  "version": "1.0.0",
   "author": "Heitor Ramon Ribeiro <[email protected]>",
   "license": "MIT",
   "scripts": {
@@ -34,7 +34,7 @@
     "eslint-config-airbnb-typescript": "^16.1.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
-    "eslint-plugin-unicorn": "40.0.0"
+    "eslint-plugin-unicorn": "40.1.0"
   },
   "main": "index.js"
 }