WIP

.gitignore

@@ -115,3 +115,4 @@ deploy.env
 
 .nx/cache
 .tmp
+tmp

apps/service/Dockerfile

@@ -1,20 +1,17 @@
-# This file is generated by Nx.
-#
-# Build the docker image with `npx nx docker-build service`.
-# Tip: Modify "docker-build" options in project.json to change docker build args.
-#
-# Run the container with `docker run -p 3000:3000 -t service`.
-FROM docker.io/node:20-alpine
+FROM --platform=linux/amd64 docker.io/node:20-alpine
 
 ENV HOST=0.0.0.0
-ENV PORT=3000
+ENV PORT=3333
 
 WORKDIR /app
 
-RUN addgroup --system service && \
-          adduser --system -G service service
+RUN addgroup --system service && adduser --system -G service service
+
+# Needed by @fastify/secure-session 
+RUN npm i sodium-native@^4.0.0
 
 COPY dist/apps/service service
+
 RUN chown -R service:service .
 
-CMD [ "node", "service" ]
+CMD [ "node", "service/app.js" ]

apps/service/api/serverless.js

@@ -1,4 +1,4 @@
-import init from '../dist';
+import init from '../app';
 
 export default async (req, res) => {
   const app = init();

apps/service/project.json

@@ -23,14 +23,15 @@
       "defaultConfiguration": "production",
       "options": {
         "platform": "node",
-        "target": "node20",
+        "target": "node18",
         "outputPath": "dist/apps/service",
         "format": ["cjs"],
         "bundle": true,
         "deleteOutputPath": true,
-        "main": "apps/service/src/main.ts",
+        "main": "apps/service/src/app.ts",
         "tsConfig": "apps/service/tsconfig.app.json",
         "generatePackageJson": false,
+        "external": ["sodium-native"],
         "esbuildOptions": {
           "sourcemap": true,
           "outExtension": {
@@ -68,6 +69,22 @@
         "production": {
           "thirdParty": true,
           "minify": true
+        },
+        "vercel": {
+          "thirdParty": true,
+          "minify": true,
+          "assets": [
+            {
+              "glob": "**/*",
+              "input": "apps/service/public",
+              "output": "public"
+            },
+            {
+              "glob": "**/*",
+              "input": "apps/service/api",
+              "output": "api"
+            }
+          ]
         }
       }
     },
@@ -79,7 +96,9 @@
         "runBuildTargetDependencies": true,
         "buildTargetOptions": {
           "progress": true
-        }
+        },
+        "args": ["--listen"],
+        "debounce": 1000
       },
       "configurations": {
         "development": {

apps/service/src/app.ts

@@ -116,4 +116,19 @@ function init() {
   return app;
 }
 
+// If called directly i.e. "node app"
+if (require.main === module || process.argv.includes('--listen')) {
+  const app = init();
+  const host = process.env.HOST ?? '0.0.0.0';
+  const port = process.env.PORT ? Number(process.env.PORT) : 3333;
+
+  app.listen({ host, port }, (err) => {
+    if (err) {
+      app.log.fatal(err);
+      process.exit(1);
+    }
+  });
+}
+
+// Required as a module => executed on vercel / other serverless platform
 export default init;

apps/service/vercel.json

@@ -1,5 +1,6 @@
 {
-  "buildCommand": "yarn add sodium-native@^4.0.0",
+  "buildCommand": "yarn nx build service -c vercel && yarn add sodium-native@^4.0.0",
+  "outputDirectory": "dist/apps/service",
   "rewrites": [
     {
       "source": "/(.*)",

apps/website/src/pages/ReportsPage/components/ReportsChart/index.ts

@@ -1,5 +1,5 @@
 import { lazy } from 'react';
 
-const ReportsChart = lazy(() => import(/* webpackChunkName: "ReportsChart" */ './ReportsChart'));
+const ReportsChart = lazy(() => import('./ReportsChart'));
 
 export default ReportsChart;

apps/website/src/pages/index.ts

@@ -1,7 +1,7 @@
 import { lazy } from 'react';
 
 export { default as HomePage } from './HomePage';
-export const CreateProjectPage = lazy(() => import(/* webpackChunkName: "CreateProjectPage" */ './CreateProjectPage'));
-export const ReportPage = lazy(() => import(/* webpackChunkName: "ReportPage" */ './ReportPage'));
-export const ReportsPage = lazy(() => import(/* webpackChunkName: "ReportsPage" */ './ReportsPage'));
-export const LoginPage = lazy(() => import(/* webpackChunkName: "LoginPage" */ './LoginPage'));
+export const CreateProjectPage = lazy(() => import('./CreateProjectPage'));
+export const ReportPage = lazy(() => import('./ReportPage'));
+export const ReportsPage = lazy(() => import('./ReportsPage'));
+export const LoginPage = lazy(() => import('./LoginPage'));

package.json

@@ -19,11 +19,6 @@
     "@nx/react": "^18.3.3",
     "@nx/vite": "18.3.3",
     "@nx/web": "18.3.3",
-    "@swc-node/register": "~1.8.0",
-    "@swc/cli": "~0.1.62",
-    "@swc/core": "~1.3.85",
-    "@swc/helpers": "~0.5.2",
-    "@testing-library/react": "14.0.0",
     "@types/jest": "^29.5.1",
     "@types/jest-when": "^3.5.2",
     "@types/node": "18.16.9",
@@ -37,10 +32,7 @@
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-jest": "^27.2.1",
-    "eslint-plugin-jsx-a11y": "6.7.1",
     "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-react": "7.32.2",
-    "eslint-plugin-react-hooks": "4.6.0",
     "husky": "^8.0.3",
     "jest": "^29.7.0",
     "jest-when": "^3.5.2",