eddev 2.3.18 → 2.3.19

package/dist/app/lib/blocks/editor/installGutenbergHooks.d.ts

@@ -1,5 +1,5 @@
 export declare const blockMetaDescriptors: Map<string, BlockMeta> & {
-    $$valtioSnapshot: Omit<Map<string, BlockMeta>, "set" | "clear" | "delete">;
+    $$valtioSnapshot: Omit<Map<string, BlockMeta>, "set" | "delete" | "clear">;
 };
 export declare function whenEditorIsReady(): Promise<void>;
 export declare function installEDGutenbergHooks(): void;

package/dist/app/lib/devtools/components/DevUI.d.ts

@@ -10,7 +10,7 @@ export declare class ErrorBoundary extends Component<PropsWithChildren<{}>, Stat
     state: State;
     static getDerivedStateFromError(err: Error): State;
     componentDidCatch(error: Error, errorInfo: ErrorInfo): void;
-    render(): string | number | boolean | Iterable<import("react").ReactNode> | import("react").JSX.Element | null | undefined;
+    render(): string | number | boolean | import("react").JSX.Element | Iterable<import("react").ReactNode> | null | undefined;
 }
 export {};
 //# sourceMappingURL=DevUI.d.ts.map

package/dist/app/lib/devtools/hooks/useTailwind.d.ts

@@ -85,12 +85,12 @@ export declare function useTailwindConfig(): {
                     readonly max: string;
                 })[];
             } | undefined;
-            readonly supports?: {
+            readonly supports?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
                 readonly [x: string]: string;
-            } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
-            readonly data?: {
+            } | undefined;
+            readonly data?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
                 readonly [x: string]: string;
-            } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
+            } | undefined;
             readonly colors?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").RecursiveKeyValuePair<string, string>) | {
                 readonly [x: string]: string | /*elided*/ any;
             } | undefined;
@@ -493,12 +493,12 @@ export declare function useTailwindConfig(): {
                         readonly max: string;
                     })[];
                 } | undefined;
-                readonly supports?: {
+                readonly supports?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
                     readonly [x: string]: string;
-                } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
-                readonly data?: {
+                } | undefined;
+                readonly data?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
                     readonly [x: string]: string;
-                } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
+                } | undefined;
                 readonly colors?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").RecursiveKeyValuePair<string, string>) | {
                     readonly [x: string]: string | /*elided*/ any;
                 } | undefined;
@@ -1130,12 +1130,12 @@ export declare function useTailwindConfig(): {
                             readonly max: string;
                         })[];
                     } | undefined;
-                    readonly supports?: {
+                    readonly supports?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
                         readonly [x: string]: string;
-                    } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
-                    readonly data?: {
+                    } | undefined;
+                    readonly data?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
                         readonly [x: string]: string;
-                    } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
+                    } | undefined;
                     readonly colors?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").RecursiveKeyValuePair<string, string>) | {
                         readonly [x: string]: string | /*elided*/ any;
                     } | undefined;
@@ -1538,12 +1538,12 @@ export declare function useTailwindConfig(): {
                                 readonly max: string;
                             })[];
                         } | undefined;
-                        readonly supports?: {
+                        readonly supports?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
                             readonly [x: string]: string;
-                        } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
-                        readonly data?: {
+                        } | undefined;
+                        readonly data?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
                             readonly [x: string]: string;
-                        } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
+                        } | undefined;
                         readonly colors?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").RecursiveKeyValuePair<string, string>) | {
                             readonly [x: string]: string | /*elided*/ any;
                         } | undefined;
@@ -2150,12 +2150,12 @@ export declare function useTailwindConfig(): {
                 readonly max: string;
             })[];
         } | undefined;
-        readonly supports?: {
+        readonly supports?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
             readonly [x: string]: string;
-        } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
-        readonly data?: {
+        } | undefined;
+        readonly data?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
             readonly [x: string]: string;
-        } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
+        } | undefined;
         readonly colors?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").RecursiveKeyValuePair<string, string>) | {
             readonly [x: string]: string | /*elided*/ any;
         } | undefined;
