Merge pull request #1162 from CodeForAfrica/fix/trustlab_build

kilemensi · web-flow · commit ba7cf7277e9e · 2025-05-21T11:59:03.000+03:00
Fix `@/trustlab` build
diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
@@ -48,7 +48,7 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             ${{ inputs.build_args }}
diff --git a/.github/workflows/charterafrica-deploy-dev.yml b/.github/workflows/charterafrica-deploy-dev.yml
@@ -50,7 +50,7 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             MONGO_URL=${{ secrets.CHARTERAFRICA_MONGO_URL }}
diff --git a/.github/workflows/charterafrica-deploy-prod.yml b/.github/workflows/charterafrica-deploy-prod.yml
@@ -77,7 +77,7 @@ jobs:
 
       - name: Build Docker image
         if: steps.version-check.outputs.changed == 'true'
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             MONGO_URL=${{ secrets.CHARTERAFRICA_MONGO_URL }}
diff --git a/.github/workflows/civicsignalblog-deploy-prod.yml b/.github/workflows/civicsignalblog-deploy-prod.yml
@@ -72,7 +72,7 @@ jobs:
 
       - name: Build Docker image
         if: steps.version-check.outputs.changed == 'true'
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             MONGO_URL=${{ secrets.CIVICSIGNALBLOG_MONGO_URL }}
diff --git a/.github/workflows/climatemappedafrica-deploy-dev.yml b/.github/workflows/climatemappedafrica-deploy-dev.yml
@@ -51,7 +51,7 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             MONGO_URL=${{ secrets.CLIMATEMAPPEDAFRICA_MONGO_URL }}
diff --git a/.github/workflows/codeforafrica-deploy-dev.yml b/.github/workflows/codeforafrica-deploy-dev.yml
@@ -52,7 +52,7 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             MONGODB_URL=${{ secrets.CODEFORAFRICA_MONGO_URL }}/${{ env.APP_NAME }}
diff --git a/.github/workflows/codeforafrica-deploy-prod.yml b/.github/workflows/codeforafrica-deploy-prod.yml
@@ -73,7 +73,7 @@ jobs:
 
       - name: Build Docker image
         if: steps.version-check.outputs.changed == 'true'
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             MONGODB_URL=${{ secrets.CODEFORAFRICA_MONGODB_URL }}
diff --git a/.github/workflows/codeforafrica-deploy-review-app.yml b/.github/workflows/codeforafrica-deploy-review-app.yml
@@ -55,7 +55,7 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             MONGODB_URL=${{ secrets.CODEFORAFRICA_MONGO_URL }}/${{ env.APP_NAME }}
diff --git a/.github/workflows/pesayetu-deploy-dev.yml b/.github/workflows/pesayetu-deploy-dev.yml
@@ -52,7 +52,7 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             WORDPRESS_URL=${{ secrets.PESAYETU_WORDPRESS_URL }}
diff --git a/.github/workflows/roboshield-deploy-dev.yml b/.github/workflows/roboshield-deploy-dev.yml
@@ -52,7 +52,7 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             MONGO_URL=${{ secrets.ROBOSHIELD_MONGO_URL }}
diff --git a/.github/workflows/roboshield-deploy-prod.yml b/.github/workflows/roboshield-deploy-prod.yml
@@ -64,7 +64,7 @@ jobs:
 
       - name: Build Docker image
         if: steps.version-check.outputs.changed == 'true'
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             MONGO_URL=${{ secrets.ROBOSHIELD_MONGO_URL }}
diff --git a/.github/workflows/trustlab-deploy-dev.yml b/.github/workflows/trustlab-deploy-dev.yml
@@ -52,7 +52,7 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             PAYLOAD_CORS=${{ vars.TRUSTLAB_PAYLOAD_CORS }}
diff --git a/.github/workflows/twoopstracker-deploy-dev.yml b/.github/workflows/twoopstracker-deploy-dev.yml
@@ -55,7 +55,7 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             TWOOPSTRACKER_API_URL=${{ env.TWOOPSTRACKER_API_URL }}
diff --git a/.github/workflows/vpnmanager-deploy-dev.yml b/.github/workflows/vpnmanager-deploy-dev.yml
@@ -49,7 +49,7 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             API_SECRET_KEY=${{ secrets.VPNMANAGER_API_SECRET_KEY }}
diff --git a/Dockerfile b/Dockerfile
@@ -983,8 +983,6 @@ COPY --from=trustlab-builder --chown=nextjs:nodejs /workspace/apps/trustlab/.nex
 COPY --from=trustlab-builder --chown=nextjs:nodejs /workspace/apps/trustlab/.next/static ./apps/trustlab/.next/static
 USER nextjs
 
