Skip to content

Commit 1e3fb5e

Browse files
fix(deps): update dependency express to v5 (#1779)
* fix(deps): update dependency express to v5 * Update * Lint --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Nathan Bierema <[email protected]>
1 parent da5e9f0 commit 1e3fb5e

File tree

4 files changed

+261
-20
lines changed

4 files changed

+261
-20
lines changed

packages/redux-devtools-cli/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,18 @@
4242
},
4343
"dependencies": {
4444
"@apollo/server": "^4.12.1",
45+
"@as-integrations/express5": "^1.1.0",
4546
"@emotion/react": "^11.14.0",
4647
"@emotion/styled": "^11.14.0",
4748
"@redux-devtools/app": "workspace:^",
4849
"@reduxjs/toolkit": "^2.8.2",
4950
"@types/react": "^19.1.6",
50-
"body-parser": "^1.20.3",
51+
"body-parser": "^2.2.0",
5152
"chalk": "^5.4.1",
5253
"cors": "^2.8.5",
5354
"cross-spawn": "^7.0.6",
5455
"electron": "^31.7.7",
55-
"express": "^4.21.2",
56+
"express": "^5.1.0",
5657
"get-port": "^7.1.0",
5758
"graphql": "^16.11.0",
5859
"knex": "^3.1.0",
@@ -72,7 +73,7 @@
7273
"@types/body-parser": "^1.19.5",
7374
"@types/cors": "^2.8.18",
7475
"@types/cross-spawn": "^6.0.6",
75-
"@types/express": "^4.17.22",
76+
"@types/express": "^5.0.3",
7677
"@types/jest": "^29.5.14",
7778
"@types/lodash-es": "^4.17.12",
7879
"@types/minimist": "^1.2.5",

packages/redux-devtools-cli/src/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ export default async function (argv: { [arg: string]: any }): Promise<{
4141
const agServer = socketClusterServer.attach(httpServer, options);
4242

4343
const app = express();
44+
// eslint-disable-next-line @typescript-eslint/no-misused-promises
4445
httpServer.on('request', app);
4546
const store = createStore(options);
4647
app.use(routes(options, store, agServer));
@@ -76,7 +77,7 @@ export default async function (argv: { [arg: string]: any }): Promise<{
7677
});
7778
})
7879
.catch(function (error) {
79-
console.error(error); // eslint-disable-line no-console
80+
console.error(error);
8081
});
8182
}
8283
}
@@ -110,15 +111,14 @@ export default async function (argv: { [arg: string]: any }): Promise<{
110111
request.end(data);
111112
})
112113
.catch(function (error) {
113-
console.error(error); // eslint-disable-line no-console
114+
console.error(error);
114115
});
115116
}
116117
})();
117118
void (async () => {
118119
for await (const data of socket.listener('disconnect')) {
119120
const channel = agServer.exchange.channel('sc-' + socket.id);
120121
channel.unsubscribe();
121-
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
122122
void agServer.exchange.transmitPublish(channelToEmit!, {
123123
id: socket.id,
124124
type: 'DISCONNECTED',

packages/redux-devtools-cli/src/routes.ts

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,24 +62,24 @@ function routes(
6262
'/graphql',
6363
cors<cors.CorsRequest>(),
6464
bodyParser.json(),
65+
// @ts-expect-error https://github.com/apollo-server-integrations/apollo-server-integration-express5/issues/9
6566
expressMiddleware(server, {
6667
context: () => Promise.resolve({ store }),
6768
}),
6869
);
6970
})
7071
.catch((error) => {
71-
console.error(error); // eslint-disable-line no-console
72+
console.error(error);
7273
});
7374

7475
serveUmdModule('react');
7576
serveUmdModule('react-dom');
7677
serveUmdModule('@redux-devtools/app');
7778

7879
app.get('/port.js', function (req, res) {
79-
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
8080
res.send(`reduxDevToolsPort = ${options.port}`);
8181
});
82-
app.get('*', function (req, res) {
82+
app.get('/{*splat}', function (req, res) {
8383
res.sendFile(
8484
path.join(
8585
path.dirname(fileURLToPath(import.meta.url)),
@@ -93,7 +93,10 @@ function routes(
9393
app.use(bodyParser.urlencoded({ limit: limit, extended: false }));
9494

9595
app.post('/', function (req, res) {
96-
if (!req.body) return res.status(404).end();
96+
if (!req.body) {
97+
res.status(404).end();
98+
return;
99+
}
97100
switch (req.body.op) {
98101
case 'get':
99102
store
@@ -102,7 +105,7 @@ function routes(
102105
res.send(r || {});
103106
})
104107
.catch(function (error) {
105-
console.error(error); // eslint-disable-line no-console
108+
console.error(error);
106109
res.sendStatus(500);
107110
});
108111
break;
@@ -113,7 +116,7 @@ function routes(
113116
res.send(r);
114117
})
115118
.catch(function (error) {
116-
console.error(error); // eslint-disable-line no-console
119+
console.error(error);
117120
res.sendStatus(500);
118121
});
119122
break;
@@ -131,7 +134,7 @@ function routes(
131134
});
132135
})
133136
.catch(function (error) {
134-
console.error(error); // eslint-disable-line no-console
137+
console.error(error);
135138
res.status(500).send({});
136139
});
137140
}

0 commit comments

Comments
 (0)