Merge release into prod

.github/workflows/fe_build.yml

@@ -34,13 +34,6 @@ jobs:
           server-token: 'local'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Prepare
-        run: SKIP_DRUPAL_INSTALL=1 pnpm turbo:prep
-        env:
-          TURBO_API: 'http://127.0.0.1:9080'
-          TURBO_TOKEN: 'local'
-          TURBO_TEAM: 'local'
-
       - name: Publisher
         uses: AmazeeLabs/publisher-action@4371b4a90a9fe2c86248e76c0f428e39abf6b610
         with:
@@ -50,6 +43,13 @@ jobs:
             apps/website/public
           cache_key: 'fe-build-${{ inputs.env }}'
 
+      - name: Prepare
+        run: SKIP_DRUPAL_INSTALL=1 pnpm turbo:prep
+        env:
+          TURBO_API: 'http://127.0.0.1:9080'
+          TURBO_TOKEN: 'local'
+          TURBO_TEAM: 'local'
+
       - name: Build & deploy
         run: |
           set -ex
@@ -68,10 +68,16 @@ jobs:
             pnpm build:gatsby 
           fi
 
+          # "netlify deploy" fails to locate edge functions when executed from a
+          # monorepo. Flags like --cwd or --filter do not help. So we deploy the
+          # website app to a dedicated folder first.
+          pnpm deploy --filter "@custom/website" /tmp/deploy --prod
+          cd /tmp/deploy
+
           # Deploy
           pnpm netlify env:set AWS_LAMBDA_JS_RUNTIME nodejs18.x
           pnpm netlify env:set DRUPAL_EXTERNAL_URL $DRUPAL_EXTERNAL_URL
-          pnpm netlify deploy --cwd=. --dir=apps/website/public --prodIfUnlocked
+          pnpm netlify deploy --prodIfUnlocked
 
           # Report success to Publisher
           echo "BUILD_IS_SUCCESSFUL=1" >> $GITHUB_ENV

.lagoon/Dockerfile

@@ -118,4 +118,9 @@ RUN npm install -g [email protected]
 
 COPY --from=builder /tmp/.deploy/publisher /app
 
+# Decap config.
+ENV VITE_DECAP_REPO='AmazeeLabs/silverback-template'
+ARG LAGOON_GIT_BRANCH
+ENV VITE_DECAP_BRANCH="$LAGOON_GIT_BRANCH"
+
 CMD pnpm publisher

apps/publisher/publisher.config.ts

@@ -72,6 +72,8 @@ function githubEnvVars(): Record<string, string> {
       'PUBLISHER_OAUTH2_SESSION_SECRET',
       'PUBLISHER_OAUTH2_ENVIRONMENT_TYPE',
       'PUBLISHER_OAUTH2_TOKEN_HOST',
+      'VITE_DECAP_REPO',
+      'VITE_DECAP_BRANCH',
     ].map((name) => {
       if (name === 'DRUPAL_INTERNAL_URL') {
         // No internal URLs when building on Github.

apps/website/netlify/functions/github-proxy.mts

@@ -1,6 +1,7 @@
-import { githubProxy } from '@amazeelabs/decap-cms-backend-token-auth/proxy';
 import type { Context } from '@netlify/functions';
 
+import { githubProxy } from '../../node_modules/@amazeelabs/decap-cms-backend-token-auth/build/proxy.js';
+
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export default function (request: Request, context: Context) {
   if (!process.env.DECAP_GITHUB_TOKEN) {