@skgo/sveltekit-adapter 0.15.0 → 0.16.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@skgo/sveltekit-adapter",
-	"version": "0.15.0",
+	"version": "0.16.1",
 	"description": "SvelteKit adapter for skgo: builds a frontend that a Go binary renders and answers",
 	"keywords": [
 		"adapter",
@@ -40,6 +40,6 @@
 		"skgo-adapter/prerender-csp.js"
 	],
 	"peerDependencies": {
-		"@sveltejs/kit": "^3.0.0-next.0"
+		"@sveltejs/kit": "^3.0.0"
 	}
 }

package/skgo-adapter.js

@@ -113,7 +113,7 @@ export default function skgo({ out = 'build', precompress = true } = {}) {
 		emulate() {
 			return {
 				platform: () => ({
-					async skgoPrerenderLoad(module, event) {
+					async skgoPrerenderLoad(module, source, event) {
 						await buildPrerenderBinary();
 						const headers = Object.fromEntries(
 							[...event.request.headers].map(([name, value]) => [name, [value]])
@@ -133,6 +133,11 @@ export default function skgo({ out = 'build', precompress = true } = {}) {
 						};
 						const raw = await runPrerenderCommand(prerenderBinary, [], prerenderRoot, JSON.stringify(request));
 						const answer = JSON.parse(raw);
+						if (typeof answer.failure === 'string') {
+							throw new Error(
+								`skgo: Go load failed during prerender: route ID ${event.route.id}, path ${event.url.pathname}, source ${source}: ${answer.failure}`
+							);
+						}
 						for (const [name, values] of Object.entries(answer.headers ?? {})) {
 							event.setHeaders({ [name]: values.join(', ') });
 						}
@@ -404,7 +409,7 @@ function writeAppManifest(file, manifest) {
 /**
  * Kit's own server manifest, as an object *and* as text. Kit 3 generates a
  * complete server-instance module instead of returning manifest source. We
- * remove its eager Server import and constructor and export the manifest it
+ * remove its eager create_server import and call and export the manifest it
  * wrote; every remaining import sits inside a lazy thunk, so importing the
  * result resolves nothing and runs no application code. The source is worth
  * keeping because those thunks carry information the imported object has
@@ -413,22 +418,27 @@ function writeAppManifest(file, manifest) {
  * @param {import('@sveltejs/kit').Builder} builder
  * @returns {Promise<{ manifest: any, source: string }>}
  */
-async function readKitManifest(builder) {
+export async function readKitManifest(builder) {
 	const dir = builder.getBuildDirectory('skgo');
 	const file = join(dir, 'kit-manifest.js');
 	mkdirSync(dir, { recursive: true });
 	builder.generateServerInstance(file);
-	let source = readFileSync(file, 'utf8');
-	const original = source;
-	source = source
-		.replace(/^import \{ Server \} from '[^']+';\n/, '')
-		.replace(/^const manifest = /m, 'export const manifest = ')
-		.replace(/\nexport const server = new Server\(manifest\);\n?$/, '\n');
-	if (source === original || !source.includes('export const manifest = ')) {
+	const original = readFileSync(file, 'utf8');
+	// Kit 3's builder writes this wrapper around its lazy manifest. Strip both
+	// sides before importing it: importing Kit's server would execute its module
+	// graph, while this read should only discover what the Go binary must serve.
+	const serverImport = /^import \{ create_server \} from '[^']+';\n/;
+	const serverCall = /\nexport const server = create_server\(manifest\);\n?$/;
+	if (!serverImport.test(original) || !serverCall.test(original) ||
+		!original.replace(serverImport, '').startsWith('const manifest = ')) {
 		throw new Error(
 			'skgo: kit generated a server instance in an unknown shape; refusing to guess where its manifest is'
 		);
 	}
+	const source = original
+		.replace(serverImport, '')
+		.replace(/^const manifest = /, 'export const manifest = ')
+		.replace(serverCall, '\n');
 	writeFileSync(file, source);
 	try {
 		// The cache buster matters: `vp build` can run twice in one process.