Skip to content

Commit 4379740

Browse files
committed
fix(hotfix): fix how @adminjs/express is loaded in its loader
1 parent 8f9879c commit 4379740

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"rxjs": "^7.1.0"
3030
},
3131
"devDependencies": {
32+
"@adminjs/express": "^6.0.0",
3233
"@commitlint/cli": "^17.4.4",
3334
"@commitlint/config-conventional": "^17.4.4",
3435
"@nestjs/common": ">=9.3.10",

src/loaders/express.loader.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,26 @@ import { AbstractLoader } from './abstract.loader.js';
1010

1111
@Injectable()
1212
export class ExpressLoader extends AbstractLoader {
13-
public register(
13+
public async register(
1414
admin: AdminJS,
1515
httpAdapter: AbstractHttpAdapter,
1616
options: AdminModuleOptions,
1717
) {
1818
const app = httpAdapter.getInstance();
1919

2020
loadPackage('express', '@adminjs/nestjs');
21-
const adminJsExpressjs = loadPackage('@adminjs/express', '@adminjs/nestjs', () =>
22-
require('@adminjs/express'),
23-
);
21+
const adminJsExpressjs = await import('@adminjs/express');
2422
loadPackage('express-formidable', '@adminjs/nestjs');
2523

2624
let router;
2725

28-
if ('auth' in options) {
26+
if (options.auth) {
2927
loadPackage('express-session', '@adminjs/nestjs');
30-
router = adminJsExpressjs.buildAuthenticatedRouter(
28+
router = adminJsExpressjs.default.buildAuthenticatedRouter(
3129
admin, options.auth, undefined, options.sessionOptions, options.formidableOptions,
3230
);
3331
} else {
34-
router = adminJsExpressjs.buildRouter(admin, undefined, options.formidableOptions);
32+
router = adminJsExpressjs.default.buildRouter(admin, undefined, options.formidableOptions);
3533
}
3634

3735
// This named function is there on purpose.

yarn.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@
4242
styled-system "^5.1.5"
4343
text-mask-addons "^3.8.0"
4444

45+
"@adminjs/express@^6.0.0":
46+
version "6.0.0"
47+
resolved "https://registry.yarnpkg.com/@adminjs/express/-/express-6.0.0.tgz#9ad77dda79034682aee22f746f9b9460d5e5739a"
48+
integrity sha512-TIylSszG5yUp+uHFYWWCrlztViiR05KM7suDo4SWd4UezZYc0mwNgfYPsnEmKkf5VFMEiCtYqhdCt38OxUPn/g==
49+
4550
"@ampproject/remapping@^2.2.0":
4651
version "2.2.0"
4752
resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"

0 commit comments

Comments
 (0)