From e794f52b1acf917edcc3b886a89bcd55ca7f6329 Mon Sep 17 00:00:00 2001
From: Louis <louis@jan.ai>
Date: Thu, 28 Dec 2023 16:19:40 +0700
Subject: [PATCH] chore: update makefile

---
 Makefile              | 1 +
 electron/package.json | 2 +-
 package.json          | 8 ++++++--
 server/package.json   | 9 +++++----
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index b0f5ed5432..a61ae92bbf 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@ ifeq ($(OS),Windows_NT)
 	yarn config set network-timeout 300000
 endif
 	yarn build:core
+	yarn build:server
 	yarn install
 	yarn build:extensions
 
diff --git a/electron/package.json b/electron/package.json
index f7127f8acc..3cc5e7680f 100644
--- a/electron/package.json
+++ b/electron/package.json
@@ -72,7 +72,7 @@
   "dependencies": {
     "@alumna/reflect": "^1.1.3",
     "@janhq/core": "link:./core",
-    "@janhq/server": "file:../server",
+    "@janhq/server": "link:./server",
     "@npmcli/arborist": "^7.1.0",
     "@types/request": "^2.48.12",
     "@uiball/loaders": "^1.3.0",
diff --git a/package.json b/package.json
index c12ae12818..e4a1cae893 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,8 @@
       "uikit",
       "core",
       "electron",
-      "web"
+      "web",
+      "server"
     ],
     "nohoist": [
       "uikit",
@@ -16,7 +17,9 @@
       "electron",
       "electron/**",
       "web",
-      "web/**"
+      "web/**",
+      "server",
+      "server/**"
     ]
   },
   "scripts": {
@@ -28,6 +31,7 @@
     "test-local": "yarn lint && yarn build:test && yarn test",
     "dev:uikit": "yarn workspace @janhq/uikit install && yarn workspace @janhq/uikit dev",
     "build:uikit": "yarn workspace @janhq/uikit install && yarn workspace @janhq/uikit build",
+    "build:server": "cd server && yarn install && yarn run build",
     "build:core": "cd core && yarn install && yarn run build",
     "build:web": "yarn workspace jan-web build && cpx \"web/out/**\" \"electron/renderer/\"",
     "build:electron": "cpx \"models/**\" \"electron/models/\" && yarn workspace jan build",
diff --git a/server/package.json b/server/package.json
index c3ff370fce..2d350a3178 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,7 +1,8 @@
 {
   "name": "@janhq/server",
   "version": "0.1.3",
-  "main": "./build/index.js",
+  "main": "build/index.js",
+  "types": "build/index.d.ts",
   "author": "Jan <service@jan.ai>",
   "license": "AGPL-3.0",
   "homepage": "https://jan.ai",
@@ -18,11 +19,11 @@
   "dependencies": {
     "@fastify/cors": "^8.4.2",
     "@fastify/static": "^6.12.0",
-    "core": "link:./core",
+    "@janhq/core": "link:./core",
+    "dotenv": "^16.3.1",
     "fastify": "^4.24.3",
     "request": "^2.88.2",
-    "request-progress": "^3.0.0",
-    "dotenv": "^16.3.1"
+    "request-progress": "^3.0.0"
   },
   "devDependencies": {
     "@types/body-parser": "^1.19.5",