houdini-svelte 0.17.0 → 0.17.2

package/.turbo/turbo-compile.log

@@ -1,5 +1,5 @@
-houdini-svelte:compile: cache hit, replaying output d2038584b36d45dd
+houdini-svelte:compile: cache hit, replaying output bb0207bdc5a5b1bb
 houdini-svelte:compile: 
-houdini-svelte:compile: > houdini-svelte@0.17.0 compile /home/runner/work/houdini/houdini/packages/houdini-svelte
+houdini-svelte:compile: > houdini-svelte@0.17.2 compile /home/runner/work/houdini/houdini/packages/houdini-svelte
 houdini-svelte:compile: > scripts build --plugin
 houdini-svelte:compile: 

package/.turbo/turbo-typedefs.log

@@ -1,5 +1,5 @@
-houdini-svelte:typedefs: cache hit, replaying output 72fe195e637ee1e9
+houdini-svelte:typedefs: cache hit, replaying output d8f39fd8ade18fe7
 houdini-svelte:typedefs: 
-houdini-svelte:typedefs: > houdini-svelte@0.17.0 typedefs /home/runner/work/houdini/houdini/packages/houdini-svelte
+houdini-svelte:typedefs: > houdini-svelte@0.17.2 typedefs /home/runner/work/houdini/houdini/packages/houdini-svelte
 houdini-svelte:typedefs: > scripts typedefs --plugin
 houdini-svelte:typedefs: 

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # houdini-svelte
 
