From e2c71d4e3daefcdb5d561db09f2e05f445e786ba Mon Sep 17 00:00:00 2001 From: Ahmed Mohamedeen Date: Thu, 18 Sep 2025 17:56:22 -0600 Subject: [PATCH 1/3] chore(dependencies): add remark-gfm package to client Former-commit-id: 6dea4d6643d7704473459703ce00d66363cfcb8b [formerly 6b668b4178c029301b7b3e96f98a871e4d4ca599] [formerly a68e05c528b5ef7376068b2db211504a44c99ab7 [formerly d96a7885ae17bbd48293d0ce134b89d448dec64d]] Former-commit-id: 296b0a0d2164895a062144cfc94798e7eee6a097 [formerly 7796566316edb6c112fecc8b2c76d5c29f4f8158] Former-commit-id: 2bcc0c166ac5df950ef44aa2560bc70efe3ab1dd --- bun.lock | 1 + client/package.json | 1 + 2 files changed, 2 insertions(+) diff --git a/bun.lock b/bun.lock index 0cd6a79c0..35180f5a6 100644 --- a/bun.lock +++ b/bun.lock @@ -276,6 +276,7 @@ "react-toastify": "^11.0.5", "react-tooltip": "^5.28.1", "react-virtualized": "^9.22.6", + "remark-gfm": "^4.0.0", "rrule": "^2.8.1", "shared": "workspace:*", "socket.io-client": "^4.8.1", diff --git a/client/package.json b/client/package.json index 733cbc8c5..62cfdcefd 100644 --- a/client/package.json +++ b/client/package.json @@ -75,6 +75,7 @@ "react-toastify": "^11.0.5", "react-tooltip": "^5.28.1", "react-virtualized": "^9.22.6", + "remark-gfm": "^4.0.0", "rrule": "^2.8.1", "shared": "workspace:*", "socket.io-client": "^4.8.1", From fe36f77f07c83955cccc9ee78b611cd18a3b59fd Mon Sep 17 00:00:00 2001 From: Ahmed Mohamedeen Date: Thu, 18 Sep 2025 18:00:41 -0600 Subject: [PATCH 2/3] fix(server): bun server not working due to withFileTypes config with globSync Former-commit-id: ef970a1ab5905d5879e16d3766d065f0a40862ce [formerly 9247db56902f2abb787a58bbe83c88d1b42eb51b] [formerly 920a0f447ec860100563d104b2072dcb708b2ff2 [formerly 8228a9aa5aa310ee76fbbb5463edb8df1a6806f4]] Former-commit-id: ec927e85390a615903fb1393bfe5b00edef18452 [formerly 31f9a2c706dc849572b81f4c4965ad6d4ef86539] Former-commit-id: 0302eff87407a33b2b137928212b9c4c82263746 --- server/src/lib/locales/routes/locales.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/server/src/lib/locales/routes/locales.ts b/server/src/lib/locales/routes/locales.ts index be5232e39..846bf6601 100644 --- a/server/src/lib/locales/routes/locales.ts +++ b/server/src/lib/locales/routes/locales.ts @@ -8,11 +8,8 @@ import { z } from 'zod/v4' import { ALLOWED_LANG, ALLOWED_NAMESPACE } from '../constants/locales' export const allApps = fs - .globSync(['../client/src/apps/*/*', '../apps/*'], { - withFileTypes: true - }) - .filter(e => fs.existsSync(`${e.parentPath}/${e.name}/locales`)) - .map(e => `${e.parentPath}/${e.name}`) + .globSync(['../client/src/apps/*/*', '../apps/*']) + .filter(e => fs.existsSync(`${e}/locales`)) const getLocale = forgeController .query() From b9a878b82a50d383ad682e039db82e1d3bd6430f Mon Sep 17 00:00:00 2001 From: Ahmed Mohamedeen Date: Thu, 18 Sep 2025 18:26:58 -0600 Subject: [PATCH 3/3] fix(server): update start script to also use source code because build doesn't start Former-commit-id: 7dd64acd85835b44b23930b8424bb0362f41603d [formerly 57e0890a40c3bab535c78b28587ff15418033b8b] [formerly 4ed017f024a176a3ba3f25feb315182ce8b75041 [formerly 6af422ebd6dc18755356493b489eb0b7f0398368]] Former-commit-id: 3383f032209a76c2c869b7aafe3060b52c55184a [formerly 107bc576724fd263132421979557287aecdfec68] Former-commit-id: 7aa194cb5c35c217705dc8fd88b6d13bc2f3582b --- server/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/package.json b/server/package.json index 3ba1d53c1..36f63a19c 100755 --- a/server/package.json +++ b/server/package.json @@ -17,7 +17,7 @@ "dev": "tsx watch --env-file=../env/.env.local ./src/index.ts", "types": "bun run tsc -b --noEmit", "build": "bun build ./src/index.ts --target bun --minify --production --outfile=./dist/server.js", - "start": "NODE_ENV=production bun --env-file=../env/.env.local ./dist/server.js", + "start": "NODE_ENV=production bun --env-file=../env/.env.local ./src/index.ts", "lint": "eslint ./src --fix && prettier --write ./src", "test": "jest", "schema:generate": "bun ./scripts/generateSchema.ts" @@ -122,4 +122,4 @@ "tsx": "^4.19.1", "typescript-eslint": "^8.37.0" } -} \ No newline at end of file +}