Merge remote-tracking branch 'origin/release' into publisher-oauth

# Conflicts:
#	apps/website/.lagoon.env
#	apps/website/package.json
#	pnpm-lock.yaml

.github/actions/setup/action.yml

@@ -16,7 +16,7 @@ runs:
     - uses: pnpm/action-setup@v2
       name: Install pnpm
       with:
-        version: 8.6.0
+        version: 8.6.12
 
     - name: Get pnpm store directory
       id: pnpm-cache
@@ -31,18 +31,18 @@ runs:
         restore-keys: |
           ${{ runner.os }}-pnpm-store-
 
+    - name: Install dependencies
+      shell: bash
+      run: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 pnpm i
+
     - name: Cache playwright binaries
       uses: actions/cache@v3
       id: playwright-cache
       with:
         path: ~/.cache/ms-playwright
-        key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
+        key: ${{ runner.os }}-playwright-${{ hashFiles('**/pnpm-lock.yaml') }}
 
     - name: Install Playwright browsers
-      run: pnpx playwright install
+      run: pnpm --filter "@custom-tests/e2e" download-browsers
       shell: bash
       if: steps.playwright-cache.outputs.cache-hit != 'true'
-
-    - name: Install dependencies
-      shell: bash
-      run: pnpm i

.github/workflows/release.yml → .github/workflows/merge_dev_to_stage.yml

@@ -1,15 +1,17 @@
-name: Release
+name: Merge dev to stage
 on:
   workflow_dispatch:
   schedule:
     - cron: '15 14 * * *'
 jobs:
-  test:
-    name: Test
-    runs-on: ubuntu-20.04
+  merge:
+    name: Merge
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          ref: 'dev'
 
       - name: Merge dev to stage
         uses: devmasx/[email protected]

.github/workflows/test.yml

@@ -3,11 +3,14 @@ on:
   push:
 
 jobs:
-
   test:
     name: Test
     runs-on: ubuntu-20.04
     steps:
+      - name: Init check
+        if: ${{ github.repository != 'AmazeeLabs/silverback-template'}}
+        run: echo 'Please run the INIT script. See the root README.md for instructions.' && false
+
       - name: Checkout
         uses: actions/checkout@v3
         with:
@@ -19,7 +22,7 @@ jobs:
       - name: TurboRepo local server
         uses: felixmosh/turborepo-gh-artifacts@v2
         with:
-          server-token: "local"
+          server-token: 'local'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Test
@@ -48,11 +51,25 @@ jobs:
           exitOnceUploaded: true
 
       - name: Deploy storybook to netlify
-        run: npx netlify-cli deploy --prod --filter @custom/ui --dir=packages/ui/storybook-static
+        run:
+          pnpm run --filter=@custom/ui build && npx netlify-cli deploy --prod
+          --filter @custom/ui --dir=packages/ui/storybook-static
         env:
+          VITEST_CLOUDINARY_CLOUDNAME: local
           NETLIFY_SITE_ID: ${{ vars.NETLIFY_STORYBOOK_ID }}
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-        if: ${{ github.ref  == 'refs/heads/dev' && vars.NETLIFY_STORYBOOK_ID != '' }}
+        if:
+          ${{ github.ref  == 'refs/heads/dev' && vars.NETLIFY_STORYBOOK_ID != ''
+          }}
+
+      - name: Merge release to prod (silverback-template only)
+        uses: devmasx/[email protected]
+        if: ${{ github.repository == 'AmazeeLabs/silverback-template' && github.ref  == 'refs/heads/release'}}
+        with:
+          type: now
+          from_branch: release
+          target_branch: prod
+          github_token: ${{ secrets.GITHUB_TOKEN }}
 
   docker_build:
     name: Docker Build

.gitpod.Dockerfile

@@ -1,12 +1,26 @@
 FROM gitpod/workspace-full
 RUN sudo update-alternatives --set php $(which php8.1)
-RUN sudo install-packages php8.1-gd php8.1-mbstring php8.1-curl php8.1-sqlite3 php8.1-zip php8.1-xdebug
+RUN sudo install-packages php8.1-gd php8.1-mbstring php8.1-curl php8.1-sqlite3 php8.1-zip php8.1-xdebug php8.1-imagick
 RUN pnpx [email protected] install-deps
 RUN pnpx [email protected] install
-RUN npm install -g [email protected].0
+RUN npm install -g [email protected].12 @withgraphite/graphite-cli
 
 COPY .gitpod/xdebug.ini /etc/php/8.1/mods-available/xdebug.ini
 RUN curl -fsSL https://deno.land/x/install/install.sh | sh
 RUN /home/gitpod/.deno/bin/deno completions bash > /home/gitpod/.bashrc.d/90-deno && \
     echo 'export DENO_INSTALL="/home/gitpod/.deno"' >> /home/gitpod/.bashrc.d/90-deno && \
     echo 'export PATH="$DENO_INSTALL/bin:$PATH"' >> /home/gitpod/.bashrc.d/90-deno
