Skip to content

Commit a303e81

Browse files
update to express 5 version
1 parent 562c016 commit a303e81

File tree

7 files changed

+1887
-858
lines changed

7 files changed

+1887
-858
lines changed

docker-compose.dev.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ services:
99
ports:
1010
- "8060:8060/tcp"
1111
volumes:
12-
- .:/app
13-
- /app/node_modules/@esbuild
12+
- ./packages/fnd-server/src:/app/packages/fnd-server/src

package-lock.json

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

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
"devDependencies": {
1111
"@babel/register": "^7.25.9",
1212
"@toruslabs/config": "^3.1.0",
13-
"@toruslabs/eslint-config-typescript": "^4.1.0",
14-
"@toruslabs/torus-scripts": "^7.1.2",
13+
"@toruslabs/eslint-config-typescript": "^4.1.3",
14+
"@toruslabs/torus-scripts": "^7.1.5",
1515
"cross-env": "^7.0.3",
1616
"dotenv": "^16.4.7",
17-
"eslint": "^9.22.0",
17+
"eslint": "^9.24.0",
1818
"husky": "^9.1.7",
1919
"lerna": "^8.2.1",
20-
"lint-staged": "^15.4.3",
20+
"lint-staged": "^15.5.0",
2121
"prettier": "^3.5.3",
2222
"tsconfig-paths-webpack-plugin": "^4.2.0",
2323
"tsx": "^4.19.3",
24-
"typescript": "^5.8.2",
24+
"typescript": "^5.8.3",
2525
"wait-port": "^1.1.0"
2626
},
2727
"version": "1.1.0",

packages/fetch-node-details/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@
6565
"access": "public"
6666
},
6767
"devDependencies": {
68-
"@vitest/browser": "^3.0.8",
69-
"@vitest/coverage-istanbul": "^3.0.8",
70-
"playwright": "^1.51.0",
71-
"vitest": "^3.0.8"
68+
"@vitest/browser": "^3.1.1",
69+
"@vitest/coverage-istanbul": "^3.1.1",
70+
"playwright": "^1.51.1",
71+
"vitest": "^3.1.1"
7272
}
7373
}

packages/fnd-server/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,25 @@
1616
"down": "docker compose -f ../../docker-compose.dev.yml down"
1717
},
1818
"dependencies": {
19-
"@sentry/node": "^9.5.0",
19+
"@sentry/node": "^9.11.0",
2020
"@toruslabs/config": "^3.1.0",
2121
"@toruslabs/constants": "^15.0.0",
2222
"@toruslabs/fnd-base": "^15.0.0",
23-
"@toruslabs/loglevel-sentry": "^8.0.2",
23+
"@toruslabs/loglevel-sentry": "^8.1.0",
2424
"celebrate": "^15.0.3",
2525
"compression": "^1.8.0",
2626
"cors": "^2.8.5",
2727
"dotenv": "^16.4.7",
28-
"express": "^4.21.2",
29-
"helmet": "^8.0.0",
28+
"express": "^5.1.0",
29+
"helmet": "^8.1.0",
3030
"loglevel": "^1.9.2",
3131
"morgan": "^1.10.0"
3232
},
3333
"devDependencies": {
34-
"@toruslabs/eslint-config-node": "^4.1.0",
34+
"@toruslabs/eslint-config-node": "^4.1.3",
3535
"@types/compression": "^1.7.5",
3636
"@types/cors": "^2.8.17",
37-
"@types/express": "^4.17.21",
37+
"@types/express": "^5.0.1",
3838
"@types/morgan": "^1.9.9",
3939
"assert": "^2.1.0",
4040
"cross-env": "^7.0.3",

packages/fnd-server/src/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ app.disable("x-powered-by");
7575

7676
app.use(traceContextMiddleware);
7777

78-
app.use(["/fnd-service", "/"], router);
78+
app.use("/fnd-service", router);
79+
app.use("/", router);
7980

8081
// Add this after all routes,
8182
// but before any and other error-handling middlewares are defined

packages/fnd-server/src/router.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ import log from "loglevel";
1515
const router = express.Router();
1616

1717
router.get("/", (_req: Request, res: Response) => {
18-
return res.status(200).send("Welcome to the fnd server!!");
18+
res.status(200).send("Welcome to the fnd server!!");
1919
});
2020

2121
router.get("/health", (_req: Request, res: Response) => {
22-
return res.status(200).send("ok!");
22+
res.status(200).send("ok!");
2323
});
2424

2525
router.get(
@@ -49,13 +49,13 @@ router.get(
4949
// use static details for sapphire mainnet and testnet
5050
const nodeDetails = fetchLocalConfig(finalNetwork as TORUS_NETWORK_TYPE, keyType as WEB3AUTH_KEY_TYPE, sigType as WEB3AUTH_SIG_TYPE);
5151

52-
return res.status(200).json({
52+
res.status(200).json({
5353
nodeDetails,
5454
success: true,
5555
});
5656
} catch (error) {
5757
log.error("Error while fetching nodes details", error);
58-
return res.status(500).json({
58+
res.status(500).json({
5959
success: false,
6060
message: (error as Error).message || "Something went wrong",
6161
});

0 commit comments

Comments
 (0)