From 3bdd13fa44ce967c4530cd894269019fe183bcbf Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sun, 27 Apr 2025 12:22:10 +0300
Subject: [PATCH] chore(nx/forge): work on server packaging

---
 .github/actions/build-server/action.yml        |  4 ++--
 _regroup_monorepo/apps/server/package.json     |  1 -
 apps/server/package.json                       |  4 ++++
 .../server/scripts/build-server.sh             | 18 +++---------------
 4 files changed, 9 insertions(+), 18 deletions(-)
 rename {_regroup_monorepo/apps => apps}/server/scripts/build-server.sh (77%)

diff --git a/.github/actions/build-server/action.yml b/.github/actions/build-server/action.yml
index 44c790614..1b6e048b6 100644
--- a/.github/actions/build-server/action.yml
+++ b/.github/actions/build-server/action.yml
@@ -22,8 +22,8 @@ runs:
       MATRIX_ARCH: ${{ inputs.arch }}
     shell: bash
     run: |
-      npm run chore:update-build-info
-      npm run server:package
+      pnpm run chore:update-build-info
+      pnpm nx --project=@triliumnext/server package
   - name: Prepare artifacts
     shell: bash
     run: |
diff --git a/_regroup_monorepo/apps/server/package.json b/_regroup_monorepo/apps/server/package.json
index 24c371ba5..ad56c927d 100644
--- a/_regroup_monorepo/apps/server/package.json
+++ b/_regroup_monorepo/apps/server/package.json
@@ -27,7 +27,6 @@
     "start": "cross-env nodemon src/main.ts",
     "test": "cross-env TRILIUM_ENV=dev TRILIUM_DATA_DIR=./spec/data TRILIUM_INTEGRATION_TEST=memory vitest",
     "coverage": "cross-env TRILIUM_ENV=dev TRILIUM_DATA_DIR=./spec/data TRILIUM_INTEGRATION_TEST=memory vitest --coverage",
-    "package": "bash ./scripts/build-server.sh"
   },
   "dependencies": {
     
diff --git a/apps/server/package.json b/apps/server/package.json
index 794ac5b8a..66567ddfc 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -146,6 +146,10 @@
           }
         }
       },
+      "package": {
+        "dependsOn": [ "^build" ],
+        "command": "bash apps/server/scripts/build-server.sh"
+      },
       "docker-build": {
         "dependsOn": [
           "build"
diff --git a/_regroup_monorepo/apps/server/scripts/build-server.sh b/apps/server/scripts/build-server.sh
similarity index 77%
rename from _regroup_monorepo/apps/server/scripts/build-server.sh
rename to apps/server/scripts/build-server.sh
index 4c487185b..313726c86 100644
--- a/_regroup_monorepo/apps/server/scripts/build-server.sh
+++ b/apps/server/scripts/build-server.sh
@@ -23,17 +23,9 @@ echo "Selected Arch: $ARCH"
 # Set Node.js version and architecture-specific filename
 NODE_VERSION=22.14.0
 
-BUILD_DIR="./build"
-DIST_DIR="./dist"
-CLEANUP_SCRIPT="./scripts/cleanupNodeModules.ts"
-
-# Trigger the build
-echo "Build start"
-npm run build:prepare-dist
-echo "Build finished"
-
-# pruning of unnecessary files and devDeps in node_modules
-node --experimental-strip-types $CLEANUP_SCRIPT $BUILD_DIR
+script_dir=$(realpath $(dirname $0))
+BUILD_DIR="$script_dir/../dist"
+DIST_DIR="$script_dir/../out"
 
 NODE_FILENAME=node-v${NODE_VERSION}-linux-${ARCH}
 
@@ -54,12 +46,8 @@ rm -rf $BUILD_DIR/node/lib/node_modules/{npm,corepack} \
 printf "#!/bin/sh\n./node/bin/node src/main\n" > $BUILD_DIR/trilium.sh
 chmod 755 $BUILD_DIR/trilium.sh
 
-# TriliumNextTODO: is this still required? If yes → move to copy-dist/copy-trilium
-cp tpl/anonymize-database.sql $BUILD_DIR/
-
 VERSION=`jq -r ".version" package.json`
 
-
 ARCHIVE_NAME="TriliumNextNotes-Server-${VERSION}-linux-${ARCH}"
 echo "Creating Archive $ARCHIVE_NAME..."