@absolutejs/absolute 0.20.0-beta.177 → 0.20.0-beta.178

package/dist/react/server.js

@@ -482,7 +482,7 @@ var ISLAND_BOOTSTRAP_MANIFEST_KEY = "AbsoluteIslandBootstrap", LEGACY_ISLAND_BOO
       islands[framework] = entries;
   }
   return islands;
-}, getIslandManifestKey = (framework, component) => `Island${toIslandFrameworkSegment(framework)}${component}`;
+}, getIslandManifestKey = (framework, component) => `Island${toIslandFrameworkSegment(framework)}${component}`, ISLAND_STYLE_PREFIX = "IslandStyle", getIslandStyleManifestEntries = (manifest) => Object.entries(manifest).filter(([key]) => key.startsWith(ISLAND_STYLE_PREFIX)), getIslandStyleManifestKey = (framework, component) => `${ISLAND_STYLE_PREFIX}${toIslandFrameworkSegment(framework)}${component}`;
 
 // src/core/islandPageContext.ts
 var ISLAND_MARKER = 'data-island="true"', MANIFEST_MARKER = "__ABSOLUTE_MANIFEST__", ISLAND_STATE_MARKER = "__ABS_ISLAND_STATE__", CLOSING_HEAD_TAG = "</head>", warnedMissingBootstrap = false, warnIfBootstrapMissing = (manifest) => {
@@ -519,12 +519,27 @@ var ISLAND_MARKER = 'data-island="true"', MANIFEST_MARKER = "__ABSOLUTE_MANIFEST
     browserManifest[key] = value;
   }
   return browserManifest;
-}, buildIslandsHeadMarkup = (manifest) => {
+}, ISLAND_MARKER_TAG, ISLAND_FRAMEWORKS, readMarkerAttribute = (tag, name) => new RegExp(`\\b${name}="([^"]*)"`).exec(tag)?.[1]?.replaceAll("&quot;", '"').replaceAll("&lt;", "<").replaceAll("&gt;", ">").replaceAll("&amp;", "&"), toIslandFramework = (value) => ISLAND_FRAMEWORKS.find((framework) => framework === value), collectRenderedIslandStyleKeys = (html) => {
+  const keys = new Set;
+  for (const [tag] of html.matchAll(ISLAND_MARKER_TAG)) {
+    const framework = toIslandFramework(readMarkerAttribute(tag, "data-framework"));
+    const component = readMarkerAttribute(tag, "data-component");
+    if (framework && component)
+      keys.add(getIslandStyleManifestKey(framework, component));
+  }
+  return keys;
+}, buildIslandStyleLinks = (manifest, html) => {
+  if (html === undefined)
+    return "";
+  const renderedKeys = collectRenderedIslandStyleKeys(html);
+  return getIslandStyleManifestEntries(manifest).filter(([key]) => renderedKeys.has(key)).filter(([, href]) => !html.includes(`href="${href}"`)).map(([key, href]) => `<link rel="stylesheet" href="${href}" data-island-style="${key}"${nonceAttr()}>`).join("");
+}, buildIslandsHeadMarkup = (manifest, html) => {
+  const styleLinks = buildIslandStyleLinks(manifest, html);
   const manifestScript = `<script${nonceAttr()}>window.__ABSOLUTE_MANIFEST__ = ${escapeScriptContent(JSON.stringify(toBrowserManifest(manifest)))}</script>`;
   const islandStateScript = `<script${nonceAttr()}>window.__ABS_ISLAND_STATE__ = ${escapeScriptContent(JSON.stringify(globalThis.__ABS_ISLAND_STATE__ ?? {}))}</script>`;
   const bootstrapPath = getIslandBootstrapPath(manifest);
   const bootstrapScript = bootstrapPath ? `<script${nonceAttr()} type="module" src="${bootstrapPath}"></script>` : "";
-  return `${manifestScript}${islandStateScript}${bootstrapScript}`;
+  return `${styleLinks}${manifestScript}${islandStateScript}${bootstrapScript}`;
 }, injectHeadMarkup = (html, markup) => {
   const closingHeadIndex = html.indexOf("</head>");
   if (closingHeadIndex >= 0) {
@@ -706,7 +721,7 @@ var ISLAND_MARKER = 'data-island="true"', MANIFEST_MARKER = "__ABSOLUTE_MANIFEST
     return html;
   }
   warnIfBootstrapMissing(manifest);
-  return injectHeadMarkup(html, buildIslandsHeadMarkup(manifest));
+  return injectHeadMarkup(html, buildIslandsHeadMarkup(manifest, html));
 }, injectIslandPageContextStream = (stream, options) => {
   const manifest = globalThis.__absoluteManifest;
   if (!manifest)
@@ -730,6 +745,13 @@ var init_islandPageContext = __esm(() => {
   init_logger();
   MANIFEST_BUILD_DIR_KEY = Symbol.for("absolutejs.islandManifestBuildDir");
   WINDOWS_ABSOLUTE_PATH = /^[A-Za-z]:[\\/]|^\\\\/;
+  ISLAND_MARKER_TAG = /<[^>]*\bdata-island="true"[^>]*>/g;
+  ISLAND_FRAMEWORKS = [
+    "react",
+    "svelte",
+    "vue",
+    "angular"
+  ];
 });
 
 // src/core/devRouteRegistrationCallsite.ts
@@ -2128,6 +2150,12 @@ var CONVENTIONS_KEY = "__absoluteConventions", isConventionsMap = (value) => Boo
     logConventionRenderError(framework, "error", renderError);
   }
   return null;
