Merge pull request #3133 from vuestorefront/v2-develop

chore: merge v2-develop into v2
vuestorefront · May 7, 2024 · d18f86b · d18f86b
2 parents c33e26d + a1e98be
commit d18f86b
Show file tree

Hide file tree

Showing 166 changed files with 1,466 additions and 1,271 deletions.
diff --git a/.github/workflows/cd-generate-changelog-changeset.yml b/.github/workflows/cd-generate-changelog-changeset.yml
@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'

diff --git a/.github/workflows/cd-v2-automerge.yml b/.github/workflows/cd-v2-automerge.yml
@@ -17,7 +17,7 @@ jobs:
     if: ${{ startsWith(github.head_ref, 'v2' )}}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - id: automerge
         name: automerge
         uses: 'pascalgn/[email protected]'

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,9 +23,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -38,9 +38,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -56,9 +56,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -73,9 +73,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -90,9 +90,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -110,9 +110,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -127,11 +127,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -140,7 +140,7 @@ jobs:
       - name: Pre-Cypress (build all dependencies)
         run: yarn test:ci-pre:vue
       - name: Cypress run
-        uses: cypress-io/github-action@v5.8.4
+        uses: cypress-io/github-action@v6.6.1
         with:
           browser: chrome
           working-directory: apps/test/vue
@@ -164,9 +164,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -175,7 +175,7 @@ jobs:
       - name: Pre-Cypress (build all dependencies)
         run: yarn test:ci-pre:react
       - name: Cypress run
-        uses: cypress-io/github-action@v5.8.4
+        uses: cypress-io/github-action@v6.6.1
         with:
           browser: chrome
           working-directory: apps/test/react
@@ -201,9 +201,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -234,11 +234,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -272,11 +272,11 @@ jobs:
     if: ${{ github.ref == 'refs/heads/v2' }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -312,11 +312,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: GitGuardian scan
-        uses: GitGuardian/ggshield-action@v1.26.0
+        uses: GitGuardian/ggshield-action@v1.27.0
         with:
           args: -v
         env:

diff --git a/.github/workflows/configure-environment.yml b/.github/workflows/configure-environment.yml
@@ -21,7 +21,7 @@ jobs:
       target-domain: ${{ steps.resolve-env.outputs.target-domain }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
       - name: Determine environment
         shell: bash
         id: resolve-env
@@ -55,4 +55,3 @@ jobs:
           echo "Selected environment" $DOCKER_NAMESPACE
           echo "Selected environment" $FARMER_INSTANCE_NAME
           echo "Selected environment" $TARGET_DOMAIN
-
diff --git a/.github/workflows/deploy-docs-vue-storefront-cloud.yml b/.github/workflows/deploy-docs-vue-storefront-cloud.yml
@@ -26,19 +26,19 @@ jobs:
     needs: [build, configure-enviroment]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
       - name: Install dependencies
         run: NOT_GENERATE_ICON=true && yarn --immutable
       - name: 'Authenticate to Google Cloud'
-        uses: 'google-github-actions/auth@v1'
+        uses: 'google-github-actions/auth@v2'
         with:
           credentials_json: ${{ secrets.GCP_SFUI_SHARED_SERVICE_ACCOUNT_KEY }}
       - name: 'Upload assets to env directory within SFUI GCP storage'
-        uses: 'google-github-actions/upload-cloud-storage@v1'
+        uses: 'google-github-actions/upload-cloud-storage@v2'
         with:
           path: 'apps/preview/shared/public/@assets'
           parent: false

diff --git a/.github/workflows/image-build-vue-storefront-cloud.yml b/.github/workflows/image-build-vue-storefront-cloud.yml
@@ -15,13 +15,12 @@ on:
         required: true
         type: string
 
-
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup deployment environments variables
         shell: bash
         run: |
@@ -36,5 +35,5 @@ jobs:
           username: ${{ secrets.CLOUD_USERNAME }}
           password: ${{ secrets.CLOUD_PASSWORD }}
           dockerfile: ${{ inputs.DOCKERFILE_PATH }}
-          buildoptions: "--compress"
-          buildargs: VITE_DOCS_BASEPATH,VITE_DOCS_EXAMPLES_REACT_PATH,VITE_DOCS_EXAMPLES_VUE_PATH,ENVIRONMENT
+          buildoptions: '--compress'
+          buildargs: VITE_DOCS_BASEPATH,VITE_DOCS_EXAMPLES_REACT_PATH,VITE_DOCS_EXAMPLES_VUE_PATH,ENVIRONMENT
diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npx --no-install commitlint --edit "$1" --config ./commitlint.config.js
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npx turbo run lint
diff --git a/.husky/prepare-commit-msg b/.husky/prepare-commit-msg
@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 exec < /dev/tty && git cz --hook || true
diff --git a/.vuestorefrontcloud/demo/docker/Dockerfile b/.vuestorefrontcloud/demo/docker/Dockerfile
@@ -1,11 +1,11 @@
-FROM node:16 AS build
+FROM node:20 AS build
 
 WORKDIR /var/www
 
 COPY . .
 
 RUN cd boilerplates/nuxt \
-  && yarn \ 
+  && yarn \
   && yarn generate
 
 FROM nginx
@@ -15,4 +15,4 @@ COPY --from=build var/www/boilerplates/nuxt/dist /usr/share/nginx/html
 
 RUN chown nginx:nginx /usr/share/nginx/html
 
-CMD ["nginx", "-g", "daemon off;"]
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/.vuestorefrontcloud/docs/Dockerfile b/.vuestorefrontcloud/docs/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18-alpine AS build
+FROM node:20-alpine AS build
 
 WORKDIR /var/www
 

diff --git a/.vuestorefrontcloud/test-next/docker/Dockerfile b/.vuestorefrontcloud/test-next/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16 AS build
+FROM node:20 AS build
 
 WORKDIR /var/www
 

diff --git a/.vuestorefrontcloud/test-nuxt/docker/Dockerfile b/.vuestorefrontcloud/test-nuxt/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16 AS build
+FROM node:20 AS build
 
 WORKDIR /var/www