Shebang and relative imports (HoudiniGraphql#630)

* add shebang to cmd

* simplify resolveId logic to do the equivalent of resolve_relative

* only perform resolve_relative on non-entries - leave old logic behind for entries

* changeset

* add comment

* more comments

.changeset/small-walls-invite.md

@@ -0,0 +1,5 @@
+---
+'houdini-svelte': patch
+---
+
+Fix relative imports from root layout

.changeset/young-bears-invent.md

@@ -0,0 +1,5 @@
+---
+'houdini': patch
+---
+
+Add shebang to executable

e2e/sveltekit/src/routes/+layout.svelte

@@ -4,6 +4,10 @@
   import cache from '$houdini/runtime/cache';
   import { routes } from '$lib/utils/routes.js';
 
+  // leave this in to make sure we don't break relative imports from
+  // the root layout. see: https://github.com/HoudiniGraphql/houdini/issues/629
+  import Test from './Test.svelte';
+
   if (browser) {
     // @ts-ignore
     window.cache = cache;
@@ -22,7 +26,7 @@
 
 <slot />
 
-<hr />
+<Test />
 
 <nav>
   {#each routesKvp as { key, value }}

e2e/sveltekit/src/routes/Test.svelte

@@ -0,0 +1 @@
+<hr />

packages/_scripts/build.js

@@ -61,7 +61,7 @@ export default async function ({ plugin }) {
 		// cmd needs to be bundled and set as the project's bin
 		else if (dirname === 'cmd') {
 			package_json.bin = './build/cmd-esm/index.js'
-			await build({ package_json, source: dir, plugin })
+			await build({ package_json, source: dir, plugin, cmd: true })
 		}
 
 		// its not a special directory, treat it as a sub module
@@ -82,7 +82,7 @@ export default async function ({ plugin }) {
 }
 
 // create esm and cjs builds of the source
-async function build({ package_json, source, bundle = true, plugin }) {
+async function build({ package_json, source, bundle = true, plugin, cmd }) {
 	// if we aren't bundling, look up the entrypoints once
 	const children = bundle
 		? []
@@ -96,12 +96,12 @@ async function build({ package_json, source, bundle = true, plugin }) {
 			// where we will put everything
 			const target_dir = path.join(build_dir, `${path.basename(source)}-${which}`)
 
-			let header = ''
+			let header = cmd ? '#!/usr/bin/env node\n' : ''
 			if (bundle) {
 				if (plugin) {
-					header = `const require = conflict_free(import.meta.url);`
+					header += `const require = conflict_free(import.meta.url);`
 				} else {
-					header = `import { createRequire as conflict_free } from 'module'; const require = conflict_free(import.meta.url);`
+					header += `import { createRequire as conflict_free } from 'module'; const require = conflict_free(import.meta.url);`
 				}
 			}
 

packages/houdini-svelte/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'])