Merge branch 'main' into chore/build-arm-image

CodeForAfrica · Oct 10, 2024 · 8e33f4e · 8e33f4e
2 parents 7db4b44 + 6507997
commit 8e33f4e
Show file tree

Hide file tree

Showing 12 changed files with 407 additions and 265 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -403,9 +403,13 @@ ENV NEXT_PUBLIC_APP_LOGO_URL=${NEXT_PUBLIC_APP_LOGO_URL} \
 
 RUN set -ex \
   # Create nextjs cache dir w/ correct permissions
-  && mkdir -p ./apps/civicsignalblog//.next \
+  && mkdir -p ./apps/civicsignalblog/.next \
   && chown nextjs:nodejs ./apps/civicsignalblog/.next
 
+# Node
+# Subpath imports definitions
+COPY --from=civicsignalblog-builder --chown=nextjs:nodejs /workspace/apps/civicsignalblog/package.json ./apps/civicsignalblog/package.json
+
 # PNPM
 # symlink some dependencies
 COPY --from=civicsignalblog-builder --chown=nextjs:nodejs /workspace/node_modules ./node_modules
@@ -424,8 +428,8 @@ COPY --from=civicsignalblog-builder --chown=nextjs:nodejs /workspace/apps/civics
 COPY --from=civicsignalblog-builder --chown=nextjs:nodejs /workspace/apps/civicsignalblog/.next ./apps/civicsignalblog/.next
 
 # Payload
-COPY --from=civicsignalblog-builder /workspace/apps/civicsignalblog/dist ./apps/civicsignalblog/dist
-COPY --from=civicsignalblog-builder /workspace/apps/civicsignalblog/build ./apps/civicsignalblog/build
+COPY --from=civicsignalblog-builder --chown=nextjs:nodejs /workspace/apps/civicsignalblog/dist ./apps/civicsignalblog/dist
+COPY --from=civicsignalblog-builder --chown=nextjs:nodejs /workspace/apps/civicsignalblog/build ./apps/civicsignalblog/build
 
 # Since we can't use output: "standalone", switch to specific app's folder
 WORKDIR /workspace/apps/civicsignalblog

diff --git a/apps/charterafrica/package.json b/apps/charterafrica/package.json
@@ -25,7 +25,7 @@
     "build-server": "tsc --project tsconfig.server.json",
     "build-next": "NEXT_BUILD=true pnpm build-server && NEXT_BUILD=true PAYLOAD_CONFIG_PATH=${PAYLOAD_CONFIG_PATH:-dist/payload.config.js} node dist/server.js",
     "build-payload": "payload build",
-    "dev": "NODE_OPTIONS='--inspect' ts-node --project tsconfig.server.json server.ts",
+    "dev": "NODE_OPTIONS='--inspect' TS_NODE_PROJECT=tsconfig.server.json tsx server.ts",
     "start": "PAYLOAD_CONFIG_PATH=${PAYLOAD_CONFIG_PATH:-dist/payload.config.js} NODE_ENV=${NODE_ENV:-production} node dist/server.js",
     "lint-check": "TIMING=1 eslint './'",
     "lint": "TIMING=1 eslint --fix './'",
@@ -107,7 +107,7 @@
     "playwright-config-commons-ui": "workspace:*",
     "prettier": "catalog:",
     "react-test-renderer": "catalog:",
-    "ts-node": "catalog:",
+    "tsx": "catalog:",
     "typescript": "catalog:",
     "webpack": "catalog:"
   },

diff --git a/apps/charterafrica/tsconfig.json b/apps/charterafrica/tsconfig.json
@@ -21,8 +21,5 @@
     }
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
-  "exclude": ["build", "dist", "node_modules"],
-  "ts-node": {
-    "swc": true
-  }
+  "exclude": ["build", "dist", "node_modules"]
 }
diff --git a/apps/civicsignalblog/package.json b/apps/civicsignalblog/package.json
@@ -25,7 +25,7 @@
     "build-next": "NEXT_BUILD=true pnpm build-server && NEXT_BUILD=true PAYLOAD_CONFIG_PATH=${PAYLOAD_CONFIG_PATH:-dist/payload.config.js} node dist/server.js",
     "build-payload": "payload build",
     "start": "PAYLOAD_CONFIG_PATH=${PAYLOAD_CONFIG_PATH:-dist/payload.config.js} NODE_ENV=${NODE_ENV:-production} node dist/server.js",
-    "dev": "NODE_OPTIONS='--inspect --conditions=dev' ts-node --project tsconfig.server.json server.ts",
+    "dev": "NODE_OPTIONS='--inspect --conditions=dev' TS_NODE_PROJECT=tsconfig.server.json tsx server.ts",
     "lint-check": "TIMING=1 eslint './'",
     "lint": "TIMING=1 eslint --fix './'",
     "jest": "jest",
@@ -97,7 +97,7 @@
     "playwright-config-commons-ui": "workspace:*",
     "prettier": "catalog:",
     "react-test-renderer": "catalog:",
