houdini-react 1.2.23-next.0 → 1.2.24

package/build/plugin/vite.d.ts

@@ -4,7 +4,7 @@ declare const _default: {
         houdiniConfig: import("houdini").Config;
     }) => void) | undefined;
     buildEnd?: ((this: import("rollup").PluginContext, error?: Error | undefined, houdiniConfig?: import("houdini").Config | undefined) => void | Promise<void>) | undefined;
-    closeBundle?: ((this: import("rollup").PluginContext) => void | Promise<void>) | undefined;
+    closeBundle?: ((this: import("rollup").PluginContext, config: import("houdini").Config) => void | Promise<void>) | undefined;
     configResolved?: import("rollup").ObjectHook<(this: void, config: Readonly<Omit<import("vite").UserConfig, "plugins" | "assetsInclude" | "optimizeDeps" | "worker"> & {
         configFile: string | undefined;
         configFileDependencies: string[];

package/build/plugin-cjs/index.js

@@ -78416,7 +78416,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) {
@@ -78956,7 +78956,7 @@ 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)];
@@ -78966,9 +78966,9 @@ function internalRoutes(config2) {
   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: import_node_path2.default.join(config2.rootDir, "temp"),
@@ -78989,7 +78989,7 @@ async function buildLocalSchema(config2) {
       }
     }
   });
