Merge dev into stage

.github/workflows/fe_build.yml

@@ -68,6 +68,16 @@ jobs:
             pnpm build:gatsby 
           fi
 
+          # Debug
+          env | grep VITE_
+          pwd
+          ls -lisa .
+          ls -lisa public
+          ls -lisa public/admin
+          ls -lisa public/admin/assets
+          cat public/admin/assets/*
+          grep -R 'api_root' public/admin/assets
+
           # Deploy
           pnpm netlify env:set AWS_LAMBDA_JS_RUNTIME nodejs18.x
           pnpm netlify env:set DRUPAL_EXTERNAL_URL $DRUPAL_EXTERNAL_URL

.lagoon/Dockerfile

@@ -35,11 +35,6 @@ RUN --mount=type=cache,target=/tmp/cache composer install --no-dev
 
 WORKDIR /app
 
-# Decap config.
-ENV VITE_DECAP_REPO='AmazeeLabs/silverback-template'
-ARG LAGOON_GIT_BRANCH
-ENV VITE_DECAP_BRANCH="$LAGOON_GIT_BRANCH"
-
 # Copy the all package sources, install and prepare them.
 COPY . /app
 RUN --mount=type=cache,target=/tmp/cache pnpm i && \
@@ -119,6 +114,11 @@ 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/decap/turbo.json

@@ -3,6 +3,7 @@
   "extends": ["//"],
   "tasks": {
     "prep:vite": {
+      "env": ["VITE_DECAP_REPO", "VITE_DECAP_BRANCH"],
       "dependsOn": ["^prep"],
       "inputs": ["src/**", "vite.config.ts", "index.html"],
       "outputs": ["dist/**"]

apps/publisher/eslint.config.mjs

@@ -1,3 +1,8 @@
 import { base, defineConfig } from '@custom/eslint-config';
 
-export default defineConfig([...base]);
+export default defineConfig([
+  ...base,
+  {
+    ignores: ['.cache/**'],
+  },
+]);

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/.gitignore

@@ -5,3 +5,6 @@
 public
 styles.css
 persisted-store
+
+# Deno comes with "netlify dev". We don't need its lock file.
+/deno.lock

apps/website/deno.jsonc

@@ -0,0 +1,10 @@
+// This isn't a Deno project, yet Deno is added by netlify-cli when
+// "netlify dev" is used.
+// This file is picked up by Deno automatically, so we can use it to adjust Deno
+// behavior.
+{
+  // By default, Deno will use node_modules/.deno dir for storing dependencies.
+  // Somehow it messes up node_modules resolution leading to Gatsby build
+  // errors. So we prevent Deno from using node_modules dir.
+  "nodeModulesDir": false,
+}