@sveltejs/adapter-netlify 5.1.1 → 5.2.1

package/files/serverless.js

@@ -290,8 +290,9 @@ function createReadableStream(file) {
 function init(manifest) {
 	const server = new Server(manifest);
 
+	/** @type {Promise<void> | null} */
 	let init_promise = server.init({
-		env: process.env,
+		env: /** @type {Record<string, string>} */ (process.env),
 		read: (file) => createReadableStream(`.netlify/server/${file}`)
 	});
 
@@ -304,7 +305,7 @@ function init(manifest) {
 		const response = await server.respond(to_request(event), {
 			platform: { context },
 			getClientAddress() {
-				return event.headers['x-nf-client-connection-ip'];
+				return /** @type {string} */ (event.headers['x-nf-client-connection-ip']);
 			}
 		});
 
@@ -335,13 +336,11 @@ function init(manifest) {
  * @param {import('@netlify/functions').HandlerEvent} event
  * @returns {Request}
  */
-function to_request(event) {
-	const { httpMethod, headers, rawUrl, body, isBase64Encoded } = event;
-
+function to_request({ httpMethod, headers, rawUrl, body, isBase64Encoded }) {
 	/** @type {RequestInit} */
 	const init = {
 		method: httpMethod,
-		headers: new Headers(headers)
+		headers: new Headers(/** @type {Record<string, string>} */ (headers))
 	};
 
 	if (httpMethod !== 'GET' && httpMethod !== 'HEAD') {

package/index.js

@@ -1,3 +1,4 @@
+/** @import { BuildOptions } from 'esbuild' */
 import { appendFileSync, existsSync, readdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { dirname, join, resolve, posix } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -16,6 +17,17 @@ const [kit_major, kit_minor] = VERSION.split('.');
  * } & toml.JsonMap} NetlifyConfig
  */
 
+/**
+ * @template T
+ * @template {keyof T} K
+ * @typedef {Partial<Omit<T, K>> & Required<Pick<T, K>>} PartialExcept
+ */
+
+/**
+ * We use a custom `Builder` type here to support the minimum version of SvelteKit.
+ * @typedef {PartialExcept<import('@sveltejs/kit').Builder, 'log' | 'rimraf' | 'mkdirp' | 'config' | 'prerendered' | 'routes' | 'createEntries' | 'findServerAssets' | 'generateFallback' | 'generateEnvModule' | 'generateManifest' | 'getBuildDirectory' | 'getClientDirectory' | 'getServerDirectory' | 'getAppPath' | 'writeClient' | 'writePrerendered' | 'writePrerendered' | 'writeServer' | 'copy' | 'compress'>} Builder2_4_0
+ */
+
 const name = '@sveltejs/adapter-netlify';
 const files = fileURLToPath(new URL('./files', import.meta.url).href);
 
@@ -29,7 +41,7 @@ const FUNCTION_PREFIX = 'sveltekit-';
 export default function ({ split = false, edge = edge_set_in_env_var } = {}) {
 	return {
 		name,
-
+		/** @param {Builder2_4_0} builder */
 		async adapt(builder) {
 			if (!builder.routes) {
 				throw new Error(
@@ -106,13 +118,14 @@ export default function ({ split = false, edge = edge_set_in_env_var } = {}) {
 				}
 
 				return true;
-			}
+			},
+			instrumentation: () => true
 		}
 	};
 }
 /**
  * @param { object } params
- * @param {import('@sveltejs/kit').Builder} params.builder
+ * @param {Builder2_4_0} params.builder
  */
 async function generate_edge_functions({ builder }) {
 	const tmp = builder.getBuildDirectory('netlify-tmp');
@@ -174,9 +187,8 @@ async function generate_edge_functions({ builder }) {
 		version: 1
 	};
 
-	await esbuild.build({
-		entryPoints: [`${tmp}/entry.js`],
-		outfile: '.netlify/edge-functions/render.js',
+	/** @type {BuildOptions} */
+	const esbuild_config = {
 		bundle: true,
 		format: 'esm',
 		platform: 'browser',
@@ -194,13 +206,34 @@ async function generate_edge_functions({ builder }) {
 		// https://docs.netlify.com/edge-functions/api/#runtime-environment
 		external: builtinModules.map((id) => `node:${id}`),
 		alias: Object.fromEntries(builtinModules.map((id) => [id, `node:${id}`]))
-	});
+	};
+	await Promise.all([
+		esbuild.build({
+			entryPoints: [`${tmp}/entry.js`],
+			outfile: '.netlify/edge-functions/render.js',
+			...esbuild_config
+		}),
+		builder.hasServerInstrumentationFile?.() &&
+			esbuild.build({
+				entryPoints: [`${builder.getServerDirectory()}/instrumentation.server.js`],
+				outfile: '.netlify/edge/instrumentation.server.js',
+				...esbuild_config
+			})
+	]);
+
+	if (builder.hasServerInstrumentationFile?.()) {
+		builder.instrument?.({
+			entrypoint: '.netlify/edge-functions/render.js',
+			instrumentation: '.netlify/edge/instrumentation.server.js',
+			start: '.netlify/edge/start.js'
+		});
+	}
 
 	writeFileSync('.netlify/edge-functions/manifest.json', JSON.stringify(edge_manifest));
 }
 /**
  * @param { object } params
- * @param {import('@sveltejs/kit').Builder} params.builder
+ * @param {Builder2_4_0} params.builder
  * @param { string } params.publish
  * @param { boolean } params.split
  */
@@ -272,6 +305,16 @@ function generate_lambda_functions({ builder, publish, split }) {
 
 			writeFileSync(`.netlify/functions-internal/${name}.mjs`, fn);
 			writeFileSync(`.netlify/functions-internal/${name}.json`, fn_config);
+			if (builder.hasServerInstrumentationFile?.()) {
+				builder.instrument?.({
+					entrypoint: `.netlify/functions-internal/${name}.mjs`,
+					instrumentation: '.netlify/server/instrumentation.server.js',
+					start: `.netlify/functions-start/${name}.start.mjs`,
+					module: {
+						exports: ['handler']
+					}
+				});
+			}
 
 			const redirect = `/.netlify/functions/${name} 200`;
 			redirects.push(`${pattern} ${redirect}`);
@@ -286,6 +329,17 @@ function generate_lambda_functions({ builder, publish, split }) {
 
 		writeFileSync(`.netlify/functions-internal/${FUNCTION_PREFIX}render.json`, fn_config);
 		writeFileSync(`.netlify/functions-internal/${FUNCTION_PREFIX}render.mjs`, fn);
+		if (builder.hasServerInstrumentationFile?.()) {
+			builder.instrument?.({
+				entrypoint: `.netlify/functions-internal/${FUNCTION_PREFIX}render.mjs`,
+				instrumentation: '.netlify/server/instrumentation.server.js',
+				start: `.netlify/functions-start/${FUNCTION_PREFIX}render.start.mjs`,
+				module: {
+					exports: ['handler']
+				}
+			});
+		}
+
 		redirects.push(`* /.netlify/functions/${FUNCTION_PREFIX}render 200`);
 	}
 
@@ -313,8 +367,8 @@ function get_netlify_config() {
 }
 
 /**
- * @param {NetlifyConfig} netlify_config
- * @param {import('@sveltejs/kit').Builder} builder
+ * @param {NetlifyConfig | null} netlify_config
+ * @param {Builder2_4_0} builder
  **/
 function get_publish_directory(netlify_config, builder) {
 	if (netlify_config) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-netlify",
-  "version": "5.1.1",
+  "version": "5.2.1",
   "description": "A SvelteKit adapter that creates a Netlify app",
   "keywords": [
     "adapter",
@@ -48,7 +48,7 @@
     "rollup": "^4.14.2",
     "typescript": "^5.3.3",
     "vitest": "^3.2.3",
-    "@sveltejs/kit": "^2.27.3"
+    "@sveltejs/kit": "^2.31.1"
   },
   "peerDependencies": {
     "@sveltejs/kit": "^2.4.0"