houdini-svelte 0.17.9 → 0.17.11

package/README.md

@@ -0,0 +1,33 @@
+<div align="center">
+  <img alt="houdini" height="200" src="https://raw.githubusercontent.com/HoudiniGraphql/houdini/main/.github/assets/houdini-v5.png" />
+  <br />
+  <br />
+  <strong>
+    The disappearing GraphQL clients.
+  </strong>
+  <br />
+  <br />
+  <a href="https://npmjs.org/package/houdini">
+    <img src="https://img.shields.io/npm/v/houdini.svg" alt="version" />
+  </a>
+  <a href="https://github.com/HoudiniGraphql/houdini/actions">
+    <img src="https://github.com/HoudiniGraphql/houdini/actions/workflows/tests.yml/badge.svg" alt="CI Tests" />
+  </a>
+  <a href="https://github.com/HoudiniGraphql/houdini">
+    <img src="https://img.shields.io/github/stars/HoudiniGraphql/houdini.svg?label=stars" alt="github stars" />
+  </a>
+  <a href="https://npmjs.org/package/houdini">
+    <img src="https://img.shields.io/npm/dm/houdini.svg" alt="downloads" />
+  </a>
+  <a href="https://github.com/HoudiniGraphql/houdini/blob/main/LICENSE">
+    <img src="https://img.shields.io/github/license/HoudiniGraphql/houdini.svg?maxAge=2592000" alt="license" />
+  </a>
+</div>
+
+----
+
+At its core, houdini seeks to enable a high quality developer experience
+without compromising bundle size. Like Svelte, houdini shifts what is
+traditionally handled by a bloated runtime into a compile step that allows
+for the generation of an incredibly lean GraphQL abstraction for your application.
+See more at <a href="https://www.houdinigraphql.com">HoudiniGraphQL.com</a> 🚀

package/build/plugin-cjs/index.js

