houdini-svelte 0.17.0 → 0.17.1

package/.turbo/turbo-compile.log

@@ -1,5 +1,5 @@
-houdini-svelte:compile: cache hit, replaying output d2038584b36d45dd
+houdini-svelte:compile: cache hit, replaying output aadda8d104f20a37
 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.1 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 e36eb7179ec2204c
 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.1 typedefs /home/runner/work/houdini/houdini/packages/houdini-svelte
 houdini-svelte:typedefs: > scripts typedefs --plugin
 houdini-svelte:typedefs: 

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # houdini-svelte
 
+## 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-cjs/index.js

@@ -183561,14 +183561,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 +183590,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;

package/build/plugin-esm/index.js

@@ -183557,14 +183557,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 +183586,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;

package/build/test-cjs/index.js

@@ -300305,14 +300305,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 +300334,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;

package/build/test-esm/index.js

@@ -300294,14 +300294,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 +300323,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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini-svelte",
-  "version": "0.17.0",
+  "version": "0.17.1",
   "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.1",
     "minimatch": "^5.1.0",
     "recast": "^0.21.5",
     "svelte": "^3.52.0"

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'])