-    "ts-node": "catalog:",
+    "tsx": "catalog:",
     "typescript": "catalog:",
     "webpack": "catalog:"
   },

diff --git a/apps/civicsignalblog/tsconfig.json b/apps/civicsignalblog/tsconfig.json
@@ -22,8 +22,5 @@
     }
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
-  "exclude": ["build", "dist", "node_modules"],
-  "ts-node": {
-    "swc": true
-  }
+  "exclude": ["build", "dist", "node_modules"]
 }
diff --git a/apps/climatemappedafrica/package.json b/apps/climatemappedafrica/package.json
@@ -25,7 +25,7 @@
     "build-next": "NEXT_BUILD=true pnpm build-server && NEXT_BUILD=true PAYLOAD_CONFIG_PATH=${PAYLOAD_CONFIG_PATH:-dist/payload.config.js} node dist/server.js",
     "build-payload": "payload build",
     "start": "PAYLOAD_CONFIG_PATH=${PAYLOAD_CONFIG_PATH:-dist/payload.config.js} NODE_ENV=${NODE_ENV:-production} node dist/server.js",
-    "dev": "NODE_OPTIONS='--inspect' ts-node --project tsconfig.server.json server.ts",
+    "dev": "NODE_OPTIONS='--inspect' TS_NODE_PROJECT=tsconfig.server.json tsx server.ts",
     "lint-check": "TIMING=1 eslint './'",
     "lint": "TIMING=1 eslint --fix './'",
     "jest": "jest --passWithNoTests",
@@ -125,7 +125,7 @@
     "prettier": "catalog:",
     "react-test-renderer": "catalog:",
     "svg-url-loader": "catalog:",
-    "ts-node": "catalog:",
+    "tsx": "catalog:",
     "typescript": "catalog:"
   },
   "engines": {

diff --git a/apps/climatemappedafrica/tsconfig.json b/apps/climatemappedafrica/tsconfig.json
@@ -23,8 +23,5 @@
     }
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
-  "exclude": ["build", "dist", "node_modules"],
-  "ts-node": {
-    "swc": true
-  }
+  "exclude": ["build", "dist", "node_modules"]
 }
diff --git a/apps/codeforafrica/package.json b/apps/codeforafrica/package.json
@@ -25,7 +25,7 @@
     "build-next": "NEXT_BUILD=true pnpm build-server && NEXT_BUILD=true PAYLOAD_CONFIG_PATH=${PAYLOAD_CONFIG_PATH:-dist/payload.config.js} node dist/server.js",
     "build-payload": "payload build",
     "start": "PAYLOAD_CONFIG_PATH=${PAYLOAD_CONFIG_PATH:-dist/payload.config.js} NODE_ENV=${NODE_ENV:-production} node dist/server.js",
-    "dev": "NODE_OPTIONS='--inspect' ts-node --project tsconfig.server.json server.ts",
+    "dev": "NODE_OPTIONS='--inspect' TS_NODE_PROJECT=tsconfig.server.json tsx server.ts",
     "lint-check": "TIMING=1 eslint './'",
     "lint": "TIMING=1 eslint --fix './'",
     "jest": "jest",
@@ -93,7 +93,7 @@
     "playwright-config-commons-ui": "workspace:*",
     "prettier": "catalog:",
     "react-test-renderer": "catalog:",
-    "ts-node": "catalog:",
+    "tsx": "catalog:",
     "typescript": "catalog:",
     "webpack": "catalog:"
   },

diff --git a/apps/codeforafrica/tsconfig.json b/apps/codeforafrica/tsconfig.json
@@ -21,8 +21,5 @@
     }
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
-  "exclude": ["build", "dist", "node_modules"],
-  "ts-node": {
-    "swc": true
-  }
+  "exclude": ["build", "dist", "node_modules"]
 }
diff --git a/apps/roboshield/package.json b/apps/roboshield/package.json
@@ -7,7 +7,7 @@
     "build-next": "NEXT_BUILD=true pnpm build-server && NEXT_BUILD=true PAYLOAD_CONFIG_PATH=${PAYLOAD_CONFIG_PATH:-dist/payload.config.js} node dist/server.js",
     "build-payload": "payload build",
     "start": "PAYLOAD_CONFIG_PATH=${PAYLOAD_CONFIG_PATH:-dist/payload.config.js} NODE_ENV=${NODE_ENV:-production} node dist/server.js",
-    "dev": "NODE_OPTIONS='--inspect' ts-node --project tsconfig.server.json server.ts",
+    "dev": "NODE_OPTIONS='--inspect' TS_NODE_PROJECT=tsconfig.server.json tsx server.ts",
     "clean": "rm -rf .next .turbo node_modules",
     "jest": "jest --passWithNoTests",
     "lint-check": "TIMING=1 next lint './'",
@@ -74,7 +74,7 @@
     "jest": "catalog:",
     "jest-config-commons-ui": "workspace:*",
     "prettier": "catalog:",
-    "ts-node": "catalog:",
+    "tsx": "catalog:",
     "typescript": "catalog:"
   }
 }