fix(hotfix): fix how @adminjs/express is loaded in its loader

SoftwareBrothers · Apr 19, 2023 · 4379740 · 4379740
1 parent 8f9879c
commit 4379740
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -29,6 +29,7 @@
     "rxjs": "^7.1.0"
   },
   "devDependencies": {
+    "@adminjs/express": "^6.0.0",
     "@commitlint/cli": "^17.4.4",
     "@commitlint/config-conventional": "^17.4.4",
     "@nestjs/common": ">=9.3.10",

diff --git a/src/loaders/express.loader.ts b/src/loaders/express.loader.ts
@@ -10,28 +10,26 @@ import { AbstractLoader } from './abstract.loader.js';
 
 @Injectable()
 export class ExpressLoader extends AbstractLoader {
-  public register(
+  public async register(
     admin: AdminJS,
     httpAdapter: AbstractHttpAdapter,
     options: AdminModuleOptions,
   ) {
     const app = httpAdapter.getInstance();
 
     loadPackage('express', '@adminjs/nestjs');
-    const adminJsExpressjs = loadPackage('@adminjs/express', '@adminjs/nestjs', () =>
-      require('@adminjs/express'),
-    );
+    const adminJsExpressjs = await import('@adminjs/express');
     loadPackage('express-formidable', '@adminjs/nestjs');
 
     let router;
 
-    if ('auth' in options) {
+    if (options.auth) {
       loadPackage('express-session', '@adminjs/nestjs');
-      router = adminJsExpressjs.buildAuthenticatedRouter(
+      router = adminJsExpressjs.default.buildAuthenticatedRouter(
         admin, options.auth, undefined, options.sessionOptions, options.formidableOptions,
       );
     } else {
-      router = adminJsExpressjs.buildRouter(admin, undefined, options.formidableOptions);
+      router = adminJsExpressjs.default.buildRouter(admin, undefined, options.formidableOptions);
     }
 
     // This named function is there on purpose. 

diff --git a/yarn.lock b/yarn.lock
@@ -42,6 +42,11 @@
     styled-system "^5.1.5"
     text-mask-addons "^3.8.0"
 
+"@adminjs/express@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@adminjs/express/-/express-6.0.0.tgz#9ad77dda79034682aee22f746f9b9460d5e5739a"
+  integrity sha512-TIylSszG5yUp+uHFYWWCrlztViiR05KM7suDo4SWd4UezZYc0mwNgfYPsnEmKkf5VFMEiCtYqhdCt38OxUPn/g==
+
 "@ampproject/remapping@^2.2.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"