-RUN ls -lah apps/trustlab/
-
 # server.js is created by next build from the standalone output
 # https://nextjs.org/docs/pages/api-reference/next-config-js/output
 CMD ["node", "apps/trustlab/server.js"]
diff --git a/apps/trustlab/.env b/apps/trustlab/.env
@@ -7,6 +7,9 @@ SENTRY_PROJECT=trustlab
 NEXT_PUBLIC_APP_URL=http://localhost:3000
 NEXT_PUBLIC_IMAGE_UNOPTIMIZED="true"
 NEXT_PUBLIC_SEO_DISABLED="true"
+PROJECT_ROOT=../..
 
 NEXT_PUBLIC_DEFAULT_LOCALE=en
 NEXT_PUBLIC_LOCALES="en"
+
+NEXT_TELEMETRY_DISABLED=1
diff --git a/apps/trustlab/package.json b/apps/trustlab/package.json
@@ -5,15 +5,15 @@
   "scripts": {
     "dev": "next dev",
     "build": "next build",
-    "start": "next start",
+    "start": "node --env-file=.env --env-file=.env.local .next/standalone/apps/trustlab/server.js",
     "lint-check": "TIMING=1 eslint './'",
     "lint": "TIMING=1 eslint --flag unstable_config_lookup_from_file --fix './'",
     "generate:importmap": "cross-env NODE_OPTIONS=--no-deprecation payload generate:importmap",
     "generate:types": "cross-env NODE_OPTIONS=--no-deprecation payload generate:types",
     "jest": "jest",
     "playwright": "npx playwright test",
     "payload": "cross-env NODE_OPTIONS=--no-deprecation payload",
-    "clean": "rm -rf .next .turbo build dist node_modules"
+    "clean": "rm -rf .next .turbo build coverage dist node_modules"
   },
   "dependencies": {
     "@commons-ui/core": "workspace:*",
@@ -44,6 +44,7 @@
     "payload": "catalog:payload-v3",
     "react": "catalog:",
     "react-dom": "catalog:",
+    "require-in-the-middle": "^7.5.2",
     "sharp": "catalog:",
     "swr": "catalog:"
   },
diff --git a/apps/trustlab/payload.config.ts b/apps/trustlab/payload.config.ts
@@ -2,6 +2,7 @@ import sharp from "sharp";
 import { lexicalEditor } from "@payloadcms/richtext-lexical";
 import { mongooseAdapter } from "@payloadcms/db-mongodb";
 import { nodemailerAdapter } from "@payloadcms/email-nodemailer";
+import type { NodemailerAdapterArgs } from "@payloadcms/email-nodemailer";
 import { buildConfig, CollectionConfig, GlobalConfig } from "payload";
 import path from "path";
 import { fileURLToPath } from "url";
@@ -24,10 +25,10 @@ const csrf =
     .map((d) => d.trim())
     .filter(Boolean) ?? [];
 
-let email = nodemailerAdapter();
+let nodemailerAdapterArgs: NodemailerAdapterArgs | undefined;
 if (process.env.SMTP_HOST && process.env.SMTP_PASS) {
   const smtpPort = Number(process.env.SMTP_PORT) || 587;
-  email = nodemailerAdapter({
+  nodemailerAdapterArgs = {
     defaultFromAddress:
       process.env.SMTP_FROM_ADDRESS || "noreply@trustlab.africa",
     defaultFromName: process.env.SENDGRID_FROM_NAME || "TrustLab CMS",
@@ -41,8 +42,9 @@ if (process.env.SMTP_HOST && process.env.SMTP_PASS) {
         pass: process.env.SMTP_PASS,
       },
     },
-  });
+  };
 }
+const email = nodemailerAdapter(nodemailerAdapterArgs);
 
 export default buildConfig({
   admin: {
@@ -77,6 +79,7 @@ export default buildConfig({
   secret: process.env.PAYLOAD_SECRET || "",
   serverURL: process.env.NEXT_PUBLIC_APP_URL,
   sharp,
+  telemetry: process.env.NEXT_TELEMETRY_DISABLED === "0",
   typescript: {
     outputFile: path.resolve(dirname, "payload-types.ts"),
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