+## 0.17.2
+
+### Patch Changes
+
+-   [#639](https://github.com/HoudiniGraphql/houdini/pull/639) [`cfdb009`](https://github.com/HoudiniGraphql/houdini/commit/cfdb00907829576b142366bad8835e2d32f3ea78) Thanks [@AlecAivazis](https://github.com/AlecAivazis)! - Fix error with generated route types
+
+-   [#633](https://github.com/HoudiniGraphql/houdini/pull/633) [`8e52a90`](https://github.com/HoudiniGraphql/houdini/commit/8e52a907642003c3b9c9f9b2a4c9824e49136b5d) Thanks [@jycouet](https://github.com/jycouet)! - fix: queries will be sent once if they are defined in +(page|layout).gql
+
+-   Updated dependencies []:
+    -   houdini@0.17.2
+
+## 0.17.1
+
+### Patch Changes
+
+-   [#630](https://github.com/HoudiniGraphql/houdini/pull/630) [`02d8fc4`](https://github.com/HoudiniGraphql/houdini/commit/02d8fc47f71980bd2b6492162b8e57808447bdbc) Thanks [@AlecAivazis](https://github.com/AlecAivazis)! - Fix relative imports from root layout
+
+-   Updated dependencies [[`02d8fc4`](https://github.com/HoudiniGraphql/houdini/commit/02d8fc47f71980bd2b6492162b8e57808447bdbc)]:
+    -   houdini@0.17.1
+
 ## 0.17.0
 
 ### ⚠️ Breaking Changes

package/build/plugin/kit.d.ts

@@ -13,7 +13,8 @@ export declare function is_layout_script(framework: Framework, filename: string)
 export declare function is_root_layout(config: Config, filename: string): boolean;
 export declare function is_root_layout_server(config: Config, filename: string): boolean;
 export declare function is_root_layout_script(config: Config, filename: string): boolean;
-export declare function is_layout_component(config: Config, filename: string): boolean;
+export declare function is_layout_component(framework: Framework, filename: string): boolean;
+export declare function is_layout(framework: Framework, filename: string): boolean;
 export declare function is_component(config: Config, framework: Framework, filename: string): boolean;
 export declare function page_query_path(config: Config, filename: string): string;
 export declare function layout_query_path(config: Config, filename: string): string;

package/build/plugin-cjs/index.js

@@ -182653,8 +182653,11 @@ function is_root_layout_server(config2, filename) {
 function is_root_layout_script(config2, filename) {
   return resolve_relative(config2, filename).replace(config2.projectRoot, "").replace(".ts", ".js") === path_exports.sep + path_exports.join("src", "routes", "+layout.js");
 }
-function is_layout_component(config2, filename) {
-  return resolve_relative(config2, filename).replace(config2.projectRoot, "").replace(".ts", ".js") === path_exports.sep + path_exports.join("src", "routes", "+layout.svelte");
+function is_layout_component(framework2, filename) {
+  return framework2 === "kit" && filename.endsWith("+layout.svelte");
+}
+function is_layout(framework2, filename) {
+  return is_layout_script(framework2, filename) || is_layout_component(framework2, filename);
 }
 function is_component(config2, framework2, filename) {
   return framework2 === "svelte" || filename.endsWith(".svelte") && !is_route_script(framework2, filename) && !is_route(config2, framework2, filename);
@@ -182734,7 +182737,7 @@ async function walk_routes(config2, framework2, visitor, dirpath = config2.route
         continue;
       }
       await visitor.routeLayoutQuery(routeLayoutQuery, childPath);
-    } else if (is_layout_component(config2, child)) {
+    } else if (is_layout_component(framework2, child)) {
       const contents = await fs_exports.readFile(childPath);
       if (!contents) {
         continue;
@@ -182852,41 +182855,6 @@ function store_import({
   return { id: ids, added };
 }
 
-// src/plugin/codegen/adapter.ts
-async function generateAdapter({ config: config2, framework: framework2 }) {
-  if (framework2 !== "kit") {
-    return;
-  }
-  const adapterLocation = path_exports.join(config2.pluginRuntimeDirectory("houdini-svelte"), "adapter.js");
-  const adapter = {
-    kit: sveltekitAdapter
-  }[framework2];
-  await fs_exports.mkdirp(path_exports.dirname(adapterLocation));
-  await fs_exports.writeFile(adapterLocation, adapter);
-}
-var sveltekitAdapter = `import { goto as go } from '$app/navigation'
-import { get } from 'svelte/store';
-import { browser, prerendering } from '$app/environment'
-import { page } from '$app/stores'
-import { error as svelteKitError } from '@sveltejs/kit'
-
-export function goTo(location, options) {
-    go(location, options)
-}
-
-export const isBrowser = browser
-
-export let clientStarted = false;
-
-export function setClientStarted() {
-	clientStarted = true
-}
-
-export const isPrerender = prerendering
-
-export const error = svelteKitError
-`;
-
 // src/plugin/codegen/components/index.ts
 async function componentTypesGenerator(framework2, { config: config2, documents }) {
   const queries = {};
@@ -183212,7 +183180,7 @@ function append_Store(houdiniRelative, config2, queries) {
   return queries.map((query) => {
     const name2 = query.name.value;
     return `import { ${name2}$result, ${name2}$input } from '${houdiniRelative}/${config2.artifactDirectoryName}/${name2}'
-	import { ${name2}Store } from '${houdiniRelative}/${stores_directory_name()}/${name2}'`;
+	import { ${name2}Store } from '${houdiniRelative}/plugins/houdini-svelte/${stores_directory_name()}/${name2}'`;
   }).join("\n");
 }
 function append_VariablesFunction(type, config2, queries) {
@@ -183551,7 +183519,6 @@ async function codegen_default(input) {
     fs_exports.mkdirp(stores_directory(input.plugin_root))
   ]);
   await Promise.all([
-    generateAdapter(input),
     svelteKitGenerator(input.framework, input),
     storesGenerator(input),
     componentTypesGenerator(input.framework, input)
@@ -183561,14 +183528,20 @@ async function codegen_default(input) {
 // src/plugin/fsPatch.ts
 var import_fs = __toESM(require("fs"), 1);
 var fsPatch_default = (getFramwork) => ({
-  resolveId(filepath, _, { config: config2 }) {
+  async resolveId(filepath, _, { config: config2, isEntry }) {
+    if (!isEntry) {
+      const match = filepath.match("^((../)+)src/routes");
+      if (match) {
+        return path_exports.join(config2.projectRoot, filepath.substring(match[1].length));
+      }
+      return;
+    }
     filepath = path_exports.posixify(filepath.toString());
     if (is_route_script(getFramwork(), filepath) || is_root_layout(config2, filepath) || is_root_layout_server(config2, filepath)) {
       return {
-        id: filepath
+        id: resolve_relative(config2, filepath)
       };
     }
-    return null;
   },
   load: async (filepath, { config: config2 }) => {
     filepath = path_exports.posixify(filepath.toString());
@@ -183584,7 +183557,6 @@ var fsPatch_default = (getFramwork) => ({
         code: await fs_exports.readFile(filepath) || await fs_exports.readFile(path_exports.join(config2.projectRoot, filepath)) || empty_layout
       };
     }
-    return null;
   }
 });
 var _readDirSync = import_fs.default.readdirSync;
@@ -183968,18 +183940,26 @@ async function kit_load_generator(page2) {
     ),
     find_page_info(page2)
   ]);
-  const queries = inline_queries.concat(layout_query ?? []).concat(page_query ?? []);
+  const houdini_load_queries = [];
   for (const [i3, target] of (page_info.houdini_load ?? []).entries()) {
-    queries.push({
+    houdini_load_queries.push({
       name: target.name.value,
       variables: operation_requires_variables(target),
       store_id: AST15.memberExpression(AST15.identifier("houdini_load"), AST15.literal(i3))
     });
   }
   if (script) {
+    const queries_that_needs_a_load = [...houdini_load_queries, ...inline_queries];
+    const isLayout = is_layout(page2.framework, page2.filepath);
+    if (isLayout && layout_query) {
+      queries_that_needs_a_load.push(layout_query);
+    }
+    if (!isLayout && page_query) {
+      queries_that_needs_a_load.push(page_query);
+    }
     add_load({
       page: page2,
-      queries,
+      queries: queries_that_needs_a_load,
       page_info
     });
   }
@@ -184694,6 +184674,31 @@ var HoudiniSveltePlugin = async () => ({
         path_exports.join(config2.projectRoot, plugin_config(config2).client)
       );
       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'
+import { error as svelteKitError } from '@sveltejs/kit'
+
+export function goTo(location, options) {
+		go(location, options)
+}
+
+export const isBrowser = browser
+
+export let clientStarted = false;
+
+export function setClientStarted() {
+	clientStarted = true
+}
+
+export const isPrerender = prerendering
+
+export const error = svelteKitError
+`;
+      return framework === "kit" ? sveltekit_adapter : content;
     }
   },
   extract_documents: extract_default,

package/build/plugin-esm/index.js

@@ -182649,8 +182649,11 @@ function is_root_layout_server(config2, filename) {
 function is_root_layout_script(config2, filename) {
   return resolve_relative(config2, filename).replace(config2.projectRoot, "").replace(".ts", ".js") === path_exports.sep + path_exports.join("src", "routes", "+layout.js");
 }
-function is_layout_component(config2, filename) {
-  return resolve_relative(config2, filename).replace(config2.projectRoot, "").replace(".ts", ".js") === path_exports.sep + path_exports.join("src", "routes", "+layout.svelte");
+function is_layout_component(framework2, filename) {
+  return framework2 === "kit" && filename.endsWith("+layout.svelte");
+}
+function is_layout(framework2, filename) {
+  return is_layout_script(framework2, filename) || is_layout_component(framework2, filename);
 }
 function is_component(config2, framework2, filename) {
   return framework2 === "svelte" || filename.endsWith(".svelte") && !is_route_script(framework2, filename) && !is_route(config2, framework2, filename);
@@ -182730,7 +182733,7 @@ async function walk_routes(config2, framework2, visitor, dirpath = config2.route
         continue;
       }
       await visitor.routeLayoutQuery(routeLayoutQuery, childPath);
-    } else if (is_layout_component(config2, child)) {
+    } else if (is_layout_component(framework2, child)) {
       const contents = await fs_exports.readFile(childPath);
       if (!contents) {
         continue;
@@ -182848,41 +182851,6 @@ function store_import({
   return { id: ids, added };
 }
 
-// src/plugin/codegen/adapter.ts
-async function generateAdapter({ config: config2, framework: framework2 }) {
-  if (framework2 !== "kit") {
-    return;
-  }
-  const adapterLocation = path_exports.join(config2.pluginRuntimeDirectory("houdini-svelte"), "adapter.js");
-  const adapter = {
-    kit: sveltekitAdapter
-  }[framework2];
-  await fs_exports.mkdirp(path_exports.dirname(adapterLocation));
-  await fs_exports.writeFile(adapterLocation, adapter);
-}
-var sveltekitAdapter = `import { goto as go } from '$app/navigation'
-import { get } from 'svelte/store';
-import { browser, prerendering } from '$app/environment'
-import { page } from '$app/stores'
-import { error as svelteKitError } from '@sveltejs/kit'
-
-export function goTo(location, options) {
-    go(location, options)
-}
-
-export const isBrowser = browser
-
-export let clientStarted = false;
-
-export function setClientStarted() {
-	clientStarted = true
-}
-
-export const isPrerender = prerendering
-
-export const error = svelteKitError
-`;
-
 // src/plugin/codegen/components/index.ts
 async function componentTypesGenerator(framework2, { config: config2, documents }) {
   const queries = {};
@@ -183208,7 +183176,7 @@ function append_Store(houdiniRelative, config2, queries) {
   return queries.map((query) => {
     const name2 = query.name.value;
     return `import { ${name2}$result, ${name2}$input } from '${houdiniRelative}/${config2.artifactDirectoryName}/${name2}'
-	import { ${name2}Store } from '${houdiniRelative}/${stores_directory_name()}/${name2}'`;
+	import { ${name2}Store } from '${houdiniRelative}/plugins/houdini-svelte/${stores_directory_name()}/${name2}'`;
   }).join("\n");
 }
 function append_VariablesFunction(type, config2, queries) {
@@ -183547,7 +183515,6 @@ async function codegen_default(input) {
     fs_exports.mkdirp(stores_directory(input.plugin_root))
   ]);
   await Promise.all([
-    generateAdapter(input),
     svelteKitGenerator(input.framework, input),
     storesGenerator(input),
     componentTypesGenerator(input.framework, input)
@@ -183557,14 +183524,20 @@ async function codegen_default(input) {
 // src/plugin/fsPatch.ts
 import filesystem, { Dirent } from "fs";
 var fsPatch_default = (getFramwork) => ({
-  resolveId(filepath, _, { config: config2 }) {
+  async resolveId(filepath, _, { config: config2, isEntry }) {
+    if (!isEntry) {
+      const match = filepath.match("^((../)+)src/routes");
+      if (match) {
+        return path_exports.join(config2.projectRoot, filepath.substring(match[1].length));
+      }
+      return;
+    }
     filepath = path_exports.posixify(filepath.toString());
     if (is_route_script(getFramwork(), filepath) || is_root_layout(config2, filepath) || is_root_layout_server(config2, filepath)) {
       return {
-        id: filepath
+        id: resolve_relative(config2, filepath)
       };
     }
-    return null;
   },
   load: async (filepath, { config: config2 }) => {
     filepath = path_exports.posixify(filepath.toString());
@@ -183580,7 +183553,6 @@ var fsPatch_default = (getFramwork) => ({
         code: await fs_exports.readFile(filepath) || await fs_exports.readFile(path_exports.join(config2.projectRoot, filepath)) || empty_layout
       };
     }
-    return null;
   }
 });
 var _readDirSync = filesystem.readdirSync;
@@ -183964,18 +183936,26 @@ async function kit_load_generator(page2) {
     ),
     find_page_info(page2)
   ]);
-  const queries = inline_queries.concat(layout_query ?? []).concat(page_query ?? []);
+  const houdini_load_queries = [];
   for (const [i3, target] of (page_info.houdini_load ?? []).entries()) {
-    queries.push({
+    houdini_load_queries.push({
       name: target.name.value,
       variables: operation_requires_variables(target),
       store_id: AST15.memberExpression(AST15.identifier("houdini_load"), AST15.literal(i3))
     });
   }
   if (script) {
+    const queries_that_needs_a_load = [...houdini_load_queries, ...inline_queries];
+    const isLayout = is_layout(page2.framework, page2.filepath);
+    if (isLayout && layout_query) {
+      queries_that_needs_a_load.push(layout_query);
+    }
+    if (!isLayout && page_query) {
+      queries_that_needs_a_load.push(page_query);
+    }
     add_load({
       page: page2,
-      queries,
+      queries: queries_that_needs_a_load,
       page_info
     });
   }
@@ -184690,6 +184670,31 @@ var HoudiniSveltePlugin = async () => ({
         path_exports.join(config2.projectRoot, plugin_config(config2).client)
       );
       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'
+import { error as svelteKitError } from '@sveltejs/kit'
+
+export function goTo(location, options) {
+		go(location, options)
+}
+
+export const isBrowser = browser
+
+export let clientStarted = false;
+
+export function setClientStarted() {
+	clientStarted = true
+}
+
+export const isPrerender = prerendering
+
+export const error = svelteKitError
+`;
+      return framework === "kit" ? sveltekit_adapter : content;
     }
   },
   extract_documents: extract_default,

package/build/preprocess-cjs/index.js

@@ -186422,6 +186422,12 @@ function is_root_layout_server(config2, filename) {
 function is_root_layout_script(config2, filename) {
   return resolve_relative(config2, filename).replace(config2.projectRoot, "").replace(".ts", ".js") === path_exports.sep + path_exports.join("src", "routes", "+layout.js");
 }
+function is_layout_component(framework, filename) {
+  return framework === "kit" && filename.endsWith("+layout.svelte");
+}
+function is_layout(framework, filename) {
+  return is_layout_script(framework, filename) || is_layout_component(framework, filename);
+}
 function is_component(config2, framework, filename) {
   return framework === "svelte" || filename.endsWith(".svelte") && !is_route_script(framework, filename) && !is_route(config2, framework, filename);
 }
@@ -186892,18 +186898,26 @@ async function kit_load_generator(page2) {
     ),
     find_page_info(page2)
   ]);
-  const queries = inline_queries.concat(layout_query ?? []).concat(page_query ?? []);
+  const houdini_load_queries = [];
   for (const [i3, target] of (page_info.houdini_load ?? []).entries()) {
-    queries.push({
+    houdini_load_queries.push({
       name: target.name.value,
       variables: operation_requires_variables(target),
       store_id: AST15.memberExpression(AST15.identifier("houdini_load"), AST15.literal(i3))
     });
   }
   if (script) {
+    const queries_that_needs_a_load = [...houdini_load_queries, ...inline_queries];
+    const isLayout = is_layout(page2.framework, page2.filepath);
+    if (isLayout && layout_query) {
+      queries_that_needs_a_load.push(layout_query);
+    }
+    if (!isLayout && page_query) {
+      queries_that_needs_a_load.push(page_query);
+    }
     add_load({
       page: page2,
-      queries,
+      queries: queries_that_needs_a_load,
       page_info
     });
   }

package/build/preprocess-esm/index.js

@@ -186414,6 +186414,12 @@ function is_root_layout_server(config2, filename) {
 function is_root_layout_script(config2, filename) {
   return resolve_relative(config2, filename).replace(config2.projectRoot, "").replace(".ts", ".js") === path_exports.sep + path_exports.join("src", "routes", "+layout.js");
 }
+function is_layout_component(framework, filename) {
+  return framework === "kit" && filename.endsWith("+layout.svelte");
+}
+function is_layout(framework, filename) {
+  return is_layout_script(framework, filename) || is_layout_component(framework, filename);
+}
 function is_component(config2, framework, filename) {
   return framework === "svelte" || filename.endsWith(".svelte") && !is_route_script(framework, filename) && !is_route(config2, framework, filename);
 }
@@ -186884,18 +186890,26 @@ async function kit_load_generator(page2) {
     ),
     find_page_info(page2)
   ]);
-  const queries = inline_queries.concat(layout_query ?? []).concat(page_query ?? []);
+  const houdini_load_queries = [];
   for (const [i3, target] of (page_info.houdini_load ?? []).entries()) {
-    queries.push({
+    houdini_load_queries.push({
       name: target.name.value,
       variables: operation_requires_variables(target),
       store_id: AST15.memberExpression(AST15.identifier("houdini_load"), AST15.literal(i3))
     });
   }
   if (script) {
+    const queries_that_needs_a_load = [...houdini_load_queries, ...inline_queries];
+    const isLayout = is_layout(page2.framework, page2.filepath);
+    if (isLayout && layout_query) {
+      queries_that_needs_a_load.push(layout_query);
+    }
+    if (!isLayout && page_query) {
+      queries_that_needs_a_load.push(page_query);
+    }
     add_load({
       page: page2,
-      queries,
+      queries: queries_that_needs_a_load,
       page_info
     });
   }

package/build/test-cjs/index.js

@@ -299397,8 +299397,11 @@ function is_root_layout_server(config3, filename) {
 function is_root_layout_script(config3, filename) {
   return resolve_relative(config3, filename).replace(config3.projectRoot, "").replace(".ts", ".js") === path_exports.sep + path_exports.join("src", "routes", "+layout.js");
 }
-function is_layout_component(config3, filename) {
-  return resolve_relative(config3, filename).replace(config3.projectRoot, "").replace(".ts", ".js") === path_exports.sep + path_exports.join("src", "routes", "+layout.svelte");
+function is_layout_component(framework2, filename) {
+  return framework2 === "kit" && filename.endsWith("+layout.svelte");
+}
+function is_layout(framework2, filename) {
+  return is_layout_script(framework2, filename) || is_layout_component(framework2, filename);
 }
 function is_component(config3, framework2, filename) {
   return framework2 === "svelte" || filename.endsWith(".svelte") && !is_route_script(framework2, filename) && !is_route(config3, framework2, filename);
@@ -299478,7 +299481,7 @@ async function walk_routes(config3, framework2, visitor, dirpath = config3.route
         continue;
       }
       await visitor.routeLayoutQuery(routeLayoutQuery, childPath);
-    } else if (is_layout_component(config3, child)) {
+    } else if (is_layout_component(framework2, child)) {
       const contents = await fs_exports.readFile(childPath);
       if (!contents) {
         continue;
@@ -299596,41 +299599,6 @@ function store_import({
   return { id: ids, added };
 }
 
-// src/plugin/codegen/adapter.ts
-async function generateAdapter({ config: config3, framework: framework2 }) {
-  if (framework2 !== "kit") {
-    return;
-  }
-  const adapterLocation = path_exports.join(config3.pluginRuntimeDirectory("houdini-svelte"), "adapter.js");
-  const adapter = {
-    kit: sveltekitAdapter
-  }[framework2];
-  await fs_exports.mkdirp(path_exports.dirname(adapterLocation));
-  await fs_exports.writeFile(adapterLocation, adapter);
-}
-var sveltekitAdapter = `import { goto as go } from '$app/navigation'
-import { get } from 'svelte/store';
-import { browser, prerendering } from '$app/environment'
-import { page } from '$app/stores'
-import { error as svelteKitError } from '@sveltejs/kit'
-
-export function goTo(location, options) {
-    go(location, options)
-}
-
-export const isBrowser = browser
-
-export let clientStarted = false;
-
-export function setClientStarted() {
-	clientStarted = true
-}
-
-export const isPrerender = prerendering
-
-export const error = svelteKitError
-`;
-
 // src/plugin/codegen/components/index.ts
 async function componentTypesGenerator(framework2, { config: config3, documents }) {
   const queries = {};
@@ -299956,7 +299924,7 @@ function append_Store(houdiniRelative, config3, queries) {
   return queries.map((query) => {
     const name2 = query.name.value;
     return `import { ${name2}$result, ${name2}$input } from '${houdiniRelative}/${config3.artifactDirectoryName}/${name2}'
-	import { ${name2}Store } from '${houdiniRelative}/${stores_directory_name()}/${name2}'`;
+	import { ${name2}Store } from '${houdiniRelative}/plugins/houdini-svelte/${stores_directory_name()}/${name2}'`;
   }).join("\n");
 }
 function append_VariablesFunction(type, config3, queries) {
@@ -300295,7 +300263,6 @@ async function codegen_default(input) {
     fs_exports.mkdirp(stores_directory(input.plugin_root))
   ]);
   await Promise.all([
-    generateAdapter(input),
     svelteKitGenerator(input.framework, input),
     storesGenerator(input),
     componentTypesGenerator(input.framework, input)
@@ -300305,14 +300272,20 @@ async function codegen_default(input) {
 // src/plugin/fsPatch.ts
 var import_fs = __toESM(require("fs"), 1);
 var fsPatch_default = (getFramwork) => ({
-  resolveId(filepath, _, { config: config3 }) {
+  async resolveId(filepath, _, { config: config3, isEntry }) {
+    if (!isEntry) {
+      const match = filepath.match("^((../)+)src/routes");
+      if (match) {
+        return path_exports.join(config3.projectRoot, filepath.substring(match[1].length));
+      }
+      return;
+    }
     filepath = path_exports.posixify(filepath.toString());
     if (is_route_script(getFramwork(), filepath) || is_root_layout(config3, filepath) || is_root_layout_server(config3, filepath)) {
       return {
-        id: filepath
+        id: resolve_relative(config3, filepath)
       };
     }
-    return null;
   },
   load: async (filepath, { config: config3 }) => {
     filepath = path_exports.posixify(filepath.toString());
@@ -300328,7 +300301,6 @@ var fsPatch_default = (getFramwork) => ({
         code: await fs_exports.readFile(filepath) || await fs_exports.readFile(path_exports.join(config3.projectRoot, filepath)) || empty_layout
       };
     }
-    return null;
   }
 });
 var _readDirSync = import_fs.default.readdirSync;
@@ -300712,18 +300684,26 @@ async function kit_load_generator(page2) {
     ),
     find_page_info(page2)
   ]);
-  const queries = inline_queries.concat(layout_query ?? []).concat(page_query ?? []);
+  const houdini_load_queries = [];
   for (const [i3, target] of (page_info.houdini_load ?? []).entries()) {
-    queries.push({
+    houdini_load_queries.push({
       name: target.name.value,
       variables: operation_requires_variables(target),
       store_id: AST16.memberExpression(AST16.identifier("houdini_load"), AST16.literal(i3))
     });
   }
   if (script) {
+    const queries_that_needs_a_load = [...houdini_load_queries, ...inline_queries];
+    const isLayout = is_layout(page2.framework, page2.filepath);
+    if (isLayout && layout_query) {
+      queries_that_needs_a_load.push(layout_query);
+    }
+    if (!isLayout && page_query) {
+      queries_that_needs_a_load.push(page_query);
+    }
     add_load({
       page: page2,
-      queries,
+      queries: queries_that_needs_a_load,
       page_info
     });
   }
@@ -301438,6 +301418,31 @@ var HoudiniSveltePlugin = async () => ({
         path_exports.join(config3.projectRoot, plugin_config(config3).client)
       );
       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'
+import { error as svelteKitError } from '@sveltejs/kit'
+
+export function goTo(location, options) {
+		go(location, options)
+}
+
+export const isBrowser = browser
+
+export let clientStarted = false;
+
+export function setClientStarted() {
+	clientStarted = true
+}
+
+export const isPrerender = prerendering
+
+export const error = svelteKitError
+`;
+      return framework === "kit" ? sveltekit_adapter : content;
     }
   },
   extract_documents: extract_default,

package/build/test-esm/index.js

@@ -299386,8 +299386,11 @@ function is_root_layout_server(config3, filename) {
 function is_root_layout_script(config3, filename) {
   return resolve_relative(config3, filename).replace(config3.projectRoot, "").replace(".ts", ".js") === path_exports.sep + path_exports.join("src", "routes", "+layout.js");
 }
-function is_layout_component(config3, filename) {
-  return resolve_relative(config3, filename).replace(config3.projectRoot, "").replace(".ts", ".js") === path_exports.sep + path_exports.join("src", "routes", "+layout.svelte");
+function is_layout_component(framework2, filename) {
+  return framework2 === "kit" && filename.endsWith("+layout.svelte");
+}
+function is_layout(framework2, filename) {
+  return is_layout_script(framework2, filename) || is_layout_component(framework2, filename);
 }
 function is_component(config3, framework2, filename) {
   return framework2 === "svelte" || filename.endsWith(".svelte") && !is_route_script(framework2, filename) && !is_route(config3, framework2, filename);
@@ -299467,7 +299470,7 @@ async function walk_routes(config3, framework2, visitor, dirpath = config3.route
         continue;
       }
       await visitor.routeLayoutQuery(routeLayoutQuery, childPath);
-    } else if (is_layout_component(config3, child)) {
+    } else if (is_layout_component(framework2, child)) {
       const contents = await fs_exports.readFile(childPath);
       if (!contents) {
         continue;
@@ -299585,41 +299588,6 @@ function store_import({
   return { id: ids, added };
 }
 
-// src/plugin/codegen/adapter.ts
-async function generateAdapter({ config: config3, framework: framework2 }) {
-  if (framework2 !== "kit") {
-    return;
-  }
-  const adapterLocation = path_exports.join(config3.pluginRuntimeDirectory("houdini-svelte"), "adapter.js");
-  const adapter = {
-    kit: sveltekitAdapter
-  }[framework2];
-  await fs_exports.mkdirp(path_exports.dirname(adapterLocation));
-  await fs_exports.writeFile(adapterLocation, adapter);
-}
-var sveltekitAdapter = `import { goto as go } from '$app/navigation'
-import { get } from 'svelte/store';
-import { browser, prerendering } from '$app/environment'
-import { page } from '$app/stores'
-import { error as svelteKitError } from '@sveltejs/kit'
-
-export function goTo(location, options) {
-    go(location, options)
-}
-
-export const isBrowser = browser
-
-export let clientStarted = false;
-
-export function setClientStarted() {
-	clientStarted = true
-}
-
-export const isPrerender = prerendering
-
-export const error = svelteKitError
-`;
-
 // src/plugin/codegen/components/index.ts
 async function componentTypesGenerator(framework2, { config: config3, documents }) {
   const queries = {};
@@ -299945,7 +299913,7 @@ function append_Store(houdiniRelative, config3, queries) {
   return queries.map((query) => {
     const name2 = query.name.value;
     return `import { ${name2}$result, ${name2}$input } from '${houdiniRelative}/${config3.artifactDirectoryName}/${name2}'
-	import { ${name2}Store } from '${houdiniRelative}/${stores_directory_name()}/${name2}'`;
+	import { ${name2}Store } from '${houdiniRelative}/plugins/houdini-svelte/${stores_directory_name()}/${name2}'`;
   }).join("\n");
 }
 function append_VariablesFunction(type, config3, queries) {
@@ -300284,7 +300252,6 @@ async function codegen_default(input) {
     fs_exports.mkdirp(stores_directory(input.plugin_root))
   ]);
   await Promise.all([
-    generateAdapter(input),
     svelteKitGenerator(input.framework, input),
     storesGenerator(input),
     componentTypesGenerator(input.framework, input)
@@ -300294,14 +300261,20 @@ async function codegen_default(input) {
 // src/plugin/fsPatch.ts
 import filesystem, { Dirent } from "fs";
 var fsPatch_default = (getFramwork) => ({
-  resolveId(filepath, _, { config: config3 }) {
+  async resolveId(filepath, _, { config: config3, isEntry }) {
+    if (!isEntry) {
+      const match = filepath.match("^((../)+)src/routes");
+      if (match) {
+        return path_exports.join(config3.projectRoot, filepath.substring(match[1].length));
+      }
+      return;
+    }
     filepath = path_exports.posixify(filepath.toString());
     if (is_route_script(getFramwork(), filepath) || is_root_layout(config3, filepath) || is_root_layout_server(config3, filepath)) {
       return {
-        id: filepath
+        id: resolve_relative(config3, filepath)
       };
     }
-    return null;
   },
   load: async (filepath, { config: config3 }) => {
     filepath = path_exports.posixify(filepath.toString());
@@ -300317,7 +300290,6 @@ var fsPatch_default = (getFramwork) => ({
         code: await fs_exports.readFile(filepath) || await fs_exports.readFile(path_exports.join(config3.projectRoot, filepath)) || empty_layout
       };
     }
-    return null;
   }
 });
 var _readDirSync = filesystem.readdirSync;
@@ -300701,18 +300673,26 @@ async function kit_load_generator(page2) {
     ),
     find_page_info(page2)
   ]);
-  const queries = inline_queries.concat(layout_query ?? []).concat(page_query ?? []);
+  const houdini_load_queries = [];
   for (const [i3, target] of (page_info.houdini_load ?? []).entries()) {
-    queries.push({
+    houdini_load_queries.push({
       name: target.name.value,
       variables: operation_requires_variables(target),
       store_id: AST16.memberExpression(AST16.identifier("houdini_load"), AST16.literal(i3))
     });
   }
   if (script) {
+    const queries_that_needs_a_load = [...houdini_load_queries, ...inline_queries];
+    const isLayout = is_layout(page2.framework, page2.filepath);
+    if (isLayout && layout_query) {
+      queries_that_needs_a_load.push(layout_query);
+    }
+    if (!isLayout && page_query) {
+      queries_that_needs_a_load.push(page_query);
+    }
     add_load({
       page: page2,
-      queries,
+      queries: queries_that_needs_a_load,
       page_info
     });
   }
@@ -301427,6 +301407,31 @@ var HoudiniSveltePlugin = async () => ({
         path_exports.join(config3.projectRoot, plugin_config(config3).client)
       );
       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'
+import { error as svelteKitError } from '@sveltejs/kit'
+
+export function goTo(location, options) {
+		go(location, options)
+}
+
+export const isBrowser = browser
+
+export let clientStarted = false;
+
+export function setClientStarted() {
+	clientStarted = true
+}
+
+export const isPrerender = prerendering
+
+export const error = svelteKitError
+`;
+      return framework === "kit" ? sveltekit_adapter : content;
     }
   },
   extract_documents: extract_default,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini-svelte",
-  "version": "0.17.0",
+  "version": "0.17.2",
   "description": "The svelte plugin for houdini",
   "type": "module",
   "dependencies": {
@@ -9,7 +9,7 @@
     "ast-types": "^0.15.1",
     "estree-walker": "^3.0.1",
     "graphql": "^16.6.0",
-    "houdini": "^0.17.0",
+    "houdini": "^0.17.2",
     "minimatch": "^5.1.0",
     "recast": "^0.21.5",
     "svelte": "^3.52.0"

package/src/plugin/codegen/index.ts

@@ -1,7 +1,6 @@
 import { GenerateHookInput, fs, Config } from 'houdini'
 
 import { stores_directory, type_route_dir } from '../kit'
-import adapter from './adapter'
 import components from './components'
 import kit from './routes'
 import stores from './stores'
@@ -15,7 +14,6 @@ export default async function (input: PluginGenerateInput) {
 
 	// generate the files
 	await Promise.all([
-		adapter(input),
 		kit(input.framework, input),
 		stores(input),
 		components(input.framework, input),

package/src/plugin/codegen/routes/index.ts

@@ -183,7 +183,7 @@ function append_Store(houdiniRelative: string, config: Config, queries: Operatio
 			return `import { ${name}$result, ${name}$input } from '${houdiniRelative}/${
 				config.artifactDirectoryName
 			}/${name}'
-	import { ${name}Store } from '${houdiniRelative}/${stores_directory_name()}/${name}'`
+	import { ${name}Store } from '${houdiniRelative}/plugins/houdini-svelte/${stores_directory_name()}/${name}'`
 		})
 		.join('\n')
 }

package/src/plugin/codegen/routes/kit.test.ts

@@ -40,7 +40,7 @@ test('generates types for inline queries', async function () {
 		import type { VariableFunction, AfterLoadFunction, BeforeLoadFunction } from "../../../../plugins/houdini-svelte/runtime/types";
 		import type { PageLoadEvent, PageData as KitPageData } from "./$types";
 		import { MyInlineQuery$result, MyInlineQuery$input } from "../../../../artifacts/MyInlineQuery";
-		import { MyInlineQueryStore } from "../../../../stores/MyInlineQuery";
+		import { MyInlineQueryStore } from "../../../../plugins/houdini-svelte/stores/MyInlineQuery";
 		type PageParams = PageLoadEvent["params"];
 
 		export type PageData = {
@@ -81,7 +81,7 @@ query MyPageQuery {
 		import type { VariableFunction, AfterLoadFunction, BeforeLoadFunction } from "../../../../plugins/houdini-svelte/runtime/types";
 		import type { PageLoadEvent, PageData as KitPageData } from "./$types";
 		import { MyPageQuery$result, MyPageQuery$input } from "../../../../artifacts/MyPageQuery";
-		import { MyPageQueryStore } from "../../../../stores/MyPageQuery";
+		import { MyPageQueryStore } from "../../../../plugins/houdini-svelte/stores/MyPageQuery";
 		type PageParams = PageLoadEvent["params"];
 
 		export type PageData = {
@@ -122,7 +122,7 @@ query MyLayoutQuery {
 		import type { VariableFunction, AfterLoadFunction, BeforeLoadFunction } from "../../../../plugins/houdini-svelte/runtime/types";
 		import type { LayoutLoadEvent, LayoutData as KitPageData } from "./$types";
 		import { MyLayoutQuery$result, MyLayoutQuery$input } from "../../../../artifacts/MyLayoutQuery";
-		import { MyLayoutQueryStore } from "../../../../stores/MyLayoutQuery";
+		import { MyLayoutQueryStore } from "../../../../plugins/houdini-svelte/stores/MyLayoutQuery";
 		type LayoutParams = LayoutLoadEvent["params"];
 
 		export type LayoutData = {
@@ -178,9 +178,9 @@ test('generates types for after load', async function () {
 		import type { VariableFunction, AfterLoadFunction, BeforeLoadFunction } from "../../../../plugins/houdini-svelte/runtime/types";
 		import type { PageLoadEvent, PageData as KitPageData } from "./$types";
 		import { MyPageLoad1Query$result, MyPageLoad1Query$input } from "../../../../artifacts/MyPageLoad1Query";
-		import { MyPageLoad1QueryStore } from "../../../../stores/MyPageLoad1Query";
+		import { MyPageLoad1QueryStore } from "../../../../plugins/houdini-svelte/stores/MyPageLoad1Query";
 		import { MyPageLoad2Query$result, MyPageLoad2Query$input } from "../../../../artifacts/MyPageLoad2Query";
-		import { MyPageLoad2QueryStore } from "../../../../stores/MyPageLoad2Query";
+		import { MyPageLoad2QueryStore } from "../../../../plugins/houdini-svelte/stores/MyPageLoad2Query";
 		type PageParams = PageLoadEvent["params"];
 		export type MyPageLoad1QueryVariables = VariableFunction<PageParams, MyPageLoad1Query$input>;
 		type AfterLoadReturn = ReturnType<typeof import("./+page").afterLoad>;
@@ -254,9 +254,9 @@ test('generates types for onError', async function () {
 		import type { VariableFunction, AfterLoadFunction, BeforeLoadFunction } from "../../../../plugins/houdini-svelte/runtime/types";
 		import type { PageLoadEvent, PageData as KitPageData } from "./$types";
 		import { MyPageLoad1Query$result, MyPageLoad1Query$input } from "../../../../artifacts/MyPageLoad1Query";
-		import { MyPageLoad1QueryStore } from "../../../../stores/MyPageLoad1Query";
+		import { MyPageLoad1QueryStore } from "../../../../plugins/houdini-svelte/stores/MyPageLoad1Query";
 		import { MyPageLoad2Query$result, MyPageLoad2Query$input } from "../../../../artifacts/MyPageLoad2Query";
-		import { MyPageLoad2QueryStore } from "../../../../stores/MyPageLoad2Query";
+		import { MyPageLoad2QueryStore } from "../../../../plugins/houdini-svelte/stores/MyPageLoad2Query";
 		type PageParams = PageLoadEvent["params"];
 		export type MyPageLoad1QueryVariables = VariableFunction<PageParams, MyPageLoad1Query$input>;
 

package/src/plugin/fsPatch.ts

@@ -12,7 +12,18 @@ import {
 // this plugin is responsible for faking `+page.js` existence in the eyes of sveltekit
 export default (getFramwork: () => Framework) =>
 	({
-		resolveId(filepath, _, { config }) {
+		async resolveId(filepath, _, { config, isEntry }) {
+			// without this check, the block underneath breaks relative imports from root layout
+			if (!isEntry) {
+				// make sure there is no
+				const match = filepath.match('^((../)+)src/routes')
+				if (match) {
+					return path.join(config.projectRoot, filepath.substring(match[1].length))
+				}
+				// if there is no deep relative import, do the default thing
+				return
+			}
+
 			// everything internal to houdini should assume posix paths
 			filepath = path.posixify(filepath.toString())
 
@@ -23,11 +34,9 @@ export default (getFramwork: () => Framework) =>
 				is_root_layout_server(config, filepath)
 			) {
 				return {
-					id: filepath,
+					id: resolve_relative(config, filepath),
 				}
 			}
-
-			return null
 		},
 
 		load: async (filepath, { config }) => {
@@ -57,9 +66,6 @@ export default (getFramwork: () => Framework) =>
 						empty_layout,
 				}
 			}
-
-			// do the normal thing
-			return null
 		},
 	} as Plugin['vite'])
 

package/src/plugin/index.ts

@@ -38,6 +38,34 @@ const HoudiniSveltePlugin: PluginFactory = async () => ({
 
 			return content.replace('HOUDINI_CLIENT_PATH', relativePath)
 		},
+
+		'adapter.js': ({ content }) => {
+			// dedicated sveltekit adapter.
+			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'
+import { error as svelteKitError } from '@sveltejs/kit'
+
+export function goTo(location, options) {
+		go(location, options)
+}
+
+export const isBrowser = browser
+
+export let clientStarted = false;
+
+export function setClientStarted() {
+	clientStarted = true
+}
+
+export const isPrerender = prerendering
+
+export const error = svelteKitError
+`
+
+			return framework === 'kit' ? sveltekit_adapter : content
+		},
 	},
 
 	// custom logic to pull a graphql document out of a svelte file

package/src/plugin/kit.ts

@@ -69,11 +69,12 @@ export function is_root_layout_script(config: Config, filename: string) {
 	)
 }
 
-export function is_layout_component(config: Config, filename: string) {
-	return (
-		resolve_relative(config, filename).replace(config.projectRoot, '').replace('.ts', '.js') ===
-		path.sep + path.join('src', 'routes', '+layout.svelte')
-	)
+export function is_layout_component(framework: Framework, filename: string) {
+	return framework === 'kit' && filename.endsWith('+layout.svelte')
+}
+
+export function is_layout(framework: Framework, filename: string) {
+	return is_layout_script(framework, filename) || is_layout_component(framework, filename)
 }
 
 export function is_component(config: Config, framework: Framework, filename: string) {
@@ -203,7 +204,7 @@ export async function walk_routes(
 		}
 
 		// inline layout queries
-		else if (is_layout_component(config, child)) {
+		else if (is_layout_component(framework, child)) {
 			// load the contents and parse it
 			const contents = await fs.readFile(childPath)
 			if (!contents) {

package/src/plugin/transforms/kit/load.test.ts

@@ -369,10 +369,10 @@ describe('kit route processor', function () {
 		`)
 		expect(route.script).toMatchInlineSnapshot(`
 			import GQL_MyQuery1 from "$houdini/plugins/houdini-svelte/stores/MyQuery1";
+			import { load_TestQuery } from "$houdini/plugins/houdini-svelte/stores/TestQuery";
 			import GQL_MyQuery2 from "$houdini/plugins/houdini-svelte/stores/MyQuery2";
 			import { load_MyQuery2 } from "$houdini/plugins/houdini-svelte/stores/MyQuery2";
 			import { load_MyQuery1 } from "$houdini/plugins/houdini-svelte/stores/MyQuery1";
-			import { load_TestQuery } from "$houdini/plugins/houdini-svelte/stores/TestQuery";
 			import { getCurrentConfig } from "$houdini/runtime/lib/config";
 			import { RequestContext } from "$houdini/plugins/houdini-svelte/runtime/session";
 			import GQL_TestQuery from "$houdini/plugins/houdini-svelte/stores/TestQuery";
@@ -386,14 +386,6 @@ describe('kit route processor', function () {
 			    const houdiniConfig = await getCurrentConfig();
 			    const promises = [];
 			    const inputs = {};
-			    inputs["TestQuery"] = {};
-
-			    promises.push(load_TestQuery({
-			        "variables": inputs["TestQuery"],
-			        "event": context,
-			        "blocking": false
-			    }));
-
 			    inputs["MyQuery1"] = {};
 
 			    promises.push(load_MyQuery1({
@@ -414,6 +406,14 @@ describe('kit route processor', function () {
 			        "blocking": false
 			    }));
 
+			    inputs["TestQuery"] = {};
+
+			    promises.push(load_TestQuery({
+			        "variables": inputs["TestQuery"],
+			        "event": context,
+			        "blocking": false
+			    }));
+
 			    let result = {};
 
 			    try {
@@ -444,6 +444,7 @@ describe('kit route processor', function () {
 		expect(route.component).toMatchInlineSnapshot(
 			'import GQL_TestPageQuery from "$houdini/plugins/houdini-svelte/stores/TestPageQuery";'
 		)
+
 		expect(route.script).toMatchInlineSnapshot(`
 			import { load_TestPageQuery } from "$houdini/plugins/houdini-svelte/stores/TestPageQuery";
 			import { getCurrentConfig } from "$houdini/runtime/lib/config";
@@ -477,6 +478,32 @@ describe('kit route processor', function () {
 			    };
 			}
 		`)
+
+		expect(route.layout).toMatchInlineSnapshot(`
+			import { page } from "$app/stores";
+			import { extractSession, setClientSession } from "$houdini/plugins/houdini-svelte/runtime/session";
+			import { onMount } from "svelte";
+			import { setClientStarted } from "$houdini/plugins/houdini-svelte/runtime/adapter";
+			import GQL_TestPageQuery from "$houdini/plugins/houdini-svelte/stores/TestPageQuery";
+			onMount(() => setClientStarted());
+
+			page.subscribe(val => {
+			    setClientSession(extractSession(val.data));
+			});
+		`)
+
+		expect(route.layout_script).toMatchInlineSnapshot(`
+			import GQL_TestPageQuery from "$houdini/plugins/houdini-svelte/stores/TestPageQuery";
+
+			export async function load(event) {
+			    const __houdini__vite__plugin__return__value__ = {};
+
+			    return {
+			        ...event.data,
+			        ...__houdini__vite__plugin__return__value__
+			    };
+			}
+		`)
 	})
 
 	test('route with +layout.gql query', async function () {
@@ -493,6 +520,24 @@ describe('kit route processor', function () {
 		expect(route.component).toMatchInlineSnapshot(
 			'import GQL_TestLayoutQuery from "$houdini/plugins/houdini-svelte/stores/TestLayoutQuery";'
 		)
+
+		expect(route.script).toMatchInlineSnapshot(
+			'import GQL_TestLayoutQuery from "$houdini/plugins/houdini-svelte/stores/TestLayoutQuery";'
+		)
+
+		expect(route.layout).toMatchInlineSnapshot(`
+			import { page } from "$app/stores";
+			import { extractSession, setClientSession } from "$houdini/plugins/houdini-svelte/runtime/session";
+			import { onMount } from "svelte";
+			import { setClientStarted } from "$houdini/plugins/houdini-svelte/runtime/adapter";
+			import GQL_TestLayoutQuery from "$houdini/plugins/houdini-svelte/stores/TestLayoutQuery";
+			onMount(() => setClientStarted());
+
+			page.subscribe(val => {
+			    setClientSession(extractSession(val.data));
+			});
+		`)
+
 		expect(route.layout_script).toMatchInlineSnapshot(`
 			import { load_TestLayoutQuery } from "$houdini/plugins/houdini-svelte/stores/TestLayoutQuery";
 			import { getCurrentConfig } from "$houdini/runtime/lib/config";

package/src/plugin/transforms/kit/load.ts

@@ -11,6 +11,7 @@ import { parseSvelte } from '../../extract'
 import { extract_load_function } from '../../extractLoadFunction'
 import {
 	HoudiniRouteScript,
+	is_layout,
 	is_route,
 	is_route_script,
 	layout_query_path,
@@ -63,21 +64,30 @@ export default async function kit_load_generator(page: SvelteTransformPage) {
 		find_page_info(page),
 	])
 
-	const queries = inline_queries.concat(layout_query ?? []).concat(page_query ?? [])
+	const houdini_load_queries = []
 	for (const [i, target] of (page_info.houdini_load ?? []).entries()) {
-		queries.push({
+		houdini_load_queries.push({
 			name: target.name!.value,
 			variables: operation_requires_variables(target),
 			store_id: AST.memberExpression(AST.identifier('houdini_load'), AST.literal(i)),
 		})
 	}
 
-	// if we are processing a route config file (+page.ts)
+	// add the load functions
 	if (script) {
-		// add the load function to the query file
+		const queries_that_needs_a_load = [...houdini_load_queries, ...inline_queries]
+		// Add special queries files to the list only if we are in the good context
+		const isLayout = is_layout(page.framework, page.filepath)
+		if (isLayout && layout_query) {
+			queries_that_needs_a_load.push(layout_query)
+		}
+		if (!isLayout && page_query) {
+			queries_that_needs_a_load.push(page_query)
+		}
+
 		add_load({
 			page,
-			queries,
+			queries: queries_that_needs_a_load,
 			page_info,
 		})
 	}

package/build/plugin/codegen/adapter.d.ts

@@ -1,2 +0,0 @@
-import { PluginGenerateInput } from '.';
-export default function generateAdapter({ config, framework }: PluginGenerateInput): Promise<void>;

package/build/plugin/imports.d.ts

@@ -1,15 +0,0 @@
-import { Config, Script } from 'houdini';
-import recast from 'recast';
-declare type Identifier = recast.types.namedTypes.Identifier;
-export declare function store_import({ config, script, artifact, local, }: {
-    config: Config;
-    script: Script;
-    artifact: {
-        name: string;
-    };
-    local?: string;
-}): {
-    id: Identifier;
-    added: number;
-};
-export {};

package/src/plugin/codegen/adapter.ts

@@ -1,45 +0,0 @@
-import { fs, path } from 'houdini'
-
-import { PluginGenerateInput } from '.'
-
-export default async function generateAdapter({ config, framework }: PluginGenerateInput) {
-	// we only need to generate an adapter for kit (the default one is fine for vanilla svelte)
-	if (framework !== 'kit') {
-		return
-	}
-
-	// the location of the adapter
-	const adapterLocation = path.join(config.pluginRuntimeDirectory('houdini-svelte'), 'adapter.js')
-
-	// figure out which adapter we need to lay down
-	const adapter = {
-		kit: sveltekitAdapter,
-	}[framework]
-
-	// write the index file that exports the runtime
-	await fs.mkdirp(path.dirname(adapterLocation))
-	await fs.writeFile(adapterLocation, adapter)
-}
-
-const sveltekitAdapter = `import { goto as go } from '$app/navigation'
-import { get } from 'svelte/store';
-import { browser, prerendering } from '$app/environment'
-import { page } from '$app/stores'
-import { error as svelteKitError } from '@sveltejs/kit'
-
-export function goTo(location, options) {
-    go(location, options)
-}
-
-export const isBrowser = browser
-
-export let clientStarted = false;
-
-export function setClientStarted() {
-	clientStarted = true
-}
-
-export const isPrerender = prerendering
-
-export const error = svelteKitError
-`

package/src/plugin/imports.ts

@@ -1,28 +0,0 @@
-import { Config, Script } from 'houdini'
-import { ensure_imports } from 'houdini/vite'
-import recast from 'recast'
-
-import { store_import_path } from './kit'
-
-type Identifier = recast.types.namedTypes.Identifier
-
-export function store_import({
-	config,
-	script,
-	artifact,
-	local,
-}: {
-	config: Config
-	script: Script
-	artifact: { name: string }
-	local?: string
-}): { id: Identifier; added: number } {
-	const { ids, added } = ensure_imports({
-		config,
-		script,
-		sourceModule: store_import_path({ config, name: artifact.name }),
-		import: `GQL_${artifact.name}`,
-	})
-
-	return { id: ids, added }
-}