@nifrajs/web-solid 4.0.2 → 5.1.0

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAUjD,6EAA6E;AAC7E,eAAO,MAAM,YAAY,EAAE,aA2B1B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAgDjD,6EAA6E;AAC7E,eAAO,MAAM,YAAY,EAAE,aA8B1B,CAAA"}

package/dist/index.js

@@ -1,6 +1,39 @@
+import { sharedConfig } from "solid-js";
 import { generateHydrationScript, renderToStream as solidRenderToStream, renderToString as solidRenderToString, } from "solid-js/web";
 import { compose } from "./compose.js";
 const HYDRATION_HEAD = generateHydrationScript();
+// An unset NODE_ENV counts as production, as for the framework's own error pages.
+const showsErrors = () => {
+    const nodeEnv = typeof process === "undefined" ? undefined : process.env?.NODE_ENV;
+    return nodeEnv === "development" || nodeEnv === "test";
+};
+/** What the browser receives for an error Solid hands to hydration: its text names server internals. */
+function redactedError() {
+    // Built bare: a constructed Error carries a stack and, on Bun, the line, column and file it was made
+    // at, and Solid serializes every own property.
+    // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: Object.create over Error.prototype with a message is an Error minus its stack.
+    return Object.create(Error.prototype, {
+        message: { value: "Internal Server Error", writable: true, configurable: true },
+    });
+}
+/**
+ * Render `app` with every Error that Solid serializes for hydration replaced. An `<ErrorBoundary>` that
+ * caught on the server, or a failed resource, otherwise ships the message and stack in an inline script.
+ * Nested contexts copy this one, so they keep the wrapped `serialize`.
+ */
+function redactingErrors(app) {
+    if (showsErrors())
+        return app;
+    return () => {
+        // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: Solid's server renderers set a context with serialize; the check below handles its absence.
+        const context = sharedConfig.context;
+        const serialize = context?.serialize;
+        if (context !== undefined && serialize !== undefined) {
+            context.serialize = (id, value) => serialize(id, value instanceof Error ? redactedError() : value);
+        }
+        return app();
+    };
+}
 /** The Solid server render adapter - pass to @nifrajs/web's `renderPage`. */
 export const solidAdapter = {
     // Synchronous one-pass render for non-deferred pages (renderPage's buffered fast path). Solid's
@@ -8,8 +41,11 @@ export const solidAdapter = {
     // `generateHydrationScript()`) as `renderToStream`, but skips the TransformStream + Solid's
     // streaming machinery - the heaviest of the five renderers on Bun. A page that defer()s/Suspends
     // takes `renderToStream` below (progressive resolution needs it).
-    renderToString(chain, props) {
-        return solidRenderToString(compose(chain, props));
+    renderToString(chain, props, options) {
+        const app = redactingErrors(compose(chain, props));
+        return options?.nonce === undefined
+            ? solidRenderToString(app)
+            : solidRenderToString(app, { nonce: options.nonce });
     },
     renderToStream(chain, props, options) {
         // Solid's `renderToStream` streams `Uint8Array` chunks into a Web `WritableStream` via
@@ -18,7 +54,7 @@ export const solidAdapter = {
         // <head>) seeds client hydration. A render failure errors `ts.readable`, which `renderPage`
         // surfaces on the response body. The nonce reaches the resource and boundary scripts Solid streams.
         const ts = new TransformStream();
-        const app = compose(chain, props);
+        const app = redactingErrors(compose(chain, props));
         const stream = options?.nonce === undefined
             ? solidRenderToStream(app)
             : solidRenderToStream(app, { nonce: options.nonce });

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,uBAAuB,EACvB,cAAc,IAAI,mBAAmB,EACrC,cAAc,IAAI,mBAAmB,GACtC,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,MAAM,cAAc,GAAG,uBAAuB,EAAE,CAAA;AAEhD,6EAA6E;AAC7E,MAAM,CAAC,MAAM,YAAY,GAAkB;IACzC,gGAAgG;IAChG,mFAAmF;IACnF,4FAA4F;IAC5F,iGAAiG;IACjG,kEAAkE;IAClE,cAAc,CAAC,KAAK,EAAE,KAAK;QACzB,OAAO,mBAAmB,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAA;IACnD,CAAC;IACD,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO;QAClC,uFAAuF;QACvF,2FAA2F;QAC3F,6FAA6F;QAC7F,4FAA4F;QAC5F,oGAAoG;QACpG,MAAM,EAAE,GAAG,IAAI,eAAe,EAA0B,CAAA;QACxD,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;QACjC,MAAM,MAAM,GACV,OAAO,EAAE,KAAK,KAAK,SAAS;YAC1B,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC;YAC1B,CAAC,CAAC,mBAAmB,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;QACxD,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAA;QAC1B,OAAO,EAAE,CAAC,QAAQ,CAAA;IACpB,CAAC;IACD,aAAa;QACX,OAAO,cAAc,CAAA;IACvB,CAAC;CACF,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/mdx.js

@@ -30,7 +30,7 @@ export function solidMdxBunPlugin(generate) {
         async setup(build) {
             let compile;
             try {
-                compile = (await import(__rewriteRelativeImportExtension(MDX_MODULE))).compile;
+                compile = (await import(__rewriteRelativeImportExtension(MDX_MODULE, true))).compile;
             }
             catch {
                 throw new Error("@nifrajs/web-solid/mdx: compiling `.mdx` needs the `@mdx-js/mdx` package - install it (`bun add @mdx-js/mdx`).");

package/dist/mdx.js.map

@@ -1 +1 @@
-{"version":3,"file":"mdx.js","sourceRoot":"","sources":["../src/mdx.ts"],"names":[],"mappings":";;;;;;;;AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAC5C,oDAAoD;AACpD,OAAO,gBAAgB,MAAM,0BAA0B,CAAA;AACvD,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC/E,oDAAoD;AACpD,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAG5C,wGAAwG;AACxG,MAAM,UAAU,GAAG,aAAa,CAAA;AAMhC;sEACsE;AACtE,MAAM,UAAU,iBAAiB,CAAC,QAAuB;IACvD,OAAO;QACL,IAAI,EAAE,mBAAmB,QAAQ,EAAE;QACnC,KAAK,CAAC,KAAK,CAAC,KAAK;YACf,IAAI,OAA+B,CAAA;YACnC,IAAI,CAAC;gBACH,OAAO,GAAI,CAAC,MAAM,MAAM,kCAAC,UAAU,EAAC,CAAiB,CAAC,OAAO,CAAA;YAC/D,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,IAAI,KAAK,CACb,gHAAgH,CACjH,CAAA;YACH,CAAC;YACD,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;gBACrD,MAAM,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBACzC,0FAA0F;gBAC1F,MAAM,GAAG,GAAG,MAAM,CAChB,MAAM,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;oBACzC,GAAG,EAAE,IAAI;oBACT,oBAAoB,EAAE,gCAAgC;iBACvD,CAAC,CACH,CAAA;gBACD,4EAA4E;gBAC5E,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE;oBACvC,QAAQ,EAAE,GAAG,IAAI,MAAM;oBACvB,OAAO,EAAE;wBACP,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;wBAC7C,CAAC,gBAAgB,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC;qBACpD;oBACD,OAAO,EAAE,KAAK;oBACd,UAAU,EAAE,KAAK;iBAClB,CAAC,CAAA;gBACF,OAAO,EAAE,QAAQ,EAAE,iBAAiB,CAAC,MAAM,EAAE,IAAI,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;YAC1F,CAAC,CAAC,CAAA;QACJ,CAAC;KACF,CAAA;AACH,CAAC"}
+{"version":3,"file":"mdx.js","sourceRoot":"","sources":["../src/mdx.ts"],"names":[],"mappings":";;;;;;;;AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAC5C,oDAAoD;AACpD,OAAO,gBAAgB,MAAM,0BAA0B,CAAA;AACvD,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC/E,oDAAoD;AACpD,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAG5C,wGAAwG;AACxG,MAAM,UAAU,GAAG,aAAa,CAAA;AAMhC;sEACsE;AACtE,MAAM,UAAU,iBAAiB,CAAC,QAAuB;IACvD,OAAO;QACL,IAAI,EAAE,mBAAmB,QAAQ,EAAE;QACnC,KAAK,CAAC,KAAK,CAAC,KAAK;YACf,IAAI,OAA+B,CAAA;YACnC,IAAI,CAAC;gBACH,OAAO,GAAI,CAAC,MAAM,MAAM,kCAAC,UAAU,QAAC,CAAiB,CAAC,OAAO,CAAA;YAC/D,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,IAAI,KAAK,CACb,gHAAgH,CACjH,CAAA;YACH,CAAC;YACD,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;gBACrD,MAAM,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBACzC,0FAA0F;gBAC1F,MAAM,GAAG,GAAG,MAAM,CAChB,MAAM,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;oBACzC,GAAG,EAAE,IAAI;oBACT,oBAAoB,EAAE,gCAAgC;iBACvD,CAAC,CACH,CAAA;gBACD,4EAA4E;gBAC5E,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE;oBACvC,QAAQ,EAAE,GAAG,IAAI,MAAM;oBACvB,OAAO,EAAE;wBACP,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;wBAC7C,CAAC,gBAAgB,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC;qBACpD;oBACD,OAAO,EAAE,KAAK;oBACd,UAAU,EAAE,KAAK;iBAClB,CAAC,CAAA;gBACF,OAAO,EAAE,QAAQ,EAAE,iBAAiB,CAAC,MAAM,EAAE,IAAI,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;YAC1F,CAAC,CAAC,CAAA;QACJ,CAAC;KACF,CAAA;AACH,CAAC"}

package/dist/route-props.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-props.d.ts","sourceRoot":"","sources":["../src/route-props.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAKhF;;;GAGG;AACH,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,WAAW,EAC3B,aAAa,EAAE,kBAAkB,CAAC,eAAe,CAAC,EAClD,WAAW,CAAC,EAAE,kBAAkB,CAAC,aAAa,CAAC,GAC9C,WAAW,CAyCb"}
+{"version":3,"file":"route-props.d.ts","sourceRoot":"","sources":["../src/route-props.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAKhF;;;GAGG;AACH,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,WAAW,EAC3B,aAAa,EAAE,kBAAkB,CAAC,eAAe,CAAC,EAClD,WAAW,CAAC,EAAE,kBAAkB,CAAC,aAAa,CAAC,GAC9C,WAAW,CA4Cb"}

package/dist/route-props.js

@@ -12,6 +12,9 @@ export function routeProps(snapshot, searchSchemas, matchChains) {
         },
         // Each layout's own loader data. Without it a layout renders `data: null` on the client while the
         // server rendered it with its data.
+        get serverComponents() {
+            return snapshot().serverComponents;
+        },
         get layoutData() {
             return snapshot().layoutData;
         },

package/dist/route-props.js.map

@@ -1 +1 @@
-{"version":3,"file":"route-props.js","sourceRoot":"","sources":["../src/route-props.ts"],"names":[],"mappings":"AACA,mGAAmG;AACnG,gGAAgG;AAChG,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEnD;;;GAGG;AACH,MAAM,UAAU,UAAU,CACxB,QAA2B,EAC3B,aAAkD,EAClD,WAA+C;IAE/C,OAAO;QACL,IAAI,IAAI;YACN,OAAO,QAAQ,EAAE,CAAC,IAAI,CAAA;QACxB,CAAC;QACD,kGAAkG;QAClG,oCAAoC;QACpC,IAAI,UAAU;YACZ,OAAO,QAAQ,EAAE,CAAC,UAAU,CAAA;QAC9B,CAAC;QACD,IAAI,UAAU;YACZ,OAAO,QAAQ,EAAE,CAAC,UAAU,CAAA;QAC9B,CAAC;QACD,IAAI,OAAO;YACT,OAAO,QAAQ,EAAE,CAAC,OAAO,CAAA;QAC3B,CAAC;QACD,+FAA+F;QAC/F,IAAI,MAAM;YACR,OAAO,QAAQ,EAAE,CAAC,MAAM,CAAA;QAC1B,CAAC;QACD,IAAI,IAAI;YACN,OAAO,QAAQ,EAAE,CAAC,IAAI,CAAA;QACxB,CAAC;QACD,IAAI,MAAM;YACR,+FAA+F;YAC/F,wEAAwE;YACxE,MAAM,CAAC,GAAG,QAAQ,EAAE,CAAA;YACpB,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YAC/B,OAAO,aAAa,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;QAC7F,CAAC;QACD,IAAI,UAAU;YACZ,OAAO,QAAQ,EAAE,CAAC,UAAU,CAAA;QAC9B,CAAC;QACD,IAAI,UAAU;YACZ,OAAO,QAAQ,EAAE,CAAC,UAAU,CAAA;QAC9B,CAAC;QACD,qFAAqF;QACrF,IAAI,UAAU;YACZ,OAAO,WAAW,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAA;QAC1C,CAAC;KACa,CAAA;AAClB,CAAC"}
+{"version":3,"file":"route-props.js","sourceRoot":"","sources":["../src/route-props.ts"],"names":[],"mappings":"AACA,mGAAmG;AACnG,gGAAgG;AAChG,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEnD;;;GAGG;AACH,MAAM,UAAU,UAAU,CACxB,QAA2B,EAC3B,aAAkD,EAClD,WAA+C;IAE/C,OAAO;QACL,IAAI,IAAI;YACN,OAAO,QAAQ,EAAE,CAAC,IAAI,CAAA;QACxB,CAAC;QACD,kGAAkG;QAClG,oCAAoC;QACpC,IAAI,gBAAgB;YAClB,OAAO,QAAQ,EAAE,CAAC,gBAAgB,CAAA;QACpC,CAAC;QACD,IAAI,UAAU;YACZ,OAAO,QAAQ,EAAE,CAAC,UAAU,CAAA;QAC9B,CAAC;QACD,IAAI,UAAU;YACZ,OAAO,QAAQ,EAAE,CAAC,UAAU,CAAA;QAC9B,CAAC;QACD,IAAI,OAAO;YACT,OAAO,QAAQ,EAAE,CAAC,OAAO,CAAA;QAC3B,CAAC;QACD,+FAA+F;QAC/F,IAAI,MAAM;YACR,OAAO,QAAQ,EAAE,CAAC,MAAM,CAAA;QAC1B,CAAC;QACD,IAAI,IAAI;YACN,OAAO,QAAQ,EAAE,CAAC,IAAI,CAAA;QACxB,CAAC;QACD,IAAI,MAAM;YACR,+FAA+F;YAC/F,wEAAwE;YACxE,MAAM,CAAC,GAAG,QAAQ,EAAE,CAAA;YACpB,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YAC/B,OAAO,aAAa,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;QAC7F,CAAC;QACD,IAAI,UAAU;YACZ,OAAO,QAAQ,EAAE,CAAC,UAAU,CAAA;QAC9B,CAAC;QACD,IAAI,UAAU;YACZ,OAAO,QAAQ,EAAE,CAAC,UAAU,CAAA;QAC9B,CAAC;QACD,qFAAqF;QACrF,IAAI,UAAU;YACZ,OAAO,WAAW,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAA;QAC1C,CAAC;KACa,CAAA;AAClB,CAAC"}

package/dist/server-components/Outlet.d.ts

@@ -0,0 +1,12 @@
+import { type ComponentClientAdapter, ComponentController, type ComponentKey, type ComponentState, type ServerComponent as Handle } from "@nifrajs/web/server-components/client";
+import { type JSX } from "solid-js";
+export declare function ServerComponent<Input, Props, View>(props: {
+    readonly state: ComponentState;
+    readonly component: Handle<Input, Props, View>;
+    readonly instanceKey: ComponentKey;
+    readonly input: NoInfer<Input>;
+    readonly parent?: string;
+    readonly controller?: ComponentController | undefined;
+    readonly clientAdapter?: ComponentClientAdapter | undefined;
+}): JSX.Element;
+//# sourceMappingURL=Outlet.d.ts.map

package/dist/server-components/Outlet.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Outlet.d.ts","sourceRoot":"","sources":["../../src/server-components/Outlet.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,sBAAsB,EAC3B,mBAAmB,EACnB,KAAK,YAAY,EACjB,KAAK,cAAc,EACnB,KAAK,eAAe,IAAI,MAAM,EAE/B,MAAM,uCAAuC,CAAA;AAC9C,OAAO,EAA4B,KAAK,GAAG,EAA4B,MAAM,UAAU,CAAA;AACvF,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE;IACzD,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAA;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC9C,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAA;IAClC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,UAAU,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAA;IACrD,QAAQ,CAAC,aAAa,CAAC,EAAE,sBAAsB,GAAG,SAAS,CAAA;CAC5D,GAAG,GAAG,CAAC,OAAO,CAsBd"}

package/dist/server-components/Outlet.jsx

@@ -0,0 +1,36 @@
+import { ComponentController, resolveComponentRecord, } from "@nifrajs/web/server-components/client";
+import { createEffect, createMemo, onCleanup, onMount, Show } from "solid-js";
+export function ServerComponent(props) {
+    const record = createMemo(() => resolveComponentRecord(props.state, props.component, props.instanceKey, props.input, props.parent ?? null));
+    return (<Show keyed when={record().instance}>
+      {(_instance) => (<Range state={props.state} record={record()} controller={props.controller} clientAdapter={props.clientAdapter}/>)}
+    </Show>);
+}
+function Range(props) {
+    const record = props.record;
+    let host;
+    let controller;
+    onMount(() => {
+        if (props.controller === undefined && props.clientAdapter === undefined)
+            throw new Error("component_contract");
+        controller =
+            props.controller ??
+                new ComponentController({ state: props.state, adapter: props.clientAdapter });
+        void controller.mount(host, record.instance).catch(() => {
+            throw new Error("component_failed");
+        });
+    });
+    onCleanup(() => {
+        if (controller !== undefined)
+            void (props.controller === undefined
+                ? controller.dispose()
+                : controller.unmount(record.instance));
+    });
+    createEffect(() => {
+        const state = props.state;
+        if (controller !== undefined)
+            void controller.adopt(state).catch(() => controller?.reportError("component_failed"));
+    });
+    return <div ref={host} data-nifra-component={record.instance} innerHTML={record.html}/>;
+}
+//# sourceMappingURL=Outlet.jsx.map

package/dist/server-components/Outlet.jsx.map

@@ -0,0 +1 @@
+{"version":3,"file":"Outlet.jsx","sourceRoot":"","sources":["../../src/server-components/Outlet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,mBAAmB,EAInB,sBAAsB,GACvB,MAAM,uCAAuC,CAAA;AAC9C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAY,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AACvF,MAAM,UAAU,eAAe,CAAqB,KAQnD;IACC,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,EAAE,CAC7B,sBAAsB,CACpB,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,SAAS,EACf,KAAK,CAAC,WAAW,EACjB,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,MAAM,IAAI,IAAI,CACrB,CACF,CAAA;IACD,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,CAClC;MAAA,CAAC,CAAC,SAAiB,EAAE,EAAE,CAAC,CACtB,CAAC,KAAK,CACJ,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CACnB,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,CACjB,UAAU,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAC7B,aAAa,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,EACnC,CACH,CACH;IAAA,EAAE,IAAI,CAAC,CACR,CAAA;AACH,CAAC;AACD,SAAS,KAAK,CAAC,KAKd;IACC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;IAC3B,IAAI,IAAqB,CAAA;IACzB,IAAI,UAA2C,CAAA;IAC/C,OAAO,CAAC,GAAG,EAAE;QACX,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,IAAI,KAAK,CAAC,aAAa,KAAK,SAAS;YACrE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;QACvC,UAAU;YACR,KAAK,CAAC,UAAU;gBAChB,IAAI,mBAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,aAAc,EAAE,CAAC,CAAA;QAChF,KAAK,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACtD,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;QACrC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IACF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,UAAU,KAAK,SAAS;YAC1B,KAAK,CAAC,KAAK,CAAC,UAAU,KAAK,SAAS;gBAClC,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE;gBACtB,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC5C,CAAC,CAAC,CAAA;IACF,YAAY,CAAC,GAAG,EAAE;QAChB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAA;QACzB,IAAI,UAAU,KAAK,SAAS;YAC1B,KAAK,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAA;IACzF,CAAC,CAAC,CAAA;IACF,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAG,CAAA;AAC1F,CAAC"}

package/dist/server-components/client.d.ts

@@ -0,0 +1,3 @@
+import { type NativeRangeOptions } from "@nifrajs/web/server-components/range";
+export declare function solidComponentClient(options: Omit<NativeRangeOptions, "adapter" | "runtime">): import("@nifrajs/web/server-components/client").ComponentClientAdapter;
+//# sourceMappingURL=client.d.ts.map

package/dist/server-components/client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/server-components/client.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,kBAAkB,EAExB,MAAM,sCAAsC,CAAA;AAG7C,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,SAAS,CAAC,0EAwD5F"}

package/dist/server-components/client.js

@@ -0,0 +1,56 @@
+import { disposeComponentPortals } from "@nifrajs/web/server-components/portal";
+import { nativeComponentClient, } from "@nifrajs/web/server-components/range";
+import { batch, createComponent, createSignal } from "solid-js";
+import { hydrate } from "solid-js/web";
+export function solidComponentClient(options) {
+    return nativeComponentClient({
+        ...options,
+        adapter: "solid",
+        runtime: {
+            hydrate(host, contract, record) {
+                // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: Only this adapter produces its prepared tree and native root; component records and public props are validated before native preparation.
+                const [props, setProps] = createSignal(record.props);
+                const slots = Object.fromEntries(contract.slots.map((name) => [
+                    name,
+                    '<nifra-slot data-nifra-slot="' +
+                        name +
+                        '">' +
+                        (record.slots?.[name] ?? "") +
+                        "</nifra-slot>",
+                ]));
+                const reactive = new Proxy({}, {
+                    // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: Only this adapter produces its prepared tree and native root; component records and public props are validated before native preparation.
+                    get: (_, name) => (name === "slots" ? slots : props()[name]),
+                    has: (_, name) => name === "slots" || Object.hasOwn(props(), name),
+                    ownKeys: () => [...Object.keys(props()), "slots"],
+                    getOwnPropertyDescriptor: () => ({ enumerable: true, configurable: true }),
+                });
+                const dispose = hydrate(
+                // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: Only this adapter produces its prepared tree and native root; component records and public props are validated before native preparation.
+                () => createComponent(contract.component, reactive), host, { renderId: record.renderId });
+                let disposed = false;
+                return {
+                    update(next, current) {
+                        if (!disposed && current())
+                            batch(() => {
+                                if (current())
+                                    setProps(() => next);
+                            });
+                    },
+                    async dispose() {
+                        if (!disposed) {
+                            disposed = true;
+                            try {
+                                await disposeComponentPortals(host);
+                            }
+                            finally {
+                                dispose();
+                            }
+                        }
+                    },
+                };
+            },
+        },
+    });
+}
+//# sourceMappingURL=client.js.map

package/dist/server-components/client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/server-components/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAA;AAC/E,OAAO,EAEL,qBAAqB,GACtB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,KAAK,EAAkB,eAAe,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,MAAM,UAAU,oBAAoB,CAAC,OAAwD;IAC3F,OAAO,qBAAqB,CAAC;QAC3B,GAAG,OAAO;QACV,OAAO,EAAE,OAAO;QAChB,OAAO,EAAE;YACP,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM;gBAC5B,2MAA2M;gBAC3M,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,KAAgC,CAAC,CAAA;gBAC/E,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAC9B,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;oBAC3B,IAAI;oBACJ,+BAA+B;wBAC7B,IAAI;wBACJ,IAAI;wBACJ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;wBAC5B,eAAe;iBAClB,CAAC,CACH,CAAA;gBACD,MAAM,QAAQ,GAAG,IAAI,KAAK,CACxB,EAAE,EACF;oBACE,2MAA2M;oBAC3M,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,IAAc,CAAC,CAAC;oBACtE,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC;oBAClE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,OAAO,CAAC;oBACjD,wBAAwB,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;iBAC3E,CACF,CAAA;gBACD,MAAM,OAAO,GAAG,OAAO;gBACrB,2MAA2M;gBAC3M,GAAG,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,SAA+C,EAAE,QAAQ,CAAC,EACzF,IAAI,EACJ,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAC9B,CAAA;gBACD,IAAI,QAAQ,GAAG,KAAK,CAAA;gBACpB,OAAO;oBACL,MAAM,CAAC,IAAI,EAAE,OAAO;wBAClB,IAAI,CAAC,QAAQ,IAAI,OAAO,EAAE;4BACxB,KAAK,CAAC,GAAG,EAAE;gCACT,IAAI,OAAO,EAAE;oCAAE,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAA;4BACrC,CAAC,CAAC,CAAA;oBACN,CAAC;oBACD,KAAK,CAAC,OAAO;wBACX,IAAI,CAAC,QAAQ,EAAE,CAAC;4BACd,QAAQ,GAAG,IAAI,CAAA;4BACf,IAAI,CAAC;gCACH,MAAM,uBAAuB,CAAC,IAAI,CAAC,CAAA;4BACrC,CAAC;oCAAS,CAAC;gCACT,OAAO,EAAE,CAAA;4BACX,CAAC;wBACH,CAAC;oBACH,CAAC;iBACF,CAAA;YACH,CAAC;SACF;KACF,CAAC,CAAA;AACJ,CAAC"}

package/dist/server-components/server.d.ts

@@ -0,0 +1,3 @@
+import type { ServerComponentRenderAdapter } from "@nifrajs/web/server-components";
+export declare const solidServerComponents: () => ServerComponentRenderAdapter;
+//# sourceMappingURL=server.d.ts.map

package/dist/server-components/server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server-components/server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAA;AAIlF,eAAO,MAAM,qBAAqB,QAAO,4BAMtC,CAAA"}

package/dist/server-components/server.js

@@ -0,0 +1,9 @@
+import { nativeServerComponents } from "@nifrajs/web/server-components/native";
+import { createComponent } from "solid-js";
+import { renderToString } from "solid-js/web";
+export const solidServerComponents = () => nativeServerComponents("solid", (component, props, renderId) => 
+// biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: The native renderer receives only its registered component and schema-projected props from the shared executor.
+renderToString(() => createComponent(component, props), {
+    renderId,
+}));
+//# sourceMappingURL=server.js.map

package/dist/server-components/server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server-components/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAA;AAC9E,OAAO,EAAkB,eAAe,EAAE,MAAM,UAAU,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAiC,EAAE,CACtE,sBAAsB,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;AAC7D,iLAAiL;AACjL,cAAc,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,SAA+C,EAAE,KAAK,CAAC,EAAE;IAC5F,QAAQ;CACT,CAAC,CACH,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nifrajs/web-solid",
-  "version": "4.0.2",
+  "version": "5.1.0",
   "description": "Solid render adapter for @nifrajs/web - SSR + hydration, with the Solid Babel build plugin (@nifrajs/web-solid/plugin).",
   "keywords": [
     "bun",
@@ -90,6 +90,20 @@
       "bun": "./src/fn.ts",
       "types": "./dist/fn.d.ts",
       "default": "./dist/fn.js"
+    },
+    "./server-components": {
+      "bun": "./src/server-components/server.ts",
+      "types": "./dist/server-components/server.d.ts",
+      "default": "./dist/server-components/server.js"
+    },
+    "./server-components/client": {
+      "bun": "./src/server-components/client.ts",
+      "types": "./dist/server-components/client.d.ts",
+      "default": "./dist/server-components/client.js"
+    },
+    "./server-components/outlet": {
+      "types": "./dist/server-components/Outlet.d.ts",
+      "default": "./src/server-components/Outlet.tsx"
     }
   },
   "files": [
@@ -107,10 +121,10 @@
   "dependencies": {
     "@babel/core": "^7.26.0",
     "@babel/preset-typescript": "^7.26.0",
-    "@nifrajs/core": "4.0.2",
-    "@nifrajs/i18n": "4.0.2",
-    "@nifrajs/image": "4.0.2",
-    "@nifrajs/web": "4.0.2",
+    "@nifrajs/core": "5.1.0",
+    "@nifrajs/i18n": "5.1.0",
+    "@nifrajs/image": "5.1.0",
+    "@nifrajs/web": "5.1.0",
     "babel-preset-solid": "^1.9.3",
     "solid-refresh": "^0.7.8"
   },

package/src/index.ts

@@ -5,6 +5,7 @@
  * Bun-plugin in `@nifrajs/web-solid/plugin`.
  */
 import type { RenderAdapter } from "@nifrajs/web"
+import { sharedConfig } from "solid-js"
 import {
   generateHydrationScript,
   renderToStream as solidRenderToStream,
@@ -14,6 +15,43 @@ import { compose } from "./compose.ts"
 
 const HYDRATION_HEAD = generateHydrationScript()
 
+// An unset NODE_ENV counts as production, as for the framework's own error pages.
+const showsErrors = (): boolean => {
+  const nodeEnv = typeof process === "undefined" ? undefined : process.env?.NODE_ENV
+  return nodeEnv === "development" || nodeEnv === "test"
+}
+
+/** What the browser receives for an error Solid hands to hydration: its text names server internals. */
+function redactedError(): Error {
+  // Built bare: a constructed Error carries a stack and, on Bun, the line, column and file it was made
+  // at, and Solid serializes every own property.
+  // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: Object.create over Error.prototype with a message is an Error minus its stack.
+  return Object.create(Error.prototype, {
+    message: { value: "Internal Server Error", writable: true, configurable: true },
+  }) as Error
+}
+
+/**
+ * Render `app` with every Error that Solid serializes for hydration replaced. An `<ErrorBoundary>` that
+ * caught on the server, or a failed resource, otherwise ships the message and stack in an inline script.
+ * Nested contexts copy this one, so they keep the wrapped `serialize`.
+ */
+function redactingErrors<T>(app: () => T): () => T {
+  if (showsErrors()) return app
+  return () => {
+    // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: Solid's server renderers set a context with serialize; the check below handles its absence.
+    const context = sharedConfig.context as
+      | { serialize?: (id: string, value: unknown) => void }
+      | undefined
+    const serialize = context?.serialize
+    if (context !== undefined && serialize !== undefined) {
+      context.serialize = (id, value) =>
+        serialize(id, value instanceof Error ? redactedError() : value)
+    }
+    return app()
+  }
+}
+
 /** The Solid server render adapter - pass to @nifrajs/web's `renderPage`. */
 export const solidAdapter: RenderAdapter = {
   // Synchronous one-pass render for non-deferred pages (renderPage's buffered fast path). Solid's
@@ -21,8 +59,11 @@ export const solidAdapter: RenderAdapter = {
   // `generateHydrationScript()`) as `renderToStream`, but skips the TransformStream + Solid's
   // streaming machinery - the heaviest of the five renderers on Bun. A page that defer()s/Suspends
   // takes `renderToStream` below (progressive resolution needs it).
-  renderToString(chain, props) {
-    return solidRenderToString(compose(chain, props))
+  renderToString(chain, props, options) {
+    const app = redactingErrors(compose(chain, props))
+    return options?.nonce === undefined
+      ? solidRenderToString(app)
+      : solidRenderToString(app, { nonce: options.nonce })
   },
   renderToStream(chain, props, options) {
     // Solid's `renderToStream` streams `Uint8Array` chunks into a Web `WritableStream` via
@@ -31,7 +72,7 @@ export const solidAdapter: RenderAdapter = {
     // <head>) seeds client hydration. A render failure errors `ts.readable`, which `renderPage`
     // surfaces on the response body. The nonce reaches the resource and boundary scripts Solid streams.
     const ts = new TransformStream<Uint8Array, Uint8Array>()
-    const app = compose(chain, props)
+    const app = redactingErrors(compose(chain, props))
     const stream =
       options?.nonce === undefined
         ? solidRenderToStream(app)

package/src/route-props.ts

@@ -18,6 +18,9 @@ export function routeProps(
     },
     // Each layout's own loader data. Without it a layout renders `data: null` on the client while the
     // server rendered it with its data.
+    get serverComponents() {
+      return snapshot().serverComponents
+    },
     get layoutData() {
       return snapshot().layoutData
     },

package/src/server-components/Outlet.tsx

@@ -0,0 +1,72 @@
+import {
+  type ComponentClientAdapter,
+  ComponentController,
+  type ComponentKey,
+  type ComponentState,
+  type ServerComponent as Handle,
+  resolveComponentRecord,
+} from "@nifrajs/web/server-components/client"
+import { createEffect, createMemo, type JSX, onCleanup, onMount, Show } from "solid-js"
+export function ServerComponent<Input, Props, View>(props: {
+  readonly state: ComponentState
+  readonly component: Handle<Input, Props, View>
+  readonly instanceKey: ComponentKey
+  readonly input: NoInfer<Input>
+  readonly parent?: string
+  readonly controller?: ComponentController | undefined
+  readonly clientAdapter?: ComponentClientAdapter | undefined
+}): JSX.Element {
+  const record = createMemo(() =>
+    resolveComponentRecord(
+      props.state,
+      props.component,
+      props.instanceKey,
+      props.input,
+      props.parent ?? null,
+    ),
+  )
+  return (
+    <Show keyed when={record().instance}>
+      {(_instance: string) => (
+        <Range
+          state={props.state}
+          record={record()}
+          controller={props.controller}
+          clientAdapter={props.clientAdapter}
+        />
+      )}
+    </Show>
+  )
+}
+function Range(props: {
+  readonly state: ComponentState
+  readonly record: import("@nifrajs/web/server-components/client").ComponentRecord
+  readonly controller?: ComponentController | undefined
+  readonly clientAdapter?: ComponentClientAdapter | undefined
+}): JSX.Element {
+  const record = props.record
+  let host!: HTMLDivElement
+  let controller: ComponentController | undefined
+  onMount(() => {
+    if (props.controller === undefined && props.clientAdapter === undefined)
+      throw new Error("component_contract")
+    controller =
+      props.controller ??
+      new ComponentController({ state: props.state, adapter: props.clientAdapter! })
+    void controller.mount(host, record.instance).catch(() => {
+      throw new Error("component_failed")
+    })
+  })
+  onCleanup(() => {
+    if (controller !== undefined)
+      void (props.controller === undefined
+        ? controller.dispose()
+        : controller.unmount(record.instance))
+  })
+  createEffect(() => {
+    const state = props.state
+    if (controller !== undefined)
+      void controller.adopt(state).catch(() => controller?.reportError("component_failed"))
+  })
+  return <div ref={host} data-nifra-component={record.instance} innerHTML={record.html} />
+}

package/src/server-components/client.ts

@@ -0,0 +1,64 @@
+import { disposeComponentPortals } from "@nifrajs/web/server-components/portal"
+import {
+  type NativeRangeOptions,
+  nativeComponentClient,
+} from "@nifrajs/web/server-components/range"
+import { batch, type Component, createComponent, createSignal } from "solid-js"
+import { hydrate } from "solid-js/web"
+export function solidComponentClient(options: Omit<NativeRangeOptions, "adapter" | "runtime">) {
+  return nativeComponentClient({
+    ...options,
+    adapter: "solid",
+    runtime: {
+      hydrate(host, contract, record) {
+        // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: Only this adapter produces its prepared tree and native root; component records and public props are validated before native preparation.
+        const [props, setProps] = createSignal(record.props as Record<string, unknown>)
+        const slots = Object.fromEntries(
+          contract.slots.map((name) => [
+            name,
+            '<nifra-slot data-nifra-slot="' +
+              name +
+              '">' +
+              (record.slots?.[name] ?? "") +
+              "</nifra-slot>",
+          ]),
+        )
+        const reactive = new Proxy<Record<string, unknown>>(
+          {},
+          {
+            // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: Only this adapter produces its prepared tree and native root; component records and public props are validated before native preparation.
+            get: (_, name) => (name === "slots" ? slots : props()[name as string]),
+            has: (_, name) => name === "slots" || Object.hasOwn(props(), name),
+            ownKeys: () => [...Object.keys(props()), "slots"],
+            getOwnPropertyDescriptor: () => ({ enumerable: true, configurable: true }),
+          },
+        )
+        const dispose = hydrate(
+          // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: Only this adapter produces its prepared tree and native root; component records and public props are validated before native preparation.
+          () => createComponent(contract.component as Component<Record<string, unknown>>, reactive),
+          host,
+          { renderId: record.renderId },
+        )
+        let disposed = false
+        return {
+          update(next, current) {
+            if (!disposed && current())
+              batch(() => {
+                if (current()) setProps(() => next)
+              })
+          },
+          async dispose() {
+            if (!disposed) {
+              disposed = true
+              try {
+                await disposeComponentPortals(host)
+              } finally {
+                dispose()
+              }
+            }
+          },
+        }
+      },
+    },
+  })
+}

package/src/server-components/server.ts

@@ -0,0 +1,11 @@
+import type { ServerComponentRenderAdapter } from "@nifrajs/web/server-components"
+import { nativeServerComponents } from "@nifrajs/web/server-components/native"
+import { type Component, createComponent } from "solid-js"
+import { renderToString } from "solid-js/web"
+export const solidServerComponents = (): ServerComponentRenderAdapter =>
+  nativeServerComponents("solid", (component, props, renderId) =>
+    // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: The native renderer receives only its registered component and schema-projected props from the shared executor.
+    renderToString(() => createComponent(component as Component<Record<string, unknown>>, props), {
+      renderId,
+    }),
+  )