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

package/files/cjs/handler.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('./shims-24e5b259.js');
-var app_js = require('./server/app.js');
+var APP = require('APP');
 require('node:http');
 require('node:https');
 require('node:zlib');
@@ -13,13 +13,11 @@ require('node:url');
 require('net');
 
 /**
- *
  * @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);
+	const app = new APP.App(manifest);
 
 	return async (event) => {
 		const { httpMethod, headers, rawUrl, body, isBase64Encoded } = event;
@@ -27,25 +25,20 @@ function init(manifest) {
 		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 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.
@@ -59,14 +52,14 @@ function init(manifest) {
 
 		return {
 			...partial_response,
-			body: rendered.body
+			body: await rendered.text()
 		};
 	};
 }
 
 /**
  * Splits headers into two categories: single value and multi value
- * @param {Record<string, string | string[]>} headers
+ * @param {Headers} headers
  * @returns {{
  *   headers: Record<string, string>,
  *   multiValueHeaders: Record<string, string[]>
@@ -79,11 +72,14 @@ function split_headers(headers) {
 	/** @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;
-	}
+	headers.forEach((value, key) => {
+		if (key === 'set-cookie') {
+			m[key] = value.split(', ');
+		} else {
+			h[key] = value;
+		}
+	});
+
 	return {
 		headers: h,
 		multiValueHeaders: m

package/files/esm/handler.js

@@ -1,5 +1,5 @@
 import './shims-c8fba98f.js';
-import { App } from './server/app.js';
+import { App } from 'APP';
 import 'node:http';
 import 'node:https';
 import 'node:zlib';
@@ -9,12 +9,10 @@ import 'node:url';
 import 'net';
 
 /**
- *
  * @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) => {
@@ -23,25 +21,20 @@ function init(manifest) {
 		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 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.
@@ -55,14 +48,14 @@ function init(manifest) {
 
 		return {
 			...partial_response,
-			body: rendered.body
+			body: await rendered.text()
 		};
 	};
 }
 
 /**
  * Splits headers into two categories: single value and multi value
- * @param {Record<string, string | string[]>} headers
+ * @param {Headers} headers
  * @returns {{
  *   headers: Record<string, string>,
  *   multiValueHeaders: Record<string, string[]>
@@ -75,11 +68,14 @@ function split_headers(headers) {
 	/** @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;
-	}
+	headers.forEach((value, key) => {
+		if (key === 'set-cookie') {
+			m[key] = value.split(', ');
+		} else {
+			h[key] = value;
+		}
+	});
+
 	return {
 		headers: h,
 		multiValueHeaders: m

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.40",
+  "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.233",
+    "@sveltejs/kit": "1.0.0-next.234",
     "rimraf": "^3.0.2",
     "rollup": "^2.58.0"
   },