@tanstack/react-query-next-experimental 5.21.2 → 5.21.6

package/build/legacy/HydrationStreamProvider.cjs

@@ -34,6 +34,7 @@ __export(HydrationStreamProvider_exports, {
   createHydrationStreamProvider: () => createHydrationStreamProvider
 });
 module.exports = __toCommonJS(HydrationStreamProvider_exports);
+var import_react_query = require("@tanstack/react-query");
 var import_navigation = require("next/navigation");
 var React = __toESM(require("react"), 1);
 var import_htmlescape = require("./htmlescape.cjs");
@@ -44,6 +45,7 @@ function createHydrationStreamProvider() {
     null
   );
   function UseClientHydrationStreamProvider(props) {
+    var _a;
     const id = `__RQ${React.useId()}`;
     const idJSON = (0, import_htmlescape.htmlEscapeJsonString)(JSON.stringify(id));
     const [transformer] = React.useState(
@@ -64,8 +66,8 @@ function createHydrationStreamProvider() {
     });
     const count = React.useRef(0);
     (0, import_navigation.useServerInsertedHTML)(() => {
-      var _a;
-      stream.push(...((_a = props.onFlush) == null ? void 0 : _a.call(props)) ?? []);
+      var _a2;
+      stream.push(...((_a2 = props.onFlush) == null ? void 0 : _a2.call(props)) ?? []);
       if (!stream.length) {
         return null;
       }
@@ -85,27 +87,23 @@ function createHydrationStreamProvider() {
         count.current++
       );
     });
-    const onEntriesRef = React.useRef(props.onEntries);
-    React.useEffect(() => {
-      onEntriesRef.current = props.onEntries;
-    });
-    React.useEffect(() => {
-      const onEntries = (...serializedEntries) => {
-        const entries = serializedEntries.map(
-          (serialized) => transformer.deserialize(serialized)
-        );
-        onEntriesRef.current(entries);
-      };
+    if (!import_react_query.isServer) {
       const win = window;
-      const winStream = win[id] ?? [];
-      onEntries(...winStream);
-      win[id] = {
-        push: onEntries
-      };
-      return () => {
-        win[id] = [];
-      };
-    }, [id, transformer]);
+      if (!((_a = win[id]) == null ? void 0 : _a.initialized)) {
+        const onEntries = (...serializedEntries) => {
+          const entries = serializedEntries.map(
+            (serialized) => transformer.deserialize(serialized)
+          );
+          props.onEntries(entries);
+        };
+        const winStream = win[id] ?? [];
+        onEntries(...winStream);
+        win[id] = {
+          initialized: true,
+          push: onEntries
+        };
+      }
+    }
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(context.Provider, { value: { stream, id }, children: props.children });
   }
   return {

package/build/legacy/HydrationStreamProvider.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/HydrationStreamProvider.tsx"],"sourcesContent":["'use client'\n\nimport { useServerInsertedHTML } from 'next/navigation'\nimport * as React from 'react'\nimport { htmlEscapeJsonString } from './htmlescape'\n\nconst serializedSymbol = Symbol('serialized')\n\ninterface DataTransformer {\n  serialize: (object: any) => any\n  deserialize: (object: any) => any\n}\n\ntype Serialized<TData> = unknown & {\n  [serializedSymbol]: TData\n}\n\ninterface TypedDataTransformer<TData> {\n  serialize: (obj: TData) => Serialized<TData>\n  deserialize: (obj: Serialized<TData>) => TData\n}\n\ninterface HydrationStreamContext<TShape> {\n  id: string\n  stream: {\n    /**\n     * **Server method**\n     * Push a new entry to the stream\n     * Will be ignored on the client\n     */\n    push: (...shape: Array<TShape>) => void\n  }\n}\n\nexport interface HydrationStreamProviderProps<TShape> {\n  children: React.ReactNode\n  /**\n   * Optional transformer to serialize/deserialize the data\n   * Example devalue, superjson et al\n   */\n  transformer?: DataTransformer\n  /**\n   * **Client method**\n   * Called in the browser when new entries are received\n   */\n  onEntries: (entries: Array<TShape>) => void\n  /**\n   * **Server method**\n   * onFlush is called on the server when the cache is flushed\n   */\n  onFlush?: () => Array<TShape>\n}\n\nexport function createHydrationStreamProvider<TShape>() {\n  const context = React.createContext<HydrationStreamContext<TShape>>(\n    null as any,\n  )\n  /**\n\n   * 1. (Happens on server): `useServerInsertedHTML()` is called **on the server** whenever a `Suspense`-boundary completes\n   *    - This means that we might have some new entries in the cache that needs to be flushed\n   *    - We pass these to the client by inserting a `<script>`-tag where we do `window[id].push(serializedVersionOfCache)`\n   * 2. (Happens in browser) In `useEffect()`:\n   *   - We check if `window[id]` is set to an array and call `push()` on all the entries which will call `onEntries()` with the new entries\n   *   - We replace `window[id]` with a `push()`-method that will be called whenever new entries are received\n   **/\n  function UseClientHydrationStreamProvider(props: {\n    children: React.ReactNode\n    /**\n     * Optional transformer to serialize/deserialize the data\n     * Example devalue, superjson et al\n     */\n    transformer?: DataTransformer\n    /**\n     * **Client method**\n     * Called in the browser when new entries are received\n     */\n    onEntries: (entries: Array<TShape>) => void\n    /**\n     * **Server method**\n     * onFlush is called on the server when the cache is flushed\n     */\n    onFlush?: () => Array<TShape>\n  }) {\n    // unique id for the cache provider\n    const id = `__RQ${React.useId()}`\n    const idJSON = htmlEscapeJsonString(JSON.stringify(id))\n\n    const [transformer] = React.useState(\n      () =>\n        (props.transformer ?? {\n          // noop\n          serialize: (obj: any) => obj,\n          deserialize: (obj: any) => obj,\n        }) as unknown as TypedDataTransformer<TShape>,\n    )\n\n    // <server stuff>\n    const [stream] = React.useState<Array<TShape>>(() => {\n      if (typeof window !== 'undefined') {\n        return {\n          push() {\n            // no-op on the client\n          },\n        } as unknown as Array<TShape>\n      }\n      return []\n    })\n    const count = React.useRef(0)\n    useServerInsertedHTML(() => {\n      // This only happens on the server\n      stream.push(...(props.onFlush?.() ?? []))\n\n      if (!stream.length) {\n        return null\n      }\n      // console.log(`pushing ${stream.length} entries`)\n      const serializedCacheArgs = stream\n        .map((entry) => transformer.serialize(entry))\n        .map((entry) => JSON.stringify(entry))\n        .join(',')\n\n      // Flush stream\n      stream.length = 0\n\n      const html: Array<string> = [\n        `window[${idJSON}] = window[${idJSON}] || [];`,\n        `window[${idJSON}].push(${htmlEscapeJsonString(serializedCacheArgs)});`,\n      ]\n      return (\n        <script\n          key={count.current++}\n          dangerouslySetInnerHTML={{\n            __html: html.join(''),\n          }}\n        />\n      )\n    })\n    // </server stuff>\n\n    // <client stuff>\n    const onEntriesRef = React.useRef(props.onEntries)\n    React.useEffect(() => {\n      onEntriesRef.current = props.onEntries\n    })\n\n    React.useEffect(() => {\n      // Client: consume cache:\n      const onEntries = (...serializedEntries: Array<Serialized<TShape>>) => {\n        const entries = serializedEntries.map((serialized) =>\n          transformer.deserialize(serialized),\n        )\n        onEntriesRef.current(entries)\n      }\n\n      const win = window as any\n      // Register cache consumer\n      const winStream: Array<Serialized<TShape>> = win[id] ?? []\n\n      onEntries(...winStream)\n\n      // Register our own consumer\n      win[id] = {\n        push: onEntries,\n      }\n\n      return () => {\n        // Cleanup after unmount\n        win[id] = []\n      }\n    }, [id, transformer])\n    // </client stuff>\n\n    return (\n      <context.Provider value={{ stream, id }}>\n        {props.children}\n      </context.Provider>\n    )\n  }\n\n  return {\n    Provider: UseClientHydrationStreamProvider,\n    context,\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,wBAAsC;AACtC,YAAuB;AACvB,wBAAqC;AA8H7B;AA5HR,IAAM,mBAAmB,OAAO,YAAY;AA+CrC,SAAS,gCAAwC;AACtD,QAAM,UAAgB;AAAA,IACpB;AAAA,EACF;AAUA,WAAS,iCAAiC,OAiBvC;AAED,UAAM,KAAK,OAAa,YAAM,CAAC;AAC/B,UAAM,aAAS,wCAAqB,KAAK,UAAU,EAAE,CAAC;AAEtD,UAAM,CAAC,WAAW,IAAU;AAAA,MAC1B,MACG,MAAM,eAAe;AAAA;AAAA,QAEpB,WAAW,CAAC,QAAa;AAAA,QACzB,aAAa,CAAC,QAAa;AAAA,MAC7B;AAAA,IACJ;AAGA,UAAM,CAAC,MAAM,IAAU,eAAwB,MAAM;AACnD,UAAI,OAAO,WAAW,aAAa;AACjC,eAAO;AAAA,UACL,OAAO;AAAA,UAEP;AAAA,QACF;AAAA,MACF;AACA,aAAO,CAAC;AAAA,IACV,CAAC;AACD,UAAM,QAAc,aAAO,CAAC;AAC5B,iDAAsB,MAAM;AA7GhC;AA+GM,aAAO,KAAK,KAAI,WAAM,YAAN,mCAAqB,CAAC,CAAE;AAExC,UAAI,CAAC,OAAO,QAAQ;AAClB,eAAO;AAAA,MACT;AAEA,YAAM,sBAAsB,OACzB,IAAI,CAAC,UAAU,YAAY,UAAU,KAAK,CAAC,EAC3C,IAAI,CAAC,UAAU,KAAK,UAAU,KAAK,CAAC,EACpC,KAAK,GAAG;AAGX,aAAO,SAAS;AAEhB,YAAM,OAAsB;AAAA,QAC1B,UAAU,MAAM,cAAc,MAAM;AAAA,QACpC,UAAU,MAAM,cAAU,wCAAqB,mBAAmB,CAAC;AAAA,MACrE;AACA,aACE;AAAA,QAAC;AAAA;AAAA,UAEC,yBAAyB;AAAA,YACvB,QAAQ,KAAK,KAAK,EAAE;AAAA,UACtB;AAAA;AAAA,QAHK,MAAM;AAAA,MAIb;AAAA,IAEJ,CAAC;AAID,UAAM,eAAqB,aAAO,MAAM,SAAS;AACjD,IAAM,gBAAU,MAAM;AACpB,mBAAa,UAAU,MAAM;AAAA,IAC/B,CAAC;AAED,IAAM,gBAAU,MAAM;AAEpB,YAAM,YAAY,IAAI,sBAAiD;AACrE,cAAM,UAAU,kBAAkB;AAAA,UAAI,CAAC,eACrC,YAAY,YAAY,UAAU;AAAA,QACpC;AACA,qBAAa,QAAQ,OAAO;AAAA,MAC9B;AAEA,YAAM,MAAM;AAEZ,YAAM,YAAuC,IAAI,EAAE,KAAK,CAAC;AAEzD,gBAAU,GAAG,SAAS;AAGtB,UAAI,EAAE,IAAI;AAAA,QACR,MAAM;AAAA,MACR;AAEA,aAAO,MAAM;AAEX,YAAI,EAAE,IAAI,CAAC;AAAA,MACb;AAAA,IACF,GAAG,CAAC,IAAI,WAAW,CAAC;AAGpB,WACE,4CAAC,QAAQ,UAAR,EAAiB,OAAO,EAAE,QAAQ,GAAG,GACnC,gBAAM,UACT;AAAA,EAEJ;AAEA,SAAO;AAAA,IACL,UAAU;AAAA,IACV;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../src/HydrationStreamProvider.tsx"],"sourcesContent":["'use client'\n\nimport { isServer } from '@tanstack/react-query'\nimport { useServerInsertedHTML } from 'next/navigation'\nimport * as React from 'react'\nimport { htmlEscapeJsonString } from './htmlescape'\n\nconst serializedSymbol = Symbol('serialized')\n\ninterface DataTransformer {\n  serialize: (object: any) => any\n  deserialize: (object: any) => any\n}\n\ntype Serialized<TData> = unknown & {\n  [serializedSymbol]: TData\n}\n\ninterface TypedDataTransformer<TData> {\n  serialize: (obj: TData) => Serialized<TData>\n  deserialize: (obj: Serialized<TData>) => TData\n}\n\ninterface HydrationStreamContext<TShape> {\n  id: string\n  stream: {\n    /**\n     * **Server method**\n     * Push a new entry to the stream\n     * Will be ignored on the client\n     */\n    push: (...shape: Array<TShape>) => void\n  }\n}\n\nexport interface HydrationStreamProviderProps<TShape> {\n  children: React.ReactNode\n  /**\n   * Optional transformer to serialize/deserialize the data\n   * Example devalue, superjson et al\n   */\n  transformer?: DataTransformer\n  /**\n   * **Client method**\n   * Called in the browser when new entries are received\n   */\n  onEntries: (entries: Array<TShape>) => void\n  /**\n   * **Server method**\n   * onFlush is called on the server when the cache is flushed\n   */\n  onFlush?: () => Array<TShape>\n}\n\nexport function createHydrationStreamProvider<TShape>() {\n  const context = React.createContext<HydrationStreamContext<TShape>>(\n    null as any,\n  )\n  /**\n\n   * 1. (Happens on server): `useServerInsertedHTML()` is called **on the server** whenever a `Suspense`-boundary completes\n   *    - This means that we might have some new entries in the cache that needs to be flushed\n   *    - We pass these to the client by inserting a `<script>`-tag where we do `window[id].push(serializedVersionOfCache)`\n   * 2. (Happens in browser) In `useEffect()`:\n   *   - We check if `window[id]` is set to an array and call `push()` on all the entries which will call `onEntries()` with the new entries\n   *   - We replace `window[id]` with a `push()`-method that will be called whenever new entries are received\n   **/\n  function UseClientHydrationStreamProvider(props: {\n    children: React.ReactNode\n    /**\n     * Optional transformer to serialize/deserialize the data\n     * Example devalue, superjson et al\n     */\n    transformer?: DataTransformer\n    /**\n     * **Client method**\n     * Called in the browser when new entries are received\n     */\n    onEntries: (entries: Array<TShape>) => void\n    /**\n     * **Server method**\n     * onFlush is called on the server when the cache is flushed\n     */\n    onFlush?: () => Array<TShape>\n  }) {\n    // unique id for the cache provider\n    const id = `__RQ${React.useId()}`\n    const idJSON = htmlEscapeJsonString(JSON.stringify(id))\n\n    const [transformer] = React.useState(\n      () =>\n        (props.transformer ?? {\n          // noop\n          serialize: (obj: any) => obj,\n          deserialize: (obj: any) => obj,\n        }) as unknown as TypedDataTransformer<TShape>,\n    )\n\n    // <server stuff>\n    const [stream] = React.useState<Array<TShape>>(() => {\n      if (typeof window !== 'undefined') {\n        return {\n          push() {\n            // no-op on the client\n          },\n        } as unknown as Array<TShape>\n      }\n      return []\n    })\n    const count = React.useRef(0)\n    useServerInsertedHTML(() => {\n      // This only happens on the server\n      stream.push(...(props.onFlush?.() ?? []))\n\n      if (!stream.length) {\n        return null\n      }\n      // console.log(`pushing ${stream.length} entries`)\n      const serializedCacheArgs = stream\n        .map((entry) => transformer.serialize(entry))\n        .map((entry) => JSON.stringify(entry))\n        .join(',')\n\n      // Flush stream\n      stream.length = 0\n\n      const html: Array<string> = [\n        `window[${idJSON}] = window[${idJSON}] || [];`,\n        `window[${idJSON}].push(${htmlEscapeJsonString(serializedCacheArgs)});`,\n      ]\n      return (\n        <script\n          key={count.current++}\n          dangerouslySetInnerHTML={{\n            __html: html.join(''),\n          }}\n        />\n      )\n    })\n    // </server stuff>\n\n    // <client stuff>\n    // Setup and run the onEntries handler on the client only, but do it during\n    // the initial render so children have access to the data immediately\n    // This is important to avoid the client suspending during the initial render\n    // if the data has not yet been hydrated.\n    if (!isServer) {\n      const win = window as any\n      if (!win[id]?.initialized) {\n        // Client: consume cache:\n        const onEntries = (...serializedEntries: Array<Serialized<TShape>>) => {\n          const entries = serializedEntries.map((serialized) =>\n            transformer.deserialize(serialized),\n          )\n          props.onEntries(entries)\n        }\n\n        const winStream: Array<Serialized<TShape>> = win[id] ?? []\n\n        onEntries(...winStream)\n\n        win[id] = {\n          initialized: true,\n          push: onEntries,\n        }\n      }\n    }\n    // </client stuff>\n\n    return (\n      <context.Provider value={{ stream, id }}>\n        {props.children}\n      </context.Provider>\n    )\n  }\n\n  return {\n    Provider: UseClientHydrationStreamProvider,\n    context,\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,yBAAyB;AACzB,wBAAsC;AACtC,YAAuB;AACvB,wBAAqC;AA8H7B;AA5HR,IAAM,mBAAmB,OAAO,YAAY;AA+CrC,SAAS,gCAAwC;AACtD,QAAM,UAAgB;AAAA,IACpB;AAAA,EACF;AAUA,WAAS,iCAAiC,OAiBvC;AApFL;AAsFI,UAAM,KAAK,OAAa,YAAM,CAAC;AAC/B,UAAM,aAAS,wCAAqB,KAAK,UAAU,EAAE,CAAC;AAEtD,UAAM,CAAC,WAAW,IAAU;AAAA,MAC1B,MACG,MAAM,eAAe;AAAA;AAAA,QAEpB,WAAW,CAAC,QAAa;AAAA,QACzB,aAAa,CAAC,QAAa;AAAA,MAC7B;AAAA,IACJ;AAGA,UAAM,CAAC,MAAM,IAAU,eAAwB,MAAM;AACnD,UAAI,OAAO,WAAW,aAAa;AACjC,eAAO;AAAA,UACL,OAAO;AAAA,UAEP;AAAA,QACF;AAAA,MACF;AACA,aAAO,CAAC;AAAA,IACV,CAAC;AACD,UAAM,QAAc,aAAO,CAAC;AAC5B,iDAAsB,MAAM;AA9GhC,UAAAA;AAgHM,aAAO,KAAK,KAAIA,MAAA,MAAM,YAAN,gBAAAA,IAAA,gBAAqB,CAAC,CAAE;AAExC,UAAI,CAAC,OAAO,QAAQ;AAClB,eAAO;AAAA,MACT;AAEA,YAAM,sBAAsB,OACzB,IAAI,CAAC,UAAU,YAAY,UAAU,KAAK,CAAC,EAC3C,IAAI,CAAC,UAAU,KAAK,UAAU,KAAK,CAAC,EACpC,KAAK,GAAG;AAGX,aAAO,SAAS;AAEhB,YAAM,OAAsB;AAAA,QAC1B,UAAU,MAAM,cAAc,MAAM;AAAA,QACpC,UAAU,MAAM,cAAU,wCAAqB,mBAAmB,CAAC;AAAA,MACrE;AACA,aACE;AAAA,QAAC;AAAA;AAAA,UAEC,yBAAyB;AAAA,YACvB,QAAQ,KAAK,KAAK,EAAE;AAAA,UACtB;AAAA;AAAA,QAHK,MAAM;AAAA,MAIb;AAAA,IAEJ,CAAC;AAQD,QAAI,CAAC,6BAAU;AACb,YAAM,MAAM;AACZ,UAAI,GAAC,SAAI,EAAE,MAAN,mBAAS,cAAa;AAEzB,cAAM,YAAY,IAAI,sBAAiD;AACrE,gBAAM,UAAU,kBAAkB;AAAA,YAAI,CAAC,eACrC,YAAY,YAAY,UAAU;AAAA,UACpC;AACA,gBAAM,UAAU,OAAO;AAAA,QACzB;AAEA,cAAM,YAAuC,IAAI,EAAE,KAAK,CAAC;AAEzD,kBAAU,GAAG,SAAS;AAEtB,YAAI,EAAE,IAAI;AAAA,UACR,aAAa;AAAA,UACb,MAAM;AAAA,QACR;AAAA,MACF;AAAA,IACF;AAGA,WACE,4CAAC,QAAQ,UAAR,EAAiB,OAAO,EAAE,QAAQ,GAAG,GACnC,gBAAM,UACT;AAAA,EAEJ;AAEA,SAAO;AAAA,IACL,UAAU;AAAA,IACV;AAAA,EACF;AACF;","names":["_a"]}

package/build/legacy/HydrationStreamProvider.js

@@ -1,6 +1,7 @@
 "use client";
 
 // src/HydrationStreamProvider.tsx
+import { isServer } from "@tanstack/react-query";
 import { useServerInsertedHTML } from "next/navigation";
 import * as React from "react";
 import { htmlEscapeJsonString } from "./htmlescape.js";
@@ -11,6 +12,7 @@ function createHydrationStreamProvider() {
     null
   );
   function UseClientHydrationStreamProvider(props) {
+    var _a;
     const id = `__RQ${React.useId()}`;
     const idJSON = htmlEscapeJsonString(JSON.stringify(id));
     const [transformer] = React.useState(
@@ -31,8 +33,8 @@ function createHydrationStreamProvider() {
     });
     const count = React.useRef(0);
     useServerInsertedHTML(() => {
-      var _a;
-      stream.push(...((_a = props.onFlush) == null ? void 0 : _a.call(props)) ?? []);
+      var _a2;
+      stream.push(...((_a2 = props.onFlush) == null ? void 0 : _a2.call(props)) ?? []);
       if (!stream.length) {
         return null;
       }
@@ -52,27 +54,23 @@ function createHydrationStreamProvider() {
         count.current++
       );
     });
-    const onEntriesRef = React.useRef(props.onEntries);
-    React.useEffect(() => {
-      onEntriesRef.current = props.onEntries;
-    });
-    React.useEffect(() => {
-      const onEntries = (...serializedEntries) => {
-        const entries = serializedEntries.map(
-          (serialized) => transformer.deserialize(serialized)
-        );
-        onEntriesRef.current(entries);
-      };
+    if (!isServer) {
       const win = window;
-      const winStream = win[id] ?? [];
-      onEntries(...winStream);
-      win[id] = {
-        push: onEntries
-      };
-      return () => {
-        win[id] = [];
-      };
-    }, [id, transformer]);
+      if (!((_a = win[id]) == null ? void 0 : _a.initialized)) {
+        const onEntries = (...serializedEntries) => {
+          const entries = serializedEntries.map(
+            (serialized) => transformer.deserialize(serialized)
+          );
+          props.onEntries(entries);
+        };
+        const winStream = win[id] ?? [];
+        onEntries(...winStream);
+        win[id] = {
+          initialized: true,
+          push: onEntries
+        };
+      }
+    }
     return /* @__PURE__ */ jsx(context.Provider, { value: { stream, id }, children: props.children });
   }
   return {

package/build/legacy/HydrationStreamProvider.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/HydrationStreamProvider.tsx"],"sourcesContent":["'use client'\n\nimport { useServerInsertedHTML } from 'next/navigation'\nimport * as React from 'react'\nimport { htmlEscapeJsonString } from './htmlescape'\n\nconst serializedSymbol = Symbol('serialized')\n\ninterface DataTransformer {\n  serialize: (object: any) => any\n  deserialize: (object: any) => any\n}\n\ntype Serialized<TData> = unknown & {\n  [serializedSymbol]: TData\n}\n\ninterface TypedDataTransformer<TData> {\n  serialize: (obj: TData) => Serialized<TData>\n  deserialize: (obj: Serialized<TData>) => TData\n}\n\ninterface HydrationStreamContext<TShape> {\n  id: string\n  stream: {\n    /**\n     * **Server method**\n     * Push a new entry to the stream\n     * Will be ignored on the client\n     */\n    push: (...shape: Array<TShape>) => void\n  }\n}\n\nexport interface HydrationStreamProviderProps<TShape> {\n  children: React.ReactNode\n  /**\n   * Optional transformer to serialize/deserialize the data\n   * Example devalue, superjson et al\n   */\n  transformer?: DataTransformer\n  /**\n   * **Client method**\n   * Called in the browser when new entries are received\n   */\n  onEntries: (entries: Array<TShape>) => void\n  /**\n   * **Server method**\n   * onFlush is called on the server when the cache is flushed\n   */\n  onFlush?: () => Array<TShape>\n}\n\nexport function createHydrationStreamProvider<TShape>() {\n  const context = React.createContext<HydrationStreamContext<TShape>>(\n    null as any,\n  )\n  /**\n\n   * 1. (Happens on server): `useServerInsertedHTML()` is called **on the server** whenever a `Suspense`-boundary completes\n   *    - This means that we might have some new entries in the cache that needs to be flushed\n   *    - We pass these to the client by inserting a `<script>`-tag where we do `window[id].push(serializedVersionOfCache)`\n   * 2. (Happens in browser) In `useEffect()`:\n   *   - We check if `window[id]` is set to an array and call `push()` on all the entries which will call `onEntries()` with the new entries\n   *   - We replace `window[id]` with a `push()`-method that will be called whenever new entries are received\n   **/\n  function UseClientHydrationStreamProvider(props: {\n    children: React.ReactNode\n    /**\n     * Optional transformer to serialize/deserialize the data\n     * Example devalue, superjson et al\n     */\n    transformer?: DataTransformer\n    /**\n     * **Client method**\n     * Called in the browser when new entries are received\n     */\n    onEntries: (entries: Array<TShape>) => void\n    /**\n     * **Server method**\n     * onFlush is called on the server when the cache is flushed\n     */\n    onFlush?: () => Array<TShape>\n  }) {\n    // unique id for the cache provider\n    const id = `__RQ${React.useId()}`\n    const idJSON = htmlEscapeJsonString(JSON.stringify(id))\n\n    const [transformer] = React.useState(\n      () =>\n        (props.transformer ?? {\n          // noop\n          serialize: (obj: any) => obj,\n          deserialize: (obj: any) => obj,\n        }) as unknown as TypedDataTransformer<TShape>,\n    )\n\n    // <server stuff>\n    const [stream] = React.useState<Array<TShape>>(() => {\n      if (typeof window !== 'undefined') {\n        return {\n          push() {\n            // no-op on the client\n          },\n        } as unknown as Array<TShape>\n      }\n      return []\n    })\n    const count = React.useRef(0)\n    useServerInsertedHTML(() => {\n      // This only happens on the server\n      stream.push(...(props.onFlush?.() ?? []))\n\n      if (!stream.length) {\n        return null\n      }\n      // console.log(`pushing ${stream.length} entries`)\n      const serializedCacheArgs = stream\n        .map((entry) => transformer.serialize(entry))\n        .map((entry) => JSON.stringify(entry))\n        .join(',')\n\n      // Flush stream\n      stream.length = 0\n\n      const html: Array<string> = [\n        `window[${idJSON}] = window[${idJSON}] || [];`,\n        `window[${idJSON}].push(${htmlEscapeJsonString(serializedCacheArgs)});`,\n      ]\n      return (\n        <script\n          key={count.current++}\n          dangerouslySetInnerHTML={{\n            __html: html.join(''),\n          }}\n        />\n      )\n    })\n    // </server stuff>\n\n    // <client stuff>\n    const onEntriesRef = React.useRef(props.onEntries)\n    React.useEffect(() => {\n      onEntriesRef.current = props.onEntries\n    })\n\n    React.useEffect(() => {\n      // Client: consume cache:\n      const onEntries = (...serializedEntries: Array<Serialized<TShape>>) => {\n        const entries = serializedEntries.map((serialized) =>\n          transformer.deserialize(serialized),\n        )\n        onEntriesRef.current(entries)\n      }\n\n      const win = window as any\n      // Register cache consumer\n      const winStream: Array<Serialized<TShape>> = win[id] ?? []\n\n      onEntries(...winStream)\n\n      // Register our own consumer\n      win[id] = {\n        push: onEntries,\n      }\n\n      return () => {\n        // Cleanup after unmount\n        win[id] = []\n      }\n    }, [id, transformer])\n    // </client stuff>\n\n    return (\n      <context.Provider value={{ stream, id }}>\n        {props.children}\n      </context.Provider>\n    )\n  }\n\n  return {\n    Provider: UseClientHydrationStreamProvider,\n    context,\n  }\n}\n"],"mappings":";;;AAEA,SAAS,6BAA6B;AACtC,YAAY,WAAW;AACvB,SAAS,4BAA4B;AA8H7B;AA5HR,IAAM,mBAAmB,OAAO,YAAY;AA+CrC,SAAS,gCAAwC;AACtD,QAAM,UAAgB;AAAA,IACpB;AAAA,EACF;AAUA,WAAS,iCAAiC,OAiBvC;AAED,UAAM,KAAK,OAAa,YAAM,CAAC;AAC/B,UAAM,SAAS,qBAAqB,KAAK,UAAU,EAAE,CAAC;AAEtD,UAAM,CAAC,WAAW,IAAU;AAAA,MAC1B,MACG,MAAM,eAAe;AAAA;AAAA,QAEpB,WAAW,CAAC,QAAa;AAAA,QACzB,aAAa,CAAC,QAAa;AAAA,MAC7B;AAAA,IACJ;AAGA,UAAM,CAAC,MAAM,IAAU,eAAwB,MAAM;AACnD,UAAI,OAAO,WAAW,aAAa;AACjC,eAAO;AAAA,UACL,OAAO;AAAA,UAEP;AAAA,QACF;AAAA,MACF;AACA,aAAO,CAAC;AAAA,IACV,CAAC;AACD,UAAM,QAAc,aAAO,CAAC;AAC5B,0BAAsB,MAAM;AA7GhC;AA+GM,aAAO,KAAK,KAAI,WAAM,YAAN,mCAAqB,CAAC,CAAE;AAExC,UAAI,CAAC,OAAO,QAAQ;AAClB,eAAO;AAAA,MACT;AAEA,YAAM,sBAAsB,OACzB,IAAI,CAAC,UAAU,YAAY,UAAU,KAAK,CAAC,EAC3C,IAAI,CAAC,UAAU,KAAK,UAAU,KAAK,CAAC,EACpC,KAAK,GAAG;AAGX,aAAO,SAAS;AAEhB,YAAM,OAAsB;AAAA,QAC1B,UAAU,MAAM,cAAc,MAAM;AAAA,QACpC,UAAU,MAAM,UAAU,qBAAqB,mBAAmB,CAAC;AAAA,MACrE;AACA,aACE;AAAA,QAAC;AAAA;AAAA,UAEC,yBAAyB;AAAA,YACvB,QAAQ,KAAK,KAAK,EAAE;AAAA,UACtB;AAAA;AAAA,QAHK,MAAM;AAAA,MAIb;AAAA,IAEJ,CAAC;AAID,UAAM,eAAqB,aAAO,MAAM,SAAS;AACjD,IAAM,gBAAU,MAAM;AACpB,mBAAa,UAAU,MAAM;AAAA,IAC/B,CAAC;AAED,IAAM,gBAAU,MAAM;AAEpB,YAAM,YAAY,IAAI,sBAAiD;AACrE,cAAM,UAAU,kBAAkB;AAAA,UAAI,CAAC,eACrC,YAAY,YAAY,UAAU;AAAA,QACpC;AACA,qBAAa,QAAQ,OAAO;AAAA,MAC9B;AAEA,YAAM,MAAM;AAEZ,YAAM,YAAuC,IAAI,EAAE,KAAK,CAAC;AAEzD,gBAAU,GAAG,SAAS;AAGtB,UAAI,EAAE,IAAI;AAAA,QACR,MAAM;AAAA,MACR;AAEA,aAAO,MAAM;AAEX,YAAI,EAAE,IAAI,CAAC;AAAA,MACb;AAAA,IACF,GAAG,CAAC,IAAI,WAAW,CAAC;AAGpB,WACE,oBAAC,QAAQ,UAAR,EAAiB,OAAO,EAAE,QAAQ,GAAG,GACnC,gBAAM,UACT;AAAA,EAEJ;AAEA,SAAO;AAAA,IACL,UAAU;AAAA,IACV;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../src/HydrationStreamProvider.tsx"],"sourcesContent":["'use client'\n\nimport { isServer } from '@tanstack/react-query'\nimport { useServerInsertedHTML } from 'next/navigation'\nimport * as React from 'react'\nimport { htmlEscapeJsonString } from './htmlescape'\n\nconst serializedSymbol = Symbol('serialized')\n\ninterface DataTransformer {\n  serialize: (object: any) => any\n  deserialize: (object: any) => any\n}\n\ntype Serialized<TData> = unknown & {\n  [serializedSymbol]: TData\n}\n\ninterface TypedDataTransformer<TData> {\n  serialize: (obj: TData) => Serialized<TData>\n  deserialize: (obj: Serialized<TData>) => TData\n}\n\ninterface HydrationStreamContext<TShape> {\n  id: string\n  stream: {\n    /**\n     * **Server method**\n     * Push a new entry to the stream\n     * Will be ignored on the client\n     */\n    push: (...shape: Array<TShape>) => void\n  }\n}\n\nexport interface HydrationStreamProviderProps<TShape> {\n  children: React.ReactNode\n  /**\n   * Optional transformer to serialize/deserialize the data\n   * Example devalue, superjson et al\n   */\n  transformer?: DataTransformer\n  /**\n   * **Client method**\n   * Called in the browser when new entries are received\n   */\n  onEntries: (entries: Array<TShape>) => void\n  /**\n   * **Server method**\n   * onFlush is called on the server when the cache is flushed\n   */\n  onFlush?: () => Array<TShape>\n}\n\nexport function createHydrationStreamProvider<TShape>() {\n  const context = React.createContext<HydrationStreamContext<TShape>>(\n    null as any,\n  )\n  /**\n\n   * 1. (Happens on server): `useServerInsertedHTML()` is called **on the server** whenever a `Suspense`-boundary completes\n   *    - This means that we might have some new entries in the cache that needs to be flushed\n   *    - We pass these to the client by inserting a `<script>`-tag where we do `window[id].push(serializedVersionOfCache)`\n   * 2. (Happens in browser) In `useEffect()`:\n   *   - We check if `window[id]` is set to an array and call `push()` on all the entries which will call `onEntries()` with the new entries\n   *   - We replace `window[id]` with a `push()`-method that will be called whenever new entries are received\n   **/\n  function UseClientHydrationStreamProvider(props: {\n    children: React.ReactNode\n    /**\n     * Optional transformer to serialize/deserialize the data\n     * Example devalue, superjson et al\n     */\n    transformer?: DataTransformer\n    /**\n     * **Client method**\n     * Called in the browser when new entries are received\n     */\n    onEntries: (entries: Array<TShape>) => void\n    /**\n     * **Server method**\n     * onFlush is called on the server when the cache is flushed\n     */\n    onFlush?: () => Array<TShape>\n  }) {\n    // unique id for the cache provider\n    const id = `__RQ${React.useId()}`\n    const idJSON = htmlEscapeJsonString(JSON.stringify(id))\n\n    const [transformer] = React.useState(\n      () =>\n        (props.transformer ?? {\n          // noop\n          serialize: (obj: any) => obj,\n          deserialize: (obj: any) => obj,\n        }) as unknown as TypedDataTransformer<TShape>,\n    )\n\n    // <server stuff>\n    const [stream] = React.useState<Array<TShape>>(() => {\n      if (typeof window !== 'undefined') {\n        return {\n          push() {\n            // no-op on the client\n          },\n        } as unknown as Array<TShape>\n      }\n      return []\n    })\n    const count = React.useRef(0)\n    useServerInsertedHTML(() => {\n      // This only happens on the server\n      stream.push(...(props.onFlush?.() ?? []))\n\n      if (!stream.length) {\n        return null\n      }\n      // console.log(`pushing ${stream.length} entries`)\n      const serializedCacheArgs = stream\n        .map((entry) => transformer.serialize(entry))\n        .map((entry) => JSON.stringify(entry))\n        .join(',')\n\n      // Flush stream\n      stream.length = 0\n\n      const html: Array<string> = [\n        `window[${idJSON}] = window[${idJSON}] || [];`,\n        `window[${idJSON}].push(${htmlEscapeJsonString(serializedCacheArgs)});`,\n      ]\n      return (\n        <script\n          key={count.current++}\n          dangerouslySetInnerHTML={{\n            __html: html.join(''),\n          }}\n        />\n      )\n    })\n    // </server stuff>\n\n    // <client stuff>\n    // Setup and run the onEntries handler on the client only, but do it during\n    // the initial render so children have access to the data immediately\n    // This is important to avoid the client suspending during the initial render\n    // if the data has not yet been hydrated.\n    if (!isServer) {\n      const win = window as any\n      if (!win[id]?.initialized) {\n        // Client: consume cache:\n        const onEntries = (...serializedEntries: Array<Serialized<TShape>>) => {\n          const entries = serializedEntries.map((serialized) =>\n            transformer.deserialize(serialized),\n          )\n          props.onEntries(entries)\n        }\n\n        const winStream: Array<Serialized<TShape>> = win[id] ?? []\n\n        onEntries(...winStream)\n\n        win[id] = {\n          initialized: true,\n          push: onEntries,\n        }\n      }\n    }\n    // </client stuff>\n\n    return (\n      <context.Provider value={{ stream, id }}>\n        {props.children}\n      </context.Provider>\n    )\n  }\n\n  return {\n    Provider: UseClientHydrationStreamProvider,\n    context,\n  }\n}\n"],"mappings":";;;AAEA,SAAS,gBAAgB;AACzB,SAAS,6BAA6B;AACtC,YAAY,WAAW;AACvB,SAAS,4BAA4B;AA8H7B;AA5HR,IAAM,mBAAmB,OAAO,YAAY;AA+CrC,SAAS,gCAAwC;AACtD,QAAM,UAAgB;AAAA,IACpB;AAAA,EACF;AAUA,WAAS,iCAAiC,OAiBvC;AApFL;AAsFI,UAAM,KAAK,OAAa,YAAM,CAAC;AAC/B,UAAM,SAAS,qBAAqB,KAAK,UAAU,EAAE,CAAC;AAEtD,UAAM,CAAC,WAAW,IAAU;AAAA,MAC1B,MACG,MAAM,eAAe;AAAA;AAAA,QAEpB,WAAW,CAAC,QAAa;AAAA,QACzB,aAAa,CAAC,QAAa;AAAA,MAC7B;AAAA,IACJ;AAGA,UAAM,CAAC,MAAM,IAAU,eAAwB,MAAM;AACnD,UAAI,OAAO,WAAW,aAAa;AACjC,eAAO;AAAA,UACL,OAAO;AAAA,UAEP;AAAA,QACF;AAAA,MACF;AACA,aAAO,CAAC;AAAA,IACV,CAAC;AACD,UAAM,QAAc,aAAO,CAAC;AAC5B,0BAAsB,MAAM;AA9GhC,UAAAA;AAgHM,aAAO,KAAK,KAAIA,MAAA,MAAM,YAAN,gBAAAA,IAAA,gBAAqB,CAAC,CAAE;AAExC,UAAI,CAAC,OAAO,QAAQ;AAClB,eAAO;AAAA,MACT;AAEA,YAAM,sBAAsB,OACzB,IAAI,CAAC,UAAU,YAAY,UAAU,KAAK,CAAC,EAC3C,IAAI,CAAC,UAAU,KAAK,UAAU,KAAK,CAAC,EACpC,KAAK,GAAG;AAGX,aAAO,SAAS;AAEhB,YAAM,OAAsB;AAAA,QAC1B,UAAU,MAAM,cAAc,MAAM;AAAA,QACpC,UAAU,MAAM,UAAU,qBAAqB,mBAAmB,CAAC;AAAA,MACrE;AACA,aACE;AAAA,QAAC;AAAA;AAAA,UAEC,yBAAyB;AAAA,YACvB,QAAQ,KAAK,KAAK,EAAE;AAAA,UACtB;AAAA;AAAA,QAHK,MAAM;AAAA,MAIb;AAAA,IAEJ,CAAC;AAQD,QAAI,CAAC,UAAU;AACb,YAAM,MAAM;AACZ,UAAI,GAAC,SAAI,EAAE,MAAN,mBAAS,cAAa;AAEzB,cAAM,YAAY,IAAI,sBAAiD;AACrE,gBAAM,UAAU,kBAAkB;AAAA,YAAI,CAAC,eACrC,YAAY,YAAY,UAAU;AAAA,UACpC;AACA,gBAAM,UAAU,OAAO;AAAA,QACzB;AAEA,cAAM,YAAuC,IAAI,EAAE,KAAK,CAAC;AAEzD,kBAAU,GAAG,SAAS;AAEtB,YAAI,EAAE,IAAI;AAAA,UACR,aAAa;AAAA,UACb,MAAM;AAAA,QACR;AAAA,MACF;AAAA,IACF;AAGA,WACE,oBAAC,QAAQ,UAAR,EAAiB,OAAO,EAAE,QAAQ,GAAG,GACnC,gBAAM,UACT;AAAA,EAEJ;AAEA,SAAO;AAAA,IACL,UAAU;AAAA,IACV;AAAA,EACF;AACF;","names":["_a"]}

package/build/modern/HydrationStreamProvider.cjs

@@ -34,6 +34,7 @@ __export(HydrationStreamProvider_exports, {
   createHydrationStreamProvider: () => createHydrationStreamProvider
 });
 module.exports = __toCommonJS(HydrationStreamProvider_exports);
+var import_react_query = require("@tanstack/react-query");
 var import_navigation = require("next/navigation");
 var React = __toESM(require("react"), 1);
 var import_htmlescape = require("./htmlescape.cjs");
@@ -84,27 +85,23 @@ function createHydrationStreamProvider() {
         count.current++
       );
     });
-    const onEntriesRef = React.useRef(props.onEntries);
-    React.useEffect(() => {
-      onEntriesRef.current = props.onEntries;
-    });
-    React.useEffect(() => {
-      const onEntries = (...serializedEntries) => {
-        const entries = serializedEntries.map(
-          (serialized) => transformer.deserialize(serialized)
-        );
-        onEntriesRef.current(entries);
-      };
+    if (!import_react_query.isServer) {
       const win = window;
-      const winStream = win[id] ?? [];
-      onEntries(...winStream);
-      win[id] = {
-        push: onEntries
-      };
-      return () => {
-        win[id] = [];
-      };
-    }, [id, transformer]);
+      if (!win[id]?.initialized) {
+        const onEntries = (...serializedEntries) => {
+          const entries = serializedEntries.map(
+            (serialized) => transformer.deserialize(serialized)
+          );
+          props.onEntries(entries);
+        };
+        const winStream = win[id] ?? [];
+        onEntries(...winStream);
+        win[id] = {
+          initialized: true,
+          push: onEntries
+        };
+      }
+    }
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(context.Provider, { value: { stream, id }, children: props.children });
   }
   return {

package/build/modern/HydrationStreamProvider.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/HydrationStreamProvider.tsx"],"sourcesContent":["'use client'\n\nimport { useServerInsertedHTML } from 'next/navigation'\nimport * as React from 'react'\nimport { htmlEscapeJsonString } from './htmlescape'\n\nconst serializedSymbol = Symbol('serialized')\n\ninterface DataTransformer {\n  serialize: (object: any) => any\n  deserialize: (object: any) => any\n}\n\ntype Serialized<TData> = unknown & {\n  [serializedSymbol]: TData\n}\n\ninterface TypedDataTransformer<TData> {\n  serialize: (obj: TData) => Serialized<TData>\n  deserialize: (obj: Serialized<TData>) => TData\n}\n\ninterface HydrationStreamContext<TShape> {\n  id: string\n  stream: {\n    /**\n     * **Server method**\n     * Push a new entry to the stream\n     * Will be ignored on the client\n     */\n    push: (...shape: Array<TShape>) => void\n  }\n}\n\nexport interface HydrationStreamProviderProps<TShape> {\n  children: React.ReactNode\n  /**\n   * Optional transformer to serialize/deserialize the data\n   * Example devalue, superjson et al\n   */\n  transformer?: DataTransformer\n  /**\n   * **Client method**\n   * Called in the browser when new entries are received\n   */\n  onEntries: (entries: Array<TShape>) => void\n  /**\n   * **Server method**\n   * onFlush is called on the server when the cache is flushed\n   */\n  onFlush?: () => Array<TShape>\n}\n\nexport function createHydrationStreamProvider<TShape>() {\n  const context = React.createContext<HydrationStreamContext<TShape>>(\n    null as any,\n  )\n  /**\n\n   * 1. (Happens on server): `useServerInsertedHTML()` is called **on the server** whenever a `Suspense`-boundary completes\n   *    - This means that we might have some new entries in the cache that needs to be flushed\n   *    - We pass these to the client by inserting a `<script>`-tag where we do `window[id].push(serializedVersionOfCache)`\n   * 2. (Happens in browser) In `useEffect()`:\n   *   - We check if `window[id]` is set to an array and call `push()` on all the entries which will call `onEntries()` with the new entries\n   *   - We replace `window[id]` with a `push()`-method that will be called whenever new entries are received\n   **/\n  function UseClientHydrationStreamProvider(props: {\n    children: React.ReactNode\n    /**\n     * Optional transformer to serialize/deserialize the data\n     * Example devalue, superjson et al\n     */\n    transformer?: DataTransformer\n    /**\n     * **Client method**\n     * Called in the browser when new entries are received\n     */\n    onEntries: (entries: Array<TShape>) => void\n    /**\n     * **Server method**\n     * onFlush is called on the server when the cache is flushed\n     */\n    onFlush?: () => Array<TShape>\n  }) {\n    // unique id for the cache provider\n    const id = `__RQ${React.useId()}`\n    const idJSON = htmlEscapeJsonString(JSON.stringify(id))\n\n    const [transformer] = React.useState(\n      () =>\n        (props.transformer ?? {\n          // noop\n          serialize: (obj: any) => obj,\n          deserialize: (obj: any) => obj,\n        }) as unknown as TypedDataTransformer<TShape>,\n    )\n\n    // <server stuff>\n    const [stream] = React.useState<Array<TShape>>(() => {\n      if (typeof window !== 'undefined') {\n        return {\n          push() {\n            // no-op on the client\n          },\n        } as unknown as Array<TShape>\n      }\n      return []\n    })\n    const count = React.useRef(0)\n    useServerInsertedHTML(() => {\n      // This only happens on the server\n      stream.push(...(props.onFlush?.() ?? []))\n\n      if (!stream.length) {\n        return null\n      }\n      // console.log(`pushing ${stream.length} entries`)\n      const serializedCacheArgs = stream\n        .map((entry) => transformer.serialize(entry))\n        .map((entry) => JSON.stringify(entry))\n        .join(',')\n\n      // Flush stream\n      stream.length = 0\n\n      const html: Array<string> = [\n        `window[${idJSON}] = window[${idJSON}] || [];`,\n        `window[${idJSON}].push(${htmlEscapeJsonString(serializedCacheArgs)});`,\n      ]\n      return (\n        <script\n          key={count.current++}\n          dangerouslySetInnerHTML={{\n            __html: html.join(''),\n          }}\n        />\n      )\n    })\n    // </server stuff>\n\n    // <client stuff>\n    const onEntriesRef = React.useRef(props.onEntries)\n    React.useEffect(() => {\n      onEntriesRef.current = props.onEntries\n    })\n\n    React.useEffect(() => {\n      // Client: consume cache:\n      const onEntries = (...serializedEntries: Array<Serialized<TShape>>) => {\n        const entries = serializedEntries.map((serialized) =>\n          transformer.deserialize(serialized),\n        )\n        onEntriesRef.current(entries)\n      }\n\n      const win = window as any\n      // Register cache consumer\n      const winStream: Array<Serialized<TShape>> = win[id] ?? []\n\n      onEntries(...winStream)\n\n      // Register our own consumer\n      win[id] = {\n        push: onEntries,\n      }\n\n      return () => {\n        // Cleanup after unmount\n        win[id] = []\n      }\n    }, [id, transformer])\n    // </client stuff>\n\n    return (\n      <context.Provider value={{ stream, id }}>\n        {props.children}\n      </context.Provider>\n    )\n  }\n\n  return {\n    Provider: UseClientHydrationStreamProvider,\n    context,\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,wBAAsC;AACtC,YAAuB;AACvB,wBAAqC;AA8H7B;AA5HR,IAAM,mBAAmB,OAAO,YAAY;AA+CrC,SAAS,gCAAwC;AACtD,QAAM,UAAgB;AAAA,IACpB;AAAA,EACF;AAUA,WAAS,iCAAiC,OAiBvC;AAED,UAAM,KAAK,OAAa,YAAM,CAAC;AAC/B,UAAM,aAAS,wCAAqB,KAAK,UAAU,EAAE,CAAC;AAEtD,UAAM,CAAC,WAAW,IAAU;AAAA,MAC1B,MACG,MAAM,eAAe;AAAA;AAAA,QAEpB,WAAW,CAAC,QAAa;AAAA,QACzB,aAAa,CAAC,QAAa;AAAA,MAC7B;AAAA,IACJ;AAGA,UAAM,CAAC,MAAM,IAAU,eAAwB,MAAM;AACnD,UAAI,OAAO,WAAW,aAAa;AACjC,eAAO;AAAA,UACL,OAAO;AAAA,UAEP;AAAA,QACF;AAAA,MACF;AACA,aAAO,CAAC;AAAA,IACV,CAAC;AACD,UAAM,QAAc,aAAO,CAAC;AAC5B,iDAAsB,MAAM;AAE1B,aAAO,KAAK,GAAI,MAAM,UAAU,KAAK,CAAC,CAAE;AAExC,UAAI,CAAC,OAAO,QAAQ;AAClB,eAAO;AAAA,MACT;AAEA,YAAM,sBAAsB,OACzB,IAAI,CAAC,UAAU,YAAY,UAAU,KAAK,CAAC,EAC3C,IAAI,CAAC,UAAU,KAAK,UAAU,KAAK,CAAC,EACpC,KAAK,GAAG;AAGX,aAAO,SAAS;AAEhB,YAAM,OAAsB;AAAA,QAC1B,UAAU,MAAM,cAAc,MAAM;AAAA,QACpC,UAAU,MAAM,cAAU,wCAAqB,mBAAmB,CAAC;AAAA,MACrE;AACA,aACE;AAAA,QAAC;AAAA;AAAA,UAEC,yBAAyB;AAAA,YACvB,QAAQ,KAAK,KAAK,EAAE;AAAA,UACtB;AAAA;AAAA,QAHK,MAAM;AAAA,MAIb;AAAA,IAEJ,CAAC;AAID,UAAM,eAAqB,aAAO,MAAM,SAAS;AACjD,IAAM,gBAAU,MAAM;AACpB,mBAAa,UAAU,MAAM;AAAA,IAC/B,CAAC;AAED,IAAM,gBAAU,MAAM;AAEpB,YAAM,YAAY,IAAI,sBAAiD;AACrE,cAAM,UAAU,kBAAkB;AAAA,UAAI,CAAC,eACrC,YAAY,YAAY,UAAU;AAAA,QACpC;AACA,qBAAa,QAAQ,OAAO;AAAA,MAC9B;AAEA,YAAM,MAAM;AAEZ,YAAM,YAAuC,IAAI,EAAE,KAAK,CAAC;AAEzD,gBAAU,GAAG,SAAS;AAGtB,UAAI,EAAE,IAAI;AAAA,QACR,MAAM;AAAA,MACR;AAEA,aAAO,MAAM;AAEX,YAAI,EAAE,IAAI,CAAC;AAAA,MACb;AAAA,IACF,GAAG,CAAC,IAAI,WAAW,CAAC;AAGpB,WACE,4CAAC,QAAQ,UAAR,EAAiB,OAAO,EAAE,QAAQ,GAAG,GACnC,gBAAM,UACT;AAAA,EAEJ;AAEA,SAAO;AAAA,IACL,UAAU;AAAA,IACV;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../src/HydrationStreamProvider.tsx"],"sourcesContent":["'use client'\n\nimport { isServer } from '@tanstack/react-query'\nimport { useServerInsertedHTML } from 'next/navigation'\nimport * as React from 'react'\nimport { htmlEscapeJsonString } from './htmlescape'\n\nconst serializedSymbol = Symbol('serialized')\n\ninterface DataTransformer {\n  serialize: (object: any) => any\n  deserialize: (object: any) => any\n}\n\ntype Serialized<TData> = unknown & {\n  [serializedSymbol]: TData\n}\n\ninterface TypedDataTransformer<TData> {\n  serialize: (obj: TData) => Serialized<TData>\n  deserialize: (obj: Serialized<TData>) => TData\n}\n\ninterface HydrationStreamContext<TShape> {\n  id: string\n  stream: {\n    /**\n     * **Server method**\n     * Push a new entry to the stream\n     * Will be ignored on the client\n     */\n    push: (...shape: Array<TShape>) => void\n  }\n}\n\nexport interface HydrationStreamProviderProps<TShape> {\n  children: React.ReactNode\n  /**\n   * Optional transformer to serialize/deserialize the data\n   * Example devalue, superjson et al\n   */\n  transformer?: DataTransformer\n  /**\n   * **Client method**\n   * Called in the browser when new entries are received\n   */\n  onEntries: (entries: Array<TShape>) => void\n  /**\n   * **Server method**\n   * onFlush is called on the server when the cache is flushed\n   */\n  onFlush?: () => Array<TShape>\n}\n\nexport function createHydrationStreamProvider<TShape>() {\n  const context = React.createContext<HydrationStreamContext<TShape>>(\n    null as any,\n  )\n  /**\n\n   * 1. (Happens on server): `useServerInsertedHTML()` is called **on the server** whenever a `Suspense`-boundary completes\n   *    - This means that we might have some new entries in the cache that needs to be flushed\n   *    - We pass these to the client by inserting a `<script>`-tag where we do `window[id].push(serializedVersionOfCache)`\n   * 2. (Happens in browser) In `useEffect()`:\n   *   - We check if `window[id]` is set to an array and call `push()` on all the entries which will call `onEntries()` with the new entries\n   *   - We replace `window[id]` with a `push()`-method that will be called whenever new entries are received\n   **/\n  function UseClientHydrationStreamProvider(props: {\n    children: React.ReactNode\n    /**\n     * Optional transformer to serialize/deserialize the data\n     * Example devalue, superjson et al\n     */\n    transformer?: DataTransformer\n    /**\n     * **Client method**\n     * Called in the browser when new entries are received\n     */\n    onEntries: (entries: Array<TShape>) => void\n    /**\n     * **Server method**\n     * onFlush is called on the server when the cache is flushed\n     */\n    onFlush?: () => Array<TShape>\n  }) {\n    // unique id for the cache provider\n    const id = `__RQ${React.useId()}`\n    const idJSON = htmlEscapeJsonString(JSON.stringify(id))\n\n    const [transformer] = React.useState(\n      () =>\n        (props.transformer ?? {\n          // noop\n          serialize: (obj: any) => obj,\n          deserialize: (obj: any) => obj,\n        }) as unknown as TypedDataTransformer<TShape>,\n    )\n\n    // <server stuff>\n    const [stream] = React.useState<Array<TShape>>(() => {\n      if (typeof window !== 'undefined') {\n        return {\n          push() {\n            // no-op on the client\n          },\n        } as unknown as Array<TShape>\n      }\n      return []\n    })\n    const count = React.useRef(0)\n    useServerInsertedHTML(() => {\n      // This only happens on the server\n      stream.push(...(props.onFlush?.() ?? []))\n\n      if (!stream.length) {\n        return null\n      }\n      // console.log(`pushing ${stream.length} entries`)\n      const serializedCacheArgs = stream\n        .map((entry) => transformer.serialize(entry))\n        .map((entry) => JSON.stringify(entry))\n        .join(',')\n\n      // Flush stream\n      stream.length = 0\n\n      const html: Array<string> = [\n        `window[${idJSON}] = window[${idJSON}] || [];`,\n        `window[${idJSON}].push(${htmlEscapeJsonString(serializedCacheArgs)});`,\n      ]\n      return (\n        <script\n          key={count.current++}\n          dangerouslySetInnerHTML={{\n            __html: html.join(''),\n          }}\n        />\n      )\n    })\n    // </server stuff>\n\n    // <client stuff>\n    // Setup and run the onEntries handler on the client only, but do it during\n    // the initial render so children have access to the data immediately\n    // This is important to avoid the client suspending during the initial render\n    // if the data has not yet been hydrated.\n    if (!isServer) {\n      const win = window as any\n      if (!win[id]?.initialized) {\n        // Client: consume cache:\n        const onEntries = (...serializedEntries: Array<Serialized<TShape>>) => {\n          const entries = serializedEntries.map((serialized) =>\n            transformer.deserialize(serialized),\n          )\n          props.onEntries(entries)\n        }\n\n        const winStream: Array<Serialized<TShape>> = win[id] ?? []\n\n        onEntries(...winStream)\n\n        win[id] = {\n          initialized: true,\n          push: onEntries,\n        }\n      }\n    }\n    // </client stuff>\n\n    return (\n      <context.Provider value={{ stream, id }}>\n        {props.children}\n      </context.Provider>\n    )\n  }\n\n  return {\n    Provider: UseClientHydrationStreamProvider,\n    context,\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,yBAAyB;AACzB,wBAAsC;AACtC,YAAuB;AACvB,wBAAqC;AA8H7B;AA5HR,IAAM,mBAAmB,OAAO,YAAY;AA+CrC,SAAS,gCAAwC;AACtD,QAAM,UAAgB;AAAA,IACpB;AAAA,EACF;AAUA,WAAS,iCAAiC,OAiBvC;AAED,UAAM,KAAK,OAAa,YAAM,CAAC;AAC/B,UAAM,aAAS,wCAAqB,KAAK,UAAU,EAAE,CAAC;AAEtD,UAAM,CAAC,WAAW,IAAU;AAAA,MAC1B,MACG,MAAM,eAAe;AAAA;AAAA,QAEpB,WAAW,CAAC,QAAa;AAAA,QACzB,aAAa,CAAC,QAAa;AAAA,MAC7B;AAAA,IACJ;AAGA,UAAM,CAAC,MAAM,IAAU,eAAwB,MAAM;AACnD,UAAI,OAAO,WAAW,aAAa;AACjC,eAAO;AAAA,UACL,OAAO;AAAA,UAEP;AAAA,QACF;AAAA,MACF;AACA,aAAO,CAAC;AAAA,IACV,CAAC;AACD,UAAM,QAAc,aAAO,CAAC;AAC5B,iDAAsB,MAAM;AAE1B,aAAO,KAAK,GAAI,MAAM,UAAU,KAAK,CAAC,CAAE;AAExC,UAAI,CAAC,OAAO,QAAQ;AAClB,eAAO;AAAA,MACT;AAEA,YAAM,sBAAsB,OACzB,IAAI,CAAC,UAAU,YAAY,UAAU,KAAK,CAAC,EAC3C,IAAI,CAAC,UAAU,KAAK,UAAU,KAAK,CAAC,EACpC,KAAK,GAAG;AAGX,aAAO,SAAS;AAEhB,YAAM,OAAsB;AAAA,QAC1B,UAAU,MAAM,cAAc,MAAM;AAAA,QACpC,UAAU,MAAM,cAAU,wCAAqB,mBAAmB,CAAC;AAAA,MACrE;AACA,aACE;AAAA,QAAC;AAAA;AAAA,UAEC,yBAAyB;AAAA,YACvB,QAAQ,KAAK,KAAK,EAAE;AAAA,UACtB;AAAA;AAAA,QAHK,MAAM;AAAA,MAIb;AAAA,IAEJ,CAAC;AAQD,QAAI,CAAC,6BAAU;AACb,YAAM,MAAM;AACZ,UAAI,CAAC,IAAI,EAAE,GAAG,aAAa;AAEzB,cAAM,YAAY,IAAI,sBAAiD;AACrE,gBAAM,UAAU,kBAAkB;AAAA,YAAI,CAAC,eACrC,YAAY,YAAY,UAAU;AAAA,UACpC;AACA,gBAAM,UAAU,OAAO;AAAA,QACzB;AAEA,cAAM,YAAuC,IAAI,EAAE,KAAK,CAAC;AAEzD,kBAAU,GAAG,SAAS;AAEtB,YAAI,EAAE,IAAI;AAAA,UACR,aAAa;AAAA,UACb,MAAM;AAAA,QACR;AAAA,MACF;AAAA,IACF;AAGA,WACE,4CAAC,QAAQ,UAAR,EAAiB,OAAO,EAAE,QAAQ,GAAG,GACnC,gBAAM,UACT;AAAA,EAEJ;AAEA,SAAO;AAAA,IACL,UAAU;AAAA,IACV;AAAA,EACF;AACF;","names":[]}

package/build/modern/HydrationStreamProvider.js

@@ -1,6 +1,7 @@
 "use client";
 
 // src/HydrationStreamProvider.tsx
+import { isServer } from "@tanstack/react-query";
 import { useServerInsertedHTML } from "next/navigation";
 import * as React from "react";
 import { htmlEscapeJsonString } from "./htmlescape.js";
@@ -51,27 +52,23 @@ function createHydrationStreamProvider() {
         count.current++
       );
     });
-    const onEntriesRef = React.useRef(props.onEntries);
-    React.useEffect(() => {
-      onEntriesRef.current = props.onEntries;
-    });
-    React.useEffect(() => {
-      const onEntries = (...serializedEntries) => {
-        const entries = serializedEntries.map(
-          (serialized) => transformer.deserialize(serialized)
-        );
-        onEntriesRef.current(entries);
-      };
+    if (!isServer) {
       const win = window;
-      const winStream = win[id] ?? [];
-      onEntries(...winStream);
-      win[id] = {
-        push: onEntries
-      };
-      return () => {
-        win[id] = [];
-      };
-    }, [id, transformer]);
+      if (!win[id]?.initialized) {
+        const onEntries = (...serializedEntries) => {
+          const entries = serializedEntries.map(
+            (serialized) => transformer.deserialize(serialized)
+          );
+          props.onEntries(entries);
+        };
+        const winStream = win[id] ?? [];
+        onEntries(...winStream);
+        win[id] = {
+          initialized: true,
+          push: onEntries
+        };
+      }
+    }
     return /* @__PURE__ */ jsx(context.Provider, { value: { stream, id }, children: props.children });
   }
   return {

package/build/modern/HydrationStreamProvider.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/HydrationStreamProvider.tsx"],"sourcesContent":["'use client'\n\nimport { useServerInsertedHTML } from 'next/navigation'\nimport * as React from 'react'\nimport { htmlEscapeJsonString } from './htmlescape'\n\nconst serializedSymbol = Symbol('serialized')\n\ninterface DataTransformer {\n  serialize: (object: any) => any\n  deserialize: (object: any) => any\n}\n\ntype Serialized<TData> = unknown & {\n  [serializedSymbol]: TData\n}\n\ninterface TypedDataTransformer<TData> {\n  serialize: (obj: TData) => Serialized<TData>\n  deserialize: (obj: Serialized<TData>) => TData\n}\n\ninterface HydrationStreamContext<TShape> {\n  id: string\n  stream: {\n    /**\n     * **Server method**\n     * Push a new entry to the stream\n     * Will be ignored on the client\n     */\n    push: (...shape: Array<TShape>) => void\n  }\n}\n\nexport interface HydrationStreamProviderProps<TShape> {\n  children: React.ReactNode\n  /**\n   * Optional transformer to serialize/deserialize the data\n   * Example devalue, superjson et al\n   */\n  transformer?: DataTransformer\n  /**\n   * **Client method**\n   * Called in the browser when new entries are received\n   */\n  onEntries: (entries: Array<TShape>) => void\n  /**\n   * **Server method**\n   * onFlush is called on the server when the cache is flushed\n   */\n  onFlush?: () => Array<TShape>\n}\n\nexport function createHydrationStreamProvider<TShape>() {\n  const context = React.createContext<HydrationStreamContext<TShape>>(\n    null as any,\n  )\n  /**\n\n   * 1. (Happens on server): `useServerInsertedHTML()` is called **on the server** whenever a `Suspense`-boundary completes\n   *    - This means that we might have some new entries in the cache that needs to be flushed\n   *    - We pass these to the client by inserting a `<script>`-tag where we do `window[id].push(serializedVersionOfCache)`\n   * 2. (Happens in browser) In `useEffect()`:\n   *   - We check if `window[id]` is set to an array and call `push()` on all the entries which will call `onEntries()` with the new entries\n   *   - We replace `window[id]` with a `push()`-method that will be called whenever new entries are received\n   **/\n  function UseClientHydrationStreamProvider(props: {\n    children: React.ReactNode\n    /**\n     * Optional transformer to serialize/deserialize the data\n     * Example devalue, superjson et al\n     */\n    transformer?: DataTransformer\n    /**\n     * **Client method**\n     * Called in the browser when new entries are received\n     */\n    onEntries: (entries: Array<TShape>) => void\n    /**\n     * **Server method**\n     * onFlush is called on the server when the cache is flushed\n     */\n    onFlush?: () => Array<TShape>\n  }) {\n    // unique id for the cache provider\n    const id = `__RQ${React.useId()}`\n    const idJSON = htmlEscapeJsonString(JSON.stringify(id))\n\n    const [transformer] = React.useState(\n      () =>\n        (props.transformer ?? {\n          // noop\n          serialize: (obj: any) => obj,\n          deserialize: (obj: any) => obj,\n        }) as unknown as TypedDataTransformer<TShape>,\n    )\n\n    // <server stuff>\n    const [stream] = React.useState<Array<TShape>>(() => {\n      if (typeof window !== 'undefined') {\n        return {\n          push() {\n            // no-op on the client\n          },\n        } as unknown as Array<TShape>\n      }\n      return []\n    })\n    const count = React.useRef(0)\n    useServerInsertedHTML(() => {\n      // This only happens on the server\n      stream.push(...(props.onFlush?.() ?? []))\n\n      if (!stream.length) {\n        return null\n      }\n      // console.log(`pushing ${stream.length} entries`)\n      const serializedCacheArgs = stream\n        .map((entry) => transformer.serialize(entry))\n        .map((entry) => JSON.stringify(entry))\n        .join(',')\n\n      // Flush stream\n      stream.length = 0\n\n      const html: Array<string> = [\n        `window[${idJSON}] = window[${idJSON}] || [];`,\n        `window[${idJSON}].push(${htmlEscapeJsonString(serializedCacheArgs)});`,\n      ]\n      return (\n        <script\n          key={count.current++}\n          dangerouslySetInnerHTML={{\n            __html: html.join(''),\n          }}\n        />\n      )\n    })\n    // </server stuff>\n\n    // <client stuff>\n    const onEntriesRef = React.useRef(props.onEntries)\n    React.useEffect(() => {\n      onEntriesRef.current = props.onEntries\n    })\n\n    React.useEffect(() => {\n      // Client: consume cache:\n      const onEntries = (...serializedEntries: Array<Serialized<TShape>>) => {\n        const entries = serializedEntries.map((serialized) =>\n          transformer.deserialize(serialized),\n        )\n        onEntriesRef.current(entries)\n      }\n\n      const win = window as any\n      // Register cache consumer\n      const winStream: Array<Serialized<TShape>> = win[id] ?? []\n\n      onEntries(...winStream)\n\n      // Register our own consumer\n      win[id] = {\n        push: onEntries,\n      }\n\n      return () => {\n        // Cleanup after unmount\n        win[id] = []\n      }\n    }, [id, transformer])\n    // </client stuff>\n\n    return (\n      <context.Provider value={{ stream, id }}>\n        {props.children}\n      </context.Provider>\n    )\n  }\n\n  return {\n    Provider: UseClientHydrationStreamProvider,\n    context,\n  }\n}\n"],"mappings":";;;AAEA,SAAS,6BAA6B;AACtC,YAAY,WAAW;AACvB,SAAS,4BAA4B;AA8H7B;AA5HR,IAAM,mBAAmB,OAAO,YAAY;AA+CrC,SAAS,gCAAwC;AACtD,QAAM,UAAgB;AAAA,IACpB;AAAA,EACF;AAUA,WAAS,iCAAiC,OAiBvC;AAED,UAAM,KAAK,OAAa,YAAM,CAAC;AAC/B,UAAM,SAAS,qBAAqB,KAAK,UAAU,EAAE,CAAC;AAEtD,UAAM,CAAC,WAAW,IAAU;AAAA,MAC1B,MACG,MAAM,eAAe;AAAA;AAAA,QAEpB,WAAW,CAAC,QAAa;AAAA,QACzB,aAAa,CAAC,QAAa;AAAA,MAC7B;AAAA,IACJ;AAGA,UAAM,CAAC,MAAM,IAAU,eAAwB,MAAM;AACnD,UAAI,OAAO,WAAW,aAAa;AACjC,eAAO;AAAA,UACL,OAAO;AAAA,UAEP;AAAA,QACF;AAAA,MACF;AACA,aAAO,CAAC;AAAA,IACV,CAAC;AACD,UAAM,QAAc,aAAO,CAAC;AAC5B,0BAAsB,MAAM;AAE1B,aAAO,KAAK,GAAI,MAAM,UAAU,KAAK,CAAC,CAAE;AAExC,UAAI,CAAC,OAAO,QAAQ;AAClB,eAAO;AAAA,MACT;AAEA,YAAM,sBAAsB,OACzB,IAAI,CAAC,UAAU,YAAY,UAAU,KAAK,CAAC,EAC3C,IAAI,CAAC,UAAU,KAAK,UAAU,KAAK,CAAC,EACpC,KAAK,GAAG;AAGX,aAAO,SAAS;AAEhB,YAAM,OAAsB;AAAA,QAC1B,UAAU,MAAM,cAAc,MAAM;AAAA,QACpC,UAAU,MAAM,UAAU,qBAAqB,mBAAmB,CAAC;AAAA,MACrE;AACA,aACE;AAAA,QAAC;AAAA;AAAA,UAEC,yBAAyB;AAAA,YACvB,QAAQ,KAAK,KAAK,EAAE;AAAA,UACtB;AAAA;AAAA,QAHK,MAAM;AAAA,MAIb;AAAA,IAEJ,CAAC;AAID,UAAM,eAAqB,aAAO,MAAM,SAAS;AACjD,IAAM,gBAAU,MAAM;AACpB,mBAAa,UAAU,MAAM;AAAA,IAC/B,CAAC;AAED,IAAM,gBAAU,MAAM;AAEpB,YAAM,YAAY,IAAI,sBAAiD;AACrE,cAAM,UAAU,kBAAkB;AAAA,UAAI,CAAC,eACrC,YAAY,YAAY,UAAU;AAAA,QACpC;AACA,qBAAa,QAAQ,OAAO;AAAA,MAC9B;AAEA,YAAM,MAAM;AAEZ,YAAM,YAAuC,IAAI,EAAE,KAAK,CAAC;AAEzD,gBAAU,GAAG,SAAS;AAGtB,UAAI,EAAE,IAAI;AAAA,QACR,MAAM;AAAA,MACR;AAEA,aAAO,MAAM;AAEX,YAAI,EAAE,IAAI,CAAC;AAAA,MACb;AAAA,IACF,GAAG,CAAC,IAAI,WAAW,CAAC;AAGpB,WACE,oBAAC,QAAQ,UAAR,EAAiB,OAAO,EAAE,QAAQ,GAAG,GACnC,gBAAM,UACT;AAAA,EAEJ;AAEA,SAAO;AAAA,IACL,UAAU;AAAA,IACV;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../src/HydrationStreamProvider.tsx"],"sourcesContent":["'use client'\n\nimport { isServer } from '@tanstack/react-query'\nimport { useServerInsertedHTML } from 'next/navigation'\nimport * as React from 'react'\nimport { htmlEscapeJsonString } from './htmlescape'\n\nconst serializedSymbol = Symbol('serialized')\n\ninterface DataTransformer {\n  serialize: (object: any) => any\n  deserialize: (object: any) => any\n}\n\ntype Serialized<TData> = unknown & {\n  [serializedSymbol]: TData\n}\n\ninterface TypedDataTransformer<TData> {\n  serialize: (obj: TData) => Serialized<TData>\n  deserialize: (obj: Serialized<TData>) => TData\n}\n\ninterface HydrationStreamContext<TShape> {\n  id: string\n  stream: {\n    /**\n     * **Server method**\n     * Push a new entry to the stream\n     * Will be ignored on the client\n     */\n    push: (...shape: Array<TShape>) => void\n  }\n}\n\nexport interface HydrationStreamProviderProps<TShape> {\n  children: React.ReactNode\n  /**\n   * Optional transformer to serialize/deserialize the data\n   * Example devalue, superjson et al\n   */\n  transformer?: DataTransformer\n  /**\n   * **Client method**\n   * Called in the browser when new entries are received\n   */\n  onEntries: (entries: Array<TShape>) => void\n  /**\n   * **Server method**\n   * onFlush is called on the server when the cache is flushed\n   */\n  onFlush?: () => Array<TShape>\n}\n\nexport function createHydrationStreamProvider<TShape>() {\n  const context = React.createContext<HydrationStreamContext<TShape>>(\n    null as any,\n  )\n  /**\n\n   * 1. (Happens on server): `useServerInsertedHTML()` is called **on the server** whenever a `Suspense`-boundary completes\n   *    - This means that we might have some new entries in the cache that needs to be flushed\n   *    - We pass these to the client by inserting a `<script>`-tag where we do `window[id].push(serializedVersionOfCache)`\n   * 2. (Happens in browser) In `useEffect()`:\n   *   - We check if `window[id]` is set to an array and call `push()` on all the entries which will call `onEntries()` with the new entries\n   *   - We replace `window[id]` with a `push()`-method that will be called whenever new entries are received\n   **/\n  function UseClientHydrationStreamProvider(props: {\n    children: React.ReactNode\n    /**\n     * Optional transformer to serialize/deserialize the data\n     * Example devalue, superjson et al\n     */\n    transformer?: DataTransformer\n    /**\n     * **Client method**\n     * Called in the browser when new entries are received\n     */\n    onEntries: (entries: Array<TShape>) => void\n    /**\n     * **Server method**\n     * onFlush is called on the server when the cache is flushed\n     */\n    onFlush?: () => Array<TShape>\n  }) {\n    // unique id for the cache provider\n    const id = `__RQ${React.useId()}`\n    const idJSON = htmlEscapeJsonString(JSON.stringify(id))\n\n    const [transformer] = React.useState(\n      () =>\n        (props.transformer ?? {\n          // noop\n          serialize: (obj: any) => obj,\n          deserialize: (obj: any) => obj,\n        }) as unknown as TypedDataTransformer<TShape>,\n    )\n\n    // <server stuff>\n    const [stream] = React.useState<Array<TShape>>(() => {\n      if (typeof window !== 'undefined') {\n        return {\n          push() {\n            // no-op on the client\n          },\n        } as unknown as Array<TShape>\n      }\n      return []\n    })\n    const count = React.useRef(0)\n    useServerInsertedHTML(() => {\n      // This only happens on the server\n      stream.push(...(props.onFlush?.() ?? []))\n\n      if (!stream.length) {\n        return null\n      }\n      // console.log(`pushing ${stream.length} entries`)\n      const serializedCacheArgs = stream\n        .map((entry) => transformer.serialize(entry))\n        .map((entry) => JSON.stringify(entry))\n        .join(',')\n\n      // Flush stream\n      stream.length = 0\n\n      const html: Array<string> = [\n        `window[${idJSON}] = window[${idJSON}] || [];`,\n        `window[${idJSON}].push(${htmlEscapeJsonString(serializedCacheArgs)});`,\n      ]\n      return (\n        <script\n          key={count.current++}\n          dangerouslySetInnerHTML={{\n            __html: html.join(''),\n          }}\n        />\n      )\n    })\n    // </server stuff>\n\n    // <client stuff>\n    // Setup and run the onEntries handler on the client only, but do it during\n    // the initial render so children have access to the data immediately\n    // This is important to avoid the client suspending during the initial render\n    // if the data has not yet been hydrated.\n    if (!isServer) {\n      const win = window as any\n      if (!win[id]?.initialized) {\n        // Client: consume cache:\n        const onEntries = (...serializedEntries: Array<Serialized<TShape>>) => {\n          const entries = serializedEntries.map((serialized) =>\n            transformer.deserialize(serialized),\n          )\n          props.onEntries(entries)\n        }\n\n        const winStream: Array<Serialized<TShape>> = win[id] ?? []\n\n        onEntries(...winStream)\n\n        win[id] = {\n          initialized: true,\n          push: onEntries,\n        }\n      }\n    }\n    // </client stuff>\n\n    return (\n      <context.Provider value={{ stream, id }}>\n        {props.children}\n      </context.Provider>\n    )\n  }\n\n  return {\n    Provider: UseClientHydrationStreamProvider,\n    context,\n  }\n}\n"],"mappings":";;;AAEA,SAAS,gBAAgB;AACzB,SAAS,6BAA6B;AACtC,YAAY,WAAW;AACvB,SAAS,4BAA4B;AA8H7B;AA5HR,IAAM,mBAAmB,OAAO,YAAY;AA+CrC,SAAS,gCAAwC;AACtD,QAAM,UAAgB;AAAA,IACpB;AAAA,EACF;AAUA,WAAS,iCAAiC,OAiBvC;AAED,UAAM,KAAK,OAAa,YAAM,CAAC;AAC/B,UAAM,SAAS,qBAAqB,KAAK,UAAU,EAAE,CAAC;AAEtD,UAAM,CAAC,WAAW,IAAU;AAAA,MAC1B,MACG,MAAM,eAAe;AAAA;AAAA,QAEpB,WAAW,CAAC,QAAa;AAAA,QACzB,aAAa,CAAC,QAAa;AAAA,MAC7B;AAAA,IACJ;AAGA,UAAM,CAAC,MAAM,IAAU,eAAwB,MAAM;AACnD,UAAI,OAAO,WAAW,aAAa;AACjC,eAAO;AAAA,UACL,OAAO;AAAA,UAEP;AAAA,QACF;AAAA,MACF;AACA,aAAO,CAAC;AAAA,IACV,CAAC;AACD,UAAM,QAAc,aAAO,CAAC;AAC5B,0BAAsB,MAAM;AAE1B,aAAO,KAAK,GAAI,MAAM,UAAU,KAAK,CAAC,CAAE;AAExC,UAAI,CAAC,OAAO,QAAQ;AAClB,eAAO;AAAA,MACT;AAEA,YAAM,sBAAsB,OACzB,IAAI,CAAC,UAAU,YAAY,UAAU,KAAK,CAAC,EAC3C,IAAI,CAAC,UAAU,KAAK,UAAU,KAAK,CAAC,EACpC,KAAK,GAAG;AAGX,aAAO,SAAS;AAEhB,YAAM,OAAsB;AAAA,QAC1B,UAAU,MAAM,cAAc,MAAM;AAAA,QACpC,UAAU,MAAM,UAAU,qBAAqB,mBAAmB,CAAC;AAAA,MACrE;AACA,aACE;AAAA,QAAC;AAAA;AAAA,UAEC,yBAAyB;AAAA,YACvB,QAAQ,KAAK,KAAK,EAAE;AAAA,UACtB;AAAA;AAAA,QAHK,MAAM;AAAA,MAIb;AAAA,IAEJ,CAAC;AAQD,QAAI,CAAC,UAAU;AACb,YAAM,MAAM;AACZ,UAAI,CAAC,IAAI,EAAE,GAAG,aAAa;AAEzB,cAAM,YAAY,IAAI,sBAAiD;AACrE,gBAAM,UAAU,kBAAkB;AAAA,YAAI,CAAC,eACrC,YAAY,YAAY,UAAU;AAAA,UACpC;AACA,gBAAM,UAAU,OAAO;AAAA,QACzB;AAEA,cAAM,YAAuC,IAAI,EAAE,KAAK,CAAC;AAEzD,kBAAU,GAAG,SAAS;AAEtB,YAAI,EAAE,IAAI;AAAA,UACR,aAAa;AAAA,UACb,MAAM;AAAA,QACR;AAAA,MACF;AAAA,IACF;AAGA,WACE,oBAAC,QAAQ,UAAR,EAAiB,OAAO,EAAE,QAAQ,GAAG,GACnC,gBAAM,UACT;AAAA,EAEJ;AAEA,SAAO;AAAA,IACL,UAAU;AAAA,IACV;AAAA,EACF;AACF;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-query-next-experimental",
-  "version": "5.21.2",
+  "version": "5.21.6",
   "description": "Hydration utils for React Query in the NextJs app directory",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -37,12 +37,12 @@
     "@vitejs/plugin-react": "^4.2.1",
     "next": "^14.0.0",
     "react": "^18.2.0",
-    "@tanstack/react-query": "5.21.2"
+    "@tanstack/react-query": "5.21.4"
   },
   "peerDependencies": {
     "next": "^13 || ^14",
     "react": "^18.0.0",
-    "@tanstack/react-query": "^5.21.2"
+    "@tanstack/react-query": "^5.21.4"
   },
   "scripts": {
     "clean": "rimraf ./build && rimraf ./coverage",

package/src/HydrationStreamProvider.tsx

@@ -1,5 +1,6 @@
 'use client'
 
+import { isServer } from '@tanstack/react-query'
 import { useServerInsertedHTML } from 'next/navigation'
 import * as React from 'react'
 import { htmlEscapeJsonString } from './htmlescape'
@@ -139,36 +140,31 @@ export function createHydrationStreamProvider<TShape>() {
     // </server stuff>
 
     // <client stuff>
-    const onEntriesRef = React.useRef(props.onEntries)
-    React.useEffect(() => {
-      onEntriesRef.current = props.onEntries
-    })
-
-    React.useEffect(() => {
-      // Client: consume cache:
-      const onEntries = (...serializedEntries: Array<Serialized<TShape>>) => {
-        const entries = serializedEntries.map((serialized) =>
-          transformer.deserialize(serialized),
-        )
-        onEntriesRef.current(entries)
-      }
-
+    // Setup and run the onEntries handler on the client only, but do it during
+    // the initial render so children have access to the data immediately
+    // This is important to avoid the client suspending during the initial render
+    // if the data has not yet been hydrated.
+    if (!isServer) {
       const win = window as any
-      // Register cache consumer
-      const winStream: Array<Serialized<TShape>> = win[id] ?? []
-
-      onEntries(...winStream)
-
-      // Register our own consumer
-      win[id] = {
-        push: onEntries,
-      }
-
-      return () => {
-        // Cleanup after unmount
-        win[id] = []
+      if (!win[id]?.initialized) {
+        // Client: consume cache:
+        const onEntries = (...serializedEntries: Array<Serialized<TShape>>) => {
+          const entries = serializedEntries.map((serialized) =>
+            transformer.deserialize(serialized),
+          )
+          props.onEntries(entries)
+        }
+
+        const winStream: Array<Serialized<TShape>> = win[id] ?? []
+
+        onEntries(...winStream)
+
+        win[id] = {
+          initialized: true,
+          push: onEntries,
+        }
       }
-    }, [id, transformer])
+    }
     // </client stuff>
 
     return (