nukejs 0.0.24 → 0.0.26

package/dist/build-cloudflare.js

@@ -12,6 +12,7 @@ import {
   findPageLayouts,
   buildPerPageRegistry,
   makePageAdapterSource,
+  buildClientComponentTagImports,
   buildCombinedBundle,
   copyPublicFiles
 } from "./build-common.js";
@@ -572,6 +573,7 @@ if (serverPages.length > 0 || ["_404.tsx", "_500.tsx"].some((f) => fs.existsSync
         pageImport: JSON.stringify("./" + path.basename(page.absPath)),
         layoutImports,
         clientComponentNames,
+        clientComponentTagImports: buildClientComponentTagImports(registry, adapterDir),
         allClientIds: [...registry.keys()],
         layoutArrayItems: layoutPaths.map((_, i) => `__layout_${i}__`).join(", "),
         prerenderedHtml: prerenderedRecord,
@@ -609,6 +611,7 @@ if (serverPages.length > 0 || ["_404.tsx", "_500.tsx"].some((f) => fs.existsSync
         pageImport: JSON.stringify("./" + path.basename(src)),
         layoutImports,
         clientComponentNames,
+        clientComponentTagImports: buildClientComponentTagImports(registry, adapterDir),
         allClientIds: [...registry.keys()],
         layoutArrayItems: layoutPaths.map((_, i) => `__layout_${i}__`).join(", "),
         prerenderedHtml: prerenderedRecord,

package/dist/build-common.js

@@ -209,8 +209,8 @@ async function buildPages(pagesDir, staticDir, outPagesDir) {
     const bundleText = await bundlePageHandler({
       absPath: page.absPath,
       pagesDir,
+      registry,
       clientComponentNames,
-      allClientIds: [...registry.keys()],
       layoutPaths,
       prerenderedHtml: prerenderedRecord,
       routeParamNames: page.paramNames,
@@ -292,11 +292,20 @@ export default async function handler(req: IncomingMessage, res: ServerResponse)
 }
 `;
 }
+function buildClientComponentTagImports(registry, adapterDir) {
+  return [...registry.entries()].map(([id, absPath], i) => {
+    const rel = path.relative(adapterDir, absPath).replace(/\\/g, "/");
+    const spec = JSON.stringify(rel.startsWith(".") ? rel : "./" + rel);
+    return `import __cc_tag_${i}__ from ${spec};
+if (typeof __cc_tag_${i}__ === 'function') (__cc_tag_${i}__ as any).__nukeClientId = ${JSON.stringify(id)};`;
+  }).join("\n");
+}
 function makePageAdapterSource(opts) {
   const {
     pageImport,
     layoutImports,
     clientComponentNames,
+    clientComponentTagImports,
     allClientIds,
     layoutArrayItems,
     prerenderedHtml,
@@ -309,6 +318,7 @@ import { createElement as __createElement__ } from 'react';
 import { renderToString as __renderToString__ } from 'react-dom/server';
 import * as __page__ from ${pageImport};
 ${layoutImports}
+${clientComponentTagImports}
 
 const CLIENT_COMPONENTS: Record<string, string> = ${JSON.stringify(clientComponentNames)};
 const ALL_CLIENT_IDS: string[] = ${JSON.stringify(allClientIds)};
@@ -431,8 +441,8 @@ function minifyHtml(h: string): string {
   });
   const minified = withoutPres
     .replace(/<!--(?!(n-head|\\/n-head|n-body-scripts|\\/n-body-scripts|n-pre-))[\\s\\S]*?-->/g, '')
-    .replace(/>\\s+</g, '> <')
-    .replace(/\\s*\\n\\s*/g, '')
+    .replace(/\\s*\\n\\s*/g, ' ')
+    .replace(/>\\s+</g, '><')
     .trim();
   return pres.length === 0
     ? minified
@@ -493,7 +503,7 @@ function serializeProps(value: any): any {
     const { type, props: p } = value as any;
     if (typeof type === 'string') return { __re: 'html', tag: type, props: serializeProps(p) };
     if (typeof type === 'function') {
-      const cid = CLIENT_COMPONENTS[type.name];
+      const cid = (type as any).__nukeClientId ?? CLIENT_COMPONENTS[type.name];
       if (cid) return { __re: 'client', componentId: cid, props: serializeProps(p) };
     }
     return undefined;
@@ -542,7 +552,7 @@ async function renderNode(node: any, hydrated: Set<string>): Promise<string> {
   }
 
   if (typeof type === 'function') {
-    const clientId = CLIENT_COMPONENTS[type.name];
+    const clientId = (type as any).__nukeClientId ?? CLIENT_COMPONENTS[type.name];
     if (clientId) {
       hydrated.add(clientId);
       const { wrapperAttrs, componentProps } = splitWrapperAttrs(props);
@@ -715,8 +725,8 @@ async function bundleApiHandler(absPath) {
 async function bundlePageHandler(opts) {
   const {
     absPath,
+    registry,
     clientComponentNames,
-    allClientIds,
     layoutPaths,
     prerenderedHtml,
     routeParamNames,
@@ -733,7 +743,8 @@ async function bundlePageHandler(opts) {
     pageImport: JSON.stringify("./" + path.basename(absPath)),
     layoutImports,
     clientComponentNames,
-    allClientIds,
+    clientComponentTagImports: buildClientComponentTagImports(registry, adapterDir),
+    allClientIds: [...registry.keys()],
     layoutArrayItems: layoutPaths.map((_, i) => `__layout_${i}__`).join(", "),
     prerenderedHtml,
     routeParamNames,
@@ -835,8 +846,8 @@ async function buildErrorPages(pagesDir, outPagesDir, prerenderedHtml) {
     const bundleText = await bundlePageHandler({
       absPath: src,
       pagesDir,
+      registry,
       clientComponentNames,
-      allClientIds: [...registry.keys()],
       layoutPaths,
       prerenderedHtml,
       routeParamNames: [],
@@ -922,6 +933,7 @@ function copyPublicFiles(publicDir, destDir) {
 }
 export {
   analyzeFile,
+  buildClientComponentTagImports,
   buildCombinedBundle,
   buildErrorPages,
   buildPages,

package/dist/build-vercel.js

@@ -12,6 +12,7 @@ import {
   findPageLayouts,
   buildPerPageRegistry,
   makePageAdapterSource,
+  buildClientComponentTagImports,
   buildCombinedBundle,
   copyPublicFiles
 } from "./build-common.js";
@@ -294,6 +295,7 @@ if (serverPages.length > 0 || hasErrorPages) {
         pageImport: JSON.stringify("./" + path.basename(page.absPath)),
         layoutImports,
         clientComponentNames,
+        clientComponentTagImports: buildClientComponentTagImports(registry, adapterDir),
         allClientIds: [...registry.keys()],
         layoutArrayItems: layoutPaths.map((_, i) => `__layout_${i}__`).join(", "),
         prerenderedHtml: prerenderedRecord,
@@ -328,6 +330,7 @@ if (serverPages.length > 0 || hasErrorPages) {
       pageImport: JSON.stringify("./" + path.basename(src)),
       layoutImports,
       clientComponentNames,
+      clientComponentTagImports: buildClientComponentTagImports(registry, adapterDir),
       allClientIds: [...registry.keys()],
       layoutArrayItems: layoutPaths.map((_, i) => `__layout_${i}__`).join(", "),
       prerenderedHtml: prerenderedRecord,

package/dist/renderer.js

@@ -81,7 +81,11 @@ async function renderFunctionComponent(type, props, ctx) {
   for (const [id, filePath] of ctx.registry.entries()) {
     const info = componentCache.get(filePath);
     if (!info?.isClientComponent) continue;
-    if (!info.exportedName || type.name !== info.exportedName) continue;
+    if (type.__nukeClientId === id) {
+    } else {
+      if (!info.exportedName || type.name !== info.exportedName) continue;
+      type.__nukeClientId = id;
+    }
     try {
       ctx.hydrated.add(id);
       const { wrapperAttrs, componentProps } = splitWrapperAttrs(props);
@@ -135,7 +139,8 @@ function serializeReactElement(element, registry) {
     for (const [id, filePath] of registry.entries()) {
       const info = componentCache.get(filePath);
       if (!info?.isClientComponent) continue;
-      if (info.exportedName && type.name === info.exportedName) {
+      if (type.__nukeClientId === id || info.exportedName && type.name === info.exportedName) {
+        type.__nukeClientId = id;
         return {
           __re: "client",
           componentId: id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nukejs",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "description": "A minimal, opinionated full-stack React framework on Node.js that server-renders everything and hydrates only interactive parts.",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",