dont ssr load local schema ever

HoudiniGraphql · Sep 28, 2023 · 523abe9 · 523abe9
1 parent ff58f3e
commit 523abe9
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 18 deletions.
diff --git a/packages/houdini-plugin-svelte-global-stores/package.json b/packages/houdini-plugin-svelte-global-stores/package.json
@@ -58,4 +58,4 @@
     },
     "main": "./build/plugin-cjs/index.js",
     "types": "./build/plugin/index.d.ts"
-}
+}
diff --git a/packages/houdini-react/package.json b/packages/houdini-react/package.json
@@ -64,4 +64,4 @@
     },
     "main": "./build/plugin-cjs/index.js",
     "types": "./build/plugin/index.d.ts"
-}
+}
diff --git a/packages/houdini-react/src/plugin/vite.tsx b/packages/houdini-react/src/plugin/vite.tsx
@@ -12,7 +12,7 @@ import {
 	RouterManifest,
 	find_match,
 	localApiEndpoint,
-	buildLocalSchema,
+	loadLocalSchema,
 } from 'houdini'
 import type { BuildOptions } from 'vite'
 
@@ -227,12 +227,7 @@ if (window.__houdini__nav_caches__ && window.__houdini__nav_caches__.artifact_ca
 			// import the schema
 			let schema: GraphQLSchema | null = null
 			if (project_manifest.local_schema) {
-				await buildLocalSchema(server.houdiniConfig)
-				schema = (
-					await server.ssrLoadModule(
-						path.join(server.houdiniConfig.rootDir, 'temp', 'assets', 'schema.js')
-					)
-				).default
+				schema = await loadLocalSchema(server.houdiniConfig)
 			}
 			// import the schema
 			const serverAdapter: (

diff --git a/packages/houdini-svelte/package.json b/packages/houdini-svelte/package.json
@@ -72,4 +72,4 @@
     },
     "main": "./build/plugin-cjs/index.js",
     "types": "./build/plugin/index.d.ts"
-}
+}
diff --git a/packages/houdini/package.json b/packages/houdini/package.json
@@ -109,4 +109,4 @@
     "bin": "./build/cmd-esm/index.js",
     "main": "./build/lib-cjs/index.js",
     "types": "./build/lib/index.d.ts"
-}
+}
diff --git a/packages/houdini/src/lib/router/server.ts b/packages/houdini/src/lib/router/server.ts
@@ -13,6 +13,7 @@ export async function buildLocalSchema(config: Config): Promise<void> {
 
 	process.env.HOUDINI_SCHEMA_BUILD = 'true'
 
+	console.log(path.join(config.localApiDir, '+schema'))
 	// build the schema somewhere we can import from
 	await build({
 		logLevel: 'silent',

diff --git a/packages/houdini/src/vite/houdini.ts b/packages/houdini/src/vite/houdini.ts
@@ -189,13 +189,7 @@ export default function Plugin(opts: PluginConfig = {}): VitePlugin {
 
 			// if there is a local schema we need to use that when generating
 			if (config.localSchema) {
-				await buildLocalSchema(config)
-				const { default: schema } = (await server.ssrLoadModule(
-					path.join(config.rootDir, 'temp', 'assets', 'schema.js')
-				),
-				{}) as { default: graphql.GraphQLSchema }
-
-				config.schema = schema
+				config.schema = await loadLocalSchema(config)
 			}
 
 			process.env.HOUDINI_PORT = String(server.config.server.port ?? 5173)
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,4 +58,4 @@ @@
         },
         "main": "./build/plugin-cjs/index.js",
         "types": "./build/plugin/index.d.ts"
-    }
+    }