+
+# Install neovim and helpers
+RUN wget https://github.com/neovim/neovim/releases/download/v0.9.2/nvim-linux64.tar.gz && \
+    tar xzf nvim-linux64.tar.gz && \
+    sudo mv nvim-linux64 /usr/local/nvim && \
+    sudo ln -s /usr/local/nvim/bin/nvim /usr/local/bin/nvim && \
+    rm -rf nvim-linux64.tar.gz
+RUN sudo apt-get install -y fd-find
+RUN npm install -g neovim
+
+RUN curl -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/latest/download/lazygit_0.40.2_Linux_x86_64.tar.gz" \
+    && tar xf lazygit.tar.gz lazygit \
+    && sudo install lazygit /usr/local/bin
+

.gitpod.yml

@@ -28,6 +28,15 @@ tasks:
   - name: Codegen
     init: gp sync-await setup
     command: pnpm --filter @custom/schema run watch
+  - name: Decap Dev
+    init: gp sync-await setup
+    command: pnpm run --filter @custom/decap dev
+  - name: Decap Proxy
+    init: gp sync-await setup
+    command: pnpm run --filter @custom/decap start:proxy
+  - name: Decap
+    init: gp sync-await setup
+    command: pnpm run --filter @custom/decap start:decap
 
 image:
   file: .gitpod.Dockerfile
@@ -51,22 +60,23 @@ github:
 
 vscode:
   extensions:
-    - "esbenp.prettier-vscode"
-    - "ZixuanChen.vitest-explorer"
-    - "GraphQL.vscode-graphql"
-    - "GraphQL.vscode-graphql-syntax"
-    - "eamodio.gitlens"
-    - "GitHub.vscode-pull-request-github"
-    - "GitHub.copilot"
-    - "dbaeumer.vscode-eslint"
-    - "ms-azuretools.vscode-docker"
-    - "ms-playwright.playwright"
-    - "denoland.vscode-deno"
-    - "bradlc.vscode-tailwindcss"
-    - "felixfbecker.php-debug"
-    - "humao.rest-client"
-    - "DEVSENSE.phptools-vscode"
-    - "GitHub.vscode-github-actions"
+    - 'esbenp.prettier-vscode'
+    - 'ZixuanChen.vitest-explorer'
+    - 'GraphQL.vscode-graphql'
+    - 'GraphQL.vscode-graphql-syntax'
+    - 'eamodio.gitlens'
+    - 'GitHub.vscode-pull-request-github'
+    - 'GitHub.copilot'
+    - 'dbaeumer.vscode-eslint'
+    - 'ms-azuretools.vscode-docker'
+    - 'ms-playwright.playwright'
+    - 'denoland.vscode-deno'
+    - 'bradlc.vscode-tailwindcss'
+    - 'felixfbecker.php-debug'
+    - 'humao.rest-client'
+    - 'DEVSENSE.phptools-vscode'
+    - 'GitHub.vscode-github-actions'
+    - 'Graphite.gti-vscode'
 
 ports:
   - port: 8000
@@ -78,3 +88,12 @@ ports:
   - port: 8888
     name: Drupal Dev
     onOpen: notify
+  - port: 5173
+    name: Decap Dev
+    onOpen: notify
+  - port: 8889
+    name: Decap
+    onOpen: notify
+  - port: 8081
+    name: Decap Proxy
+    onOpen: notify

.lagoon.yml

@@ -21,7 +21,7 @@ tasks:
         command: drush scr scripts/translations-import.php
         service: cli
 environments:
-  dev:
+  prod:
     routes:
       - nginx:
           - example.cms.amazeelabs.dev
@@ -32,3 +32,25 @@ environments:
         schedule: '*/15 * * * *'
         command: drush cron
         service: cli
+  stage:
+    routes:
+      - nginx:
+          - stage-example.cms.amazeelabs.dev
+      - build:
+          - stage-example.build.amazeelabs.dev
+    cronjobs:
+      - name: drush cron
+        schedule: '*/15 * * * *'
+        command: drush cron
+        service: cli
+  dev:
+    routes:
+      - nginx:
+          - dev-example.cms.amazeelabs.dev
+      - build:
+          - dev-example.build.amazeelabs.dev
+    cronjobs:
+      - name: drush cron
+        schedule: '*/15 * * * *'
+        command: drush cron
+        service: cli

.lagoon/Dockerfile

@@ -6,7 +6,7 @@ FROM uselagoon/node-18-builder as builder
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 # Install pnpm
-RUN npm install -g [email protected].0 && pnpm config set store-dir /tmp/cache/pnpm
+RUN npm install -g [email protected].12 && pnpm config set store-dir /tmp/cache/pnpm
 
 # Copy pnpm lockfile and install dependencies.
 COPY pnpm-lock.yaml .npmrc /app/

.vscode/settings.json

@@ -1,7 +1,6 @@
 {
   "npm.packageManager": "pnpm",
   "eslint.format.enable": true,
-  "eslint.codeActionsOnSave.rules": null,
   "editor.formatOnSave": true,
   "rest-client.followredirect": false,
   "deno.enable": true,