@sveltejs/adapter-netlify 1.0.0-next.38 → 1.0.0-next.41

package/README.md

@@ -51,7 +51,7 @@ During compilation, redirect rules are automatically appended to your `_redirect
 ### Using Netlify Forms
 
 1. Create your Netlify HTML form as described [here](https://docs.netlify.com/forms/setup/#html-forms), e.g. as `/routes/contact.svelte`. (Don't forget to add the hidden `form-name` input element!)
-2. Netlify's build bot parses your HTML files at deploy time, which means your form must be [prerendered](https://kit.svelte.dev/docs#ssr-and-javascript-prerender) as HTML. You can either add `export const prerender = true` to your `contact.svelte` to prerender just that page or set the `kit.prerender.force: true` option to prerender all pages.
+2. Netlify's build bot parses your HTML files at deploy time, which means your form must be [prerendered](https://kit.svelte.dev/docs#page-options-prerender) as HTML. You can either add `export const prerender = true` to your `contact.svelte` to prerender just that page or set the `kit.prerender.force: true` option to prerender all pages.
 3. If your Netlify form has a [custom success message](https://docs.netlify.com/forms/setup/#success-messages) like `<form netlify ... action="/success">` then ensure the corresponding `/routes/success.svelte` exists and is prerendered.
 
 ### Using Netlify Functions

package/files/cjs/handler.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var handler = require('./handler-a3623ede.js');
-require('./server/app.js');
+require('./shims-24e5b259.js');
+var APP = require('APP');
 require('node:http');
 require('node:https');
 require('node:zlib');
@@ -12,6 +12,78 @@ require('node:util');
 require('node:url');
 require('net');
 
+/**
+ * @param {import('@sveltejs/kit').SSRManifest} manifest
+ * @returns {import('@netlify/functions').Handler}
+ */
+function init(manifest) {
+	const app = new APP.App(manifest);
 
+	return async (event) => {
+		const { httpMethod, headers, rawUrl, body, isBase64Encoded } = event;
 
-exports.init = handler.init;
+		const encoding = isBase64Encoded ? 'base64' : 'utf-8';
+		const rawBody = typeof body === 'string' ? Buffer.from(body, encoding) : body;
+
+		const rendered = await app.render(
+			new Request(rawUrl, {
+				method: httpMethod,
+				headers: new Headers(headers),
+				body: rawBody
+			})
+		);
+
+		const partial_response = {
+			statusCode: rendered.status,
+			...split_headers(rendered.headers)
+		};
+
+		// TODO this is probably wrong now?
+		if (rendered.body instanceof Uint8Array) {
+			// Function responses should be strings (or undefined), and responses with binary
+			// content should be base64 encoded and set isBase64Encoded to true.
+			// https://github.com/netlify/functions/blob/main/src/function/response.ts
+			return {
+				...partial_response,
+				isBase64Encoded: true,
+				body: Buffer.from(rendered.body).toString('base64')
+			};
+		}
+
+		return {
+			...partial_response,
+			body: await rendered.text()
+		};
+	};
+}
+
+/**
+ * Splits headers into two categories: single value and multi value
+ * @param {Headers} headers
+ * @returns {{
+ *   headers: Record<string, string>,
+ *   multiValueHeaders: Record<string, string[]>
+ * }}
+ */
+function split_headers(headers) {
+	/** @type {Record<string, string>} */
+	const h = {};
+
+	/** @type {Record<string, string[]>} */
+	const m = {};
+
+	headers.forEach((value, key) => {
+		if (key === 'set-cookie') {
+			m[key] = value.split(', ');
+		} else {
+			h[key] = value;
+		}
+	});
+
+	return {
+		headers: h,
+		multiValueHeaders: m
+	};
+}
+
+exports.init = init;

package/files/cjs/{multipart-parser-e24c3004.js → multipart-parser-52bc5518.js}

@@ -3,7 +3,7 @@
 require('node:fs');
 require('node:path');
 var node_worker_threads = require('node:worker_threads');
-var handler = require('./handler-a3623ede.js');
+var shims = require('./shims-24e5b259.js');
 require('node:http');
 require('node:https');
 require('node:zlib');
@@ -11,7 +11,6 @@ require('node:stream');
 require('node:util');
 require('node:url');
 require('net');
-require('./server/app.js');
 
 globalThis.DOMException || (() => {
   const port = new node_worker_threads.MessageChannel().port1;
@@ -371,7 +370,7 @@ async function toFormData(Body, ct) {
 	let contentType;
 	let filename;
 	const entryChunks = [];
-	const formData = new handler.FormData();
+	const formData = new shims.FormData();
 
 	const onPartData = ui8a => {
 		entryValue += decoder.decode(ui8a, {stream: true});
@@ -382,7 +381,7 @@ async function toFormData(Body, ct) {
 	};
 
 	const appendFileToFormData = () => {
-		const file = new handler.File(entryChunks, filename, {type: contentType});
+		const file = new shims.File(entryChunks, filename, {type: contentType});
 		formData.append(entryName, file);
 	};
 

package/files/cjs/{handler-a3623ede.js → shims-24e5b259.js}

@@ -7,7 +7,6 @@ var Stream = require('node:stream');
 var node_util = require('node:util');
 var node_url = require('node:url');
 var net = require('net');
-var app_js = require('./server/app.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -4850,7 +4849,7 @@ class Body {
 			return formData;
 		}
 
-		const {toFormData} = await Promise.resolve().then(function () { return require('./multipart-parser-e24c3004.js'); });
+		const {toFormData} = await Promise.resolve().then(function () { return require('./multipart-parser-52bc5518.js'); });
 		return toFormData(this.body, ct);
 	}
 
@@ -6504,18 +6503,22 @@ function __fetch_polyfill() {
 	Object.defineProperties(globalThis, {
 		fetch: {
 			enumerable: true,
+			configurable: true,
 			value: fetch
 		},
 		Response: {
 			enumerable: true,
+			configurable: true,
 			value: Response
 		},
 		Request: {
 			enumerable: true,
+			configurable: true,
 			value: Request
 		},
 		Headers: {
 			enumerable: true,
+			configurable: true,
 			value: Headers
 		}
 	});
@@ -6523,84 +6526,5 @@ function __fetch_polyfill() {
 
 __fetch_polyfill();
 
-/**
- *
- * @param {import('@sveltejs/kit').SSRManifest} manifest
- * @returns {import('@netlify/functions').Handler}
- */
-function init(manifest) {
-	/** @type {import('@sveltejs/kit').App} */
-	const app = new app_js.App(manifest);
-
-	return async (event) => {
-		const { httpMethod, headers, rawUrl, body, isBase64Encoded } = event;
-
-		const encoding = isBase64Encoded ? 'base64' : 'utf-8';
-		const rawBody = typeof body === 'string' ? Buffer.from(body, encoding) : body;
-
-		const rendered = await app.render({
-			url: rawUrl,
-			method: httpMethod,
-			headers,
-			rawBody
-		});
-
-		if (!rendered) {
-			return {
-				statusCode: 404,
-				body: 'Not found'
-			};
-		}
-
-		const partial_response = {
-			statusCode: rendered.status,
-			...split_headers(rendered.headers)
-		};
-
-		if (rendered.body instanceof Uint8Array) {
-			// Function responses should be strings (or undefined), and responses with binary
-			// content should be base64 encoded and set isBase64Encoded to true.
-			// https://github.com/netlify/functions/blob/main/src/function/response.ts
-			return {
-				...partial_response,
-				isBase64Encoded: true,
-				body: Buffer.from(rendered.body).toString('base64')
-			};
-		}
-
-		return {
-			...partial_response,
-			body: rendered.body
-		};
-	};
-}
-
-/**
- * Splits headers into two categories: single value and multi value
- * @param {Record<string, string | string[]>} headers
- * @returns {{
- *   headers: Record<string, string>,
- *   multiValueHeaders: Record<string, string[]>
- * }}
- */
-function split_headers(headers) {
-	/** @type {Record<string, string>} */
-	const h = {};
-
-	/** @type {Record<string, string[]>} */
-	const m = {};
-
-	for (const key in headers) {
-		const value = headers[key];
-		const target = Array.isArray(value) ? m : h;
-		target[key] = value;
-	}
-	return {
-		headers: h,
-		multiValueHeaders: m
-	};
-}
-
 exports.File = File;
 exports.FormData = FormData;
-exports.init = init;

package/files/cjs/shims.js

@@ -0,0 +1,11 @@
+'use strict';
+
+require('./shims-24e5b259.js');
+require('node:http');
+require('node:https');
+require('node:zlib');
+require('node:stream');
+require('node:util');
+require('node:url');
+require('net');
+

package/files/esm/handler.js

@@ -1,5 +1,5 @@
-export { i as init } from './handler-1cae7b39.js';
-import './server/app.js';
+import './shims-c8fba98f.js';
+import { App } from 'APP';
 import 'node:http';
 import 'node:https';
 import 'node:zlib';
@@ -7,3 +7,79 @@ import 'node:stream';
 import 'node:util';
 import 'node:url';
 import 'net';
+
+/**
+ * @param {import('@sveltejs/kit').SSRManifest} manifest
+ * @returns {import('@netlify/functions').Handler}
+ */
+function init(manifest) {
+	const app = new App(manifest);
+
+	return async (event) => {
+		const { httpMethod, headers, rawUrl, body, isBase64Encoded } = event;
+
+		const encoding = isBase64Encoded ? 'base64' : 'utf-8';
+		const rawBody = typeof body === 'string' ? Buffer.from(body, encoding) : body;
+
+		const rendered = await app.render(
+			new Request(rawUrl, {
+				method: httpMethod,
+				headers: new Headers(headers),
+				body: rawBody
+			})
+		);
+
+		const partial_response = {
+			statusCode: rendered.status,
+			...split_headers(rendered.headers)
+		};
+
+		// TODO this is probably wrong now?
+		if (rendered.body instanceof Uint8Array) {
+			// Function responses should be strings (or undefined), and responses with binary
+			// content should be base64 encoded and set isBase64Encoded to true.
+			// https://github.com/netlify/functions/blob/main/src/function/response.ts
+			return {
+				...partial_response,
+				isBase64Encoded: true,
+				body: Buffer.from(rendered.body).toString('base64')
+			};
+		}
+
+		return {
+			...partial_response,
+			body: await rendered.text()
+		};
+	};
+}
+
+/**
+ * Splits headers into two categories: single value and multi value
+ * @param {Headers} headers
+ * @returns {{
+ *   headers: Record<string, string>,
+ *   multiValueHeaders: Record<string, string[]>
+ * }}
+ */
+function split_headers(headers) {
+	/** @type {Record<string, string>} */
+	const h = {};
+
+	/** @type {Record<string, string[]>} */
+	const m = {};
+
+	headers.forEach((value, key) => {
+		if (key === 'set-cookie') {
+			m[key] = value.split(', ');
+		} else {
+			h[key] = value;
+		}
+	});
+
+	return {
+		headers: h,
+		multiValueHeaders: m
+	};
+}
+
+export { init };

package/files/esm/{multipart-parser-b42aadce.js → multipart-parser-a360c9ae.js}

@@ -1,7 +1,7 @@
 import 'node:fs';
 import 'node:path';
 import { MessageChannel } from 'node:worker_threads';
-import { F as FormData, a as File } from './handler-1cae7b39.js';
+import { F as FormData, a as File } from './shims-c8fba98f.js';
 import 'node:http';
 import 'node:https';
 import 'node:zlib';
@@ -9,7 +9,6 @@ import 'node:stream';
 import 'node:util';
 import 'node:url';
 import 'net';
-import './server/app.js';
 
 globalThis.DOMException || (() => {
   const port = new MessageChannel().port1;

package/files/esm/{handler-1cae7b39.js → shims-c8fba98f.js}

@@ -5,7 +5,6 @@ import Stream, { PassThrough, pipeline } from 'node:stream';
 import { deprecate, types } from 'node:util';
 import { format } from 'node:url';
 import { isIP } from 'net';
-import { App } from './server/app.js';
 
 /**
  * Returns a `Buffer` instance from the given data URI `uri`.
@@ -4841,7 +4840,7 @@ class Body {
 			return formData;
 		}
 
-		const {toFormData} = await import('./multipart-parser-b42aadce.js');
+		const {toFormData} = await import('./multipart-parser-a360c9ae.js');
 		return toFormData(this.body, ct);
 	}
 
@@ -6495,18 +6494,22 @@ function __fetch_polyfill() {
 	Object.defineProperties(globalThis, {
 		fetch: {
 			enumerable: true,
+			configurable: true,
 			value: fetch
 		},
 		Response: {
 			enumerable: true,
+			configurable: true,
 			value: Response
 		},
 		Request: {
 			enumerable: true,
+			configurable: true,
 			value: Request
 		},
 		Headers: {
 			enumerable: true,
+			configurable: true,
 			value: Headers
 		}
 	});
@@ -6514,82 +6517,4 @@ function __fetch_polyfill() {
 
 __fetch_polyfill();
 
-/**
- *
- * @param {import('@sveltejs/kit').SSRManifest} manifest
- * @returns {import('@netlify/functions').Handler}
- */
-function init(manifest) {
-	/** @type {import('@sveltejs/kit').App} */
-	const app = new App(manifest);
-
-	return async (event) => {
-		const { httpMethod, headers, rawUrl, body, isBase64Encoded } = event;
-
-		const encoding = isBase64Encoded ? 'base64' : 'utf-8';
-		const rawBody = typeof body === 'string' ? Buffer.from(body, encoding) : body;
-
-		const rendered = await app.render({
-			url: rawUrl,
-			method: httpMethod,
-			headers,
-			rawBody
-		});
-
-		if (!rendered) {
-			return {
-				statusCode: 404,
-				body: 'Not found'
-			};
-		}
-
-		const partial_response = {
-			statusCode: rendered.status,
-			...split_headers(rendered.headers)
-		};
-
-		if (rendered.body instanceof Uint8Array) {
-			// Function responses should be strings (or undefined), and responses with binary
-			// content should be base64 encoded and set isBase64Encoded to true.
-			// https://github.com/netlify/functions/blob/main/src/function/response.ts
-			return {
-				...partial_response,
-				isBase64Encoded: true,
-				body: Buffer.from(rendered.body).toString('base64')
-			};
-		}
-
-		return {
-			...partial_response,
-			body: rendered.body
-		};
-	};
-}
-
-/**
- * Splits headers into two categories: single value and multi value
- * @param {Record<string, string | string[]>} headers
- * @returns {{
- *   headers: Record<string, string>,
- *   multiValueHeaders: Record<string, string[]>
- * }}
- */
-function split_headers(headers) {
-	/** @type {Record<string, string>} */
-	const h = {};
-
-	/** @type {Record<string, string[]>} */
-	const m = {};
-
-	for (const key in headers) {
-		const value = headers[key];
-		const target = Array.isArray(value) ? m : h;
-		target[key] = value;
-	}
-	return {
-		headers: h,
-		multiValueHeaders: m
-	};
-}
-
-export { FormData as F, File as a, init as i };
+export { FormData as F, File as a };

package/files/esm/shims.js

@@ -0,0 +1,8 @@
+import './shims-c8fba98f.js';
+import 'node:http';
+import 'node:https';
+import 'node:zlib';
+import 'node:stream';
+import 'node:util';
+import 'node:url';
+import 'net';

package/index.js

@@ -50,8 +50,12 @@ export default function ({ split = false } = {}) {
 			/** @type {string[]} */
 			const redirects = [];
 
+			const replace = {
+				APP: './server/app.js'
+			};
+
 			if (esm) {
-				builder.copy(`${files}/esm`, '.netlify');
+				builder.copy(`${files}/esm`, '.netlify', { replace });
 			} else {
 				glob('**/*.js', { cwd: '.netlify/server' }).forEach((file) => {
 					const filepath = `.netlify/server/${file}`;
@@ -60,7 +64,7 @@ export default function ({ split = false } = {}) {
 					writeFileSync(filepath, output);
 				});
 
-				builder.copy(`${files}/cjs`, '.netlify');
+				builder.copy(`${files}/cjs`, '.netlify', { replace });
 				writeFileSync(join('.netlify', 'package.json'), JSON.stringify({ type: 'commonjs' }));
 			}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-netlify",
-  "version": "1.0.0-next.38",
+  "version": "1.0.0-next.41",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -31,7 +31,7 @@
     "@rollup/plugin-commonjs": "^21.0.0",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.0.5",
-    "@sveltejs/kit": "1.0.0-next.218",
+    "@sveltejs/kit": "1.0.0-next.234",
     "rimraf": "^3.0.2",
     "rollup": "^2.58.0"
   },