diff --git a/Dockerfile b/Dockerfile index 4e4d2e05b..14d8fcced 100644 --- a/Dockerfile +++ b/Dockerfile @@ -96,8 +96,7 @@ FROM build as development COPY --chown=etherpad:etherpad ./src/package.json .npmrc ./src/pnpm-lock.yaml ./src/ RUN bin/installDeps.sh && { [ -z "${ETHERPAD_PLUGINS}" ] || \ - pnpm install --workspace-root ${ETHERPAD_PLUGINS}; } \ -RUN pnpm run next-build + pnpm install --workspace-root ${ETHERPAD_PLUGINS}; } FROM build as production @@ -107,7 +106,7 @@ ENV ETHERPAD_PRODUCTION=true COPY --chown=etherpad:etherpad ./src ./src RUN bin/installDeps.sh && { [ -z "${ETHERPAD_PLUGINS}" ] || \ - pnpm install --workspace-root ${ETHERPAD_PLUGINS}; } && pnpm run next-build + pnpm install --workspace-root ${ETHERPAD_PLUGINS}; } # Copy the configuration file. COPY --chown=etherpad:etherpad ${SETTINGS} "${EP_DIR}"/settings.json diff --git a/package.json b/package.json index 9bccf649a..891edbd5a 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,7 @@ "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", - "next-build": "pnpm --filter ep_etherpad-lite run build-next" + "ts-check:watch": "pnpm --filter ep_etherpad-lite run ts-check:watch" }, "dependencies": { "ep_etherpad-lite": "workspace:./src" diff --git a/src/node/hooks/express/admin.ts b/src/node/hooks/express/admin.ts index 6c5a22347..32e92178d 100644 --- a/src/node/hooks/express/admin.ts +++ b/src/node/hooks/express/admin.ts @@ -4,7 +4,7 @@ import {ArgsExpressType} from "../../types/ArgsExpressType"; const eejs = require('../../eejs'); import next from 'next' -const app = next({dev: process.env.NODE_ENV !== 'production'}) +const app = next({dev: true}) const handle = app.getRequestHandler() /** * Add the admin navigation link diff --git a/src/package.json b/src/package.json index 10dce12ee..8c4866d0f 100644 --- a/src/package.json +++ b/src/package.json @@ -93,7 +93,7 @@ "@types/sinon": "^17.0.3", "@types/supertest": "^6.0.2", "@types/underscore": "^1.11.15", - "eslint": "^8.56.0", + "eslint": "^8.57.0", "eslint-config-etherpad": "^3.0.22", "etherpad-cli-client": "^3.0.1", "mocha": "^10.3.0", @@ -123,8 +123,7 @@ "dev": "node --import tsx node/server.ts", "prod": "node --import tsx node/server.ts", "ts-check": "tsc --noEmit", - "ts-check:watch": "tsc --noEmit --watch", - "build-next": "next build" + "ts-check:watch": "tsc --noEmit --watch" }, "version": "1.9.7", "license": "Apache-2.0"