@alepha/react 0.14.4 → 0.15.0

package/README.md

@@ -10,3 +10,13 @@ This package is part of the Alepha framework and can be installed via the all-in
 npm install alepha
 ```
 
+## API Reference
+
+### Environment Variables
+
+Environment variables used to configure this package.
+
+| Variable | Type | Default | Description |
+|----------|------|---------|-------------|
+| `REACT_SSR_ENABLED` | boolean | - |  |
+| `REACT_STRICT_MODE` | boolean | true |  |

package/dist/auth/index.d.ts

@@ -41,10 +41,10 @@ declare class ReactAuth {
   protected readonly onBeginTransition: alepha2.HookPrimitive<"react:transition:begin">;
   protected readonly onFetchRequest: alepha2.HookPrimitive<"client:onRequest">;
   /**
-   * Get the current authenticated user.
-   *
-   * Alias for `alepha.state.get("user")`
-   */
+       * Get the current authenticated user.
+       *
+       * Alias for `alepha.state.get("user")`
+       */
   get user(): UserAccountToken | undefined;
   ping(): Promise<{
     name?: string | undefined;

package/dist/auth/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../../src/auth/hooks/useAuth.ts","../../src/auth/services/ReactAuth.ts","../../src/auth/providers/ReactAuthProvider.ts","../../src/auth/index.ts"],"sourcesContent":[],"mappings":";;;;;;;;;cAIa;;;;;;;;IAAA,KAAA,CA2BZ,EAAA,MAAA,EAAA,GAAA,SAAA;IAjBqB,EAAA,EAAA,MAAA;EAOf,CAAA,GAAA,SAAA;EAK6B,MAAA,EAAA,GAAA,GAAA,IAAA;EAAlB,KAAA,EAAA,CAAA,QAAA,EAAA,MAZI,CAYJ,EAAA,OCfI,CDeJ,EAAA;IAAiB,QAAA,CAAA,EAAA,MAAA;;;;ICftB,CAAA,KAAA,EAAS,MAAA,CAAA,EAAA,GAAA;EAAA,CAAA,EAAA,GDUf,OCTiB,CAAA,IAAA,CAAA;EACG,GAAA,EAAA,CAAA,YAAA,MAAA,GAAA,GAAA,CAAA,CAAA,IAAA,EAAA,MDaT,iBCbS,CDaS,GCbT,CAAA,EAAA,GAAA,OAAA;CACI;;;;;;cAHlB,SAAA;EDPA,mBA2BZ,GAAA,ECpBqB,cAAA,CACE,MDmBvB;EAjBqB,mBAAA,MAAA,ECDK,MDCL;EAOf,mBAAA,UAAA,ECPwB,UDOxB;EAK6B,mBAAA,YAAA,ECXH,YDWG;EAAlB,mBAAA,iBAAA,ECXe,OAAA,CAEK,aDSpB,CAAA,wBAAA,CAAA;EAAiB,mBAAA,cAAA,ECTG,OAAA,CAWH,aDFA,CAAA,kBAAA,CAAA;;;;ACfnC;;EAE2B,IAAA,IAAA,CAAA,CAAA,EA8BN,gBA9BM,GAAA,SAAA;EACI,IAAA,CAAA,CAAA,EAiCZ,OAjCY,CAAA;IACE,IAAA,CAAA,EAAA,MAAA,GAAA,SAAA;IAAA,KAEK,CAAA,EAAA,MAAA,GAAA,SAAA;IAAA,QAWH,CAAA,EAAA,MAAA,GAAA,SAAA;IAed,OAAA,CAAA,EAAA,MAAA,GAAA,SAAA;IAIF,SAAA,CAAA,EAAA,MAAA,GAAA,SAAA;IA6BN,aAAA,CAAA,EAAA,MAAA,EAAA,GAAA,SAAA;IAAR,KAAA,CAAA,EAAA,MAAA,EAAA,GAAA,SAAA;IAAO,EAAA,EAAA,MAAA;;;;IC1EC,QAAA,CAAA,EAAA,MAAiB;;;;ICSmB,KAAA,CAAA,EAAA,MAAA;IAAA,CAAA,KAAA,EAAA,MAAA,CAAA,EAAA,GAAA;MFiE5C,OE3DM,CF2DE,ME3DS,CAAA;EAAA,MAAA,CAAA,CAAA,EAAA,IAAA;;;;cDfT,iBAAA;6BACc;qBAAA,OAAA,CAED;;;;;;WCYf;;;;AHbX;;;;;AAsBmC,cGGtB,eHHsB,EGGP,OAAA,CAAA,OHHO,CGOjC,OAAA,CAJ0B,MAAA,CHHO"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../../src/auth/hooks/useAuth.ts","../../src/auth/services/ReactAuth.ts","../../src/auth/providers/ReactAuthProvider.ts","../../src/auth/index.ts"],"mappings":";;;;;;;;;cAIa,OAAA;EAAA,IAAA;IAAA,IAAA;IAAA,KAAA;IAAA,QAAA;IAAA,OAAA;IAAA,SAAA;IAAA,aAAA;IAAA,KAAA;IAAA,EAAA;EAAA;EAAA,MAAA;EAAA,KAAA,GAAA,QAAA,QAUS,CAAA,EAAA,OAAA;IAAA,QAAA;IAAA,QAAA;IAAA,QAAA;IAAA,KAAA;IAAA,CAAA,KAAA;EAAA,MAOf,OAAA;EAAA,GAAA,6BAAA,IAAA,QAKW,iBAAA,CAAkB,GAAA;AAAA;;;;ACfpC;;cAAa,SAAA;EAAA,mBAAA,GAAA,EAAS,cAAA,CACE,MAAA;EAAA,mBAAA,MAAA,EACG,MAAA;EAAA,mBAAA,UAAA,EACI,UAAA;EAAA,mBAAA,YAAA,EACE,YAAA;EAAA,mBAAA,iBAAA,EAAA,OAAA,CAEK,aAAA;EAAA,mBAAA,cAAA,EAAA,OAAA,CAWH,aAAA;EAAA;;;;;EAAA,IAAA,KAAA,GAed,gBAAA;EAAA,KAAA,GAIF,OAAA;IAAA,IAAA;IAAA,KAAA;IAAA,QAAA;IAAA,OAAA;IAAA,SAAA;IAAA,aAAA;IAAA,KAAA;IAAA,EAAA;EAAA;EAAA,IAAA,MAAA;EAAA,MAAA,QAAA,UAAA,OAAA;IAAA,QAAA;IAAA,QAAA;IAAA,QAAA;IAAA,QAAA;IAAA,KAAA;IAAA,CAAA,KAAA;EAAA,IA6Bd,OAAA,CAAQ,MAAA;EAAA,OAAA;AAAA;;;cC1EA,iBAAA;EAAA,mBAAA,MAAA,EACc,MAAA;EAAA,SAAA,QAAA,EAAA,OAAA,CAED,aAAA;AAAA;;;;;WCYf,WAAA;EAAA;AAAA;AAAA;;;AAYX;;;AAZW,cAYE,eAAA,EAAe,OAAA,CAAA,OAAA,CAI1B,OAAA,CAJ0B,MAAA"}

package/dist/auth/index.js

@@ -1735,23 +1735,19 @@ var ReactServerTemplateProvider = class {
 	*/
 	buildHydrationData(state) {
 		const { request, context, ...store } = this.alepha.context.als?.getStore() ?? {};
-		return {
-			...store,
-			"alepha.react.router.state": void 0,
-			layers: state.layers.map((layer) => ({
-				...layer,
-				error: layer.error ? {
-					...layer.error,
-					name: layer.error.name,
-					message: layer.error.message,
-					stack: !this.alepha.isProduction() ? layer.error.stack : void 0
-				} : void 0,
-				index: void 0,
-				path: void 0,
-				element: void 0,
-				route: void 0
-			}))
-		};
+		const hydrationData = { layers: state.layers.map((layer) => ({
+			name: layer.name,
+			props: layer.props,
+			config: layer.config,
+			error: layer.error ? {
+				...layer.error,
+				name: layer.error.name,
+				message: layer.error.message,
+				stack: !this.alepha.isProduction() ? layer.error.stack : void 0
+			} : void 0
+		})) };
+		for (const [key, value] of Object.entries(store)) if (key.charAt(0) !== "_" && key !== "alepha.react.router.state" && key !== "registry") hydrationData[key] = value;
+		return hydrationData;
 	}
 	/**
 	* Encode a string to Uint8Array using the shared encoder.
@@ -1882,7 +1878,7 @@ var ReactServerTemplateProvider = class {
 	* @param options - Streaming options
 	*/
 	createEarlyHtmlStream(globalHead, asyncWork, options = {}) {
-		const { hydration = true, onError, onRedirect } = options;
+		const { hydration = true, onError } = options;
 		const slots = this.getSlots();
 		const encoder = this.encoder;
 		return new ReadableStream({ start: async (controller) => {
@@ -1894,7 +1890,11 @@ var ReactServerTemplateProvider = class {
 				controller.enqueue(slots.headOpen);
 				if (this.earlyHeadContent) controller.enqueue(encoder.encode(this.earlyHeadContent));
 				const result = await asyncWork();
-				if (!result) {
+				if (!result || "redirect" in result) {
+					if (result && "redirect" in result) {
+						this.log.debug("Loader redirect detected after streaming started, using meta refresh", { redirect: result.redirect });
+						controller.enqueue(encoder.encode(`<meta http-equiv="refresh" content="0; url=${this.escapeHtml(result.redirect)}">\n`));
+					}
 					controller.enqueue(slots.headClose);
 					controller.enqueue(encoder.encode("<body></body></html>"));
 					controller.close();
@@ -2238,7 +2238,6 @@ var ReactServerProvider = class {
 		handler: async () => {
 			const ssrEnabled = this.alepha.primitives($page).length > 0 && this.env.REACT_SSR_ENABLED !== false;
 			this.alepha.store.set("alepha.react.server.ssr", ssrEnabled);
-			if (ssrEnabled) this.log.info("SSR streaming enabled");
 			if (this.alepha.isViteDev()) {
 				await this.configureVite(ssrEnabled);
 				return;
@@ -2399,10 +2398,7 @@ var ReactServerProvider = class {
 			const globalHead = this.serverHeadProvider.resolveGlobalHead();
 			const htmlStream = this.templateProvider.createEarlyHtmlStream(globalHead, async () => {
 				const result = await this.renderPage(route, state);
-				if (result.redirect) {
-					reply.redirect(result.redirect);
-					return null;
-				}
+				if (result.redirect) return { redirect: result.redirect };
 				return {
 					state,
 					reactStream: result.reactStream
@@ -2434,9 +2430,7 @@ var ReactServerProvider = class {
 	* @returns Render result with redirect or React stream
 	*/
 	async renderPage(route, state) {
-		this.serverTimingProvider.beginTiming("createLayers");
 		const { redirect } = await this.pageApi.createLayers(route, state);
-		this.serverTimingProvider.endTiming("createLayers");
 		if (redirect) {
 			this.log.debug("Resolver resulted in redirection", { redirect });
 			return { redirect };
@@ -2447,15 +2441,12 @@ var ReactServerProvider = class {
 			state.head ??= {};
 			state.head.link = [...state.head.link ?? [], ...preloadLinks];
 		}
-		this.serverTimingProvider.beginTiming("renderToStream");
 		const element = this.pageApi.root(state);
 		this.alepha.store.set("alepha.react.router.state", state);
-		const reactStream = await renderToReadableStream(element, { onError: (error) => {
+		return { reactStream: await renderToReadableStream(element, { onError: (error) => {
 			if (error instanceof Redirection) this.log.warn("Redirect during streaming ignored", { redirect: error.redirect });
 			else this.log.error("Streaming render error", error);
-		} });
-		this.serverTimingProvider.endTiming("renderToStream");
-		return { reactStream };
+		} }) };
 	}
 	/**
 	* For testing purposes, renders a page to HTML string.