Skip to content

feat: express 5 compatibility #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 1, 2025
Merged

feat: express 5 compatibility #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9b892e
fix: await loader.register so login page will render
tomups Sep 11, 2025
42abbb0
fix: use router instead of _router from express v5
tomups Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/admin.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export class AdminModule implements OnModuleInit {
admin.watch();

const { httpAdapter } = this.httpAdapterHost;
this.loader.register(admin, httpAdapter, {
await this.loader.register(admin, httpAdapter, {
...this.adminModuleOptions,
adminJsOptions: admin.options,
});
Expand Down
20 changes: 10 additions & 10 deletions src/loaders/express.loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,43 +58,43 @@ export class ExpressLoader extends AbstractLoader {
// Nestjs uses bodyParser under the hood which is in conflict with adminjs setup.
// Due to adminjs-expressjs usage of formidable we have to move body parser in layer tree after adminjs init.
// Notice! This is not documented feature of express, so this may change in the future. We have to keep an eye on it.
if (app && app._router && app._router.stack) {
const jsonParserIndex = app._router.stack.findIndex(
if (app && app.router && app.router.stack) {
const jsonParserIndex = app.router.stack.findIndex(
(layer: { name: string }) => layer.name === 'jsonParser',
);
if (jsonParserIndex >= 0) {
jsonParser = app._router.stack.splice(jsonParserIndex, 1);
jsonParser = app.router.stack.splice(jsonParserIndex, 1);
}

const urlencodedParserIndex = app._router.stack.findIndex(
const urlencodedParserIndex = app.router.stack.findIndex(
(layer: { name: string }) => layer.name === 'urlencodedParser',
);
if (urlencodedParserIndex >= 0) {
urlencodedParser = app._router.stack.splice(urlencodedParserIndex, 1);
urlencodedParser = app.router.stack.splice(urlencodedParserIndex, 1);
}

const adminIndex = app._router.stack.findIndex(
const adminIndex = app.router.stack.findIndex(
(layer: { name: string }) => layer.name === 'admin',
);
if (adminIndex >= 0) {
admin = app._router.stack.splice(adminIndex, 1);
admin = app.router.stack.splice(adminIndex, 1);
}

// if adminjs-nestjs didn't reorder the middleware
// the body parser would have come after corsMiddleware
const corsIndex = app._router.stack.findIndex(
const corsIndex = app.router.stack.findIndex(
(layer: { name: string }) => layer.name === 'corsMiddleware',
);

// in other case if there is no corsIndex we go after expressInit, because right after that
// there are nest endpoints.
const expressInitIndex = app._router.stack.findIndex(
const expressInitIndex = app.router.stack.findIndex(
(layer: { name: string }) => layer.name === 'expressInit',
);

const initIndex = (corsIndex >= 0 ? corsIndex : expressInitIndex) + 1;

app._router.stack.splice(
app.router.stack.splice(
initIndex,
0,
...admin,
Expand Down