chore: replace netlify-cli with @netlify/dev

.github/workflows/ci.yml

@@ -230,6 +230,10 @@ jobs:
         with:
           node-version: ${{matrix.node-version}}
           cache: pnpm
+      # required for testing netlify edge functions
+      - uses: denoland/setup-deno@v2
+        with:
+          deno-version: ^2.2.4
       - run: pnpm install --frozen-lockfile
       - run: pnpm playwright install chromium
       - run: cd packages/kit && pnpm prepublishOnly

.prettierrc

@@ -22,6 +22,7 @@
 			"files": [
 				"**/CHANGELOG.md",
 				"**/vite.config.js.timestamp-*",
+				"**/.netlify/**",
 				"**/.svelte-kit/**",
 				"**/.custom-out-dir/**",
 				"**/test-results/**",
@@ -32,7 +33,7 @@
 				"packages/package/test/watch/package/**/*",
 				"packages/kit/src/core/postbuild/fixtures/**/*",
 				"packages/adapter-cloudflare/test/apps/workers/dist/**/*",
-				"packages/*/test/**/build"
+				"packages/*/test/**/build/**"
 			],
 			"options": {
 				"rangeEnd": 0

eslint.config.js

@@ -25,6 +25,7 @@ export default [
 	{
 		ignores: [
 			'**/.svelte-kit',
+			'**/.netlify',
 			'**/.wrangler',
 			'**/test-results',
 			'**/build',
@@ -59,7 +60,8 @@ export default [
 			'packages/kit/test/apps/**/*',
 			'packages/kit/test/build-errors/**/*',
 			'packages/kit/test/prerendering/**/*',
-			'packages/test-redirect-importer/index.js'
+			'packages/test-redirect-importer/index.js',
+			'packages/adapter-netlify/test/preview.js'
 		]
 	}
 ];

package.json

@@ -41,7 +41,6 @@
 		"onlyBuiltDependencies": [
 			"@parcel/watcher",
 			"esbuild",
-			"netlify-cli",
 			"protobufjs",
 			"rolldown",
 			"sharp",

packages/adapter-netlify/index.js

@@ -249,7 +249,7 @@ function generate_lambda_functions({ builder, publish, split }) {
 		'0SERVER': './server/index.js' // digit prefix prevents CJS build from using this as a variable name, which would also get replaced
 	};
 
-	builder.copy(files, '.netlify', { replace });
+	builder.copy(files, '.netlify', { replace, filter: (name) => !name.endsWith('edge.js') });
 
 	// Configuring the function to use ESM as the output format.
 	const fn_config = JSON.stringify({ config: { nodeModuleFormat: 'esm' }, version: 1 });

packages/adapter-netlify/package.json

@@ -48,6 +48,7 @@
 		"set-cookie-parser": "^2.6.0"
 	},
 	"devDependencies": {
+		"@netlify/dev": "catalog:",
 		"@netlify/edge-functions": "catalog:",
 		"@netlify/functions": "catalog:",
 		"@netlify/node-cookies": "^0.1.0",

packages/adapter-netlify/test/apps/basic/netlify.toml

@@ -1,2 +1,2 @@
 [dev]
-  publish = "build"
+publish = "build"

packages/adapter-netlify/test/apps/basic/netlify/functions/render.mjs

@@ -0,0 +1,39 @@
+// This is a temporary workaround to be compatible with Netlify's new dev server
+// TODO: remove this once we overhaul the Netlify adapter to use Netlify's new serverless function format https://docs.netlify.com/build/functions/get-started/?data-tab=TypeScript#write-a-function
+
+import { handler } from '../../.netlify/functions-internal/sveltekit-render.mjs';
+
+/**
+ * @param {Request} request
+ * @param {import('@netlify/functions').HandlerContext} context
+ */
+export default async function (request, context) {
+	const [rawUrl, rawQuery] = request.url.split('?');
+	/** @type {import('@netlify/functions').HandlerEvent} */
+	const event = {
+		rawUrl,
+		rawQuery: rawQuery || '',
+		headers: Object.fromEntries(request.headers),
+		httpMethod: request.method,
+		isBase64Encoded: false,
+		path: new URL(request.url).pathname,
+		queryStringParameters: Object.fromEntries(new URL(request.url).searchParams),
+		body: request.body && (await request.text()),
+		multiValueHeaders: {},
+		multiValueQueryStringParameters: null
+	};
+	const result = await handler(event, context);
+	if (result) {
+		return new Response(result.body, {
+			status: result.statusCode,
+			// @ts-ignore
+			headers: result.headers
+		});
+	}
+
+	return new Response('Not Found', { status: 404 });
+}
+
+export const config = {
+	path: '/*'
+};

packages/adapter-netlify/test/apps/basic/package.json

@@ -5,14 +5,13 @@
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
-		"preview": "BROWSER=none netlify serve",
+		"preview": "node ../../preview.js",
 		"prepare": "svelte-kit sync || echo ''",
 		"test": "playwright test"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"netlify-cli": "catalog:",
 		"svelte": "catalog:",
 		"vite": "catalog:"
 	},

packages/adapter-netlify/test/apps/edge/netlify.toml

@@ -1,2 +1,15 @@
 [dev]
-  publish = "build"
+publish = "build"
+
+# TODO: remove these once we overhaul the Netlify adapter to use the new edge declarations https://docs.netlify.com/build/edge-functions/declarations/#declare-edge-functions-inline
+
+[build]
+# defaults to "netlify/edge-functions" (without the . prefix)
+edge_functions = ".netlify/edge-functions"
+
+# the dev server doesn't read the manifest.json in edge-functions so we need
+# to explicitly declare this here
+[[edge_functions]]
+path = "/*"
+function = "render"
+excludedPath = ["/_app/immutable/*", "/_app/version.json", "/.netlify/*"]

packages/adapter-netlify/test/apps/edge/package.json

@@ -5,14 +5,13 @@
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
-		"preview": "BROWSER=none netlify serve",
+		"preview": "node ../../preview.js",
 		"prepare": "svelte-kit sync || echo ''",
 		"test": "playwright test"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"netlify-cli": "catalog:",
 		"svelte": "catalog:",
 		"vite": "catalog:"
 	},

packages/adapter-netlify/test/preview.js

@@ -0,0 +1,24 @@
+// This allows us to run `netlify dev` without installing the Netlify CLI
+// Don't include this file in type checking because @netlify/dev has transitive imports with type errors
+import { NetlifyDev } from '@netlify/dev';
+import http from 'node:http';
+import process from 'node:process';
+import { getRequest, setResponse } from '@sveltejs/kit/node';
+
+const netlifyDev = new NetlifyDev({});
+
+const serverReady = netlifyDev.start();
+
+const port = process.env.PORT ? +process.env.PORT : 8888;
+const base = `http://localhost:${port}`;
+
+http
+	.createServer(async (req, res) => {
+		await serverReady;
+		const request = await getRequest({ request: req, base });
+		const response =
+			(await netlifyDev.handle(request)) ?? new Response('Not Found', { status: 404 });
+		await setResponse(res, response);
+	})
+	.listen(port);
+console.log(`Netlify Dev listening on http://localhost:${port}`);

packages/adapter-node/src/handler.js

@@ -201,7 +201,9 @@ function normalise_header(name, value) {
  * @returns {string}
  */
 function get_origin(headers) {
-	const protocol = decodeURIComponent(normalise_header(protocol_header, headers[protocol_header]) || 'https');
+	const protocol = decodeURIComponent(
+		normalise_header(protocol_header, headers[protocol_header]) || 'https'
+	);
 
 	// this helps us avoid host injections through the protocol header
 	if (protocol.includes(':')) {

packages/kit/types/index.d.ts

@@ -2769,7 +2769,7 @@ declare module '@sveltejs/kit' {
 	class Redirect_1 {
 
 		constructor(status: 300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308, location: string);
-		status: 301 | 302 | 303 | 307 | 308 | 300 | 304 | 305 | 306;
+		status: 300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308;
 		location: string;
 	}