-  process.env.HOUDINI_SCHEMA_BUILD = "false";
+  process.env.HOUDINI_SECONDARY_BUILD = "false";
 }
 async function loadLocalSchema(config2) {
   await buildLocalSchema(config2);
@@ -78999,7 +78999,7 @@ async function loadLocalSchema(config2) {
 
 // src/plugin/index.ts
 var import_node_path3 = __toESM(require("node:path"));
-var import_vite = require("vite");
+var import_vite2 = require("vite");
 
 // src/plugin/codegen/entries.ts
 async function generate_entries({
@@ -79228,12 +79228,8 @@ 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 vite_render = `
-import { renderToStream as render }  from 'react-streaming/server'
-
-export const renderToStream = render
-`;
   const app_index = `
 import { Router } from '$houdini/plugins/houdini-react/runtime'
 import React from 'react'
@@ -79257,7 +79253,8 @@ import { router_cache } from '../../runtime/routing'
 // @ts-expect-error
 import client from '../../../../../src/+client'
 // @ts-expect-error
-import App from './App'
+import App from "./App"
+import router_manifest from '$houdini/plugins/houdini-react/runtime/manifest'
 
 export const on_render =
 	({ assetPrefix, pipe, production, documentPremable }) =>
@@ -79299,7 +79296,7 @@ export const on_render =
 			window.__houdini__initial__session__ = \${JSON.stringify(session)};
 		<\/script>
 
-		\${documentPremable}
+		\${documentPremable ?? ''}
 
 		<!--
 			add a virtual module that hydrates the client and sets up the initial pending cache.
@@ -79316,25 +79313,18 @@ export const on_render =
 		}
 	}
 
-export function reactServerHandler(options) {
-	return _serverHandler({
-		...options,
-		client,
-		on_render: on_render({ assetPrefix: options.assetPrefix, pipe: options.pipe, documentPremable: options.documentPremable }),
-	})
-}
-
-export default function createServerAdapter(options) {
+export function createServerAdapter(options) {
 	return serverAdapterFactory({
 		client,
 		production: true,
+		manifest: router_manifest,
+		on_render: on_render(options),
 		...options,
-		on_render: on_render({ assetPrefix: options.assetPrefix }),
 	})
 }
 `;
   let adapter_config = `
-		import createAdapter from './server'
+		import { createServerAdapter as createAdapter } from './server'
 
 		export const endpoint = ${JSON.stringify(localApiEndpoint(config.configFile))}
 
@@ -79353,9 +79343,8 @@ export default function createServerAdapter(options) {
 	`;
   await Promise.all([
     fs_exports.writeFile(conventions_exports.adapter_config_path(config), adapter_config),
-    fs_exports.writeFile(conventions_exports.server_adapter_path(config), renderer),
-    fs_exports.writeFile(conventions_exports.app_component_path(config), app_index),
-    fs_exports.writeFile(conventions_exports.vite_render_path(config), vite_render)
+    fs_exports.writeFile(adapter_path, renderer),
+    fs_exports.writeFile(conventions_exports.app_component_path(config), app_index)
   ]);
 }
 
@@ -79624,28 +79613,44 @@ async function transformFile(page) {
 }
 
 // src/plugin/vite.tsx
+var import_vite = require("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 (env.command === "build") {
+        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 {
@@ -79657,7 +79662,7 @@ var vite_default = {
           "~/*": path_exports.join(config.projectRoot, "src", "*")
         }
       },
-      build: rollupConfig
+      ...conf
     };
   },
   resolveId(id) {
@@ -79669,6 +79674,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 (0, import_vite.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;
@@ -79691,7 +79710,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)
@@ -79732,8 +79750,18 @@ var vite_default = {
 					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") {
@@ -79748,6 +79776,7 @@ 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) {
@@ -79774,14 +79803,11 @@ if (window.__houdini__nav_caches__ && window.__houdini__nav_caches__.artifact_ca
       }
       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);
       }
-      const { reactServerHandler: serverHandler } = await server.ssrLoadModule(
-        conventions_exports.server_adapter_path(server.houdiniConfig) + "?t=" + new Date().getTime()
+      const { createServerAdapter } = await server.ssrLoadModule(
+        conventions_exports.server_adapter_path(server.houdiniConfig)
       );
       const requestHeaders = new Headers();
       for (const header of Object.entries(req.headers ?? {})) {
@@ -79798,7 +79824,7 @@ if (window.__houdini__nav_caches__ && window.__houdini__nav_caches__.artifact_ca
       for (const [key, value] of Object.entries(req.headers)) {
         request.headers.set(key, value);
       }
-      const result = await serverHandler({
+      const result = await createServerAdapter({
         schema,
         yoga,
         production: false,
@@ -79984,7 +80010,7 @@ export function useFragmentHandle(reference: { readonly "${fragmentKey}": { ${do
     if (_env) {
       return _env;
     }
-    _env = (0, import_vite.loadEnv)("dev", config.projectRoot || ".", "");
+    _env = (0, import_vite2.loadEnv)("dev", config.projectRoot || ".", "");
     return _env;
   }
 });

package/build/plugin-esm/index.js

@@ -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) {
@@ -78946,7 +78946,7 @@ 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)];
@@ -78956,9 +78956,9 @@ function internalRoutes(config2) {
   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"),
@@ -78979,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);
@@ -79218,12 +79218,8 @@ 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 vite_render = `
-import { renderToStream as render }  from 'react-streaming/server'
-
-export const renderToStream = render
-`;
   const app_index = `
 import { Router } from '$houdini/plugins/houdini-react/runtime'
 import React from 'react'
@@ -79247,7 +79243,8 @@ import { router_cache } from '../../runtime/routing'
 // @ts-expect-error
 import client from '../../../../../src/+client'
 // @ts-expect-error
-import App from './App'
+import App from "./App"
+import router_manifest from '$houdini/plugins/houdini-react/runtime/manifest'
 
 export const on_render =
 	({ assetPrefix, pipe, production, documentPremable }) =>
@@ -79289,7 +79286,7 @@ export const on_render =
 			window.__houdini__initial__session__ = \${JSON.stringify(session)};
 		<\/script>
 
-		\${documentPremable}
+		\${documentPremable ?? ''}
 
 		<!--
 			add a virtual module that hydrates the client and sets up the initial pending cache.
@@ -79306,25 +79303,18 @@ export const on_render =
 		}
 	}
 
-export function reactServerHandler(options) {
-	return _serverHandler({
-		...options,
-		client,
-		on_render: on_render({ assetPrefix: options.assetPrefix, pipe: options.pipe, documentPremable: options.documentPremable }),
-	})
-}
-
-export default function createServerAdapter(options) {
+export function createServerAdapter(options) {
 	return serverAdapterFactory({
 		client,
 		production: true,
+		manifest: router_manifest,
+		on_render: on_render(options),
 		...options,
-		on_render: on_render({ assetPrefix: options.assetPrefix }),
 	})
 }
 `;
   let adapter_config = `
-		import createAdapter from './server'
+		import { createServerAdapter as createAdapter } from './server'
 
 		export const endpoint = ${JSON.stringify(localApiEndpoint(config.configFile))}
 
@@ -79343,9 +79333,8 @@ export default function createServerAdapter(options) {
 	`;
   await Promise.all([
     fs_exports.writeFile(conventions_exports.adapter_config_path(config), adapter_config),
-    fs_exports.writeFile(conventions_exports.server_adapter_path(config), renderer),
-    fs_exports.writeFile(conventions_exports.app_component_path(config), app_index),
-    fs_exports.writeFile(conventions_exports.vite_render_path(config), vite_render)
+    fs_exports.writeFile(adapter_path, renderer),
+    fs_exports.writeFile(conventions_exports.app_component_path(config), app_index)
   ]);
 }
 
@@ -79614,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 (env.command === "build") {
+        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 {
@@ -79647,7 +79652,7 @@ var vite_default = {
           "~/*": path_exports.join(config.projectRoot, "src", "*")
         }
       },
-      build: rollupConfig
+      ...conf
     };
   },
   resolveId(id) {
@@ -79659,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;
@@ -79681,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)
@@ -79722,8 +79740,18 @@ var vite_default = {
 					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") {
@@ -79738,6 +79766,7 @@ 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) {
@@ -79764,14 +79793,11 @@ if (window.__houdini__nav_caches__ && window.__houdini__nav_caches__.artifact_ca
       }
       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);
       }
-      const { reactServerHandler: serverHandler } = await server.ssrLoadModule(
-        conventions_exports.server_adapter_path(server.houdiniConfig) + "?t=" + new Date().getTime()
+      const { createServerAdapter } = await server.ssrLoadModule(
+        conventions_exports.server_adapter_path(server.houdiniConfig)
       );
       const requestHeaders = new Headers();
       for (const header of Object.entries(req.headers ?? {})) {
@@ -79788,7 +79814,7 @@ if (window.__houdini__nav_caches__ && window.__houdini__nav_caches__.artifact_ca
       for (const [key, value] of Object.entries(req.headers)) {
         request.headers.set(key, value);
       }
-      const result = await serverHandler({
+      const result = await createServerAdapter({
         schema,
         yoga,
         production: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini-react",
-  "version": "1.2.23-next.0",
+  "version": "1.2.24",
   "description": "The React plugin for houdini",
   "keywords": [
     "typescript",
@@ -42,7 +42,7 @@
     "recast": "^0.23.1",
     "rollup": "^3.7.4",
     "use-deep-compare-effect": "^1.8.1",
-    "houdini": "^1.2.23-next.0"
+    "houdini": "^1.2.24"
   },
   "files": [
     "build"