houdini-react 1.2.22 → 1.2.23

package/build/plugin-esm/index.js

@@ -75577,10 +75577,10 @@ var validateHeaderValue = typeof http.validateHeaderValue === "function" ? http.
     throw error;
   }
 };
-var Headers = class extends URLSearchParams {
+var Headers2 = class extends URLSearchParams {
   constructor(init) {
     let result = [];
-    if (init instanceof Headers) {
+    if (init instanceof Headers2) {
       const raw = init.raw();
       for (const [name, values] of Object.entries(raw)) {
         result.push(...values.map((value) => [name, value]));
@@ -75704,7 +75704,7 @@ var Headers = class extends URLSearchParams {
   }
 };
 Object.defineProperties(
-  Headers.prototype,
+  Headers2.prototype,
   ["get", "entries", "forEach", "values"].reduce((result, property) => {
     result[property] = { enumerable: true };
     return result;
@@ -75719,7 +75719,7 @@ var Response2 = class extends Body {
   constructor(body = null, options = {}) {
     super(body, options);
     const status = options.status != null ? options.status : 200;
-    const headers = new Headers(options.headers);
+    const headers = new Headers2(options.headers);
     if (body !== null && !headers.has("Content-Type")) {
       const contentType = extractContentType(body, this);
       if (contentType) {
@@ -75794,7 +75794,7 @@ var Response2 = class extends Body {
     if (body === void 0) {
       throw new TypeError("data is not JSON serializable");
     }
-    const headers = new Headers(init && init.headers);
+    const headers = new Headers2(init && init.headers);
     if (!headers.has("content-type")) {
       headers.set("content-type", "application/json");
     }
@@ -75870,7 +75870,7 @@ var Request2 = class extends Body {
     super(inputBody, {
       size: init.size || input.size || 0
     });
-    const headers = new Headers(init.headers || input.headers || {});
+    const headers = new Headers2(init.headers || input.headers || {});
     if (inputBody !== null && !headers.has("Content-Type")) {
       const contentType = extractContentType(inputBody, this);
       if (contentType) {
@@ -78406,7 +78406,7 @@ function exec(match, params) {
   const result = {};
   const values = match.slice(1);
   let buffered = "";
-  for (let i2 = 0; i2 < params.length; i2 += 1) {
+  for (let i2 = 0; i2 < (params || []).length; i2 += 1) {
     const param = params[i2];
     let value = values[i2];
     if (param.chained && param.rest && buffered) {
@@ -78620,7 +78620,8 @@ __export(conventions_exports, {
   router_index_path: () => router_index_path,
   router_path: () => router_path,
   serialized_manifest_path: () => serialized_manifest_path,
-  server_adapter_path: () => server_adapter_path
+  server_adapter_path: () => server_adapter_path,
+  vite_render_path: () => vite_render_path
 });
 function router_path(config2) {
   return path_exports.join(base_dir(config2), "Router.jsx");
@@ -78634,6 +78635,9 @@ function server_adapter_path(config2, base) {
 function adapter_config_path(config2, base) {
   return path_exports.join(units_dir(config2, base), "render", "config.js");
 }
+function vite_render_path(config2, base) {
+  return path_exports.join(units_dir(config2, base), "render", "vite.js");
+}
 function app_component_path(config2, base) {
   return path_exports.join(units_dir(config2, base), "render", "App.jsx");
 }
@@ -78942,12 +78946,19 @@ async function extractQueries(source) {
   return props.filter((p) => p !== "children");
 }
 function isSecondaryBuild() {
-  return process.env.HOUDINI_SCHEMA_BUILD === "true";
+  return process.env.HOUDINI_SECONDARY_BUILD && process.env.HOUDINI_SECONDARY_BUILD !== "false";
+}
+function internalRoutes(config2) {
+  const routes = [localApiEndpoint(config2)];
+  if (config2.router?.auth && "redirect" in config2.router.auth) {
+    routes.push(config2.router.auth.redirect);
+  }
+  return routes;
 }
 async function buildLocalSchema(config2) {
-  const { build } = await import("vite");
-  process.env.HOUDINI_SCHEMA_BUILD = "true";
-  await build({
+  const { build: build2 } = await import("vite");
+  process.env.HOUDINI_SECONDARY_BUILD = "true";
+  await build2({
     logLevel: "silent",
     build: {
       outDir: path2.join(config2.rootDir, "temp"),
@@ -78968,7 +78979,7 @@ async function buildLocalSchema(config2) {
       }
     }
   });
-  process.env.HOUDINI_SCHEMA_BUILD = "false";
+  process.env.HOUDINI_SECONDARY_BUILD = "false";
 }
 async function loadLocalSchema(config2) {
   await buildLocalSchema(config2);
@@ -79207,16 +79218,103 @@ async function generate_renders({
   config,
   manifest: manifest3
 }) {
+  const adapter_path = conventions_exports.server_adapter_path(config);
   await fs_exports.mkdirp(path_exports.dirname(conventions_exports.server_adapter_path(config)));
   const app_index = `
+import { Router } from '$houdini/plugins/houdini-react/runtime'
 import React from 'react'
+
 import Shell from '../../../../../src/+index'
-import { Router } from '$houdini'
 
-export default (props) => <Shell><Router {...props} /></Shell>
+export default (props) => (
+	<Shell>
+		<Router {...props} />
+	</Shell>
+)
+`;
+  let renderer = `
+	import { Cache } from '$houdini/runtime/cache/cache'
+import { serverAdapterFactory, _serverHandler } from '$houdini/runtime/router/server'
+import { HoudiniClient } from '$houdini/runtime/client'
+import { renderToStream } from 'react-streaming/server'
+import React from 'react'
+
+import { router_cache } from '../../runtime/routing'
+// @ts-expect-error
+import client from '../../../../../src/+client'
+// @ts-expect-error
+import App from "./App"
+import router_manifest from '$houdini/plugins/houdini-react/runtime/manifest'
+
+export const on_render =
+	({ assetPrefix, pipe, production, documentPremable }) =>
+	async ({
+		url,
+		match,
+		session,
+		manifest,
+	}) => {
+		// instanitate a cache we can use for this request
+		const cache = new Cache({ disabled: false })
+
+		if (!match) {
+			return new Response('not found', { status: 404 })
+		}
+
+		const {
+			readable,
+			injectToStream,
+			pipe: pipeTo,
+		} = await renderToStream(
+			React.createElement(App, {
+				initialURL: url,
+				cache: cache,
+				session: session,
+				assetPrefix: assetPrefix,
+				manifest: manifest,
+				...router_cache()
+			}),
+			{
+				userAgent: 'Vite',
+			}
+		)
+
+		// add the initial scripts to the page
+		injectToStream(\`
+		<script>
+			window.__houdini__initial__cache__ = \${cache.serialize()};
+			window.__houdini__initial__session__ = \${JSON.stringify(session)};
+		<\/script>
+
+		\${documentPremable ?? ''}
+
+		<!--
+			add a virtual module that hydrates the client and sets up the initial pending cache.
+			the dynamic extension is to support dev which sees the raw jsx, and production which sees the bundled asset
+		-->
+		<script type="module" src="\${assetPrefix}/pages/\${match.id}.\${production ? 'js' : 'jsx'}" async=""><\/script>
+	\`)
+
+		if (pipeTo && pipe) {
+			pipeTo(pipe)
+			return true
+		} else {
+			return new Response(readable)
+		}
+	}
+
+export function createServerAdapter(options) {
+	return serverAdapterFactory({
+		client,
+		production: true,
+		manifest: router_manifest,
+		on_render: on_render(options),
+		...options,
+	})
+}
 `;
   let adapter_config = `
-		import createAdapter from './server'
+		import { createServerAdapter as createAdapter } from './server'
 
 		export const endpoint = ${JSON.stringify(localApiEndpoint(config.configFile))}
 
@@ -79233,72 +79331,9 @@ export default (props) => <Shell><Router {...props} /></Shell>
 			})
 		}
 	`;
-  const server_adapter = `
-import React from 'react'
-import { renderToStream } from 'react-streaming/server'
-import { Cache } from '$houdini/runtime/cache/cache'
-import { serverAdapterFactory } from '$houdini/runtime/router/server'
-
-import { Router, router_cache } from '../../runtime'
-import manifest from '../../runtime/manifest'
-import App from './App'
-
-import Shell from '../../../../../src/+index'
-
-export default (options) => {
-	return serverAdapterFactory({
-		manifest,
-		...options,
-		on_render: async ({url, match, session, pipe , manifest }) => {
-			// instanitate a cache we can use for this request
-			const cache = new Cache({ disabled: false })
-
-			if (!match) {
-				return new Response('not found', { status: 404 })
-			}
-
-			const { readable, injectToStream, pipe: pipeTo } = await renderToStream(
-				React.createElement(App, {
-					initialURL: url,
-					cache: cache,
-					session: session,
-					assetPrefix: options.assetPrefix,
-					manifest: manifest,
-					...router_cache()
-				}),
-				{
-					userAgent: 'Vite',
-				}
-			)
-
-			// add the initial scripts to the page
-			injectToStream(\`
-				<script>
-					window.__houdini__initial__cache__ = \${cache.serialize()};
-					window.__houdini__initial__session__ = \${JSON.stringify(session)};
-				<\/script>
-
-				<!--
-					add a virtual module that hydrates the client and sets up the initial pending cache.
-					the dynamic extension is to support dev which sees the raw jsx, and production which sees the bundled asset
-				-->
-				<script type="module" src="\${options.assetPrefix}/pages/\${match.id}.\${options.production ? 'js' : 'jsx'}" async=""><\/script>
-			\`)
-
-			if (pipe && pipeTo) {
-				// pipe the response to the client
-				pipeTo(pipe)
-			} else {
-				// and deliver our Response while that's running.
-				return new Response(readable)
-			}
-		},
-	})
-}
-	`;
   await Promise.all([
-    fs_exports.writeFile(conventions_exports.server_adapter_path(config), server_adapter),
     fs_exports.writeFile(conventions_exports.adapter_config_path(config), adapter_config),
+    fs_exports.writeFile(adapter_path, renderer),
     fs_exports.writeFile(conventions_exports.app_component_path(config), app_index)
   ]);
 }
@@ -79568,28 +79603,44 @@ async function transformFile(page) {
 }
 
 // src/plugin/vite.tsx
+import { build } from "vite";
 var manifest;
+var devServer = false;
 var vite_default = {
   async config(config, env) {
     manifest = await load_manifest({ config, includeArtifacts: env.mode === "production" });
     setManifest(manifest);
-    let rollupConfig;
-    if (!isSecondaryBuild()) {
-      rollupConfig = {
+    let conf = {
+      build: {
+        rollupOptions: {}
+      }
+    };
+    if (!isSecondaryBuild() || process.env.HOUDINI_SECONDARY_BUILD === "ssr") {
+      if (!devServer) {
+        conf.base = "/assets";
+      }
+      conf.build = {
         rollupOptions: {
           output: {
-            entryFileNames: "assets/[name].js"
-          }
+            assetFileNames: "assets/[name].js",
+            entryFileNames: "[name].js"
+          },
+          external: ["react-streaming/server"]
         }
       };
       await fs_exports.mkdirp(config.compiledAssetsDir);
-      rollupConfig.outDir = config.compiledAssetsDir;
-      rollupConfig.rollupOptions.input = {};
+      conf.build.rollupOptions.input = {
+        "entries/app": conventions_exports.app_component_path(config),
+        "entries/adapter": conventions_exports.adapter_config_path(config)
+      };
       for (const [id, page] of Object.entries(manifest.pages)) {
-        rollupConfig.rollupOptions.input[`pages/${id}`] = `virtual:houdini/pages/${page.id}@${page.queries}.jsx`;
+        conf.build.rollupOptions.input[`pages/${id}`] = `virtual:houdini/pages/${page.id}@${page.queries}.jsx`;
       }
       for (const artifact of manifest.artifacts) {
-        rollupConfig.rollupOptions.input[`artifacts/${artifact}`] = `virtual:houdini/artifacts/${artifact}.js`;
+        conf.build.rollupOptions.input[`artifacts/${artifact}`] = `virtual:houdini/artifacts/${artifact}.js`;
+      }
+      if (process.env.HOUDINI_SECONDARY_BUILD !== "ssr") {
+        conf.build.outDir = config.compiledAssetsDir;
       }
     }
     return {
@@ -79601,7 +79652,7 @@ var vite_default = {
           "~/*": path_exports.join(config.projectRoot, "src", "*")
         }
       },
-      build: rollupConfig
+      ...conf
     };
   },
   resolveId(id) {
@@ -79613,6 +79664,20 @@ var vite_default = {
   async buildStart({ houdiniConfig }) {
     await writeTsconfig(houdiniConfig);
   },
+  async closeBundle(config) {
+    if (isSecondaryBuild() || devServer) {
+      return;
+    }
+    console.log("\u{1F3A9} Generating Server Assets...");
+    process.env.HOUDINI_SECONDARY_BUILD = "ssr";
+    await build({
+      build: {
+        ssr: true,
+        outDir: path_exports.join(config.rootDir, "build", "ssr")
+      }
+    });
+    process.env.HOUDINI_SECONDARY_BUILD = "false";
+  },
   async load(id, { config }) {
     if (!id.startsWith("virtual:houdini")) {
       return;
@@ -79635,7 +79700,6 @@ var vite_default = {
 				// if there is pending data (or artifacts) then we should prime the caches
 				let initialData = {}
 				let initialArtifacts = {}
-
 				if (!window.__houdini__cache__) {
 					window.__houdini__cache__ = new Cache()
 					window.__houdini__hydration__layer__ = window.__houdini__cache__._internal_unstable.storage.createLayer(true)
@@ -79670,16 +79734,24 @@ var vite_default = {
 					})
 				}
 
-
-
 				// hydrate the cache with the information from the initial payload
 				window.__houdini__cache__?.hydrate(
 					window.__houdini__initial__cache__,
 					window.__houdini__hydration__layer__
 				)
 
+				// get the initial url from the window
+				const url = window.location.pathname
+
+				const app = <App
+					initialURL={url}
+					cache={window.__houdini__cache__}
+					session={window.__houdini__initial__session__}
+					{...window.__houdini__nav_caches__}
+				/>
+
 				// hydrate the application for interactivity
-				hydrateRoot(document, <App cache={window.__houdini__cache__} session={window.__houdini__initial__session__} {...window.__houdini__nav_caches__} />)
+				hydrateRoot(document, app)
 			`;
     }
     if (which === "artifacts") {
@@ -79694,51 +79766,92 @@ if (window.__houdini__nav_caches__ && window.__houdini__nav_caches__.artifact_ca
     }
   },
   async configureServer(server) {
+    devServer = true;
     await writeTsconfig(server.houdiniConfig);
     server.middlewares.use(async (req, res, next) => {
+      if (!req.url) {
+        next();
+        return;
+      }
       const { default: router_manifest } = await server.ssrLoadModule(
         path_exports.join(
           server.houdiniConfig.pluginRuntimeDirectory("houdini-react"),
           "manifest.js"
         )
       );
-      try {
-        const [match] = find_match(router_manifest, req.url ?? "/");
-        if (!match) {
-          throw new Error();
-        }
-      } catch {
-        if (req.url !== localApiEndpoint(server.houdiniConfig.configFile)) {
-          return next();
-        }
+      const [match] = find_match(router_manifest, req.url);
+      if (!match && !internalRoutes(server.houdiniConfig.configFile).find(
+        (route) => req.url?.startsWith(route)
+      )) {
+        next();
+        return;
       }
       const project_manifest = await load_manifest({ config: server.houdiniConfig });
       let schema = null;
       if (project_manifest.local_schema) {
         schema = await loadLocalSchema(server.houdiniConfig);
       }
-      const serverAdapter = (await server.ssrLoadModule(
-        conventions_exports.server_adapter_path(server.houdiniConfig) + "?t=" + new Date().getTime()
-      )).default;
       let yoga = null;
       if (project_manifest.local_yoga) {
-        const yogaPath = path_exports.join(
-          server.houdiniConfig.localApiDir,
-          "+yoga?t=" + new Date().getTime()
-        );
+        const yogaPath = path_exports.join(server.houdiniConfig.localApiDir, "+yoga");
         yoga = await server.ssrLoadModule(yogaPath);
       }
-      await serverAdapter({
+      const { createServerAdapter } = await server.ssrLoadModule(
+        conventions_exports.server_adapter_path(server.houdiniConfig)
+      );
+      const requestHeaders = new Headers();
+      for (const header of Object.entries(req.headers ?? {})) {
+        requestHeaders.set(header[0], header[1]);
+      }
+      const request = new Request(
+        "https://localhost:5173" + req.url,
+        req.method === "POST" ? {
+          method: req.method,
+          headers: requestHeaders,
+          body: await getBody(req)
+        } : void 0
+      );
+      for (const [key, value] of Object.entries(req.headers)) {
+        request.headers.set(key, value);
+      }
+      const result = await createServerAdapter({
         schema,
         yoga,
-        assetPrefix: "/virtual:houdini",
         production: false,
         manifest: router_manifest,
-        pipe: res
-      })(req, res);
+        graphqlEndpoint: localApiEndpoint(server.houdiniConfig.configFile),
+        assetPrefix: "/virtual:houdini",
+        pipe: res,
+        documentPremable: `<script type="module" src="/@vite/client" async=""><\/script>`
+      })(request);
+      if (result && result.status === 404) {
+        next();
+      }
+      if (result && typeof result !== "boolean") {
+        if (res.closed) {
+          return;
+        }
+        for (const header of Object.entries(result.headers ?? {})) {
+          res.setHeader(header[0], header[1]);
+        }
+        res.write(await result.text());
+        res.end();
+      }
     });
   }
 };
+function getBody(request) {
+  return new Promise((resolve2) => {
+    const bodyParts = [];
+    let body;
+    request.on("data", (chunk) => {
+      bodyParts.push(chunk);
+    }).on("end", () => {
+      body = Buffer.concat(bodyParts).toString();
+      resolve2(body);
+    });
+  });
+}
 
 // src/plugin/index.ts
 var manifest2;

package/build/runtime/index.d.ts

@@ -1,27 +1,10 @@
 import type { Cache } from '$houdini/runtime/cache/cache';
-import { DocumentStore } from '$houdini/runtime/client';
-import { LRUCache } from '$houdini/runtime/lib/lru';
-import { GraphQLObject, GraphQLVariables, QueryArtifact } from '$houdini/runtime/lib/types';
-import React from 'react';
-import { SuspenseCache, type PendingCache } from './routing';
+import { RouterCache } from './routing';
 export * from './hooks';
+export { router_cache } from './routing';
 export declare function Router({ cache, initialURL, artifact_cache, component_cache, data_cache, pending_cache, last_variables, session, assetPrefix, }: {
     initialURL: string;
     cache: Cache;
     session?: App.Session;
     assetPrefix: string;
 } & RouterCache): JSX.Element;
-type RouterCache = {
-    artifact_cache: SuspenseCache<QueryArtifact>;
-    component_cache: SuspenseCache<(props: any) => React.ReactElement>;
-    data_cache: SuspenseCache<DocumentStore<GraphQLObject, GraphQLVariables>>;
-    last_variables: LRUCache<GraphQLVariables>;
-    pending_cache: PendingCache;
-};
-export declare function router_cache({ pending_queries, artifacts, components, initialData, initialArtifacts, }?: {
-    pending_queries?: string[];
-    artifacts?: Record<string, QueryArtifact>;
-    components?: Record<string, (props: any) => React.ReactElement>;
-    initialData?: Record<string, DocumentStore<GraphQLObject, GraphQLVariables>>;
-    initialArtifacts?: Record<string, QueryArtifact>;
-}): RouterCache;

package/build/runtime/routing/Router.d.ts

@@ -49,4 +49,18 @@ export declare function updateLocalSession(session: App.Session): void;
 export declare function useSession(): App.Session;
 export declare function useCurrentVariables(): GraphQLVariables;
 export declare function useQueryResult<_Data extends GraphQLObject, _Input extends GraphQLVariables>(name: string): [_Data | null, DocumentStore<_Data, _Input>];
+export type RouterCache = {
+    artifact_cache: SuspenseCache<QueryArtifact>;
+    component_cache: SuspenseCache<(props: any) => React.ReactElement>;
+    data_cache: SuspenseCache<DocumentStore<GraphQLObject, GraphQLVariables>>;
+    last_variables: LRUCache<GraphQLVariables>;
+    pending_cache: PendingCache;
+};
+export declare function router_cache({ pending_queries, artifacts, components, initialData, initialArtifacts, }?: {
+    pending_queries?: string[];
+    artifacts?: Record<string, QueryArtifact>;
+    components?: Record<string, (props: any) => React.ReactElement>;
+    initialData?: Record<string, DocumentStore<GraphQLObject, GraphQLVariables>>;
+    initialArtifacts?: Record<string, QueryArtifact>;
+}): RouterCache;
 export {};

package/build/runtime-cjs/index.d.ts

@@ -1,27 +1,10 @@
 import type { Cache } from '$houdini/runtime/cache/cache';
-import { DocumentStore } from '$houdini/runtime/client';
-import { LRUCache } from '$houdini/runtime/lib/lru';
-import { GraphQLObject, GraphQLVariables, QueryArtifact } from '$houdini/runtime/lib/types';
-import React from 'react';
-import { SuspenseCache, type PendingCache } from './routing';
+import { RouterCache } from './routing';
 export * from './hooks';
+export { router_cache } from './routing';
 export declare function Router({ cache, initialURL, artifact_cache, component_cache, data_cache, pending_cache, last_variables, session, assetPrefix, }: {
     initialURL: string;
     cache: Cache;
     session?: App.Session;
     assetPrefix: string;
 } & RouterCache): JSX.Element;
-type RouterCache = {
-    artifact_cache: SuspenseCache<QueryArtifact>;
-    component_cache: SuspenseCache<(props: any) => React.ReactElement>;
-    data_cache: SuspenseCache<DocumentStore<GraphQLObject, GraphQLVariables>>;
-    last_variables: LRUCache<GraphQLVariables>;
-    pending_cache: PendingCache;
-};
-export declare function router_cache({ pending_queries, artifacts, components, initialData, initialArtifacts, }?: {
-    pending_queries?: string[];
-    artifacts?: Record<string, QueryArtifact>;
-    components?: Record<string, (props: any) => React.ReactElement>;
-    initialData?: Record<string, DocumentStore<GraphQLObject, GraphQLVariables>>;
-    initialArtifacts?: Record<string, QueryArtifact>;
-}): RouterCache;

package/build/runtime-cjs/index.js

@@ -26,14 +26,15 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var runtime_exports = {};
 __export(runtime_exports, {
   Router: () => Router,
-  router_cache: () => router_cache
+  router_cache: () => import_routing2.router_cache
 });
 module.exports = __toCommonJS(runtime_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_client2 = __toESM(require("./client"));
+var import_client = __toESM(require("./client"));
 var import_manifest = __toESM(require("./manifest"));
 var import_routing = require("./routing");
 __reExport(runtime_exports, require("./hooks"), module.exports);
+var import_routing2 = require("./routing");
 function Router({
   cache,
   initialURL,
@@ -48,7 +49,7 @@ function Router({
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     import_routing.RouterContextProvider,
     {
-      client: (0, import_client2.default)(),
+      client: (0, import_client.default)(),
       cache,
       artifact_cache,
       component_cache,
@@ -60,46 +61,6 @@ function Router({
     }
   );
 }
-function router_cache({
-  pending_queries = [],
-  artifacts = {},
-  components = {},
-  initialData = {},
-  initialArtifacts = {}
-} = {}) {
-  const result = {
-    artifact_cache: (0, import_routing.suspense_cache)(initialArtifacts),
-    component_cache: (0, import_routing.suspense_cache)(),
-    data_cache: (0, import_routing.suspense_cache)(initialData),
-    pending_cache: (0, import_routing.suspense_cache)(),
-    last_variables: (0, import_routing.suspense_cache)()
-  };
-  for (const query of pending_queries) {
-    result.pending_cache.set(query, signal_promise());
-  }
-  for (const [name, artifact] of Object.entries(artifacts)) {
-    result.artifact_cache.set(name, artifact);
-  }
-  for (const [name, component] of Object.entries(components)) {
-    result.component_cache.set(name, component);
-  }
-  return result;
-}
-function signal_promise() {
-  let resolve = () => {
-  };
-  let reject = () => {
-  };
-  const promise = new Promise((res, rej) => {
-    resolve = res;
-    reject = rej;
-  });
-  return {
-    ...promise,
-    resolve,
-    reject
-  };
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Router,