@sveltejs/adapter-netlify 5.2.0 → 5.2.2

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

@@ -17,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);
 
@@ -30,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(
@@ -114,7 +125,7 @@ export default function ({ split = false, edge = edge_set_in_env_var } = {}) {
 }
 /**
  * @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');
@@ -148,7 +159,8 @@ async function generate_edge_functions({ builder }) {
 	// Netlify will handle the optional trailing slash for us
 	const excluded = [
 		// Contains static files
-		`/${builder.getAppPath()}/*`,
+		`/${builder.getAppPath()}/immutable/*`,
+		`/${builder.getAppPath()}/version.json`,
 		...builder.prerendered.paths,
 		...Array.from(assets).flatMap((asset) => {
 			if (asset.endsWith('/index.html')) {
@@ -202,7 +214,7 @@ async function generate_edge_functions({ builder }) {
 			outfile: '.netlify/edge-functions/render.js',
 			...esbuild_config
 		}),
-		builder.hasServerInstrumentationFile() &&
+		builder.hasServerInstrumentationFile?.() &&
 			esbuild.build({
 				entryPoints: [`${builder.getServerDirectory()}/instrumentation.server.js`],
 				outfile: '.netlify/edge/instrumentation.server.js',
@@ -210,8 +222,8 @@ async function generate_edge_functions({ builder }) {
 			})
 	]);
 
-	if (builder.hasServerInstrumentationFile()) {
-		builder.instrument({
+	if (builder.hasServerInstrumentationFile?.()) {
+		builder.instrument?.({
 			entrypoint: '.netlify/edge-functions/render.js',
 			instrumentation: '.netlify/edge/instrumentation.server.js',
 			start: '.netlify/edge/start.js'
@@ -222,7 +234,7 @@ async function generate_edge_functions({ builder }) {
 }
 /**
  * @param { object } params
- * @param {import('@sveltejs/kit').Builder} params.builder
+ * @param {Builder2_4_0} params.builder
  * @param { string } params.publish
  * @param { boolean } params.split
  */
@@ -294,8 +306,8 @@ 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({
+			if (builder.hasServerInstrumentationFile?.()) {
+				builder.instrument?.({
 					entrypoint: `.netlify/functions-internal/${name}.mjs`,
 					instrumentation: '.netlify/server/instrumentation.server.js',
 					start: `.netlify/functions-start/${name}.start.mjs`,
@@ -318,8 +330,8 @@ 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({
+		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`,
@@ -356,8 +368,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.2.0",
+  "version": "5.2.2",
   "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.31.0"
+    "@sveltejs/kit": "^2.33.1"
   },
   "peerDependencies": {
     "@sveltejs/kit": "^2.4.0"