@@ -179521,6 +179521,7 @@ async function walk_routes(config2, framework2, visitor, dirpath = config2.route
   let layoutExports = [];
   let pageQueries = [];
   let layoutQueries = [];
+  let validRoute = false;
   for (const child of await fs_exports.readdir(dirpath)) {
     const childPath = path_exports.join(dirpath, child);
     if ((await fs_exports.stat(childPath)).isDirectory()) {
@@ -179528,18 +179529,21 @@ async function walk_routes(config2, framework2, visitor, dirpath = config2.route
       continue;
     }
     if (is_layout_script(framework2, childPath)) {
+      validRoute = true;
       const { houdini_load, exports } = await extract_load_function(config2, childPath);
       await visitor.layoutQueries?.(houdini_load ?? [], childPath);
       layoutQueries.push(...houdini_load ?? []);
       await visitor.layoutExports?.(exports, childPath);
       layoutExports.push(...exports);
     } else if (is_page_script(framework2, childPath)) {
+      validRoute = true;
       const { houdini_load, exports } = await extract_load_function(config2, childPath);
       await visitor.pageQueries?.(houdini_load ?? [], childPath);
       pageQueries.push(...houdini_load ?? []);
       await visitor.pageExports?.(exports, childPath);
       pageExports.push(...exports);
     } else if (is_layout_component(framework2, childPath)) {
+      validRoute = true;
       const contents = await fs_exports.readFile(childPath);
       if (!contents) {
         continue;
@@ -179563,6 +179567,7 @@ async function walk_routes(config2, framework2, visitor, dirpath = config2.route
         }
       });
     } else if (is_component(config2, framework2, child)) {
+      validRoute = true;
       const contents = await fs_exports.readFile(childPath);
       if (!contents) {
         continue;
@@ -179586,6 +179591,7 @@ async function walk_routes(config2, framework2, visitor, dirpath = config2.route
         }
       });
     } else if (child === plugin_config(config2).layoutQueryFilename) {
+      validRoute = true;
       const contents = await fs_exports.readFile(childPath);
       if (!contents) {
         continue;
@@ -179598,6 +179604,7 @@ async function walk_routes(config2, framework2, visitor, dirpath = config2.route
         throw routeQueryError(childPath);
       }
     } else if (child === plugin_config(config2).pageQueryFilename) {
+      validRoute = true;
       const contents = await fs_exports.readFile(childPath);
       if (!contents) {
         continue;
@@ -179613,7 +179620,7 @@ async function walk_routes(config2, framework2, visitor, dirpath = config2.route
       continue;
     }
   }
-  if (visitor.route && (pageQueries.length > 0 || layoutQueries.length > 0 || pageExports.length > 0 || layoutExports.length > 0)) {
+  if (visitor.route && validRoute) {
     const relative_path_regex = /src(.*)/;
     const svelteTypeFilePath = path_exports.join(
       config2.projectRoot,
@@ -179829,14 +179836,34 @@ async function svelteKitGenerator(framework2, { config: config2 }) {
         const afterLayoutLoad = layoutExports.includes("afterLoad");
         const beforeLayoutLoad = layoutExports.includes("beforeLoad");
         const onLayoutError = layoutExports.includes("onError");
-        const pageVariableLoad = pageExports.some((x4) => x4.endsWith("Variables"));
-        const layoutVariableLoad = layoutExports.some((x4) => x4.endsWith("Variables"));
+        const layout_append_VariablesFunction = append_VariablesFunction(
+          "Layout",
+          config2,
+          uniqueLayoutQueries
+        );
+        const page_append_VariablesFunction = append_VariablesFunction(
+          "Page",
+          config2,
+          uniquePageQueries
+        );
         const splitString = skTypeString.split("\n\n");
         let typeImports = splitString[0];
         let utilityTypes = splitString[1];
         let typeExports = splitString[2];
-        const functionImports = `${afterPageLoad || beforePageLoad || afterLayoutLoad || beforeLayoutLoad || pageVariableLoad || layoutVariableLoad ? `
-import type { ${layoutVariableLoad || pageVariableLoad ? "VariableFunction, " : ""}${afterLayoutLoad || afterPageLoad ? "AfterLoadFunction, " : ""}${beforeLayoutLoad || beforePageLoad ? "BeforeLoadFunction " : ""}} from '${houdiniRelative}/plugins/houdini-svelte/runtime/types';` : ""}`;
+        const functionImportsToBring = [];
+        if (layout_append_VariablesFunction !== "" || page_append_VariablesFunction !== "") {
+          functionImportsToBring.push("VariableFunction");
+        }
+        if (afterLayoutLoad || afterPageLoad) {
+          functionImportsToBring.push("AfterLoadFunction");
+        }
+        if (beforeLayoutLoad || beforePageLoad) {
+          functionImportsToBring.push("BeforeLoadFunction");
+        }
+        const functionImports = functionImportsToBring.length > 0 ? `
+import type { ${functionImportsToBring.join(
+          ", "
+        )} } from '${houdiniRelative}/plugins/houdini-svelte/runtime/types';` : "";
         typeImports = typeImports.concat(functionImports).concat(layoutTypeImports).concat(pageTypeImports);
         const layoutParams = `${layoutQueries.length > 0 && !utilityTypes.includes("LayoutParams") ? "\ntype LayoutParams = LayoutLoadEvent['params'];" : ""}`;
         const pageParams = `${pageQueries.length > 0 && !utilityTypes.includes("PageParams") ? "\ntype PageParams = PageLoadEvent['params'];" : ""}`;
@@ -179851,7 +179878,7 @@ import type { ${layoutVariableLoad || pageVariableLoad ? "VariableFunction, " :
             onLayoutError,
             pageQueries.filter((x4) => x4.variableDefinitions?.length).length > 0
           )
-        ).concat(append_VariablesFunction("Layout", config2, uniqueLayoutQueries)).concat(append_VariablesFunction("Page", config2, uniquePageQueries)).replace(
+        ).concat(layout_append_VariablesFunction).concat(page_append_VariablesFunction).replace(
           /(?<=LayoutData = )([\s\S]*?)(?=;)/,
           `Expand<$1 & { ${layoutQueries.map((query) => {
             const name2 = query.name.value;
@@ -180336,10 +180363,10 @@ import_fs.default.readdirSync = function(filepath, options) {
   function contains2(...names2) {
     return names2.some((name2) => file_names.includes(name2));
   }
-  if (contains2("+page.svelte") && !contains2("+page.js", "+page.ts", "+page.server.js", "+page.server.ts")) {
+  if (contains2("+page.svelte", "+page.gql") && !contains2("+page.js", "+page.ts", "+page.server.js", "+page.server.ts")) {
     result.push(virtual_file("+page.js", options));
   }
-  if (contains2("+layout.svelte") && !contains2("+layout.ts", "+layout.js")) {
+  if (contains2("+layout.svelte", "+layout.gql") && !contains2("+layout.ts", "+layout.js")) {
     result.push(virtual_file("+layout.js", options));
   }
   const posix_filepath = path_exports.posixify(filepath.toString());
@@ -181393,16 +181420,9 @@ var HoudiniSveltePlugin = async () => ({
       return content.replace("HOUDINI_CLIENT_PATH", relativePath);
     },
     "adapter.js": ({ content }) => {
-      const sveltekit_adapter = `import { goto as go } from '$app/navigation'
-import { get } from 'svelte/store';
-import { browser, prerendering } from '$app/environment'
-import { page } from '$app/stores'
+      const sveltekit_adapter = `import { browser, prerendering } from '$app/environment'
 import { error as svelteKitError } from '@sveltejs/kit'
 
-export function goTo(location, options) {
-		go(location, options)
-}
-
 export const isBrowser = browser
 
 export let clientStarted = false;

package/build/plugin-esm/index.js

@@ -179517,6 +179517,7 @@ async function walk_routes(config2, framework2, visitor, dirpath = config2.route
   let layoutExports = [];
   let pageQueries = [];
   let layoutQueries = [];
+  let validRoute = false;
   for (const child of await fs_exports.readdir(dirpath)) {
     const childPath = path_exports.join(dirpath, child);
     if ((await fs_exports.stat(childPath)).isDirectory()) {
@@ -179524,18 +179525,21 @@ async function walk_routes(config2, framework2, visitor, dirpath = config2.route
       continue;
     }
     if (is_layout_script(framework2, childPath)) {
+      validRoute = true;
       const { houdini_load, exports } = await extract_load_function(config2, childPath);
       await visitor.layoutQueries?.(houdini_load ?? [], childPath);
       layoutQueries.push(...houdini_load ?? []);
       await visitor.layoutExports?.(exports, childPath);
       layoutExports.push(...exports);
     } else if (is_page_script(framework2, childPath)) {
+      validRoute = true;
       const { houdini_load, exports } = await extract_load_function(config2, childPath);
       await visitor.pageQueries?.(houdini_load ?? [], childPath);
       pageQueries.push(...houdini_load ?? []);
       await visitor.pageExports?.(exports, childPath);
       pageExports.push(...exports);
     } else if (is_layout_component(framework2, childPath)) {
+      validRoute = true;
       const contents = await fs_exports.readFile(childPath);
       if (!contents) {
         continue;
@@ -179559,6 +179563,7 @@ async function walk_routes(config2, framework2, visitor, dirpath = config2.route
         }
       });
     } else if (is_component(config2, framework2, child)) {
+      validRoute = true;
       const contents = await fs_exports.readFile(childPath);
       if (!contents) {
         continue;
@@ -179582,6 +179587,7 @@ async function walk_routes(config2, framework2, visitor, dirpath = config2.route
         }
       });
     } else if (child === plugin_config(config2).layoutQueryFilename) {
+      validRoute = true;
       const contents = await fs_exports.readFile(childPath);
       if (!contents) {
         continue;
@@ -179594,6 +179600,7 @@ async function walk_routes(config2, framework2, visitor, dirpath = config2.route
         throw routeQueryError(childPath);
       }
     } else if (child === plugin_config(config2).pageQueryFilename) {
+      validRoute = true;
       const contents = await fs_exports.readFile(childPath);
       if (!contents) {
         continue;
@@ -179609,7 +179616,7 @@ async function walk_routes(config2, framework2, visitor, dirpath = config2.route
       continue;
     }
   }
-  if (visitor.route && (pageQueries.length > 0 || layoutQueries.length > 0 || pageExports.length > 0 || layoutExports.length > 0)) {
+  if (visitor.route && validRoute) {
     const relative_path_regex = /src(.*)/;
     const svelteTypeFilePath = path_exports.join(
       config2.projectRoot,
@@ -179825,14 +179832,34 @@ async function svelteKitGenerator(framework2, { config: config2 }) {
         const afterLayoutLoad = layoutExports.includes("afterLoad");
         const beforeLayoutLoad = layoutExports.includes("beforeLoad");
         const onLayoutError = layoutExports.includes("onError");
-        const pageVariableLoad = pageExports.some((x4) => x4.endsWith("Variables"));
-        const layoutVariableLoad = layoutExports.some((x4) => x4.endsWith("Variables"));
+        const layout_append_VariablesFunction = append_VariablesFunction(
+          "Layout",
+          config2,
+          uniqueLayoutQueries
+        );
+        const page_append_VariablesFunction = append_VariablesFunction(
+          "Page",
+          config2,
+          uniquePageQueries
+        );
         const splitString = skTypeString.split("\n\n");
         let typeImports = splitString[0];
         let utilityTypes = splitString[1];
         let typeExports = splitString[2];
-        const functionImports = `${afterPageLoad || beforePageLoad || afterLayoutLoad || beforeLayoutLoad || pageVariableLoad || layoutVariableLoad ? `
-import type { ${layoutVariableLoad || pageVariableLoad ? "VariableFunction, " : ""}${afterLayoutLoad || afterPageLoad ? "AfterLoadFunction, " : ""}${beforeLayoutLoad || beforePageLoad ? "BeforeLoadFunction " : ""}} from '${houdiniRelative}/plugins/houdini-svelte/runtime/types';` : ""}`;
+        const functionImportsToBring = [];
+        if (layout_append_VariablesFunction !== "" || page_append_VariablesFunction !== "") {
+          functionImportsToBring.push("VariableFunction");
+        }
+        if (afterLayoutLoad || afterPageLoad) {
+          functionImportsToBring.push("AfterLoadFunction");
+        }
+        if (beforeLayoutLoad || beforePageLoad) {
+          functionImportsToBring.push("BeforeLoadFunction");
+        }
+        const functionImports = functionImportsToBring.length > 0 ? `
+import type { ${functionImportsToBring.join(
+          ", "
+        )} } from '${houdiniRelative}/plugins/houdini-svelte/runtime/types';` : "";
         typeImports = typeImports.concat(functionImports).concat(layoutTypeImports).concat(pageTypeImports);
         const layoutParams = `${layoutQueries.length > 0 && !utilityTypes.includes("LayoutParams") ? "\ntype LayoutParams = LayoutLoadEvent['params'];" : ""}`;
         const pageParams = `${pageQueries.length > 0 && !utilityTypes.includes("PageParams") ? "\ntype PageParams = PageLoadEvent['params'];" : ""}`;
@@ -179847,7 +179874,7 @@ import type { ${layoutVariableLoad || pageVariableLoad ? "VariableFunction, " :
             onLayoutError,
             pageQueries.filter((x4) => x4.variableDefinitions?.length).length > 0
           )
-        ).concat(append_VariablesFunction("Layout", config2, uniqueLayoutQueries)).concat(append_VariablesFunction("Page", config2, uniquePageQueries)).replace(
+        ).concat(layout_append_VariablesFunction).concat(page_append_VariablesFunction).replace(
           /(?<=LayoutData = )([\s\S]*?)(?=;)/,
           `Expand<$1 & { ${layoutQueries.map((query) => {
             const name2 = query.name.value;
@@ -180332,10 +180359,10 @@ filesystem.readdirSync = function(filepath, options) {
   function contains2(...names2) {
     return names2.some((name2) => file_names.includes(name2));
   }
-  if (contains2("+page.svelte") && !contains2("+page.js", "+page.ts", "+page.server.js", "+page.server.ts")) {
+  if (contains2("+page.svelte", "+page.gql") && !contains2("+page.js", "+page.ts", "+page.server.js", "+page.server.ts")) {
     result.push(virtual_file("+page.js", options));
   }
-  if (contains2("+layout.svelte") && !contains2("+layout.ts", "+layout.js")) {
+  if (contains2("+layout.svelte", "+layout.gql") && !contains2("+layout.ts", "+layout.js")) {
     result.push(virtual_file("+layout.js", options));
   }
   const posix_filepath = path_exports.posixify(filepath.toString());
@@ -181389,16 +181416,9 @@ var HoudiniSveltePlugin = async () => ({
       return content.replace("HOUDINI_CLIENT_PATH", relativePath);
     },
     "adapter.js": ({ content }) => {
-      const sveltekit_adapter = `import { goto as go } from '$app/navigation'
-import { get } from 'svelte/store';
-import { browser, prerendering } from '$app/environment'
-import { page } from '$app/stores'
+      const sveltekit_adapter = `import { browser, prerendering } from '$app/environment'
 import { error as svelteKitError } from '@sveltejs/kit'
 
-export function goTo(location, options) {
-		go(location, options)
-}
-
 export const isBrowser = browser
 
 export let clientStarted = false;

package/build/runtime/adapter.d.ts

@@ -1,10 +1,4 @@
-export declare function goTo(href: string, opts?: {
-    replaceState?: boolean;
-    noscroll?: boolean;
-    keepfocus?: boolean;
-    state?: any;
-}): Promise<void>;
-export declare const isBrowser = false;
+export declare const isBrowser = true;
 /**
  *  After `clientStarted = true`, only client side navigation will happen.
  */

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

@@ -1,10 +1,4 @@
-export declare function goTo(href: string, opts?: {
-    replaceState?: boolean;
-    noscroll?: boolean;
-    keepfocus?: boolean;
-    state?: any;
-}): Promise<void>;
-export declare const isBrowser = false;
+export declare const isBrowser = true;
 /**
  *  After `clientStarted = true`, only client side navigation will happen.
  */

package/build/runtime-cjs/adapter.js

@@ -20,16 +20,13 @@ var adapter_exports = {};
 __export(adapter_exports, {
   clientStarted: () => clientStarted,
   error: () => error,
-  goTo: () => goTo,
   isBrowser: () => isBrowser,
   isPrerender: () => isPrerender,
   setClientStarted: () => setClientStarted
 });
 module.exports = __toCommonJS(adapter_exports);
-async function goTo(href, opts) {
-}
-const isBrowser = false;
-let clientStarted = false;
+const isBrowser = true;
+let clientStarted = true;
 let isPrerender = false;
 const error = (code, message) => message;
 function setClientStarted() {
@@ -39,7 +36,6 @@ function setClientStarted() {
 0 && (module.exports = {
   clientStarted,
   error,
-  goTo,
   isBrowser,
   isPrerender,
   setClientStarted

package/build/runtime-esm/adapter.d.ts

@@ -1,10 +1,4 @@
-export declare function goTo(href: string, opts?: {
-    replaceState?: boolean;
-    noscroll?: boolean;
-    keepfocus?: boolean;
-    state?: any;
-}): Promise<void>;
-export declare const isBrowser = false;
+export declare const isBrowser = true;
 /**
  *  After `clientStarted = true`, only client side navigation will happen.
  */

package/build/runtime-esm/adapter.js

@@ -1,7 +1,5 @@
-async function goTo(href, opts) {
-}
-const isBrowser = false;
-let clientStarted = false;
+const isBrowser = true;
+let clientStarted = true;
 let isPrerender = false;
 const error = (code, message) => message;
 function setClientStarted() {
@@ -10,7 +8,6 @@ function setClientStarted() {
 export {
   clientStarted,
   error,
-  goTo,
   isBrowser,
   isPrerender,
   setClientStarted

package/build/test-cjs/index.js

@@ -294176,6 +294176,7 @@ async function walk_routes(config3, framework2, visitor, dirpath = config3.route
   let layoutExports = [];
   let pageQueries = [];
   let layoutQueries = [];
+  let validRoute = false;
   for (const child of await fs_exports.readdir(dirpath)) {
     const childPath = path_exports.join(dirpath, child);
     if ((await fs_exports.stat(childPath)).isDirectory()) {
@@ -294183,18 +294184,21 @@ async function walk_routes(config3, framework2, visitor, dirpath = config3.route
       continue;
     }
     if (is_layout_script(framework2, childPath)) {
+      validRoute = true;
       const { houdini_load, exports } = await extract_load_function(config3, childPath);
       await visitor.layoutQueries?.(houdini_load ?? [], childPath);
       layoutQueries.push(...houdini_load ?? []);
       await visitor.layoutExports?.(exports, childPath);
       layoutExports.push(...exports);
     } else if (is_page_script(framework2, childPath)) {
+      validRoute = true;
       const { houdini_load, exports } = await extract_load_function(config3, childPath);
       await visitor.pageQueries?.(houdini_load ?? [], childPath);
       pageQueries.push(...houdini_load ?? []);
       await visitor.pageExports?.(exports, childPath);
       pageExports.push(...exports);
     } else if (is_layout_component(framework2, childPath)) {
+      validRoute = true;
       const contents = await fs_exports.readFile(childPath);
       if (!contents) {
         continue;
@@ -294218,6 +294222,7 @@ async function walk_routes(config3, framework2, visitor, dirpath = config3.route
         }
       });
     } else if (is_component(config3, framework2, child)) {
+      validRoute = true;
       const contents = await fs_exports.readFile(childPath);
       if (!contents) {
         continue;
@@ -294241,6 +294246,7 @@ async function walk_routes(config3, framework2, visitor, dirpath = config3.route
         }
       });
     } else if (child === plugin_config(config3).layoutQueryFilename) {
+      validRoute = true;
       const contents = await fs_exports.readFile(childPath);
       if (!contents) {
         continue;
@@ -294253,6 +294259,7 @@ async function walk_routes(config3, framework2, visitor, dirpath = config3.route
         throw routeQueryError(childPath);
       }
     } else if (child === plugin_config(config3).pageQueryFilename) {
+      validRoute = true;
       const contents = await fs_exports.readFile(childPath);
       if (!contents) {
         continue;
@@ -294268,7 +294275,7 @@ async function walk_routes(config3, framework2, visitor, dirpath = config3.route
       continue;
     }
   }
-  if (visitor.route && (pageQueries.length > 0 || layoutQueries.length > 0 || pageExports.length > 0 || layoutExports.length > 0)) {
+  if (visitor.route && validRoute) {
     const relative_path_regex = /src(.*)/;
     const svelteTypeFilePath = path_exports.join(
       config3.projectRoot,
@@ -294484,14 +294491,34 @@ async function svelteKitGenerator(framework2, { config: config3 }) {
         const afterLayoutLoad = layoutExports.includes("afterLoad");
         const beforeLayoutLoad = layoutExports.includes("beforeLoad");
         const onLayoutError = layoutExports.includes("onError");
-        const pageVariableLoad = pageExports.some((x4) => x4.endsWith("Variables"));
-        const layoutVariableLoad = layoutExports.some((x4) => x4.endsWith("Variables"));
+        const layout_append_VariablesFunction = append_VariablesFunction(
+          "Layout",
+          config3,
+          uniqueLayoutQueries
+        );
+        const page_append_VariablesFunction = append_VariablesFunction(
+          "Page",
+          config3,
+          uniquePageQueries
+        );
         const splitString = skTypeString.split("\n\n");
         let typeImports = splitString[0];
         let utilityTypes = splitString[1];
         let typeExports = splitString[2];
-        const functionImports = `${afterPageLoad || beforePageLoad || afterLayoutLoad || beforeLayoutLoad || pageVariableLoad || layoutVariableLoad ? `
-import type { ${layoutVariableLoad || pageVariableLoad ? "VariableFunction, " : ""}${afterLayoutLoad || afterPageLoad ? "AfterLoadFunction, " : ""}${beforeLayoutLoad || beforePageLoad ? "BeforeLoadFunction " : ""}} from '${houdiniRelative}/plugins/houdini-svelte/runtime/types';` : ""}`;
+        const functionImportsToBring = [];
+        if (layout_append_VariablesFunction !== "" || page_append_VariablesFunction !== "") {
+          functionImportsToBring.push("VariableFunction");
+        }
+        if (afterLayoutLoad || afterPageLoad) {
+          functionImportsToBring.push("AfterLoadFunction");
+        }
+        if (beforeLayoutLoad || beforePageLoad) {
+          functionImportsToBring.push("BeforeLoadFunction");
+        }
+        const functionImports = functionImportsToBring.length > 0 ? `
+import type { ${functionImportsToBring.join(
+          ", "
+        )} } from '${houdiniRelative}/plugins/houdini-svelte/runtime/types';` : "";
         typeImports = typeImports.concat(functionImports).concat(layoutTypeImports).concat(pageTypeImports);
         const layoutParams = `${layoutQueries.length > 0 && !utilityTypes.includes("LayoutParams") ? "\ntype LayoutParams = LayoutLoadEvent['params'];" : ""}`;
         const pageParams = `${pageQueries.length > 0 && !utilityTypes.includes("PageParams") ? "\ntype PageParams = PageLoadEvent['params'];" : ""}`;
@@ -294506,7 +294533,7 @@ import type { ${layoutVariableLoad || pageVariableLoad ? "VariableFunction, " :
             onLayoutError,
             pageQueries.filter((x4) => x4.variableDefinitions?.length).length > 0
           )
-        ).concat(append_VariablesFunction("Layout", config3, uniqueLayoutQueries)).concat(append_VariablesFunction("Page", config3, uniquePageQueries)).replace(
+        ).concat(layout_append_VariablesFunction).concat(page_append_VariablesFunction).replace(
           /(?<=LayoutData = )([\s\S]*?)(?=;)/,
           `Expand<$1 & { ${layoutQueries.map((query) => {
             const name2 = query.name.value;
@@ -294991,10 +295018,10 @@ import_fs.default.readdirSync = function(filepath, options) {
   function contains2(...names2) {
     return names2.some((name2) => file_names.includes(name2));
   }
-  if (contains2("+page.svelte") && !contains2("+page.js", "+page.ts", "+page.server.js", "+page.server.ts")) {
+  if (contains2("+page.svelte", "+page.gql") && !contains2("+page.js", "+page.ts", "+page.server.js", "+page.server.ts")) {
     result.push(virtual_file("+page.js", options));
   }
-  if (contains2("+layout.svelte") && !contains2("+layout.ts", "+layout.js")) {
+  if (contains2("+layout.svelte", "+layout.gql") && !contains2("+layout.ts", "+layout.js")) {
     result.push(virtual_file("+layout.js", options));
   }
   const posix_filepath = path_exports.posixify(filepath.toString());
@@ -296048,16 +296075,9 @@ var HoudiniSveltePlugin = async () => ({
       return content.replace("HOUDINI_CLIENT_PATH", relativePath);
     },
     "adapter.js": ({ content }) => {
-      const sveltekit_adapter = `import { goto as go } from '$app/navigation'
-import { get } from 'svelte/store';
-import { browser, prerendering } from '$app/environment'
-import { page } from '$app/stores'
+      const sveltekit_adapter = `import { browser, prerendering } from '$app/environment'
 import { error as svelteKitError } from '@sveltejs/kit'
 
-export function goTo(location, options) {
-		go(location, options)
-}
-
 export const isBrowser = browser
 
 export let clientStarted = false;