From 48248e258e71d8828fcb8ba0d7477a63a555031b Mon Sep 17 00:00:00 2001
From: Rafal Dziegielewski <rafal.dzieg@gmail.com>
Date: Tue, 28 Mar 2023 11:40:52 +0200
Subject: [PATCH] fix: serve custom components bundle publicly

---
 src/buildAuthenticatedRouter.ts |  2 +-
 src/buildRouter.ts              | 54 ++++++++++++++++++++++++---------
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/src/buildAuthenticatedRouter.ts b/src/buildAuthenticatedRouter.ts
index 166ad0a..7fae19b 100644
--- a/src/buildAuthenticatedRouter.ts
+++ b/src/buildAuthenticatedRouter.ts
@@ -77,7 +77,7 @@ export const buildAuthenticatedRouter = (
 
   withLogin(router, admin, auth);
   withLogout(router, admin);
-  buildAssets({ assets, router });
+  buildAssets({ admin, assets, routes, router });
 
   withProtectedRoutesHandler(router, admin);
   buildRoutes({ admin, routes, router });
diff --git a/src/buildRouter.ts b/src/buildRouter.ts
index df64dd3..d03e86f 100644
--- a/src/buildRouter.ts
+++ b/src/buildRouter.ts
@@ -23,7 +23,9 @@ export type BuildRoutesArgs = {
 };
 
 export type BuildAssetsArgs = {
+  admin: AdminJS;
   assets: (typeof AdminRouter)["assets"];
+  routes: (typeof AdminRouter)["routes"];
   router: Router;
 };
 
@@ -72,26 +74,50 @@ export const routeHandler =
     }
   };
 
+export const buildRoute = ({
+  route,
+  router,
+  admin,
+}: {
+  route: (typeof AdminRouter)["routes"][number];
+  router: Router;
+  admin: AdminJS;
+}) => {
+  // we have to change routes defined in AdminJS from {recordId} to :recordId
+  const expressPath = convertToExpressRoute(route.path);
+
+  if (route.method === "GET") {
+    router.get(expressPath, routeHandler({ admin, route }));
+  }
+
+  if (route.method === "POST") {
+    router.post(expressPath, routeHandler({ admin, route }));
+  }
+};
+
 export const buildRoutes = ({
   admin,
   routes,
   router,
 }: BuildRoutesArgs): void => {
-  routes.forEach((route) => {
-    // we have to change routes defined in AdminJS from {recordId} to :recordId
-    const expressPath = convertToExpressRoute(route.path);
-
-    if (route.method === "GET") {
-      router.get(expressPath, routeHandler({ admin, route }));
-    }
-
-    if (route.method === "POST") {
-      router.post(expressPath, routeHandler({ admin, route }));
-    }
-  });
+  routes.forEach((route) => buildRoute({ route, router, admin }));
 };
 
-export const buildAssets = ({ assets, router }: BuildAssetsArgs): void => {
+export const buildAssets = ({
+  admin,
+  assets,
+  routes,
+  router,
+}: BuildAssetsArgs): void => {
+  // Note: We want components.bundle.js to be globally available. In production it is served as a .js asset, meanwhile
+  // in local environments it's a route with "bundleComponents" action assigned.
+  const componentBundlerRoute = routes.find(
+    (r) => r.action === "bundleComponents"
+  );
+  if (componentBundlerRoute) {
+    buildRoute({ route: componentBundlerRoute, router, admin });
+  }
+
   assets.forEach((asset) => {
     router.get(asset.path, async (_req, res) => {
       res.sendFile(path.resolve(asset.src));
@@ -111,8 +137,8 @@ export const buildRouter = (
   // todo fix types
   router.use(formidableMiddleware(formidableOptions) as any);
 
+  buildAssets({ admin, assets, routes, router });
   buildRoutes({ admin, routes, router });
-  buildAssets({ assets, router });
 
   return router;
 };