Merge branch 'main' into ft/upgrade_next_to_15

.github/workflows/climatemappedafrica-deploy-dev.yml

@@ -54,7 +54,6 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           build-args: |
-            HURUMAP_API_URL=${{ secrets.CLIMATEMAPPEDAFRICA_HURUMAP_API_URL }}
             MONGO_URL=${{ secrets.CLIMATEMAPPEDAFRICA_MONGO_URL }}
             NEXT_PUBLIC_APP_URL=${{ env.NEXT_PUBLIC_APP_URL }}
             PAYLOAD_SECRET=${{ secrets.CLIMATEMAPPEDAFRICA_PAYLOAD_SECRET }}

Dockerfile

@@ -387,9 +387,7 @@ ARG NEXT_TELEMETRY_DISABLED \
   SENTRY_AUTH_TOKEN \
   SENTRY_ENVIRONMENT \
   SENTRY_ORG \
-  SENTRY_PROJECT \
-  # Custom (runtime)
-  HURUMAP_API_URL
+  SENTRY_PROJECT
 
 # This is in app-builder instead of base-builder just incase app-deps adds deps
 COPY --from=climatemappedafrica-deps /workspace/node_modules ./node_modules

apps/charterafrica/eslint.config.js

@@ -0,0 +1,38 @@
+const eslintConfig = require("eslint-config-commons-ui/next");
+
+module.exports = [
+  {
+    ignores: [
+      "**/node_modules",
+      "**/.pnp",
+      "**/.pnp.js",
+      "**/.pnpm-debug.log",
+      "**/dist/",
+      "**/coverage",
+      "**/.next/",
+      "**/out/",
+      "**/build/",
+      "**/.DS_Store",
+      "**/*.pem",
+      "**/npm-debug.log*",
+      "**/yarn-debug.log*",
+      "**/yarn-error.log*",
+      "**/.vercel",
+      "**/.now",
+      "**/.turbo",
+      "**/test-results/",
+      "**/playwright-report/",
+      "**/public/",
+    ],
+  },
+  ...eslintConfig,
+  {
+    settings: {
+      "import/resolver": {
+        webpack: {
+          config: "./eslint.webpack.config.js",
+        },
+      },
+    },
+  },
+];

apps/charterafrica/package.json

@@ -68,7 +68,6 @@
     "monaco-editor": "catalog:",
     "next": "catalog:",
     "next-seo": "catalog:",
-    "nodemailer-sendgrid": "catalog:",
     "payload": "catalog:",
     "prop-types": "catalog:",
     "qs": "catalog:",

apps/charterafrica/playwright.config.js

@@ -1,4 +1,3 @@
-/* eslint-disable import/no-extraneous-dependencies */
 const defaultConfig = require("playwright-config-commons-ui");
 
 const { use, webServer } = defaultConfig;

apps/charterafrica/public/infographic/run_time_config.js

@@ -1,7 +1,7 @@
-window.data_file = './data/data.json';
-window.data_country_file = './data/countries.json';
-const s = document.createElement('script');
-const n = document.getElementsByTagName('script')[0];
-s.async = 1;
-s.src = './static/js/bundle.js';
-n.parentNode.insertBefore(s, n);
+window.data_file = "./data/data.json";
+window.data_country_file = "./data/countries.json";
+const s = document.createElement("script");
+const n = document.getElementsByTagName("script")[0];
+s.async = 1;
+s.src = "./static/js/bundle.js";
+n.parentNode.insertBefore(s, n);