From 81f00626e110b9959d8208096718f01fda91aa9f Mon Sep 17 00:00:00 2001
From: Jannik Streek <jannik.streek@gmail.com>
Date: Mon, 19 Feb 2024 17:32:45 +0100
Subject: [PATCH] adjusted package file

---
 Dockerfile   |  4 +++-
 package.json | 38 ++++++++------------------------------
 2 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ba4610d51..8523fe342 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -88,11 +88,13 @@ COPY --chown=etherpad:etherpad ./.git/HEAD ./.git/HEAD
 COPY --chown=etherpad:etherpad ./.git/refs ./.git/refs
 COPY --chown=etherpad:etherpad ${SETTINGS} ./settings.json
 COPY --chown=etherpad:etherpad ./var ./var
+COPY --chown=etherpad:etherpad ./package.json ./package.json
+COPY --chown=etherpad:etherpad ./pnpm-workspace.yaml ./pnpm-workspace.yaml
 
 FROM build as development
 
 COPY --chown=etherpad:etherpad ./src/package.json .npmrc ./src/pnpm-lock.yaml ./src/
-COPY --chown=etherpad:etherpad ./package.json ./package.json
+
 COPY --chown=etherpad:etherpad ./src/bin ./src/bin
 
 RUN { [ -z "${ETHERPAD_PLUGINS}" ] || \
diff --git a/package.json b/package.json
index 0c2cbc627..77ccdbc6f 100644
--- a/package.json
+++ b/package.json
@@ -10,42 +10,20 @@
   ],
   "bin": {
     "etherpad-healthcheck": "src/bin/etherpad-healthcheck",
-    "etherpad-lite": "src/node/server.ts"
+    "etherpad-lite": "src/bin/run"
   },
   "scripts": {
-    "lint": "eslint .",
-    "test": "mocha --import=tsx --timeout 120000 --recursive src/tests/backend/specs src/node_modules/ep_*/static/tests/backend/specs",
-    "test-container": "mocha --import=tsx --timeout 5000 src/tests/container/specs/api",
-    "dev": "node --import tsx src/node/server.ts",
-    "prod": "node --import tsx src/node/server.ts",
-    "ts-check": "tsc --noEmit",
-    "ts-check:watch": "tsc --noEmit --watch"
+    "lint": "pnpm --filter ep_etherpad-lite run lint",
+    "test": "pnpm --filter ep_etherpad-lite run test",
+    "test-container": "pnpm --filter ep_etherpad-lite run test-container",
+    "dev": "pnpm --filter ep_etherpad-lite run dev",
+    "prod": "pnpm --filter ep_etherpad-lite run prod",
+    "ts-check": "pnpm --filter ep_etherpad-lite run ts-check",
+    "ts-check:watch": "pnpm --filter ep_etherpad-lite run ts-check:watch"
   },
   "dependencies": {
-    "log4js": "^6.9.1",
-    "tsx": "^4.7.1",
-    "underscore": "1.13.6",
-    "fast-deep-equal": "^3.1.3",
-    "cookie-parser": "^1.4.6",
-    "jsonminify": "0.4.2",
-    "express-rate-limit": "^7.1.5",
-    "express-session": "npm:@etherpad/express-session@^1.18.2",
-    "express": "4.18.2",
-    "find-root": "1.1.0",
-    "semver": "^7.6.0",
-    "live-plugin-manager-pnpm": "^0.18.1",
-    "cross-spawn": "^7.0.3",
-    "ueberdb2": "^4.2.56",
-    "measured-core": "^2.0.0",
-    "axios": "^1.6.7",
-    "wtfnode": "^0.9.1",
     "ep_etherpad-lite": "workspace:./src"
   },
-  "devDependencies": {
-    "@types/express": "^4.17.21",
-    "@types/node": "^20.11.19",
-    "typescript": "^5.3.3"
-  },
   "engines": {
     "node": ">=18.18.2",
     "npm": ">=6.14.0",