Merge branch 'refs/heads/release' into SLB-222-Font-loading

# Conflicts:
#	apps/website/gatsby-ssr.tsx
#	pnpm-lock.yaml

.github/workflows/deploy.yml

@@ -0,0 +1,69 @@
+name: Deploy
+on:
+  push:
+    branches:
+      - prod
+      - dev
+
+jobs:
+  test:
+    name: Deploy
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup
+        uses: ./.github/actions/setup
+
+      - run: pwd
+        working-directory: ${{ runner.home }}
+
+      - name: Extract branch name
+        shell: bash
+        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+        id: extract_branch
+
+      - name: Prepare deployment package
+        run: pnpm turbo:prep && pnpm deploy --filter "@custom/website" ../deploy --prod
+        env:
+          VITE_DECAP_REPO: ${{ github.repository }}
+          VITE_DECAP_BRANCH: ${{ steps.extract_branch.outputs.branch }}
+
+      - name: Build
+        run: pnpm run --filter @custom/website build
+        working-directory: ../deploy
+        env:
+          CLOUDINARY_API_KEY: ${{ vars.CLOUDINARY_API_KEY }}
+          CLOUDINARY_API_SECRET: ${{ secrets.CLOUDINARY_API_SECRET }}
+          CLOUDINARY_CLOUDNAME: ${{ secrets.CLOUDINARY_CLOUDNAME }}
+          GATSBY_PUBLIC_URL: ${{ vars.GATSBY_PUBLIC_URL }}
+
+      - name: Check for Netlify auth token
+        id: netlify-check
+        shell: bash
+        run: |
+          if [ "${{ secrets.NETLIFY_AUTH_TOKEN }}" != '' ]; then
+            echo "available=true" >> $GITHUB_OUTPUT;
+          else
+            echo "available=false" >> $GITHUB_OUTPUT;
+          fi
+
+      - name: Deploy to dev
+        run: pnpm netlify deploy --prod --filter "@custom/website"
+        working-directory: ../deploy
+        if: github.ref == 'refs/heads/dev' && steps.netlify-check.outputs.available == 'true' && vars.NETLIFY_DEV_ID != ''
+        env:
+          NETLIFY_SITE_ID: ${{ vars.NETLIFY_DEV_ID }}
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+
+      - name: Deploy to prod
+        run: pnpm netlify deploy --prod --filter "@custom/website"
+        working-directory: ../deploy
+        if: github.ref == 'refs/heads/prod' && steps.netlify-check.outputs.available == 'true' && vars.NETLIFY_PROD_ID != ''
+        env:
+          NETLIFY_SITE_ID: ${{ vars.NETLIFY_PROD_ID }}
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+

.github/workflows/test.yml

@@ -40,6 +40,16 @@ jobs:
           path: tests/e2e/playwright-report/
           retention-days: 3
 
+      - name: Check for Chromatic project token
+        id: chromatic-check
+        shell: bash
+        run: |
+          if [ "${{ secrets.CHROMATIC_PROJECT_TOKEN }}" != '' ]; then
+            echo "available=true" >> $GITHUB_OUTPUT;
+          else
+            echo "available=false" >> $GITHUB_OUTPUT;
+          fi
+
       - name: Publish to Chromatic
         uses: chromaui/action@v1
         with:
@@ -49,6 +59,7 @@ jobs:
           storybookBaseDir: packages/ui
           onlyChanged: true
           exitOnceUploaded: true
+        if: ${{ steps.chromatic-check.outputs.available == 'true' }}
 
       - name: Deploy storybook to netlify
         run:

.gitpod.Dockerfile

@@ -1,4 +1,11 @@
 FROM gitpod/workspace-full
+
+RUN bash -c 'VERSION="18.19.0" \
+    && source $HOME/.nvm/nvm.sh && nvm install $VERSION \
+    && nvm use $VERSION && nvm alias default $VERSION'
+
+RUN echo "nvm use default &>/dev/null" >> ~/.bashrc.d/51-nvm-fix
+
 RUN sudo update-alternatives --set php $(which php8.2)
 RUN sudo install-packages php8.2-gd php8.2-mbstring php8.2-curl php8.2-sqlite3 php8.2-zip php8.2-xdebug php8.2-imagick
 RUN pnpx [email protected] install-deps
@@ -11,14 +18,9 @@ RUN /home/gitpod/.deno/bin/deno completions bash > /home/gitpod/.bashrc.d/90-den
   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 sudo add-apt-repository ppa:maveonair/helix-editor && \
+    sudo apt update && \
+    sudo apt install helix
 
 # Install phpactor
 RUN curl -Lo phpactor.phar https://github.com/phpactor/phpactor/releases/latest/download/phpactor.phar

INIT.md

@@ -21,7 +21,11 @@ replace(
   '# ' + process.env.PROJECT_NAME_HUMAN,
 );
 replace(
-  'apps/cms/config/sync/system.site.yml',
+  [
+    'apps/cms/config/sync/system.site.yml',
+    'tests/schema/specs/content.spec.ts',
+    'tests/e2e/specs/drupal/metatags.spec.ts',
+  ],
   'Silverback Drupal Template',
   process.env.PROJECT_NAME_HUMAN,
 );
@@ -97,7 +101,7 @@ Update the auth key for Gatsby user.
 ```ts
 const authKey = randomString(32);
 replace(
-  'apps/website/gatsby-config.mjs',
+  'apps/cms/gatsby-config.mjs',
   "auth_key: 'cfdb0555111c0f8924cecab028b53474'",
   `auth_key: '${authKey}'`,
 );

README.md

@@ -24,8 +24,19 @@ Other steps
 - [Create a new Lagoon project](https://amazeelabs.atlassian.net/wiki/spaces/ALU/pages/368115717/Create+a+new+Lagoon+project)
 - [Create a new Netlify project](https://amazeelabs.atlassian.net/wiki/spaces/ALU/pages/368017428/Create+a+new+Netlify+project)
 - Check the [Environment overrides](#environment-overrides) section below
+- Check the [Choose a CMS](#choose-a-cms) section below
 - Create `dev` and `prod` branches (and optionally `stage`) from `release`
 
+## Choose a CMS
+
+The template comes with Drupal and Decap CMS enabled by default. To disable
+either (or both), follow these two steps:
+
+1. Remove the dependencies to `@custom/cms`/`@custom/decap` from
+   `apps/website/package.json`
+2. Remove the `@custom/cms`/`@custom/decap` plugins from
+   `apps/website/gatsby-config.mjs`
+
 ## Branches and environments
 
 <table>