@reckona/mreact-router 0.0.108 → 0.0.110

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reckona/mreact-router",
-  "version": "0.0.108",
+  "version": "0.0.110",
   "description": "File-system app router, SSR, actions, and deployment adapters for mreact.",
   "keywords": [
     "jsx",
@@ -105,20 +105,20 @@
   },
   "dependencies": {
     "typescript": "^6.0.3",
-    "@reckona/mreact": "0.0.108",
-    "@reckona/mreact-compiler": "0.0.108",
-    "@reckona/mreact-compat": "0.0.108",
-    "@reckona/mreact-query": "0.0.108",
-    "@reckona/mreact-devtools": "0.0.108",
-    "@reckona/mreact-reactive-core": "0.0.108",
-    "@reckona/mreact-reactive-dom": "0.0.108",
-    "@reckona/mreact-server": "0.0.108",
-    "@reckona/mreact-shared": "0.0.108"
+    "@reckona/mreact": "0.0.110",
+    "@reckona/mreact-compat": "0.0.110",
+    "@reckona/mreact-compiler": "0.0.110",
+    "@reckona/mreact-query": "0.0.110",
+    "@reckona/mreact-reactive-core": "0.0.110",
+    "@reckona/mreact-devtools": "0.0.110",
+    "@reckona/mreact-reactive-dom": "0.0.110",
+    "@reckona/mreact-server": "0.0.110",
+    "@reckona/mreact-shared": "0.0.110"
   },
   "peerDependencies": {
     "vite": ">=8 <9"
   },
   "optionalDependencies": {
-    "@reckona/mreact-router-native": "0.0.108"
+    "@reckona/mreact-router-native": "0.0.110"
   }
 }

package/src/adapters/cloudflare.ts

@@ -453,15 +453,18 @@ const cloudflareReservedPageModuleExportNames = new Set([
 function selectCloudflarePageComponent<Data, Env>(
   module: CloudflareRouteModule<Data, Env>,
 ): CloudflareRouteModuleComponent<Data, Env> | undefined {
-  if (typeof module.default === "function") {
-    return module.default;
+  const defaultExport = readCloudflareModuleExport(module, "default");
+  if (typeof defaultExport === "function") {
+    return defaultExport as CloudflareRouteModuleComponent<Data, Env>;
   }
 
-  if (typeof module.App === "function") {
-    return module.App;
+  const appExport = readCloudflareModuleExport(module, "App");
+  if (typeof appExport === "function") {
+    return appExport as CloudflareRouteModuleComponent<Data, Env>;
   }
 
-  for (const [name, value] of Object.entries(module)) {
+  for (const name of Object.keys(module)) {
+    const value = readCloudflareModuleExport(module, name);
     if (
       !cloudflareReservedPageModuleExportNames.has(name) &&
       typeof value === "function"
@@ -473,6 +476,19 @@ function selectCloudflarePageComponent<Data, Env>(
   return undefined;
 }
 
+function readCloudflareModuleExport(module: object, name: string): unknown {
+  const descriptor = Object.getOwnPropertyDescriptor(module, name);
+  if (descriptor === undefined) {
+    return undefined;
+  }
+
+  if ("value" in descriptor) {
+    return descriptor.value;
+  }
+
+  return descriptor.get?.call(module);
+}
+
 const cloudflareDiagnosticPageModuleExportNames = ["default", "App", "slots"] as const;
 
 // Fixed names + typeof only (never values) so the 500 response is useful without

package/src/build.ts

@@ -2609,8 +2609,11 @@ async function writeCloudflareRouteModules(options: {
 }
 
 function cloudflarePageRouteFacadeModuleSource(componentImport: string): string {
-  return `import { default as componentDefault, App as componentApp, slots as componentSlots } from ${JSON.stringify(componentImport)};
+  return `import * as componentModule from ${JSON.stringify(componentImport)};
 
+const componentDefault = readComponentModuleExport(componentModule, "default");
+const componentApp = readComponentModuleExport(componentModule, "App");
+const componentSlots = readComponentModuleExport(componentModule, "slots");
 const routeComponent = typeof componentDefault === "function"
   ? componentDefault
   : typeof componentApp === "function"
@@ -2624,7 +2627,20 @@ export const App = routeComponent === undefined
   };
 export default App;
 export const CloudflareRouteComponent = App;
-export const slots = componentSlots === undefined ? undefined : { ...componentSlots };`;
+export const slots = componentSlots === undefined ? undefined : { ...componentSlots };
+
+function readComponentModuleExport(module, name) {
+  const descriptor = Object.getOwnPropertyDescriptor(module, name);
+  if (descriptor === undefined) {
+    return undefined;
+  }
+
+  if ("value" in descriptor) {
+    return descriptor.value;
+  }
+
+  return descriptor.get?.call(module);
+}`;
 }
 
 async function collectCloudflareDirectComponentRoutes(options: {