@reckona/mreact-router 0.0.112 → 0.0.114

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reckona/mreact-router",
-  "version": "0.0.112",
+  "version": "0.0.114",
   "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-compat": "0.0.112",
-    "@reckona/mreact-query": "0.0.112",
-    "@reckona/mreact-devtools": "0.0.112",
-    "@reckona/mreact-reactive-core": "0.0.112",
-    "@reckona/mreact-compiler": "0.0.112",
-    "@reckona/mreact": "0.0.112",
-    "@reckona/mreact-reactive-dom": "0.0.112",
-    "@reckona/mreact-server": "0.0.112",
-    "@reckona/mreact-shared": "0.0.112"
+    "@reckona/mreact-compat": "0.0.114",
+    "@reckona/mreact": "0.0.114",
+    "@reckona/mreact-compiler": "0.0.114",
+    "@reckona/mreact-query": "0.0.114",
+    "@reckona/mreact-reactive-core": "0.0.114",
+    "@reckona/mreact-devtools": "0.0.114",
+    "@reckona/mreact-reactive-dom": "0.0.114",
+    "@reckona/mreact-server": "0.0.114",
+    "@reckona/mreact-shared": "0.0.114"
   },
   "peerDependencies": {
     "vite": ">=8 <9"
   },
   "optionalDependencies": {
-    "@reckona/mreact-router-native": "0.0.112"
+    "@reckona/mreact-router-native": "0.0.114"
   }
 }

package/src/adapters/cloudflare.ts

@@ -103,6 +103,7 @@ export type CloudflareRouteModuleComponent<Data = unknown, Env = unknown> = (
 
 export interface CloudflareRouteModule<Data = unknown, Env = unknown> {
   App?: CloudflareRouteModuleComponent<Data, Env> | undefined;
+  CloudflareRouteComponent?: CloudflareRouteModuleComponent<Data, Env> | undefined;
   default?: CloudflareRouteModuleComponent<Data, Env> | undefined;
   generateMetadata?:
     | ((
@@ -438,6 +439,7 @@ const cloudflareReservedPageModuleExportNames = new Set([
   "POST",
   "PUT",
   "App",
+  "CloudflareRouteComponent",
   "default",
   "generateMetadata",
   "generateStaticParams",
@@ -463,6 +465,11 @@ function selectCloudflarePageComponent<Data, Env>(
     return appExport as CloudflareRouteModuleComponent<Data, Env>;
   }
 
+  const cloudflareRouteComponentExport = readCloudflareModuleExport(module, "CloudflareRouteComponent");
+  if (typeof cloudflareRouteComponentExport === "function") {
+    return cloudflareRouteComponentExport as CloudflareRouteModuleComponent<Data, Env>;
+  }
+
   for (const name of Object.keys(module)) {
     const value = readCloudflareModuleExport(module, name);
     if (
@@ -489,7 +496,7 @@ function readCloudflareModuleExport(module: object, name: string): unknown {
   return descriptor.get?.call(module);
 }
 
-const cloudflareDiagnosticPageModuleExportNames = ["default", "App", "slots"] as const;
+const cloudflareDiagnosticPageModuleExportNames = ["default", "App", "CloudflareRouteComponent", "slots"] as const;
 
 // Fixed names + typeof only (never values) so the 500 response is useful without
 // listing app-specific export names. Accessors are not invoked.

package/src/build.ts

@@ -2611,24 +2611,42 @@ async function writeCloudflareRouteModules(options: {
 function cloudflarePageRouteFacadeModuleSource(componentImport: string): string {
   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"
-    ? componentApp
-    : undefined;
 
-export const App = routeComponent === undefined
-  ? undefined
-  : function CloudflareRouteComponent(props) {
-    return routeComponent(props);
-  };
-export default App;
-export const CloudflareRouteComponent = App;
+export function App(props) {
+  return renderCloudflareRouteComponent(props);
+}
+export default function CloudflareDefaultRouteComponent(props) {
+  return renderCloudflareRouteComponent(props);
+}
+export function CloudflareRouteComponent(props) {
+  return renderCloudflareRouteComponent(props);
+}
 export const slots = componentSlots === undefined ? undefined : { ...componentSlots };
 
+function renderCloudflareRouteComponent(props) {
+  const routeComponent = resolveCloudflareRouteComponent();
+  if (routeComponent === undefined) {
+    throw new Error("No Cloudflare component export was found for ${componentImport}.");
+  }
+
+  return routeComponent(props);
+}
+
+function resolveCloudflareRouteComponent() {
+  const componentDefault = readComponentModuleExport(componentModule, "default");
+  if (typeof componentDefault === "function") {
+    return componentDefault;
+  }
+
+  const componentApp = readComponentModuleExport(componentModule, "App");
+  if (typeof componentApp === "function") {
+    return componentApp;
+  }
+
+  return undefined;
+}
+
 function readComponentModuleExport(module, name) {
   const descriptor = Object.getOwnPropertyDescriptor(module, name);
   if (descriptor === undefined) {