fix: fix paths and dev enviornment

.devcontainer/docker-compose.yml

@@ -22,6 +22,7 @@ services:
       - TZ=Europe\London
       - DB_URL=mongodb://mongo:27017/petio
       - SSH_AUTH_SOCK=/ssh-agent
+      - NODE_ENV=development
     entrypoint: ['zsh', '-c', 'while sleep 1000; do :; done']
 
   mongo:

package.json

@@ -3,7 +3,7 @@
   "private": true,
   "author": "Petio Team",
   "license": "MIT",
-  "bin": "./pkg/api/dist/index.js",
+  "bin": "./dist/api/index.js",
   "workspaces": [
     "pkg/api",
     "pkg/frontend",
@@ -38,7 +38,7 @@
       "node16-windows-x64",
       "node16-windows-arm64"
     ],
-    "outputPath": "dist"
+    "outputPath": "dist/releases"
   },
   "packageManager": "[email protected]"
 }

pkg/api/package.json

@@ -8,7 +8,7 @@
     "watch": "nodemon",
     "inspect": "nodemon --exec \"node --require tsconfig-paths/register --require ts-node/register --inspect ./src/app.ts\"",
     "build": "tsc && tsc-alias",
-    "build:prod": "yarn ncc -t build ./src/app.ts -o dist -m",
+    "build:prod": "yarn ncc -t build ./src/app.ts -o ../../dist/api -m",
     "test": "ts-mocha --paths src/**/*.test.ts",
     "depcheck": "depcheck",
     "lint": "eslint . --ext .ts",

pkg/api/src/api/routes/web.ts

@@ -23,7 +23,6 @@ function serveReact(app: Koa, dir: string, urlPath: string) {
   app.use(mount(urlPath, spa));
 }
 
-
 export default async (app: Koa) => {
   let frontendPath = viewsConfig.frontend;
   if (!(await pathExists(path.join(frontendPath, 'index.html')))) {

pkg/api/src/config/env/paths.ts

@@ -1,16 +1,18 @@
 import path from "path";
 
+// ! This is a workaround for the fact that the process.cwd() is not the same as the root directory of the project
+// ! because pkg from vercel adds an additional pkg field that points to the root directory of the project
+const proc: Process = process;
+
 type PathsConfig = {
   rootDir: string;
   appDir: string;
   dataDir: string;
   viewsDir: string;
 };
 
-const proc: Process = process;
-
-const ROOT_DIR = proc.cwd();
-const APP_DIR = proc.env.APP_DIR ?? path.join(__dirname, '../../..');
+const ROOT_DIR = proc.pkg ? proc.cwd() : path.join(__dirname, '../../../../..');
+const APP_DIR = proc.pkg ? path.join(__dirname, "../..") : (proc.env.APP_DIR ?? path.join(__dirname, '../../../../..'));
 const VIEWS_DIR = process.env.VIEWS_FOLDER ?? path.join(APP_DIR, './pkg');
 const DATA_DIR = process.env.DATA_FOLDER ?? path.join(ROOT_DIR, './data');
 

pkg/api/src/config/env/views.ts

@@ -3,12 +3,10 @@ import pathConfig from "./paths";
 
 type ViewsConfig = {
   frontend: string;
-  admin: string;
 };
 
 const viewsConfig: ViewsConfig = {
   frontend: path.join(pathConfig.viewsDir, "./frontend"),
-  admin: path.join(pathConfig.viewsDir, "./admin"),
 };
 
 export default viewsConfig;