@octanejs/app-core 0.1.9 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octanejs/app-core",
-  "version": "0.1.9",
+  "version": "0.2.0",
   "license": "MIT",
   "type": "module",
   "engines": {
@@ -79,10 +79,10 @@
     "esbuild": "^0.28.1"
   },
   "peerDependencies": {
-    "octane": "^0.15.0"
+    "octane": "^0.16.0"
   },
   "devDependencies": {
     "@types/node": "^24.13.3",
-    "octane": "0.15.0"
+    "octane": "0.16.0"
   }
 }

package/src/client-entry-runtime.js

@@ -1,5 +1,11 @@
 // @ts-check
-export { hydrateRoot, initializeHydrationEventCapture, Suspense, ErrorBoundary } from 'octane';
+export {
+	hydrateRoot,
+	__hydrateVoidRoot,
+	initializeHydrationEventCapture,
+	Suspense,
+	ErrorBoundary,
+} from 'octane';
 import { createElementFromConfig } from 'octane/internal/client';
 
 /**

package/src/codegen.js

@@ -147,6 +147,18 @@ let lifecycleBootstrap;
 let independentBootstrap;
 let disposeIndependentHydration;
 let incompatibleBuild = false;
+${
+	options.streamedSignals === false
+		? ''
+		: `// Destructured so a bundler keeps only these two exports. The router never
+// registers a streamed HTML region, so it joins results without placement.
+const loadSignalHydration = () =>
+  import('octane/hydration/streamed-signals').then(
+    ({ bootstrapStreamedSignalResults, installSignalDocumentLifecycle }) =>
+      ({ bootstrapStreamedSignalResults, installSignalDocumentLifecycle }),
+  );
+`
+}
 ${
 	options.devClientBuild
 		? `
@@ -209,7 +221,12 @@ function importModule(path) {
   return loader ? loader() : dynamicImport(path);
 }
 
-const independentStyles = new Map();
+${
+	options.independentHydration === false
+		? `// This build compiled no independent islands.
+async function bootstrapIndependentIslands() {}
+`
+		: `const independentStyles = new Map();
 
 function clientAssetPath(path) {
   return path.startsWith('/') ? path : '/' + path;
@@ -280,12 +297,18 @@ async function bootstrapIndependentIslands(target) {
   });
   return independentBootstrap;
 }
-
-async function bootstrapDocumentLifecycle() {
+`
+}
+${
+	options.streamedSignals === false
+		? `// This build compiled no streamed signals.
+async function bootstrapDocumentLifecycle() {}
+`
+		: `async function bootstrapDocumentLifecycle() {
   if (clientBuildId === null || !documentData?.streamedSignals) return;
   if (lifecycleBootstrap) return lifecycleBootstrap;
   lifecycleBootstrap = (async () => {
-    signalHydrationModule ??= await import('octane/hydration/streamed-signals');
+    signalHydrationModule ??= await loadSignalHydration();
     if (incompatibleBuild) return;
     documentLifecycle = signalHydrationModule.installSignalDocumentLifecycle({
       document, buildId: clientBuildId, documentId: documentData.streamedSignals.documentId,
@@ -298,7 +321,8 @@ async function bootstrapDocumentLifecycle() {
   })();
   return lifecycleBootstrap;
 }
-
+`
+}
 `;
 }
 
@@ -345,6 +369,15 @@ async function bootstrapDocumentLifecycle() {
  *     app-level client router uses to commit its match tree so the first
  *     hydration pass adopts the same resolved tree the server rendered.
  *
+ * A build that knows its whole client graph narrows the entry to it. Each flag
+ * defaults to the general entry, and `false` drops that feature's code:
+ *   - `rootBoundary`: the config names a root pending or catch boundary.
+ *   - `independentHydration` / `streamedSignals`: some compiled module has an
+ *     independent island / streamed signal state, so its lazy runtime loads.
+ *   - `voidRoot: true` hydrates without returned-value reconciliation. Only a
+ *     build that proved every page and layout it can render is a void `@{}`
+ *     body, with no root boundary, may set it (see compiler/void-roots.js).
+ *
  * `getComponentExport` mirrors routes.js `get_component_export` (route named
  * export > default > first PascalCase) so server and client pick the SAME
  * component.
@@ -359,16 +392,26 @@ async function bootstrapDocumentLifecycle() {
  *   resolveImport?: (id: string) => string,
  *   runtimeModuleId?: string,
  *   generatedBy?: string,
+ *   rootBoundary?: boolean,
+ *   voidRoot?: boolean,
+ *   independentHydration?: boolean,
+ *   streamedSignals?: boolean,
  * }} [options]
  * @returns {string}
  */
 export function create_client_entry_source(options = {}) {
 	const runtimeModuleId =
 		options.runtimeModuleId ?? fileURLToPath(new URL('./client-entry-runtime.js', import.meta.url));
+	const rootBoundary = options.rootBoundary !== false;
+	const imports = [
+		options.voidRoot ? '__hydrateVoidRoot as hydrateRoot' : 'hydrateRoot',
+		'initializeHydrationEventCapture',
+		...(rootBoundary ? ['Suspense', 'ErrorBoundary', 'createElement'] : []),
+	];
 	return (
 		client_entry_prelude(
 			options,
-			`import { hydrateRoot, initializeHydrationEventCapture, Suspense, ErrorBoundary, createElement } from ${JSON.stringify(runtimeModuleId)};`,
+			`import { ${imports.join(', ')} } from ${JSON.stringify(runtimeModuleId)};`,
 		) +
 		`function getComponentExport(module, exportName) {
   // Explicit export name requires an exact match; do NOT fall back, so a
@@ -377,7 +420,9 @@ export function create_client_entry_source(options = {}) {
   if (typeof module.default === 'function') return module.default;
   return Object.entries(module).find(([key, value]) => typeof value === 'function' && /^[A-Z]/.test(key))?.[1];
 }
-
+${
+	rootBoundary
+		? `
 function withRootBoundary(content, boundary) {
   let body = content;
   // Keep ErrorBoundary closest to the route. Suspense may retain its pending
@@ -401,7 +446,9 @@ function withRootBoundary(content, boundary) {
   }
   return body;
 }
-
+`
+		: ''
+}
 (async () => {
   try {
     const el = document.getElementById('__octane_data');
@@ -428,11 +475,15 @@ function withRootBoundary(content, boundary) {
     )) throw new Error('[octane] Invalid streamed signal document identity.');
     if (globalThis.__octaneStreamedSignalSelections !== undefined) {
       if (!data.streamedSignals) throw new Error('[octane] Missing streamed signal document identity.');
-      signalHydrationModule = await import('octane/hydration/streamed-signals');
+${
+	options.streamedSignals === false
+		? `      throw new Error('[octane] Streamed signals reached a client build that compiled none.');`
+		: `      signalHydrationModule ??= await loadSignalHydration();
       if (incompatibleBuild) return;
-      streamedHydration = signalHydrationModule.bootstrapStreamedSignalHydration(data.streamedSignals);
+      streamedHydration = signalHydrationModule.bootstrapStreamedSignalResults(data.streamedSignals);
       signalOwner = streamedHydration.signalOwner;
-      await bootstrapDocumentLifecycle();
+      await bootstrapDocumentLifecycle();`
+}
     }
     if (!data.entry) {
       console.error('[octane] Unable to hydrate: no route entry in #__octane_data.');
@@ -489,7 +540,9 @@ function withRootBoundary(content, boundary) {
       Content = (_props, scope, extra) => Component({ params, url }, scope, extra);
     }
 
-    const rootBoundary = { pending: null, catch: null };
+${
+	rootBoundary
+		? `    const rootBoundary = { pending: null, catch: null };
     for (const kind of ['pending', 'catch']) {
       const entry = data.rootBoundary?.[kind];
       if (!entry) continue;
@@ -503,10 +556,13 @@ function withRootBoundary(content, boundary) {
       }
       rootBoundary[kind] = Boundary;
     }
-
+    Content = withRootBoundary(Content, rootBoundary);
+`
+		: ''
+}
     if (incompatibleBuild) return;
     if (documentLifecycle && !await documentLifecycle.whenActive()) return;
-    hydrateRoot(target, withRootBoundary(Content, rootBoundary), undefined,
+    hydrateRoot(target, Content, undefined,
       signalOwner === undefined ? undefined : { signalOwner });
   } catch (error) {
     console.error('[octane] Failed to bootstrap client hydration.', error);
@@ -564,11 +620,15 @@ export function create_islands_entry_source(options = {}) {
     )) throw new Error('[octane] Invalid streamed signal document identity.');
     if (globalThis.__octaneStreamedSignalSelections !== undefined) {
       if (!data.streamedSignals) throw new Error('[octane] Missing streamed signal document identity.');
-      signalHydrationModule = await import('octane/hydration/streamed-signals');
+${
+	options.streamedSignals === false
+		? `      throw new Error('[octane] Streamed signals reached a client build that compiled none.');`
+		: `      signalHydrationModule ??= await loadSignalHydration();
       if (incompatibleBuild) return;
-      streamedHydration = signalHydrationModule.bootstrapStreamedSignalHydration(data.streamedSignals);
+      streamedHydration = signalHydrationModule.bootstrapStreamedSignalResults(data.streamedSignals);
       signalOwner = streamedHydration.signalOwner;
-      await bootstrapDocumentLifecycle();
+      await bootstrapDocumentLifecycle();`
+}
     }
 
     // The shell stays server-owned: only its independent islands activate.