@@ -2558,12 +2558,12 @@ export declare function useTailwindConfig(): {
                     readonly max: string;
                 })[];
             } | undefined;
-            readonly supports?: {
+            readonly supports?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
                 readonly [x: string]: string;
-            } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
-            readonly data?: {
+            } | undefined;
+            readonly data?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
                 readonly [x: string]: string;
-            } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
+            } | undefined;
             readonly colors?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").RecursiveKeyValuePair<string, string>) | {
                 readonly [x: string]: string | /*elided*/ any;
             } | undefined;
@@ -3221,12 +3221,12 @@ export declare function useTailwindConfig(): {
                             readonly max: string;
                         })[];
                     } | undefined;
-                    readonly supports?: {
+                    readonly supports?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
                         readonly [x: string]: string;
-                    } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
-                    readonly data?: {
+                    } | undefined;
+                    readonly data?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
                         readonly [x: string]: string;
-                    } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
+                    } | undefined;
                     readonly colors?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").RecursiveKeyValuePair<string, string>) | {
                         readonly [x: string]: string | /*elided*/ any;
                     } | undefined;
@@ -3629,12 +3629,12 @@ export declare function useTailwindConfig(): {
                                 readonly max: string;
                             })[];
                         } | undefined;
-                        readonly supports?: {
+                        readonly supports?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
                             readonly [x: string]: string;
-                        } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
-                        readonly data?: {
+                        } | undefined;
+                        readonly data?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
                             readonly [x: string]: string;
-                        } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
+                        } | undefined;
                         readonly colors?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").RecursiveKeyValuePair<string, string>) | {
                             readonly [x: string]: string | /*elided*/ any;
                         } | undefined;
@@ -4239,12 +4239,12 @@ export declare function useTailwindConfig(): {
                         readonly max: string;
                     })[];
                 } | undefined;
-                readonly supports?: {
+                readonly supports?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
                     readonly [x: string]: string;
-                } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
-                readonly data?: {
+                } | undefined;
+                readonly data?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
                     readonly [x: string]: string;
-                } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
+                } | undefined;
                 readonly colors?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").RecursiveKeyValuePair<string, string>) | {
                     readonly [x: string]: string | /*elided*/ any;
                 } | undefined;
@@ -4647,12 +4647,12 @@ export declare function useTailwindConfig(): {
                             readonly max: string;
                         })[];
                     } | undefined;
-                    readonly supports?: {
+                    readonly supports?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
                         readonly [x: string]: string;
-                    } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
-                    readonly data?: {
+                    } | undefined;
+                    readonly data?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | {
                         readonly [x: string]: string;
-                    } | ((utils: import("tailwindcss/types/config.js").PluginUtils) => Record<string, string>) | undefined;
+                    } | undefined;
                     readonly colors?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").RecursiveKeyValuePair<string, string>) | {
                         readonly [x: string]: string | /*elided*/ any;
                     } | undefined;

package/dist/app/lib/dynamic/dynamic.js

@@ -1,12 +1,12 @@
 import { createElement, forwardRef, lazy, memo, useRef } from "react";
