houdini 2.0.0-next.7 → 2.0.0-next.9

package/build/adapter/index.d.ts

@@ -1,3 +1,3 @@
 import type { serverAdapterFactory as createAdapter } from '../runtime/router/server';
 export declare const endpoint: string;
-export declare let createServerAdapter: (args: Omit<Parameters<typeof createAdapter>[0], 'on_render' | 'manifest' | 'yoga' | 'schema' | 'graphqlEndpoint' | 'componentCache' | 'client'>) => ReturnType<typeof createAdapter>;
+export declare let createServerAdapter: (args: Omit<Parameters<typeof createAdapter>[0], 'on_render' | 'manifest' | 'server' | 'schema' | 'graphqlEndpoint' | 'componentCache' | 'client'>) => ReturnType<typeof createAdapter>;

package/build/cmd-cjs/index.js

@@ -82357,6 +82357,10 @@ ${exportStatement("config")}
       // we need to update the list of client plugins that get injected by codegen plugins
       [join2(config.runtimeSource, "client", "plugins", "injectedPlugins.js")]: (content) => injectPlugins({ config, content, importStatement, exportStatement })
     }),
+    recursiveCopy(
+      join2(config.runtimeSource, "server"),
+      join2(config.rootDir, "server")
+    ),
     generatePluginRuntimes({
       config,
       docs
@@ -83634,10 +83638,7 @@ function queryDefinitions(config, body, docs, returnType) {
       const [shapeType, inputType] = ensureImports({
         config,
         body,
-        sourceModule: path_exports.relative(
-          config.runtimeDirectory,
-          config.artifactImportPath(doc.name)
-        ),
+        sourceModule: config.artifactImportPath(doc.name),
         import: [`${doc.name}$result`, `${doc.name}$input`]
       });
       return prev.concat(
@@ -83667,10 +83668,7 @@ function fragmentListMap(config, concreteTypes, body, docs, return_type) {
     const [shapeType] = ensureImports({
       config,
       body,
-      sourceModule: path_exports.relative(
-        config.runtimeDirectory,
-        config.artifactImportPath(doc.name)
-      ),
+      sourceModule: config.artifactImportPath(doc.name),
       import: [`${definition.name.value}$data`]
     });
     let inputType = AST13.tsNeverKeyword();
@@ -83683,10 +83681,7 @@ function fragmentListMap(config, concreteTypes, body, docs, return_type) {
           ensureImports({
             config,
             body,
-            sourceModule: path_exports.relative(
-              config.runtimeDirectory,
-              config.artifactImportPath(doc.name)
-            ),
+            sourceModule: config.artifactImportPath(doc.name),
             import: [`${definition.name.value}$input`]
           })[0]
         )
@@ -89211,12 +89206,12 @@ async function packageJSON(targetPath, frameworkInfo) {
   }
   packageJSON2.devDependencies = {
     ...packageJSON2.devDependencies,
-    houdini: "^2.0.0-next.7"
+    houdini: "^2.0.0-next.9"
   };
   if (frameworkInfo.framework === "svelte" || frameworkInfo.framework === "kit") {
     packageJSON2.devDependencies = {
       ...packageJSON2.devDependencies,
-      "houdini-svelte": "^3.0.0-next.10"
+      "houdini-svelte": "^3.0.0-next.12"
     };
   } else {
     throw new Error(`Unmanaged framework: "${JSON.stringify(frameworkInfo)}"`);

package/build/cmd-esm/index.js

@@ -82361,6 +82361,10 @@ ${exportStatement("config")}
       // we need to update the list of client plugins that get injected by codegen plugins
       [join2(config.runtimeSource, "client", "plugins", "injectedPlugins.js")]: (content) => injectPlugins({ config, content, importStatement, exportStatement })
     }),
+    recursiveCopy(
+      join2(config.runtimeSource, "server"),
+      join2(config.rootDir, "server")
+    ),
     generatePluginRuntimes({
       config,
       docs
@@ -83638,10 +83642,7 @@ function queryDefinitions(config, body, docs, returnType) {
       const [shapeType, inputType] = ensureImports({
         config,
         body,
-        sourceModule: path_exports.relative(
-          config.runtimeDirectory,
-          config.artifactImportPath(doc.name)
-        ),
+        sourceModule: config.artifactImportPath(doc.name),
         import: [`${doc.name}$result`, `${doc.name}$input`]
       });
       return prev.concat(
@@ -83671,10 +83672,7 @@ function fragmentListMap(config, concreteTypes, body, docs, return_type) {
     const [shapeType] = ensureImports({
       config,
       body,
-      sourceModule: path_exports.relative(
-        config.runtimeDirectory,
-        config.artifactImportPath(doc.name)
-      ),
+      sourceModule: config.artifactImportPath(doc.name),
       import: [`${definition.name.value}$data`]
     });
     let inputType = AST13.tsNeverKeyword();
@@ -83687,10 +83685,7 @@ function fragmentListMap(config, concreteTypes, body, docs, return_type) {
           ensureImports({
             config,
             body,
-            sourceModule: path_exports.relative(
-              config.runtimeDirectory,
-              config.artifactImportPath(doc.name)
-            ),
+            sourceModule: config.artifactImportPath(doc.name),
             import: [`${definition.name.value}$input`]
           })[0]
         )
@@ -89215,12 +89210,12 @@ async function packageJSON(targetPath, frameworkInfo) {
   }
   packageJSON2.devDependencies = {
     ...packageJSON2.devDependencies,
-    houdini: "^2.0.0-next.7"
+    houdini: "^2.0.0-next.9"
   };
   if (frameworkInfo.framework === "svelte" || frameworkInfo.framework === "kit") {
     packageJSON2.devDependencies = {
       ...packageJSON2.devDependencies,
-      "houdini-svelte": "^3.0.0-next.10"
+      "houdini-svelte": "^3.0.0-next.12"
     };
   } else {
     throw new Error(`Unmanaged framework: "${JSON.stringify(frameworkInfo)}"`);

package/build/codegen-cjs/index.js

@@ -68889,6 +68889,10 @@ ${exportStatement("config")}
       // we need to update the list of client plugins that get injected by codegen plugins
       [join(config.runtimeSource, "client", "plugins", "injectedPlugins.js")]: (content) => injectPlugins({ config, content, importStatement, exportStatement })
     }),
+    recursiveCopy(
+      join(config.runtimeSource, "server"),
+      join(config.rootDir, "server")
+    ),
     generatePluginRuntimes({
       config,
       docs
@@ -70166,10 +70170,7 @@ function queryDefinitions(config, body, docs, returnType) {
       const [shapeType, inputType] = ensureImports({
         config,
         body,
-        sourceModule: path_exports.relative(
-          config.runtimeDirectory,
-          config.artifactImportPath(doc.name)
-        ),
+        sourceModule: config.artifactImportPath(doc.name),
         import: [`${doc.name}$result`, `${doc.name}$input`]
       });
       return prev.concat(
@@ -70199,10 +70200,7 @@ function fragmentListMap(config, concreteTypes, body, docs, return_type) {
     const [shapeType] = ensureImports({
       config,
       body,
-      sourceModule: path_exports.relative(
-        config.runtimeDirectory,
-        config.artifactImportPath(doc.name)
-      ),
+      sourceModule: config.artifactImportPath(doc.name),
       import: [`${definition.name.value}$data`]
     });
     let inputType = AST13.tsNeverKeyword();
@@ -70215,10 +70213,7 @@ function fragmentListMap(config, concreteTypes, body, docs, return_type) {
           ensureImports({
             config,
             body,
-            sourceModule: path_exports.relative(
-              config.runtimeDirectory,
-              config.artifactImportPath(doc.name)
-            ),
+            sourceModule: config.artifactImportPath(doc.name),
             import: [`${definition.name.value}$input`]
           })[0]
         )

package/build/codegen-esm/index.js

@@ -68888,6 +68888,10 @@ ${exportStatement("config")}
       // we need to update the list of client plugins that get injected by codegen plugins
       [join(config.runtimeSource, "client", "plugins", "injectedPlugins.js")]: (content) => injectPlugins({ config, content, importStatement, exportStatement })
     }),
+    recursiveCopy(
+      join(config.runtimeSource, "server"),
+      join(config.rootDir, "server")
+    ),
     generatePluginRuntimes({
       config,
       docs
@@ -70165,10 +70169,7 @@ function queryDefinitions(config, body, docs, returnType) {
       const [shapeType, inputType] = ensureImports({
         config,
         body,
-        sourceModule: path_exports.relative(
-          config.runtimeDirectory,
-          config.artifactImportPath(doc.name)
-        ),
+        sourceModule: config.artifactImportPath(doc.name),
         import: [`${doc.name}$result`, `${doc.name}$input`]
       });
       return prev.concat(
@@ -70198,10 +70199,7 @@ function fragmentListMap(config, concreteTypes, body, docs, return_type) {
     const [shapeType] = ensureImports({
       config,
       body,
-      sourceModule: path_exports.relative(
-        config.runtimeDirectory,
-        config.artifactImportPath(doc.name)
-      ),
+      sourceModule: config.artifactImportPath(doc.name),
       import: [`${definition.name.value}$data`]
     });
     let inputType = AST13.tsNeverKeyword();
@@ -70214,10 +70212,7 @@ function fragmentListMap(config, concreteTypes, body, docs, return_type) {
           ensureImports({
             config,
             body,
-            sourceModule: path_exports.relative(
-              config.runtimeDirectory,
-              config.artifactImportPath(doc.name)
-            ),
+            sourceModule: config.artifactImportPath(doc.name),
             import: [`${definition.name.value}$input`]
           })[0]
         )

package/build/lib-cjs/index.js

@@ -73384,7 +73384,7 @@ async function load_manifest(args) {
       layout_queries: {},
       artifacts: [],
       local_schema: false,
-      local_yoga: false
+      local_server: false
     },
     queries: [],
     layouts: [],
@@ -73408,8 +73408,8 @@ async function load_manifest(args) {
       if (name === "+schema") {
         manifest.local_schema = true;
       }
-      if (name === "+yoga") {
-        manifest.local_yoga = true;
+      if (name === "+server") {
+        manifest.local_server = true;
       }
     }
   } catch {
@@ -77808,6 +77808,9 @@ async function get_session(req, secrets) {
   if (!cookie) {
     return {};
   }
+  if (cookie === "{}") {
+    return {};
+  }
   for (const secret of secrets) {
     if (!await verify(cookie, secret)) {
       continue;

package/build/lib-esm/index.js

@@ -73295,7 +73295,7 @@ async function load_manifest(args) {
       layout_queries: {},
       artifacts: [],
       local_schema: false,
-      local_yoga: false
+      local_server: false
     },
     queries: [],
     layouts: [],
@@ -73319,8 +73319,8 @@ async function load_manifest(args) {
       if (name === "+schema") {
         manifest.local_schema = true;
       }
-      if (name === "+yoga") {
-        manifest.local_yoga = true;
+      if (name === "+server") {
+        manifest.local_server = true;
       }
     }
   } catch {
@@ -77719,6 +77719,9 @@ async function get_session(req, secrets) {
   if (!cookie) {
     return {};
   }
+  if (cookie === "{}") {
+    return {};
+  }
   for (const secret of secrets) {
     if (!await verify(cookie, secret)) {
       continue;

package/build/runtime/lib/types.d.ts

@@ -372,8 +372,8 @@ export type ProjectManifest = {
     artifacts: string[];
     /** Whether or not there is a local schema defined */
     local_schema: boolean;
-    /** Whether or not there is a custom instance of yoga defined */
-    local_yoga: boolean;
+    /** Whether or not there is a custom server defined */
+    local_server: boolean;
     /** Information about componentFields defined in the project */
     component_fields: Record<string, {
         filepath: string;

package/build/runtime/public/cache.d.ts

@@ -6,7 +6,6 @@ import type { ArgType, CacheTypeDef, IDFields, QueryInput, QueryList, QueryValue
 export declare class Cache<Def extends CacheTypeDef> {
     _internal_unstable: _Cache;
     constructor(cache: _Cache);
-    validateInstabilityWarning(): void;
     get<T extends TypeNames<Def>>(type: T, data: IDFields<Def, T>): Record<Def, T>;
     get config(): import("../lib").ConfigFile;
     list<Name extends ValidLists<Def>>(name: Name, { parentID, allLists }?: {

package/build/runtime/router/server.d.ts

@@ -1,11 +1,11 @@
-import { createServerAdapter as createAdapter } from '@whatwg-node/server';
+import { createServerAdapter } from '@whatwg-node/server';
 import type { GraphQLSchema } from 'graphql';
-import { createYoga } from 'graphql-yoga';
 import type { HoudiniClient } from '../client';
+import { Server } from '../server';
 import type { RouterManifest, RouterPageManifest, YogaServerOptions } from './types';
-export declare function _serverHandler<ComponentType = unknown>({ schema, yoga, client, production, manifest, graphqlEndpoint, on_render, componentCache, }: {
+export declare function _serverHandler<ComponentType = unknown>({ schema, server, client, production, manifest, graphqlEndpoint, on_render, componentCache, }: {
     schema?: GraphQLSchema | null;
-    yoga?: ReturnType<typeof createYoga> | null;
+    server?: Server<any, any>;
     client: HoudiniClient;
     production: boolean;
     manifest: RouterManifest<ComponentType> | null;
@@ -20,5 +20,5 @@ export declare function _serverHandler<ComponentType = unknown>({ schema, yoga,
         componentCache: Record<string, any>;
     }) => Response | Promise<Response | undefined> | undefined;
 } & Omit<YogaServerOptions, 'schema'>): (request: Request) => Promise<Response>;
-export declare const serverAdapterFactory: (args: Parameters<typeof _serverHandler>[0]) => ReturnType<typeof createAdapter>;
+export declare const serverAdapterFactory: (args: Parameters<typeof _serverHandler>[0]) => ReturnType<typeof createServerAdapter>;
 export type ServerAdapterFactory = typeof serverAdapterFactory;

package/build/runtime/server/index.d.ts

@@ -0,0 +1,17 @@
+import type { ServerAdapterRequestHandler } from '@whatwg-node/server';
+import { YogaServer } from 'graphql-yoga';
+import type { YogaSchemaDefinition } from 'graphql-yoga/typings/plugins/use-schema';
+type YogaParams = Required<ConstructorParameters<typeof YogaServer>>[0];
+type ConstructorParams = Omit<YogaParams, 'schema' | 'graphqlEndpoint'>;
+export declare class Server<ServerContext extends Record<string, any>, UserContext extends Record<string, any>> {
+    opts: ConstructorParams | null;
+    _yoga: YogaServer<any, any> | null;
+    constructor(opts?: ConstructorParams);
+    init({ endpoint, schema, getSession, }: {
+        schema: YogaSchemaDefinition<any>;
+        endpoint: string;
+        getSession: (request: Request) => Promise<UserContext>;
+    }): import("@whatwg-node/server").ServerAdapter<ServerContext, Server<ServerContext, UserContext>>;
+    handle: ServerAdapterRequestHandler<ServerContext>;
+}
+export {};

package/build/runtime-cjs/lib/types.d.ts

@@ -372,8 +372,8 @@ export type ProjectManifest = {
     artifacts: string[];
     /** Whether or not there is a local schema defined */
     local_schema: boolean;
-    /** Whether or not there is a custom instance of yoga defined */
-    local_yoga: boolean;
+    /** Whether or not there is a custom server defined */
+    local_server: boolean;
     /** Information about componentFields defined in the project */
     component_fields: Record<string, {
         filepath: string;

package/build/runtime-cjs/public/cache.d.ts

@@ -6,7 +6,6 @@ import type { ArgType, CacheTypeDef, IDFields, QueryInput, QueryList, QueryValue
 export declare class Cache<Def extends CacheTypeDef> {
     _internal_unstable: _Cache;
     constructor(cache: _Cache);
-    validateInstabilityWarning(): void;
     get<T extends TypeNames<Def>>(type: T, data: IDFields<Def, T>): Record<Def, T>;
     get config(): import("../lib").ConfigFile;
     list<Name extends ValidLists<Def>>(name: Name, { parentID, allLists }?: {

package/build/runtime-cjs/public/cache.js

@@ -29,19 +29,8 @@ class Cache {
   constructor(cache) {
     this._internal_unstable = cache;
   }
-  // if the user is using the imperative API, we want the ability to break the API
-  // with any minor version. In order to do this, we require them to accept this contract
-  // through their config file
-  validateInstabilityWarning() {
-    if (!this.config.acceptImperativeInstability && !this.config.features?.imperativeCache) {
-      console.warn(`\u26A0\uFE0F  The imperative cache API is considered unstable and will change in any minor version release
-Please acknowledge this by enabling the imperative cache feature flage in your config file.
-For more information: https://houdinigraphql.com/api/cache`);
-    }
-  }
   // return the record proxy for the given type/id combo
   get(type, data) {
-    this.validateInstabilityWarning();
     let recordID = this._internal_unstable._internal_unstable.id(type, data);
     if (!recordID) {
       throw new Error("todo");
@@ -57,7 +46,6 @@ For more information: https://houdinigraphql.com/api/cache`);
     return (0, import_lib.getCurrentConfig)();
   }
   list(name, { parentID, allLists } = {}) {
-    this.validateInstabilityWarning();
     return new import_list.ListCollection({
       cache: this,
       name,
@@ -69,7 +57,6 @@ For more information: https://houdinigraphql.com/api/cache`);
     query,
     variables
   }) {
-    this.validateInstabilityWarning();
     return this._internal_unstable.read({
       selection: query.artifact.selection,
       variables
@@ -80,7 +67,6 @@ For more information: https://houdinigraphql.com/api/cache`);
     variables,
     data
   }) {
-    this.validateInstabilityWarning();
     this._internal_unstable.write({
       selection: query.artifact.selection,
       // @ts-expect-error

package/build/runtime-cjs/router/server.d.ts

@@ -1,11 +1,11 @@
-import { createServerAdapter as createAdapter } from '@whatwg-node/server';
+import { createServerAdapter } from '@whatwg-node/server';
 import type { GraphQLSchema } from 'graphql';
-import { createYoga } from 'graphql-yoga';
 import type { HoudiniClient } from '../client';
+import { Server } from '../server';
 import type { RouterManifest, RouterPageManifest, YogaServerOptions } from './types';
-export declare function _serverHandler<ComponentType = unknown>({ schema, yoga, client, production, manifest, graphqlEndpoint, on_render, componentCache, }: {
+export declare function _serverHandler<ComponentType = unknown>({ schema, server, client, production, manifest, graphqlEndpoint, on_render, componentCache, }: {
     schema?: GraphQLSchema | null;
-    yoga?: ReturnType<typeof createYoga> | null;
+    server?: Server<any, any>;
     client: HoudiniClient;
     production: boolean;
     manifest: RouterManifest<ComponentType> | null;
@@ -20,5 +20,5 @@ export declare function _serverHandler<ComponentType = unknown>({ schema, yoga,
         componentCache: Record<string, any>;
     }) => Response | Promise<Response | undefined> | undefined;
 } & Omit<YogaServerOptions, 'schema'>): (request: Request) => Promise<Response>;
-export declare const serverAdapterFactory: (args: Parameters<typeof _serverHandler>[0]) => ReturnType<typeof createAdapter>;
+export declare const serverAdapterFactory: (args: Parameters<typeof _serverHandler>[0]) => ReturnType<typeof createServerAdapter>;
 export type ServerAdapterFactory = typeof serverAdapterFactory;

package/build/runtime-cjs/router/server.js

@@ -23,8 +23,8 @@ __export(server_exports, {
 });
 module.exports = __toCommonJS(server_exports);
 var import_server = require("@whatwg-node/server");
-var import_graphql_yoga = require("graphql-yoga");
 var import_config = require("../lib/config");
+var import_server2 = require("../server");
 var import_cookies = require("./cookies");
 var import_match = require("./match");
 var import_session = require("./session");
@@ -32,7 +32,7 @@ const config_file = (0, import_config.getCurrentConfig)();
 const session_keys = (0, import_config.localApiSessionKeys)(config_file);
 function _serverHandler({
   schema,
-  yoga,
+  server,
   client,
   production,
   manifest,
@@ -40,18 +40,23 @@ function _serverHandler({
   on_render,
   componentCache
 }) {
-  if (schema && !yoga) {
-    yoga = (0, import_graphql_yoga.createYoga)({
+  if (schema && !server) {
+    server = new import_server2.Server({
+      landingPage: !production
+    });
+  }
+  let requestHandler = null;
+  if (server && schema) {
+    requestHandler = server.init({
       schema,
-      landingPage: !production,
-      graphqlEndpoint,
-      context: async (request) => await (0, import_session.get_session)(request.headers, session_keys)
+      endpoint: graphqlEndpoint,
+      getSession: (request) => (0, import_session.get_session)(request.headers, session_keys)
     });
   }
   client.componentCache = componentCache;
-  if (schema) {
+  if (requestHandler) {
     client.registerProxy(graphqlEndpoint, async ({ query, variables, session }) => {
-      const response = await yoga(
+      const response = await requestHandler(
         new Request(`http://localhost/${graphqlEndpoint}`, {
           method: "POST",
           headers: {
@@ -77,8 +82,8 @@ function _serverHandler({
       );
     }
     const url = new URL(request.url).pathname;
-    if (yoga && url === (0, import_config.localApiEndpoint)(config_file)) {
-      return yoga(request);
+    if (requestHandler && url === graphqlEndpoint) {
+      return requestHandler(request);
     }
     const authResponse = await (0, import_session.handle_request)({
       request,

package/build/runtime-cjs/router/session.js

@@ -77,6 +77,9 @@ async function get_session(req, secrets) {
   if (!cookie) {
     return {};
   }
+  if (cookie === "{}") {
+    return {};
+  }
   for (const secret of secrets) {
     if (!await (0, import_jwt.verify)(cookie, secret)) {
       continue;

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

@@ -0,0 +1,17 @@
+import type { ServerAdapterRequestHandler } from '@whatwg-node/server';
+import { YogaServer } from 'graphql-yoga';
+import type { YogaSchemaDefinition } from 'graphql-yoga/typings/plugins/use-schema';
+type YogaParams = Required<ConstructorParameters<typeof YogaServer>>[0];
+type ConstructorParams = Omit<YogaParams, 'schema' | 'graphqlEndpoint'>;
+export declare class Server<ServerContext extends Record<string, any>, UserContext extends Record<string, any>> {
+    opts: ConstructorParams | null;
+    _yoga: YogaServer<any, any> | null;
+    constructor(opts?: ConstructorParams);
+    init({ endpoint, schema, getSession, }: {
+        schema: YogaSchemaDefinition<any>;
+        endpoint: string;
+        getSession: (request: Request) => Promise<UserContext>;
+    }): import("@whatwg-node/server").ServerAdapter<ServerContext, Server<ServerContext, UserContext>>;
+    handle: ServerAdapterRequestHandler<ServerContext>;
+}
+export {};

package/build/runtime-cjs/server/index.js

@@ -0,0 +1,62 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var server_exports = {};
+__export(server_exports, {
+  Server: () => Server
+});
+module.exports = __toCommonJS(server_exports);
+var import_server = require("@whatwg-node/server");
+var import_graphql_yoga = require("graphql-yoga");
+class Server {
+  opts;
+  _yoga = null;
+  constructor(opts) {
+    this.opts = opts ?? null;
+  }
+  init({
+    endpoint,
+    schema,
+    getSession
+  }) {
+    this._yoga = new import_graphql_yoga.YogaServer({
+      ...this.opts,
+      schema,
+      graphqlEndpoint: endpoint,
+      context: async (ctx) => {
+        const userContext = !this.opts ? {} : typeof this.opts.context === "function" ? await this.opts.context(ctx) : this.opts.context || {};
+        const sessionContext = await getSession(ctx.request) || {};
+        return {
+          ...userContext,
+          session: sessionContext
+        };
+      }
+    });
+    return (0, import_server.createServerAdapter)(this, {
+      fetchAPI: this._yoga.fetchAPI,
+      plugins: this._yoga["plugins"]
+    });
+  }
+  handle = (request, serverContext) => {
+    return this._yoga.handle(request, serverContext);
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Server
+});

package/build/runtime-esm/lib/types.d.ts

@@ -372,8 +372,8 @@ export type ProjectManifest = {
     artifacts: string[];
     /** Whether or not there is a local schema defined */
     local_schema: boolean;
-    /** Whether or not there is a custom instance of yoga defined */
-    local_yoga: boolean;
+    /** Whether or not there is a custom server defined */
+    local_server: boolean;
     /** Information about componentFields defined in the project */
     component_fields: Record<string, {
         filepath: string;

package/build/runtime-esm/public/cache.d.ts

@@ -6,7 +6,6 @@ import type { ArgType, CacheTypeDef, IDFields, QueryInput, QueryList, QueryValue
 export declare class Cache<Def extends CacheTypeDef> {
     _internal_unstable: _Cache;
     constructor(cache: _Cache);
-    validateInstabilityWarning(): void;
     get<T extends TypeNames<Def>>(type: T, data: IDFields<Def, T>): Record<Def, T>;
     get config(): import("../lib").ConfigFile;
     list<Name extends ValidLists<Def>>(name: Name, { parentID, allLists }?: {

package/build/runtime-esm/public/cache.js

@@ -6,19 +6,8 @@ class Cache {
   constructor(cache) {
     this._internal_unstable = cache;
   }
-  // if the user is using the imperative API, we want the ability to break the API
-  // with any minor version. In order to do this, we require them to accept this contract
-  // through their config file
-  validateInstabilityWarning() {
-    if (!this.config.acceptImperativeInstability && !this.config.features?.imperativeCache) {
-      console.warn(`\u26A0\uFE0F  The imperative cache API is considered unstable and will change in any minor version release
-Please acknowledge this by enabling the imperative cache feature flage in your config file.
-For more information: https://houdinigraphql.com/api/cache`);
-    }
-  }
   // return the record proxy for the given type/id combo
   get(type, data) {
-    this.validateInstabilityWarning();
     let recordID = this._internal_unstable._internal_unstable.id(type, data);
     if (!recordID) {
       throw new Error("todo");
@@ -34,7 +23,6 @@ For more information: https://houdinigraphql.com/api/cache`);
     return getCurrentConfig();
   }
   list(name, { parentID, allLists } = {}) {
-    this.validateInstabilityWarning();
     return new ListCollection({
       cache: this,
       name,
@@ -46,7 +34,6 @@ For more information: https://houdinigraphql.com/api/cache`);
     query,
     variables
   }) {
-    this.validateInstabilityWarning();
     return this._internal_unstable.read({
       selection: query.artifact.selection,
       variables
@@ -57,7 +44,6 @@ For more information: https://houdinigraphql.com/api/cache`);
     variables,
     data
   }) {
-    this.validateInstabilityWarning();
     this._internal_unstable.write({
       selection: query.artifact.selection,
       // @ts-expect-error

package/build/runtime-esm/router/server.d.ts

@@ -1,11 +1,11 @@
-import { createServerAdapter as createAdapter } from '@whatwg-node/server';
+import { createServerAdapter } from '@whatwg-node/server';
 import type { GraphQLSchema } from 'graphql';
-import { createYoga } from 'graphql-yoga';
 import type { HoudiniClient } from '../client';
+import { Server } from '../server';
 import type { RouterManifest, RouterPageManifest, YogaServerOptions } from './types';
-export declare function _serverHandler<ComponentType = unknown>({ schema, yoga, client, production, manifest, graphqlEndpoint, on_render, componentCache, }: {
+export declare function _serverHandler<ComponentType = unknown>({ schema, server, client, production, manifest, graphqlEndpoint, on_render, componentCache, }: {
     schema?: GraphQLSchema | null;
-    yoga?: ReturnType<typeof createYoga> | null;
+    server?: Server<any, any>;
     client: HoudiniClient;
     production: boolean;
     manifest: RouterManifest<ComponentType> | null;
@@ -20,5 +20,5 @@ export declare function _serverHandler<ComponentType = unknown>({ schema, yoga,
         componentCache: Record<string, any>;
     }) => Response | Promise<Response | undefined> | undefined;
 } & Omit<YogaServerOptions, 'schema'>): (request: Request) => Promise<Response>;
-export declare const serverAdapterFactory: (args: Parameters<typeof _serverHandler>[0]) => ReturnType<typeof createAdapter>;
+export declare const serverAdapterFactory: (args: Parameters<typeof _serverHandler>[0]) => ReturnType<typeof createServerAdapter>;
 export type ServerAdapterFactory = typeof serverAdapterFactory;

package/build/runtime-esm/router/server.js

@@ -1,6 +1,6 @@
-import { createServerAdapter as createAdapter } from "@whatwg-node/server";
-import { createYoga } from "graphql-yoga";
-import { localApiSessionKeys, localApiEndpoint, getCurrentConfig } from "../lib/config";
+import { createServerAdapter } from "@whatwg-node/server";
+import { localApiSessionKeys, getCurrentConfig } from "../lib/config";
+import { Server } from "../server";
 import { serialize as encodeCookie } from "./cookies";
 import { find_match } from "./match";
 import { get_session, handle_request, session_cookie_name } from "./session";
@@ -8,7 +8,7 @@ const config_file = getCurrentConfig();
 const session_keys = localApiSessionKeys(config_file);
 function _serverHandler({
   schema,
-  yoga,
+  server,
   client,
   production,
   manifest,
@@ -16,18 +16,23 @@ function _serverHandler({
   on_render,
   componentCache
 }) {
-  if (schema && !yoga) {
-    yoga = createYoga({
+  if (schema && !server) {
+    server = new Server({
+      landingPage: !production
+    });
+  }
+  let requestHandler = null;
+  if (server && schema) {
+    requestHandler = server.init({
       schema,
-      landingPage: !production,
-      graphqlEndpoint,
-      context: async (request) => await get_session(request.headers, session_keys)
+      endpoint: graphqlEndpoint,
+      getSession: (request) => get_session(request.headers, session_keys)
     });
   }
   client.componentCache = componentCache;
-  if (schema) {
+  if (requestHandler) {
     client.registerProxy(graphqlEndpoint, async ({ query, variables, session }) => {
-      const response = await yoga(
+      const response = await requestHandler(
         new Request(`http://localhost/${graphqlEndpoint}`, {
           method: "POST",
           headers: {
@@ -53,8 +58,8 @@ function _serverHandler({
       );
     }
     const url = new URL(request.url).pathname;
-    if (yoga && url === localApiEndpoint(config_file)) {
-      return yoga(request);
+    if (requestHandler && url === graphqlEndpoint) {
+      return requestHandler(request);
     }
     const authResponse = await handle_request({
       request,
@@ -79,7 +84,7 @@ function _serverHandler({
   };
 }
 const serverAdapterFactory = (args) => {
-  return createAdapter(_serverHandler(args));
+  return createServerAdapter(_serverHandler(args));
 };
 export {
   _serverHandler,

package/build/runtime-esm/router/session.js

@@ -52,6 +52,9 @@ async function get_session(req, secrets) {
   if (!cookie) {
     return {};
   }
+  if (cookie === "{}") {
+    return {};
+  }
   for (const secret of secrets) {
     if (!await verify(cookie, secret)) {
       continue;

package/build/runtime-esm/server/index.d.ts

@@ -0,0 +1,17 @@
+import type { ServerAdapterRequestHandler } from '@whatwg-node/server';
+import { YogaServer } from 'graphql-yoga';
+import type { YogaSchemaDefinition } from 'graphql-yoga/typings/plugins/use-schema';
+type YogaParams = Required<ConstructorParameters<typeof YogaServer>>[0];
+type ConstructorParams = Omit<YogaParams, 'schema' | 'graphqlEndpoint'>;
+export declare class Server<ServerContext extends Record<string, any>, UserContext extends Record<string, any>> {
+    opts: ConstructorParams | null;
+    _yoga: YogaServer<any, any> | null;
+    constructor(opts?: ConstructorParams);
+    init({ endpoint, schema, getSession, }: {
+        schema: YogaSchemaDefinition<any>;
+        endpoint: string;
+        getSession: (request: Request) => Promise<UserContext>;
+    }): import("@whatwg-node/server").ServerAdapter<ServerContext, Server<ServerContext, UserContext>>;
+    handle: ServerAdapterRequestHandler<ServerContext>;
+}
+export {};

package/build/runtime-esm/server/index.js

@@ -0,0 +1,38 @@
+import { createServerAdapter } from "@whatwg-node/server";
+import { YogaServer } from "graphql-yoga";
+class Server {
+  opts;
+  _yoga = null;
+  constructor(opts) {
+    this.opts = opts ?? null;
+  }
+  init({
+    endpoint,
+    schema,
+    getSession
+  }) {
+    this._yoga = new YogaServer({
+      ...this.opts,
+      schema,
+      graphqlEndpoint: endpoint,
+      context: async (ctx) => {
+        const userContext = !this.opts ? {} : typeof this.opts.context === "function" ? await this.opts.context(ctx) : this.opts.context || {};
+        const sessionContext = await getSession(ctx.request) || {};
+        return {
+          ...userContext,
+          session: sessionContext
+        };
+      }
+    });
+    return createServerAdapter(this, {
+      fetchAPI: this._yoga.fetchAPI,
+      plugins: this._yoga["plugins"]
+    });
+  }
+  handle = (request, serverContext) => {
+    return this._yoga.handle(request, serverContext);
+  };
+}
+export {
+  Server
+};

package/build/test-cjs/index.js

@@ -69233,6 +69233,10 @@ ${exportStatement("config")}
       // we need to update the list of client plugins that get injected by codegen plugins
       [join(config.runtimeSource, "client", "plugins", "injectedPlugins.js")]: (content) => injectPlugins({ config, content, importStatement, exportStatement })
     }),
+    recursiveCopy(
+      join(config.runtimeSource, "server"),
+      join(config.rootDir, "server")
+    ),
     generatePluginRuntimes({
       config,
       docs
@@ -70510,10 +70514,7 @@ function queryDefinitions(config, body, docs, returnType) {
       const [shapeType, inputType] = ensureImports({
         config,
         body,
-        sourceModule: path_exports.relative(
-          config.runtimeDirectory,
-          config.artifactImportPath(doc.name)
-        ),
+        sourceModule: config.artifactImportPath(doc.name),
         import: [`${doc.name}$result`, `${doc.name}$input`]
       });
       return prev.concat(
@@ -70543,10 +70544,7 @@ function fragmentListMap(config, concreteTypes, body, docs, return_type) {
     const [shapeType] = ensureImports({
       config,
       body,
-      sourceModule: path_exports.relative(
-        config.runtimeDirectory,
-        config.artifactImportPath(doc.name)
-      ),
+      sourceModule: config.artifactImportPath(doc.name),
       import: [`${definition.name.value}$data`]
     });
     let inputType = AST13.tsNeverKeyword();
@@ -70559,10 +70557,7 @@ function fragmentListMap(config, concreteTypes, body, docs, return_type) {
           ensureImports({
             config,
             body,
-            sourceModule: path_exports.relative(
-              config.runtimeDirectory,
-              config.artifactImportPath(doc.name)
-            ),
+            sourceModule: config.artifactImportPath(doc.name),
             import: [`${definition.name.value}$input`]
           })[0]
         )

package/build/test-esm/index.js

@@ -69229,6 +69229,10 @@ ${exportStatement("config")}
       // we need to update the list of client plugins that get injected by codegen plugins
       [join(config.runtimeSource, "client", "plugins", "injectedPlugins.js")]: (content) => injectPlugins({ config, content, importStatement, exportStatement })
     }),
+    recursiveCopy(
+      join(config.runtimeSource, "server"),
+      join(config.rootDir, "server")
+    ),
     generatePluginRuntimes({
       config,
       docs
@@ -70506,10 +70510,7 @@ function queryDefinitions(config, body, docs, returnType) {
       const [shapeType, inputType] = ensureImports({
         config,
         body,
-        sourceModule: path_exports.relative(
-          config.runtimeDirectory,
-          config.artifactImportPath(doc.name)
-        ),
+        sourceModule: config.artifactImportPath(doc.name),
         import: [`${doc.name}$result`, `${doc.name}$input`]
       });
       return prev.concat(
@@ -70539,10 +70540,7 @@ function fragmentListMap(config, concreteTypes, body, docs, return_type) {
     const [shapeType] = ensureImports({
       config,
       body,
-      sourceModule: path_exports.relative(
-        config.runtimeDirectory,
-        config.artifactImportPath(doc.name)
-      ),
+      sourceModule: config.artifactImportPath(doc.name),
       import: [`${definition.name.value}$data`]
     });
     let inputType = AST13.tsNeverKeyword();
@@ -70555,10 +70553,7 @@ function fragmentListMap(config, concreteTypes, body, docs, return_type) {
           ensureImports({
             config,
             body,
-            sourceModule: path_exports.relative(
-              config.runtimeDirectory,
-              config.artifactImportPath(doc.name)
-            ),
+            sourceModule: config.artifactImportPath(doc.name),
             import: [`${definition.name.value}$input`]
           })[0]
         )

package/build/vite/hmr.d.ts

@@ -1,5 +1,3 @@
-import type { EnvironmentModuleNode } from 'vite';
 import { type Config } from '../lib';
 export declare function isGraphQLFile(filepath: string): boolean;
 export declare function shouldReactToFileChange(filepath: string, config: Config): Promise<boolean>;
-export declare function fileDependsOnHoudini(modules: EnvironmentModuleNode[], houdiniPath: string): Boolean;

package/build/vite-cjs/index.js

@@ -73003,7 +73003,7 @@ async function load_manifest(args) {
       layout_queries: {},
       artifacts: [],
       local_schema: false,
-      local_yoga: false
+      local_server: false
     },
     queries: [],
     layouts: [],
@@ -73027,8 +73027,8 @@ async function load_manifest(args) {
       if (name === "+schema") {
         manifest.local_schema = true;
       }
-      if (name === "+yoga") {
-        manifest.local_yoga = true;
+      if (name === "+server") {
+        manifest.local_server = true;
       }
     }
   } catch {
@@ -80003,6 +80003,10 @@ ${exportStatement("config")}
       // we need to update the list of client plugins that get injected by codegen plugins
       [join2(config2.runtimeSource, "client", "plugins", "injectedPlugins.js")]: (content) => injectPlugins({ config: config2, content, importStatement, exportStatement })
     }),
+    recursiveCopy(
+      join2(config2.runtimeSource, "server"),
+      join2(config2.rootDir, "server")
+    ),
     generatePluginRuntimes({
       config: config2,
       docs
@@ -81280,10 +81284,7 @@ function queryDefinitions(config2, body, docs, returnType) {
       const [shapeType, inputType] = ensureImports({
         config: config2,
         body,
-        sourceModule: path_exports.relative(
-          config2.runtimeDirectory,
-          config2.artifactImportPath(doc.name)
-        ),
+        sourceModule: config2.artifactImportPath(doc.name),
         import: [`${doc.name}$result`, `${doc.name}$input`]
       });
       return prev.concat(
@@ -81313,10 +81314,7 @@ function fragmentListMap(config2, concreteTypes, body, docs, return_type) {
     const [shapeType] = ensureImports({
       config: config2,
       body,
-      sourceModule: path_exports.relative(
-        config2.runtimeDirectory,
-        config2.artifactImportPath(doc.name)
-      ),
+      sourceModule: config2.artifactImportPath(doc.name),
       import: [`${definition.name.value}$data`]
     });
     let inputType = AST13.tsNeverKeyword();
@@ -81329,10 +81327,7 @@ function fragmentListMap(config2, concreteTypes, body, docs, return_type) {
           ensureImports({
             config: config2,
             body,
-            sourceModule: path_exports.relative(
-              config2.runtimeDirectory,
-              config2.artifactImportPath(doc.name)
-            ),
+            sourceModule: config2.artifactImportPath(doc.name),
             import: [`${definition.name.value}$input`]
           })[0]
         )
@@ -85754,17 +85749,6 @@ async function shouldReactToFileChange(filepath, config2) {
   }
   return config2.includeFile(filepath, { root: process.cwd() });
 }
-function fileDependsOnHoudini(modules, houdiniPath) {
-  const fileDependencies = modules.reduce((acc, module2) => {
-    module2.importedModules.forEach((importedModule) => {
-      if (importedModule?.id) acc.push(importedModule.id);
-    });
-    return acc;
-  }, []);
-  return fileDependencies.some((file) => {
-    return file.startsWith(houdiniPath);
-  });
-}
 
 // src/vite/houdini.ts
 var config;
@@ -85778,12 +85762,19 @@ function Plugin(opts = {}) {
     // houdini will always act as a "meta framework" and process the user's code before it
     // is processed by the user's library-specific plugins.
     enforce: "pre",
-    async hotUpdate({ file, server, modules, timestamp }) {
+    async hotUpdate({
+      file,
+      server,
+      modules,
+      timestamp,
+      read
+    }) {
       const config2 = await getConfig(opts);
       const shouldReact = await shouldReactToFileChange(file, config2);
       const runtimeDir = path_exports.join(config2.projectRoot, config2.runtimeDir ?? ".houdini");
+      const dependsOn = (await read()).includes("$houdini");
       const isGqlFile = isGraphQLFile(file);
-      if (!(shouldReact && (fileDependsOnHoudini(modules, runtimeDir) || isGqlFile))) {
+      if (!(shouldReact && (dependsOn || isGqlFile))) {
         return modules;
       }
       if (config2.localSchema) {
@@ -85793,20 +85784,18 @@ function Plugin(opts = {}) {
       config2.pluginMode = true;
       let artifactStats = void 0;
       if (!lastHotUpdateEvent || timestamp !== lastHotUpdateEvent.timestamp) {
-        console.log("\u{1F3A9} \u{1F504} bundle HMR rebuild...");
         try {
           artifactStats = await compile(config2);
         } catch (e2) {
           formatErrors(e2);
         }
+        lastHotUpdateEvent = {
+          timestamp
+        };
       }
-      lastHotUpdateEvent = {
-        timestamp
-      };
       if (!artifactStats) {
         return modules;
       }
-      console.log("\u{1F3A9} \u2B06\uFE0F bundle changed, triggering HMR update");
       const taintedModules = [];
       for await (const file2 of fs_exports.walk(runtimeDir)) {
         const module2 = environment.moduleGraph.getModuleById(file2);

package/build/vite-esm/index.js

@@ -72996,7 +72996,7 @@ async function load_manifest(args) {
       layout_queries: {},
       artifacts: [],
       local_schema: false,
-      local_yoga: false
+      local_server: false
     },
     queries: [],
     layouts: [],
@@ -73020,8 +73020,8 @@ async function load_manifest(args) {
       if (name === "+schema") {
         manifest.local_schema = true;
       }
-      if (name === "+yoga") {
-        manifest.local_yoga = true;
+      if (name === "+server") {
+        manifest.local_server = true;
       }
     }
   } catch {
@@ -79995,6 +79995,10 @@ ${exportStatement("config")}
       // we need to update the list of client plugins that get injected by codegen plugins
       [join2(config2.runtimeSource, "client", "plugins", "injectedPlugins.js")]: (content) => injectPlugins({ config: config2, content, importStatement, exportStatement })
     }),
+    recursiveCopy(
+      join2(config2.runtimeSource, "server"),
+      join2(config2.rootDir, "server")
+    ),
     generatePluginRuntimes({
       config: config2,
       docs
@@ -81272,10 +81276,7 @@ function queryDefinitions(config2, body, docs, returnType) {
       const [shapeType, inputType] = ensureImports({
         config: config2,
         body,
-        sourceModule: path_exports.relative(
-          config2.runtimeDirectory,
-          config2.artifactImportPath(doc.name)
-        ),
+        sourceModule: config2.artifactImportPath(doc.name),
         import: [`${doc.name}$result`, `${doc.name}$input`]
       });
       return prev.concat(
@@ -81305,10 +81306,7 @@ function fragmentListMap(config2, concreteTypes, body, docs, return_type) {
     const [shapeType] = ensureImports({
       config: config2,
       body,
-      sourceModule: path_exports.relative(
-        config2.runtimeDirectory,
-        config2.artifactImportPath(doc.name)
-      ),
+      sourceModule: config2.artifactImportPath(doc.name),
       import: [`${definition.name.value}$data`]
     });
     let inputType = AST13.tsNeverKeyword();
@@ -81321,10 +81319,7 @@ function fragmentListMap(config2, concreteTypes, body, docs, return_type) {
           ensureImports({
             config: config2,
             body,
-            sourceModule: path_exports.relative(
-              config2.runtimeDirectory,
-              config2.artifactImportPath(doc.name)
-            ),
+            sourceModule: config2.artifactImportPath(doc.name),
             import: [`${definition.name.value}$input`]
           })[0]
         )
@@ -85746,17 +85741,6 @@ async function shouldReactToFileChange(filepath, config2) {
   }
   return config2.includeFile(filepath, { root: process.cwd() });
 }
-function fileDependsOnHoudini(modules, houdiniPath) {
-  const fileDependencies = modules.reduce((acc, module) => {
-    module.importedModules.forEach((importedModule) => {
-      if (importedModule?.id) acc.push(importedModule.id);
-    });
-    return acc;
-  }, []);
-  return fileDependencies.some((file) => {
-    return file.startsWith(houdiniPath);
-  });
-}
 
 // src/vite/houdini.ts
 var config;
@@ -85770,12 +85754,19 @@ function Plugin(opts = {}) {
     // houdini will always act as a "meta framework" and process the user's code before it
     // is processed by the user's library-specific plugins.
     enforce: "pre",
-    async hotUpdate({ file, server, modules, timestamp }) {
+    async hotUpdate({
+      file,
+      server,
+      modules,
+      timestamp,
+      read
+    }) {
       const config2 = await getConfig(opts);
       const shouldReact = await shouldReactToFileChange(file, config2);
       const runtimeDir = path_exports.join(config2.projectRoot, config2.runtimeDir ?? ".houdini");
+      const dependsOn = (await read()).includes("$houdini");
       const isGqlFile = isGraphQLFile(file);
-      if (!(shouldReact && (fileDependsOnHoudini(modules, runtimeDir) || isGqlFile))) {
+      if (!(shouldReact && (dependsOn || isGqlFile))) {
         return modules;
       }
       if (config2.localSchema) {
@@ -85785,20 +85776,18 @@ function Plugin(opts = {}) {
       config2.pluginMode = true;
       let artifactStats = void 0;
       if (!lastHotUpdateEvent || timestamp !== lastHotUpdateEvent.timestamp) {
-        console.log("\u{1F3A9} \u{1F504} bundle HMR rebuild...");
         try {
           artifactStats = await compile(config2);
         } catch (e2) {
           formatErrors(e2);
         }
+        lastHotUpdateEvent = {
+          timestamp
+        };
       }
-      lastHotUpdateEvent = {
-        timestamp
-      };
       if (!artifactStats) {
         return modules;
       }
-      console.log("\u{1F3A9} \u2B06\uFE0F bundle changed, triggering HMR update");
       const taintedModules = [];
       for await (const file2 of fs_exports.walk(runtimeDir)) {
         const module = environment.moduleGraph.getModuleById(file2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini",
-  "version": "2.0.0-next.7",
+  "version": "2.0.0-next.9",
   "description": "The disappearing GraphQL clients",
   "keywords": [
     "typescript",
@@ -38,7 +38,7 @@
     "@types/fs-extra": "^9.0.13",
     "@types/micromatch": "^4.0.2",
     "@ungap/structured-clone": "^1.0.2",
-    "@whatwg-node/server": "^0.9.14",
+    "@whatwg-node/server": "^0.10.5",
     "ast-types": "^0.16.1",
     "commander": "^9.4.0",
     "deepmerge": "^4.2.2",