+}, isPageRequest = (request) => {
+  if (request.headers.get("hx-request") === "true")
+    return true;
+  if (request.headers.get("sec-fetch-dest") === "document")
+    return true;
+  return (request.headers.get("accept") ?? "").includes("text/html");
 }, renderConventionError = async (framework, pageName, error) => {
   const errorProps = buildErrorProps(error);
   const frameworkResponse = await tryFrameworkErrorConvention(framework, pageName, errorProps, error);
@@ -2139,12 +2167,6 @@ var CONVENTIONS_KEY = "__absoluteConventions", isConventionsMap = (value) => Boo
       return htmlResponse;
   }
   return null;
-}, isPageRequest = (request) => {
-  if (request.headers.get("hx-request") === "true")
-    return true;
-  if (request.headers.get("sec-fetch-dest") === "document")
-    return true;
-  return (request.headers.get("accept") ?? "").includes("text/html");
 }, renderStaticRouteError = async (request, error) => {
   if (!isPageRequest(request))
     return null;
@@ -2450,6 +2472,18 @@ var asset = (source, name) => {
   return assetPath;
 };
 
+// src/utils/requestRenderUrl.ts
+var requestRenderUrl = (request) => {
+  if (!request)
+    return;
+  try {
+    const parsed = new URL(request.url);
+    return `${parsed.pathname.replace(/\/{2,}/g, "/")}${parsed.search}`;
+  } catch {
+    return;
+  }
+};
+
 // src/react/pageHandler.ts
 init_cspNonceRef();
 init_islandPageContext();
@@ -2735,16 +2769,7 @@ init_spaRouteManifest();
 init_resolveConvention();
 init_browserTranslation();
 var withRequestUrl = (props, url) => Object.assign(Object.create(null), props, { url });
-var resolveRequestPathname = (request) => {
-  if (!request)
-    return;
-  try {
-    const parsed = new URL(request.url);
-    return `${parsed.pathname}${parsed.search}`;
-  } catch {
-    return;
-  }
-};
+var resolveRequestPathname = (request) => requestRenderUrl(request);
 var buildRefreshSetup = () => {
   if (isProductionRuntime()) {
     return "";
@@ -2855,6 +2880,7 @@ var reactFileRoute = (route) => defineFileRouteWith("react", route, async ({ man
 init_cspNonceRef();
 init_requestContext();
 init_pageResponseCache();
+import { AsyncLocalStorage as AsyncLocalStorage5 } from "async_hooks";
 import { readFile } from "fs/promises";
 import { dirname, join } from "path";
 init_devRouteRegistrationCallsite();
@@ -2927,6 +2953,27 @@ var injectFlightPayload = (html, flight, nonce) => {
   });
 };
 
+// src/react/serverComponents/nodeRendererRef.ts
+var STORAGE_KEY = Symbol.for("absolutejs.reactServerNodeRendererStorage");
+var isRendererStorage = (value) => typeof value === "object" && value !== null && ("getStore" in value) && typeof value.getStore === "function" && ("run" in value) && typeof value.run === "function";
+var isRenderer = (value) => typeof value === "function";
+var readStorage = () => {
+  const storage = Reflect.get(globalThis, STORAGE_KEY);
+  return isRendererStorage(storage) ? storage : undefined;
+};
+var getReactServerNodeRenderer = () => {
+  const store = readStorage()?.getStore();
+  return isRenderer(store) ? store : undefined;
+};
+var runWithReactServerNodeRenderer = (renderer, createStorage, render) => {
+  let storage = readStorage();
+  if (!storage) {
+    storage = createStorage();
+    Reflect.set(globalThis, STORAGE_KEY, storage);
+  }
+  return storage.run(renderer, render);
+};
+
 // src/react/serverComponents/pageHandler.ts
 var isRecord4 = (value) => typeof value === "object" && value !== null;
 var isPageModule = (value) => isRecord4(value) && typeof value.Page === "function" && isRecord4(value.clientManifest) && typeof value.createElement === "function" && typeof value.renderToReadableStream === "function";
@@ -2969,6 +3016,16 @@ var loadRenderer = async (rendererPath) => {
 var logRenderError = (error) => {
   console.error("[SSR] React Server Components error:", error);
 };
+var createNodeRenderer = (pageModule, renderer) => {
+  const { renderStaticHtml } = renderer;
+  if (!renderStaticHtml)
+    return;
+  const render = (node) => renderStaticHtml(pageModule.renderToReadableStream(node, pageModule.clientManifest, {
+    onError: logRenderError
+  }));
+  return render;
+};
+var createRendererStorage = () => new AsyncLocalStorage5;
 var handleReactServerPageRequest = async (input) => {
   const request = input.request ?? getCurrentAbsoluteRequest();
   if (input.page === "") {
@@ -2984,11 +3041,13 @@ var handleReactServerPageRequest = async (input) => {
       ]);
       const renderer = await loadRenderer(runtime.ssr);
       const nonce = readCspNonce();
-      const flight = pageModule.renderToReadableStream(pageModule.createElement(pageModule.Page, input.props ?? {}), pageModule.clientManifest, { onError: logRenderError });
+      const renderFlight = () => pageModule.renderToReadableStream(pageModule.createElement(pageModule.Page, input.props ?? {}), pageModule.clientManifest, { onError: logRenderError });
+      const nodeRenderer = createNodeRenderer(pageModule, renderer);
+      const flight = nodeRenderer ? runWithReactServerNodeRenderer(nodeRenderer, createRendererStorage, renderFlight) : renderFlight();
       const [forHtml, forPayload] = flight.tee();
       const html = await renderer.renderHtml(forHtml, {
         bootstrapModules: [runtime.client],
-        bootstrapScriptContent: BROWSER_TRANSLATION_BASELINE_SCRIPT,
+        bootstrapScriptContent: `${BROWSER_TRANSLATION_BASELINE_SCRIPT}window.__ABS_SLOT_HYDRATION_PENDING__=true;`,
         nonce,
         onError: logRenderError
       });
@@ -3014,5 +3073,5 @@ export {
   reactFileRoute
 };
 
-//# debugId=FB633E162EB858B764756E2164756E21
+//# debugId=567A32D4B8B7FF0164756E2164756E21
 //# sourceMappingURL=server.js.map