-import { useAssetCapture } from "../../utils/asset-capture.js";
+import { useSSRResponse } from "../../utils/ssr-response-data.js";
 export function dynamic(factory, name) {
     const ReactLazyComponent = lazy(factory);
     let PreloadedComponent;
     let factoryPromise;
     const Component = memo(forwardRef(function LazyWithPreload(props, ref) {
         if (env.serverless && !env.client && name) {
-            useAssetCapture()?.add(name);
+            useSSRResponse()?.addPreload(name);
         }
         // Once one of these is chosen, we must ensure that it continues to be
         // used for all subsequent renders, otherwise it can cause the

package/dist/app/lib/hooks/query-hooks.d.ts

@@ -1,4 +1,4 @@
-import { FetchQueryOptions, UndefinedInitialDataInfiniteOptions, UndefinedInitialDataOptions, UseInfiniteQueryResult, UseMutationOptions, UseMutationResult, UseQueryResult } from "@tanstack/react-query";
+import { type FetchQueryOptions, type UndefinedInitialDataInfiniteOptions, type UndefinedInitialDataOptions, type UseInfiniteQueryResult, type UseMutationOptions, type UseMutationResult, type UseQueryResult } from "@tanstack/react-query";
 import { TRPCClientError, TRPCRequestOptions } from "@trpc/client";
 type OptionalMaybes<T> = T extends any[] ? T : T extends {
     [key: string]: any;
@@ -37,14 +37,15 @@ type CreateUseInfiniteQueryOptions = {
     defaultLimit: number;
     paths: Record<"nodesPath" | "pageInfoPath" | "endCursorPath" | "hasNextPagePath", string[]>;
 };
+export type InfiniteQueryResult<TData = any, TVars = any> = UseInfiniteQueryResult<{
+    nodes: TData;
+    total?: number | null;
+}, QueryError>;
 export type UseInfiniteQueryFunction<TData, TVars> = (args: OptionalMaybes<Omit<TVars, "cursor">>, options?: Omit<UndefinedInitialDataInfiniteOptions<TData, QueryError, TData, any[]>, "queryKey" | "queryFn" | "initialData" | "initialPageParam" | "getNextPageParam" | "select"> & {
     headers?: Record<string, string>;
     /** Initial data can be passed in, but should match the original GraphQL query in structure (including nodes/hasNextPage/endCursor) */
     initialData?: any;
-}) => UseInfiniteQueryResult<{
-    nodes: TData;
-    total?: number | null;
-}, QueryError>;
+}) => InfiniteQueryResult<TData, TVars>;
 export declare function createUseInfiniteQuery<TData extends any, TVars extends MaybeVars>(init: CreateUseInfiniteQueryOptions): UseInfiniteQueryFunction<TData, TVars>;
 export type UseMutationFunction<TData, TArgs> = ((options?: Omit<UseMutationOptions<TData, QueryError, TArgs>, "mutationFn"> & {
     headers?: Record<string, string>;
@@ -86,5 +87,5 @@ export declare const rpcClient: {
     mutation<TName extends RPCMutationName>(name: TName, input: RPCMutationInput<TName>, opts?: TRPCRequestOptions): Promise<RPCMutationResult<TName>>;
 };
 export declare function getQueryClient(): import("@tanstack/react-query").QueryClient;
-export type { QueryError, UseQueryResult, UseMutationResult };
+export type { QueryError, UseMutationResult, UseQueryResult };
 //# sourceMappingURL=query-hooks.d.ts.map

package/dist/app/lib/hooks/query-hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-hooks.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/hooks/query-hooks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query-hooks.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/hooks/query-hooks.ts"],"names":[],"mappings":"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"}

package/dist/app/lib/hooks/query-hooks.js

@@ -1,7 +1,7 @@
-import { useInfiniteQuery, useMutation, useQuery, useQueryClient, } from "@tanstack/react-query";
-import { startTransition, useEffect, useState } from "react";
+import { useInfiniteQuery, useMutation, useQuery, useQueryClient, useSuspenseQuery, useSuspenseInfiniteQuery } from "@tanstack/react-query";
+import { useMemo } from "react";
 import { joinURL } from "ufo";
-import { getQueryClient as utilGetQueryClient } from "../../utils/query-client.js";
+import { getHydratedSSRQuery, getQueryClient as utilGetQueryClient } from "../../utils/query-client.js";
 import { getRPCClient } from "../../utils/trpc-client.js";
 import { apiConfig } from "../runtime/apiConfig.js";
 class QueryError extends Error {
@@ -73,11 +73,13 @@ const fetchQuery = async (name, params, opts) => {
 export function createUseQuery(init) {
     const hook = (args, options) => {
         const customKey = apiConfig.customQueryKey;
-        return useQuery({
-            queryKey: ["query", init.name, args, options?.headers, customKey],
+        const queryKey = ["query", init.name, args, options?.headers, customKey];
+        return (env.server ? useSuspenseQuery : useQuery)({
+            queryKey: queryKey,
             queryFn: (args) => fetchQuery(init.name, args.queryKey[2] ? JSON.stringify(args.queryKey[2]) : "", {
                 headers: options?.headers,
             }),
+            initialData: env.client ? getHydratedSSRQuery(queryKey) : undefined,
             ...options,
         }, useFallbackClient());
     };
@@ -99,31 +101,31 @@ function selectByPath(data, path) {
 export function createUseInfiniteQuery(init) {
     const hook = (args, options) => {
         const customKey = apiConfig.customQueryKey;
-        const [initial, setInitial] = useState(() => {
-            if (options?.initialData) {
-                const data = options?.initialData;
+        const queryKey = ["query", init.name, args, init.defaultLimit, options?.headers, customKey];
+        const initial = useMemo(() => {
+            let data = options?.initialData;
+            if (data) {
                 const endCursor = selectByPath(data, init.paths.endCursorPath);
                 const hasNextPage = selectByPath(data, init.paths.hasNextPagePath);
                 const nodes = selectByPath(data, init.paths.nodesPath);
-                if (!nodes)
-                    return {};
+                if (nodes) {
+                    return {
+                        initialData: {
+                            pages: [{ nodes, endCursor, hasNextPage }],
+                            pageParams: [],
+                        },
+                    };
+                }
+            }
+            data = getHydratedSSRQuery(queryKey);
+            if (data) {
                 return {
-                    initialData: {
-                        pages: [{ nodes, endCursor, hasNextPage }],
-                        pageParams: [],
-                    },
+                    initialData: data,
                 };
             }
-        });
-        useEffect(() => {
-            startTransition(() => {
-                setInitial({
-                    initialData: undefined,
-                });
-            });
         }, []);
-        return useInfiniteQuery({
-            queryKey: ["query", init.name, args, init.defaultLimit, options?.headers, customKey],
+        return (env.server ? useSuspenseInfiniteQuery : useInfiniteQuery)({
+            queryKey,
             queryFn: async (args) => {
                 const finalArgs = {
                     limit: args.queryKey[3],

package/dist/app/server/render-ssr-page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render-ssr-page.d.ts","sourceRoot":"","sources":["../../../src/app/server/render-ssr-page.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAKrF,KAAK,OAAO,GAAG;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,qBAAqB,CAAA;IAClC,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,OAAO,wDAyH/C;AAED,KAAK,UAAU,GAAG;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CA6GpE;AAED,KAAK,mBAAmB,GAAG;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,GAAG,CAAA;CAChB,GAAG,eAAe,CAAA;AAEnB,wBAAsB,eAAe,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAiBlF;AAED,KAAK,KAAK,GAAG;IACX,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAA;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAgB,WAAW,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,KAAK,UA8B1D"}
+{"version":3,"file":"render-ssr-page.d.ts","sourceRoot":"","sources":["../../../src/app/server/render-ssr-page.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAKrF,KAAK,OAAO,GAAG;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,qBAAqB,CAAA;IAClC,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,OAAO,wDAoI/C;AAED,KAAK,UAAU,GAAG;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CA6GpE;AAED,KAAK,mBAAmB,GAAG;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,GAAG,CAAA;CAChB,GAAG,eAAe,CAAA;AAEnB,wBAAsB,eAAe,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAiBlF;AAED,KAAK,KAAK,GAAG;IACX,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAA;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAgB,WAAW,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,KAAK,UA8B1D"}

package/dist/app/server/render-ssr-page.js

@@ -5,14 +5,17 @@ import { Writable } from "stream";
 import { MetaTags } from "../entry/MetaTags.js";
 import { SSRRoot } from "../entry/ssr-root.js";
 import { RouteLoader } from "../lib/routing/loader.js";
-import { AssetCaptureContext } from "../utils/asset-capture.js";
+import { ServerRenderResponseContext } from "../utils/ssr-response-data.js";
 import { ServerContext } from "./server-context.js";
 import { SecureHeaderBuilder } from "./utils/content-security.js";
 export async function getSsrStream(args) {
     const clientManifest = ServerContext.main.runtime.getManifest("client");
-    const preloadAssets = new Set([clientManifest.handler]);
-    const includedAssets = new Set();
-    const jsx = (_jsx(Suspense, { children: _jsx(AssetCaptureContext.Provider, { value: preloadAssets, children: _jsx(SSRRoot, { metaTags: args.initialData?.meta?.head || [], pathname: args.pathname, hostname: args.hostname, initialData: args.initialData, loader: new RouteLoader() }) }) }));
+    const ssrResponse = {
+        preloadAssets: new Set([clientManifest.handler]),
+        includedAssets: new Set(),
+        queryCache: new Map(),
+    };
+    const jsx = (_jsx(Suspense, { children: _jsx(ServerRenderResponseContext.Provider, { value: ssrResponse, children: _jsx(SSRRoot, { metaTags: args.initialData?.meta?.head || [], pathname: args.pathname, hostname: args.hostname, initialData: args.initialData, loader: new RouteLoader() }) }) }));
     const stream = await new Promise(async (resolve, reject) => {
         // console.log("Rendering to pipable")
         const stream = renderToPipeableStream(jsx, {
@@ -63,7 +66,7 @@ export async function getSsrStream(args) {
                 });
                 stream.pipe(writableStream);
             });
-            for (const input of preloadAssets) {
+            for (const input of ssrResponse.preloadAssets) {
                 const assets = await clientManifest.inputs[input].assets();
                 // controller.enqueue(new TextEncoder().encode(`\n<!-- for ${input} -->`))
                 for (const _asset of assets) {
@@ -75,9 +78,9 @@ export async function getSsrStream(args) {
                     if (!key) {
                         throw new Error("Asset must have a key: " + JSON.stringify(asset));
                     }
-                    if (includedAssets.has(key))
+                    if (ssrResponse.includedAssets.has(key))
                         continue;
-                    includedAssets.add(key);
+                    ssrResponse.includedAssets.add(key);
                     // Render the asset
                     try {
                         const tag = renderAsset(asset);
@@ -88,6 +91,7 @@ export async function getSsrStream(args) {
                     }
                 }
             }
+            controller.enqueue(new TextEncoder().encode(`<script type="text/javascript">window._SSR_CACHE=${JSON.stringify([...ssrResponse.queryCache.entries()])}</script>`));
             // console.log("ASSETS", await clientManifest)
             controller.enqueue(new TextEncoder().encode(middle));
             for (const chunk of inner) {

package/dist/app/utils/query-client.d.ts

@@ -1,5 +1,6 @@
 import { QueryClient } from "@tanstack/react-query";
 import { PropsWithChildren } from "react";
 export declare function getQueryClient(): QueryClient;
+export declare function getHydratedSSRQuery(queryKey: any): any;
 export declare function QueryProvider(props: PropsWithChildren<{}>): import("react").JSX.Element;
 //# sourceMappingURL=query-client.d.ts.map

package/dist/app/utils/query-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-client.d.ts","sourceRoot":"","sources":["../../../src/app/utils/query-client.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAuB,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAGzC,wBAAgB,cAAc,gBAc7B;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,iBAAiB,CAAC,EAAE,CAAC,+BAEzD"}
+{"version":3,"file":"query-client.d.ts","sourceRoot":"","sources":["../../../src/app/utils/query-client.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA8B,WAAW,EAAuB,MAAM,uBAAuB,CAAA;AACpG,OAAO,EAAE,iBAAiB,EAAW,MAAM,OAAO,CAAA;AAelD,wBAAgB,cAAc,gBAO7B;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,GAAG,OAMhD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,iBAAiB,CAAC,EAAE,CAAC,+BAyBzD"}

package/dist/app/utils/query-client.js

@@ -1,20 +1,53 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { QueryClientProvider, QueryClient } from "@tanstack/react-query";
+import { QueryCache, QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { useMemo } from "react";
+import { useSSRResponse } from "./ssr-response-data.js";
+function getQueryClientOptions() {
+    if (env.serverless && env.dev && !env.client) {
+        return {
+            queries: {
+                staleTime: 1,
+            },
+        };
+    }
+    return {};
+}
 let queryClient = null;
 export function getQueryClient() {
     if (!queryClient) {
         queryClient = new QueryClient({
-            defaultOptions: env.serverless && env.dev && !env.client
-                ? {
-                    queries: {
-                        staleTime: 1,
-                    },
-                }
-                : {},
+            defaultOptions: getQueryClientOptions(),
         });
     }
     return queryClient;
 }
+export function getHydratedSSRQuery(queryKey) {
+    const queryHash = JSON.stringify(queryKey);
+    if (env.client && env.frontend && typeof window !== "undefined" && "_SSR_CACHE" in window) {
+        const cache = window._SSR_CACHE;
+        return cache.find(([hash]) => hash === queryHash)?.[1];
+    }
+}
 export function QueryProvider(props) {
-    return _jsx(QueryClientProvider, { client: getQueryClient(), children: props.children });
+    const ssrResponse = useSSRResponse();
+    const queryClient = useMemo(() => {
+        let queryCache;
+        /**
+         * In SSR server mode, save query cache values to the SSR Response metadata.
+         * The client will try to get these from getHydratedSSRQuery()
+         */
+        if (env.server) {
+            queryCache = new QueryCache({
+                onSuccess(data, query) {
+                    ssrResponse?.queryCache.set(JSON.stringify(query.queryKey), data);
+                },
+            });
+            return new QueryClient({
+                queryCache: queryCache,
+                defaultOptions: getQueryClientOptions(),
+            });
+        }
+        return getQueryClient();
+    }, []);
+    return _jsx(QueryClientProvider, { client: queryClient, children: props.children });
 }

package/dist/app/utils/ssr-cache.d.ts

@@ -0,0 +1,6 @@
+export type SSRResponseData = {
+    assets: Set<string>;
+};
+export declare const SSRResponseContext: import("react").Context<SSRResponseData>;
+export declare const useSSRResponse: () => SSRResponseData;
+//# sourceMappingURL=ssr-cache.d.ts.map

package/dist/app/utils/ssr-cache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ssr-cache.d.ts","sourceRoot":"","sources":["../../../src/app/utils/ssr-cache.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,kBAAkB,0CAA6C,CAAA;AAE5E,eAAO,MAAM,cAAc,uBAE1B,CAAA"}

package/dist/app/utils/ssr-cache.js

@@ -0,0 +1,5 @@
+import { createContext, useContext } from "react";
+export const SSRResponseContext = createContext(undefined);
+export const useSSRResponse = () => {
+    return useContext(SSRResponseContext);
+};

package/dist/app/utils/ssr-response-data.d.ts

@@ -0,0 +1,13 @@
+export type ServerRenderResponseData = {
+    preloadAssets: Set<string>;
+    includedAssets: Set<string>;
+    queryCache: Map<string, any>;
+};
+export declare const ServerRenderResponseContext: import("react").Context<ServerRenderResponseData | undefined>;
+export declare function useSSRResponse(): {
+    addPreload(name: string): void;
+    preloadAssets: Set<string>;
+    includedAssets: Set<string>;
+    queryCache: Map<string, any>;
+} | null;
+//# sourceMappingURL=ssr-response-data.d.ts.map

package/dist/app/utils/ssr-response-data.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ssr-response-data.d.ts","sourceRoot":"","sources":["../../../src/app/utils/ssr-response-data.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,wBAAwB,GAAG;IACrC,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3B,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5B,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,2BAA2B,+DAAiE,CAAA;AAEzG,wBAAgB,cAAc;qBAMP,MAAM;mBAbZ,GAAG,CAAC,MAAM,CAAC;oBACV,GAAG,CAAC,MAAM,CAAC;gBACf,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC;SAiB7B"}

package/dist/app/utils/ssr-response-data.js

@@ -0,0 +1,14 @@
+import { createContext, useContext } from "react";
+export const ServerRenderResponseContext = createContext(undefined);
+export function useSSRResponse() {
+    const data = useContext(ServerRenderResponseContext);
+    if (data) {
+        return {
+            ...data,
+            addPreload(name) {
+                data.preloadAssets.add(name);
+            }
+        };
+    }
+    return null;
+}

package/dist/node/compiler/get-vite-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-vite-config.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/get-vite-config.ts"],"names":[],"mappings":"AAMA,OAAO,EAAgB,YAAY,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAG/D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAEtD,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,UAAU,EAAE,OAAO,CAAA;IACnB,MAAM,EAAE,UAAU,GAAG,KAAK,CAAA;IAC1B,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;IACzB,MAAM,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CAqDlD;AAED,KAAK,eAAe,GAAG;IACrB,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,wBAAgB,WAAW,CAAC,IAAI,GAAE,eAAoB,kBA4FrD;AAED;;GAEG;AACH,wBAAgB,SAAS,IAAI,YAAY,CA6CxC;AA4BD,wBAAgB,aAAa,IAAI,YAAY,CAW5C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,EAAE,CAatD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,EAAE,CAE/D;AAED,wBAAgB,wBAAwB,IAAI,YAAY,CA8BvD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE;IAAE,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,YAAY,CA6BzG;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CAmEtD"}
+{"version":3,"file":"get-vite-config.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/get-vite-config.ts"],"names":[],"mappings":"AAMA,OAAO,EAAgB,YAAY,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAG/D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAEtD,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,UAAU,EAAE,OAAO,CAAA;IACnB,MAAM,EAAE,UAAU,GAAG,KAAK,CAAA;IAC1B,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;IACzB,MAAM,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CAuDlD;AAED,KAAK,eAAe,GAAG;IACrB,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,wBAAgB,WAAW,CAAC,IAAI,GAAE,eAAoB,kBA4FrD;AAED;;GAEG;AACH,wBAAgB,SAAS,IAAI,YAAY,CA6CxC;AA4BD,wBAAgB,aAAa,IAAI,YAAY,CAW5C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,EAAE,CAatD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,EAAE,CAE/D;AAED,wBAAgB,wBAAwB,IAAI,YAAY,CA8BvD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE;IAAE,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,YAAY,CA6BzG;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CAkEtD"}

package/dist/node/compiler/get-vite-config.js

@@ -11,8 +11,10 @@ export function envPlugin(args) {
     const envDefines = {
         client: args.client ? "true" : "false",
         serverless: args.serverless ? "true" : "false",
+        server: !args.client && args.serverless ? "true" : "false",
         dev: args.mode === "development" ? "true" : "false",
         admin: args.target === "cms" ? "true" : "false",
+        frontend: args.target === "frontend" ? "true" : "false",
         themePath: JSON.stringify(args.publicUrl),
         devUI: args.mode === "development" ? "true" : "false",
         serverlessOrigin: JSON.stringify("http://serverleress-endpoint"),

package/dist/node/compiler/vinxi-app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vinxi-app.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/vinxi-app.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAKtD,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,WAAW,EAAE,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,EAAE,QAAQ,CAAA;CACjB,CAAA;AAED,KAAK,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,CAAA;AAC7D,KAAK,mBAAmB,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,QAAQ,CAAA;AACrD,KAAK,iBAAiB,GAAG,MAAM,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAA;AAEhE,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAA;CAC1C,CAAA;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,OA4P3C"}
+{"version":3,"file":"vinxi-app.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/vinxi-app.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAKtD,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,WAAW,EAAE,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,EAAE,QAAQ,CAAA;CACjB,CAAA;AAED,KAAK,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,CAAA;AAC7D,KAAK,mBAAmB,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,QAAQ,CAAA;AACrD,KAAK,iBAAiB,GAAG,MAAM,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAA;AAEhE,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAA;CAC1C,CAAA;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,OA4P3C"}

package/dist/node/compiler/vinxi-app.js

@@ -1,4 +1,5 @@
 import { joinURL } from "ufo";
+// @ts-ignore
 import { createApp } from "vinxi";
 import tsconfigPaths from "vite-tsconfig-paths";
 import { StatefulLog } from "../utils/stateful-log.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.3.18",
+  "version": "2.3.19",
   "description": "",
   "main": "index.js",
   "type": "module",

package/types.env.d.ts

@@ -2,7 +2,9 @@ declare global {
   interface EDEnv {
     client: boolean
     serverless: boolean
+    server: boolean
     admin: boolean
+    frontend: boolean,
     dev: boolean
     devUI: boolean
     rpcEnabled: boolean
@@ -17,4 +19,4 @@ declare global {
   }
 }
 
-export {}
+export { }