@sveltejs/adapter-netlify 2.0.2 → 2.0.4

package/files/esm/serverless.js

@@ -1,6 +1,7 @@
 import './shims.js';
 import { Server } from '0SERVER';
 import 'node:stream/web';
+import 'node:buffer';
 import 'node:crypto';
 import 'assert';
 import 'net';

package/files/esm/shims.js

@@ -1,4 +1,5 @@
 import { ReadableStream as ReadableStream$1, TransformStream, WritableStream } from 'node:stream/web';
+import buffer from 'node:buffer';
 import { webcrypto } from 'node:crypto';
 import require$$0$1 from 'assert';
 import require$$4 from 'net';
@@ -20744,6 +20745,9 @@ function requireUndici () {
 
 var undiciExports = requireUndici();
 
+// @ts-expect-error
+const File = buffer.File ?? undiciExports.File;
+
 /** @type {Record<string, any>} */
 const globals = {
 	crypto: webcrypto,
@@ -20754,7 +20758,8 @@ const globals = {
 	ReadableStream: ReadableStream$1,
 	TransformStream,
 	WritableStream,
-	FormData: undiciExports.FormData
+	FormData: undiciExports.FormData,
+	File
 };
 
 // exported for dev/preview and node environments

package/index.js

@@ -1,16 +1,8 @@
-import {
-	appendFileSync,
-	existsSync,
-	readFileSync,
-	writeFileSync,
-	unlinkSync,
-	createReadStream
-} from 'fs';
-import { dirname, join, resolve, posix } from 'path';
-import { fileURLToPath } from 'url';
+import { appendFileSync, existsSync, readdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { dirname, join, resolve, posix } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import esbuild from 'esbuild';
 import toml from '@iarna/toml';
-import { createInterface } from 'readline';
 
 /**
  * @typedef {{
@@ -41,6 +33,8 @@ const edge_set_in_env_var =
 	process.env.NETLIFY_SVELTEKIT_USE_EDGE === 'true' ||
 	process.env.NETLIFY_SVELTEKIT_USE_EDGE === '1';
 
+const FUNCTION_PREFIX = 'sveltekit-';
+
 /** @type {import('.').default} */
 export default function ({ split = false, edge = edge_set_in_env_var } = {}) {
 	return {
@@ -59,40 +53,6 @@ export default function ({ split = false, edge = edge_set_in_env_var } = {}) {
 			// "build" is the default publish directory when Netlify detects SvelteKit
 			const publish = get_publish_directory(netlify_config, builder) || 'build';
 
-			const redirects_file_path = join(publish, '_redirects');
-
-			// If redirects file exists - empty any netlify generated files in functions-internal
-			// Without removing other files that may have been auto generated by integrations
-			if (existsSync(redirects_file_path)) {
-				// Read each line of the file
-				const fileStream = createReadStream(redirects_file_path);
-				const rl = createInterface({
-					input: fileStream,
-					crlfDelay: Infinity
-				});
-
-				// Create an array of lines
-				const lines = [];
-				for await (const line of rl) {
-					lines.push(line);
-				}
-
-				const functions_internal = join('.netlify', 'functions-internal');
-
-				// Loop through redirects, and delete corresponding functions-internal files
-				lines.forEach((line) => {
-					if (line) {
-						// example line /.netlify/functions/{function_name} 200
-						const path = line.split(' ')[1];
-						const function_name = path.split('/').pop();
-						const mjsFile = join(functions_internal, `${function_name}.mjs`);
-						const jsonFile = join(functions_internal, `${function_name}.json`);
-						if (existsSync(mjsFile)) unlinkSync(mjsFile);
-						if (existsSync(jsonFile)) unlinkSync(jsonFile);
-					}
-				});
-			}
-
 			// empty out existing build directories
 			builder.rimraf(publish);
 			builder.rimraf('.netlify/edge-functions');
@@ -100,6 +60,14 @@ export default function ({ split = false, edge = edge_set_in_env_var } = {}) {
 			builder.rimraf('.netlify/package.json');
 			builder.rimraf('.netlify/serverless.js');
 
+			if (existsSync('.netlify/functions-internal')) {
+				for (const file of readdirSync('.netlify/functions-internal')) {
+					if (file.startsWith(FUNCTION_PREFIX)) {
+						builder.rimraf(join('.netlify/functions-internal', file));
+					}
+				}
+			}
+
 			builder.log.minor(`Publishing to "${publish}"`);
 
 			builder.log.minor('Copying assets...');
@@ -195,7 +163,7 @@ async function generate_edge_functions({ builder }) {
  * @param { boolean } params.split
  */
 async function generate_lambda_functions({ builder, publish, split }) {
-	builder.mkdirp('.netlify/functions-internal');
+	builder.mkdirp('.netlify/functions-internal/.svelte-kit');
 
 	/** @type {string[]} */
 	const redirects = [];
@@ -236,7 +204,8 @@ async function generate_lambda_functions({ builder, publish, split }) {
 			}
 
 			const pattern = `/${parts.join('/')}`;
-			const name = parts.join('-').replace(/[:.]/g, '_').replace('*', '__rest') || 'index';
+			const name =
+				FUNCTION_PREFIX + (parts.join('-').replace(/[:.]/g, '_').replace('*', '__rest') || 'index');
 
 			// skip routes with identical patterns, they were already folded into another function
 			if (seen.has(pattern)) continue;
@@ -244,10 +213,11 @@ async function generate_lambda_functions({ builder, publish, split }) {
 
 			// figure out which lower priority routes should be considered fallbacks
 			for (let j = i + 1; j < builder.routes.length; j += 1) {
-				if (routes[j].prerender === true) continue;
+				const other = builder.routes[j];
+				if (other.prerender === true) continue;
 
-				if (matches(route.segments, routes[j].segments)) {
-					routes.push(builder.routes[j]);
+				if (matches(route.segments, other.segments)) {
+					routes.push(other);
 				}
 			}
 
@@ -261,8 +231,9 @@ async function generate_lambda_functions({ builder, publish, split }) {
 			writeFileSync(`.netlify/functions-internal/${name}.mjs`, fn);
 			writeFileSync(`.netlify/functions-internal/${name}.json`, fn_config);
 
-			redirects.push(`${pattern} /.netlify/functions/${name} 200`);
-			redirects.push(`${pattern}/__data.json /.netlify/functions/${name} 200`);
+			const redirect = `/.netlify/functions/${name} 200`;
+			redirects.push(`${pattern} ${redirect}`);
+			redirects.push(`${pattern === '/' ? '' : pattern}/__data.json ${redirect}`);
 		}
 	} else {
 		const manifest = builder.generateManifest({
@@ -271,9 +242,9 @@ async function generate_lambda_functions({ builder, publish, split }) {
 
 		const fn = `import { init } from '../serverless.js';\n\nexport const handler = init(${manifest});\n`;
 
-		writeFileSync(`.netlify/functions-internal/render.json`, fn_config);
-		writeFileSync('.netlify/functions-internal/render.mjs', fn);
-		redirects.push('* /.netlify/functions/render 200');
+		writeFileSync(`.netlify/functions-internal/${FUNCTION_PREFIX}render.json`, fn_config);
+		writeFileSync(`.netlify/functions-internal/${FUNCTION_PREFIX}render.mjs`, fn);
+		redirects.push(`* /.netlify/functions/${FUNCTION_PREFIX}render 200`);
 	}
 
 	// this should happen at the end, after builder.writeClient(...),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-netlify",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -38,7 +38,7 @@
     "rollup": "^3.7.0",
     "typescript": "^4.9.4",
     "uvu": "^0.5.6",
-    "@sveltejs/kit": "^1.5.1"
+    "@sveltejs/kit": "^1.5.6"
   },
   "peerDependencies": {
     "@sveltejs/kit": "^1.5.0"