Skip to content

Commit 2c3e031

Browse files
committed
chore: add express version detection script
AdminForth/1781/image
1 parent 03fe106 commit 2c3e031

5 files changed

Lines changed: 166 additions & 184 deletions

File tree

adminforth/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@
9999
"dotenv": "^16.4.5",
100100
"esm": "^3.2.25",
101101
"execa": "^9.5.2",
102-
"express": "^5.2.1",
103102
"filewatcher": "^3.0.1",
104103
"fs-extra": "^11.2.0",
105104
"fuse.js": "^7.0.0",
@@ -140,7 +139,8 @@
140139
"@adminforth/connector-mysql": "^1.0.3",
141140
"@adminforth/connector-postgres": "^1.0.4",
142141
"@adminforth/connector-qdrant": "^1.0.4",
143-
"@adminforth/connector-sqlite": "^1.0.3"
142+
"@adminforth/connector-sqlite": "^1.0.3",
143+
"express": "^4.21.0 || ^5.0.0"
144144
},
145145
"peerDependenciesMeta": {
146146
"@adminforth/connector-sqlite": {

adminforth/pnpm-lock.yaml

Lines changed: 3 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

adminforth/servers/express.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ import { afLogger } from '../modules/logger.js';
2626
import { ADMINFORTH_CLIENT_ID_HEADER, runWithRequestContext } from '../modules/requestContext.js';
2727
import * as z from 'zod';
2828
import multer from 'multer';
29+
import { createRequire } from 'module';
30+
31+
// express is a peer dependency, so resolve it from the host project at runtime
32+
// instead of a static JSON import (which would hard-link a peer dep at parse time).
33+
const require = createRequire(import.meta.url);
34+
const expressVersion: string = require('express/package.json').version;
2935

3036
function replaceAtStart(string, substring) {
3137
if (string.startsWith(substring)) {
@@ -263,6 +269,7 @@ class ExpressServer implements IExpressHttpServer {
263269

264270
this.server = http.createServer(this.expressApp);
265271
const wss = new WebSocketServer({ server: this.server, path: `${base}/afws` });
272+
afLogger.info(`${this.adminforth.formatAdminForth()} 🚂 Using express v${expressVersion}`);
266273
afLogger.info(`${this.adminforth.formatAdminForth()} 🌐 WebSocket server started`);
267274
// Handle WebSocket connections
268275
wss.on('connection', async (ws, req) => {

dev-demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"better-sqlite3": "^10.1.0",
3838
"clickhouse-migrations": "^1.2.0",
3939
"decimal.js": "^10.6.0",
40-
"express": "^5.2.1",
40+
"express": "^4.21.0",
4141
"pg": "^8.16.3",
4242
"random-words": "^2.0.1",
4343
"sqlstring": "^2.3.3",

0 commit comments

Comments
 (0)