@lovrozagar/flare 0.5.0 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@lovrozagar/flare",
-	"version": "0.5.0",
+	"version": "0.6.0",
 	"description": "Solid meta-framework. Server-driven, NDJSON streaming, renderToStream.",
 	"keywords": [
 		"flare",
@@ -130,10 +130,10 @@
 	"peerDependencies": {
 		"@babel/parser": ">=8.0.0",
 		"@formatjs/intl-localematcher": ">=0.6.0",
-		"@solidjs/vite-plugin": ">=3.0.0-next.0",
-		"@solidjs/web": ">=2.0.0-rc.0",
+		"@solidjs/vite-plugin": ">=3.0.0-next.47",
+		"@solidjs/web": ">=2.0.0-rc.13",
 		"@tanstack/query-broadcast-client-experimental": ">=5.0.0",
-		"@tanstack/solid-query": ">=6.0.0-rc.0",
+		"@tanstack/solid-query": ">=6.0.0-rc.5",
 		"isbot": ">=5.0.0",
 		"magic-string": ">=0.30.0",
 		"negotiator": ">=1.0.0",
@@ -141,7 +141,7 @@
 		"oxc-parser": ">=0.139.0",
 		"oxc-resolver": ">=11.23.0",
 		"sharp": ">=0.33.0",
-		"solid-js": ">=2.0.0-rc.0",
+		"solid-js": ">=2.0.0-rc.13",
 		"tailwindcss": ">=4.0.0",
 		"vite": ">=8.0.0"
 	},

package/src/components/index.ts

@@ -11,7 +11,7 @@ export {
 } from "./await.tsx";
 export { DirectionScript, type DirectionScriptProps } from "./direction-script.tsx";
 export { ResetCSS } from "./reset-css.tsx";
-export { SSRContextProvider, type SSRContextValue, setSSRContext, useSSRContext } from "./ssr-context.tsx";
+export { SSRContextProvider, type SSRContextValue, useSSRContext } from "./ssr-context.tsx";
 export { ThemeScript, type ThemeScriptProps } from "./theme-script.tsx";
 export { ViewTransitionCSS, type ViewTransitionCSSProps } from "./view-transition-css.tsx";
 

package/src/components/ssr-context.tsx

@@ -18,9 +18,6 @@ export interface SSRContextValue {
 
 const SSRCtx = createContext<SSRContextValue | null>(null);
 
-/** @deprecated Wrap the tree with SSRContextProvider. Solid 2 has no sharedConfig.context. */
-export function setSSRContext(_value: SSRContextValue): void {}
-
 export function useSSRContext(): SSRContextValue | undefined {
 	return useContext(SSRCtx) ?? undefined;
 }

package/src/direction/index.tsx

@@ -1,4 +1,4 @@
-import { createContext, createEffect, createSignal, onSettled, sharedConfig, untrack, useContext } from "solid-js";
+import { createContext, createEffect, createSignal, isHydrating, onSettled, untrack, useContext } from "solid-js";
 import { isServer, type JSX } from "@solidjs/web";
 
 export type Direction = "ltr" | "rtl";
@@ -61,7 +61,7 @@ export function DirectionProvider(props: { children: JSX.Element; config?: Direc
 		storageKey: props.config?.storageKey ?? DEFAULT_CONFIG.storageKey,
 	};
 
-	const hydrating = isServer || !!sharedConfig.hydrating;
+	const hydrating = isServer || isHydrating();
 
 	/* During SSR + hydration, start from defaultDir so the tree matches.
 	   DirectionScript already applied localStorage to <html> before first paint. */

package/src/generators/index.ts

@@ -1210,7 +1210,7 @@ export function generateRouteRegistry(
 	}
 
 	if (hasServer) {
-		lines.push(`\t\tenv: Parameters<typeof _FlareHandler["fetch"]>[1]`);
+		lines.push(`\t\tenv: NonNullable<(typeof _FlareHandler)["~flare"]>["env"]`);
 		lines.push(`\t\tserverContext: NonNullable<(typeof _FlareHandler)["~flare"]>["serverContext"]`);
 	}
 	if (hasQueryClient) {

package/src/lazy/index.tsx

@@ -1,6 +1,6 @@
 import type { JSX } from "@solidjs/web";
 import { Dynamic, isServer } from "@solidjs/web";
-import { type Component, createSignal, onSettled, Show, sharedConfig, untrack } from "solid-js";
+import { type Component, createSignal, isHydrating, onSettled, Show, untrack } from "solid-js";
 import { retryImport } from "../internal.ts";
 import { warn } from "../logger.ts";
 import { GLOBAL_LAZY_LOADED, GLOBAL_LAZY_PENDING } from "../protocol.ts";
@@ -56,7 +56,7 @@ export function lazy<P extends Record<string, unknown>>(options: LazyOptions<P>)
 	getGlobalPending().add(loadPromise);
 
 	return ((props: P) => {
-		const isSSR = isServer || !!sharedConfig.hydrating;
+		const isSSR = isServer || isHydrating();
 
 		/* Pre-known error at render time → throw from component body */
 		if (loadError) throw loadError;
@@ -116,7 +116,7 @@ export function clientLazy<P extends Record<string, unknown>>(
 	}
 
 	return ((props: P & { pending?: Component<P> }) => {
-		const isSSR = isServer || !!sharedConfig.hydrating;
+		const isSSR = isServer || isHydrating();
 
 		/* Pre-known error at render time → throw from component body */
 		if (loadError) throw loadError;

package/src/server/index.ts

@@ -43,53 +43,54 @@ export interface ServerBuilder<
 	TExcluded extends string = never,
 	TAuth = unknown,
 	TServerContext = Record<string, unknown>,
+	TEnv = unknown,
 > {
-	/** Type-only: what `.authenticateFn()` and `.serverContext()` resolve to. Generated route types read it. */
-	readonly "~flare"?: { auth: TAuth; serverContext: TServerContext };
+	/** Type-only: what `.authenticateFn()`, `.serverContext()`, and `createServer<TEnv>()` resolve to. Generated route types read it. */
+	readonly "~flare"?: { auth: TAuth; env: TEnv; serverContext: TServerContext };
 	authenticateFn: "authenticateFn" extends TExcluded
 		? never
 		: <TNewAuth>(
 				fn: (ctx: {
 					callerData?: unknown[];
-					env: unknown;
+					env: TEnv;
 					request: Request;
 					serverContext: Record<string, unknown>;
 					url: URL;
 				}) => TNewAuth | null | Promise<TNewAuth | null>,
-			) => ServerBuilder<TExcluded | "authenticateFn", TNewAuth, TServerContext>;
+			) => ServerBuilder<TExcluded | "authenticateFn", TNewAuth, TServerContext, TEnv>;
 	cache: "cache" extends TExcluded
 		? never
-		: (config: HandlerCacheConfig) => ServerBuilder<TExcluded | "cache", TAuth, TServerContext>;
-	fetch(request: Request, env?: unknown, ctx?: { waitUntil?: (p: Promise<unknown>) => void }): Promise<Response>;
+		: (config: HandlerCacheConfig) => ServerBuilder<TExcluded | "cache", TAuth, TServerContext, TEnv>;
+	fetch(request: Request, env?: TEnv, ctx?: { waitUntil?: (p: Promise<unknown>) => void }): Promise<Response>;
 	getStaticParams(): Promise<StaticParamsMap>;
 	keepalive: "keepalive" extends TExcluded
 		? never
-		: (config: KeepaliveConfig) => ServerBuilder<TExcluded | "keepalive", TAuth, TServerContext>;
-	mount(prefix: string, target: MountTarget): ServerBuilder<TExcluded, TAuth, TServerContext>;
+		: (config: KeepaliveConfig) => ServerBuilder<TExcluded | "keepalive", TAuth, TServerContext, TEnv>;
+	mount(prefix: string, target: MountTarget): ServerBuilder<TExcluded, TAuth, TServerContext, TEnv>;
 	security: "security" extends TExcluded
 		? never
 		: (
 				config:
 					| SecurityConfig
 					| ((ctx: {
-							env: unknown;
+							env: TEnv;
 							nonce: string;
 							request: Request;
 							serverContext: Record<string, unknown>;
 					  }) => SecurityConfig),
-			) => ServerBuilder<TExcluded | "security", TAuth, TServerContext>;
+			) => ServerBuilder<TExcluded | "security", TAuth, TServerContext, TEnv>;
 	serverContext: "serverContext" extends TExcluded
 		? never
 		: <T extends Record<string, unknown>>(
-				fn: (ctx: { env: unknown; request: Request }) => T | Promise<T>,
-			) => ServerBuilder<TExcluded | "serverContext", TAuth, T>;
+				fn: (ctx: { env: TEnv; request: Request }) => T | Promise<T>,
+			) => ServerBuilder<TExcluded | "serverContext", TAuth, T, TEnv>;
 	sitemap: "sitemap" extends TExcluded
 		? never
-		: (config: SitemapSubmitConfig) => ServerBuilder<TExcluded | "sitemap", TAuth, TServerContext>;
+		: (config: SitemapSubmitConfig) => ServerBuilder<TExcluded | "sitemap", TAuth, TServerContext, TEnv>;
 	tracing: "tracing" extends TExcluded
 		? never
-		: (config: TracingConfig) => ServerBuilder<TExcluded | "tracing", TAuth, TServerContext>;
-	use(...args: (FlareMiddleware | PathMatcher | string)[]): ServerBuilder<TExcluded, TAuth, TServerContext>;
+		: (config: TracingConfig) => ServerBuilder<TExcluded | "tracing", TAuth, TServerContext, TEnv>;
+	use(...args: (FlareMiddleware | PathMatcher | string)[]): ServerBuilder<TExcluded, TAuth, TServerContext, TEnv>;
 }
 
 /* Internal implementation type — no exclusion tracking */
@@ -155,7 +156,10 @@ function bindWaitUntil(ctx?: {
 	};
 }
 
-export function createServer(router: MarkedRouterConfig): ServerBuilder {
+/** `TEnv` is the worker env (`createServer<Cloudflare.Env>(router)`); it types `ctx.env` here and in every route. */
+export function createServer<TEnv = unknown>(
+	router: MarkedRouterConfig,
+): ServerBuilder<never, unknown, Record<string, unknown>, TEnv> {
 	const middlewareEntries: MiddlewareEntry[] = [];
 	const mountConfigs: MountConfig[] = [];
 	let authenticateFn: ServerHandlerConfig["authenticateFn"];
@@ -293,5 +297,5 @@ export function createServer(router: MarkedRouterConfig): ServerBuilder {
 		},
 	};
 
-	return builder as ServerBuilder;
+	return builder as ServerBuilder<never, unknown, Record<string, unknown>, TEnv>;
 }

package/src/theme/index.tsx

@@ -3,8 +3,8 @@ import {
 	createEffect,
 	createMemo,
 	createSignal,
+	isHydrating,
 	onSettled,
-	sharedConfig,
 	untrack,
 	useContext,
 } from "solid-js";
@@ -68,7 +68,7 @@ export function ThemeProvider(props: { children: JSX.Element; config?: ThemeConf
 		themes: props.config?.themes ?? DEFAULT_CONFIG.themes,
 	};
 
-	const hydrating = isServer || !!sharedConfig.hydrating;
+	const hydrating = isServer || isHydrating();
 
 	/* During SSR + hydration, always start from defaultTheme so the tree matches.
 	   ThemeScript already applied localStorage to <html> before first paint.