@sveltejs/adapter-netlify 5.0.2 → 5.1.1

package/files/edge.js

@@ -3,18 +3,32 @@ import { manifest } from 'MANIFEST';
 
 const server = new Server(manifest);
 
+/**
+ * We don't know the origin until we receive a request, but
+ * that's guaranteed to happen before we call `read`
+ * @type {string}
+ */
+let origin;
+
 const initialized = server.init({
 	// @ts-ignore
-	env: Deno.env.toObject()
+	env: Deno.env.toObject(),
+	read: async (file) => {
+		const response = await fetch(`${origin}/${file}`);
+		if (!response.ok) {
+			throw new Error(`Failed to fetch ${file}: ${response.status} ${response.statusText}`);
+		}
+		return response.body;
+	}
 });
 
-/**
- * @param { Request } request
- * @param { any } context
- * @returns { Promise<Response> }
- */
-export default async function handler(request, context) {
-	await initialized;
+/** @type {import('@netlify/edge-functions').EdgeFunction} */
+async function handler(request, context) {
+	if (!origin) {
+		origin = new URL(request.url).origin;
+		await initialized;
+	}
+
 	return server.respond(request, {
 		platform: { context },
 		getClientAddress() {
@@ -22,3 +36,5 @@ export default async function handler(request, context) {
 		}
 	});
 }
+
+export { handler as default };

package/index.js

@@ -5,6 +5,9 @@ import { builtinModules } from 'node:module';
 import process from 'node:process';
 import esbuild from 'esbuild';
 import toml from '@iarna/toml';
+import { VERSION } from '@sveltejs/kit';
+
+const [kit_major, kit_minor] = VERSION.split('.');
 
 /**
  * @typedef {{
@@ -13,26 +16,6 @@ import toml from '@iarna/toml';
  * } & toml.JsonMap} NetlifyConfig
  */
 
-/**
- * TODO(serhalp) Replace this custom type with an import from `@netlify/edge-functions`,
- * once that type is fixed to include `excludedPath` and `function`.
- * @typedef {{
- *	 functions: Array<
- *		 | {
- *				 function: string;
- *				 path: string;
- *				 excludedPath?: string | string[];
- *		   }
- *		 | {
- *				 function: string;
- *				 pattern: string;
- *				 excludedPattern?: string | string[];
- *		   }
- *	 >;
- *	 version: 1;
- *	 }} HandlerManifest
- */
-
 const name = '@sveltejs/adapter-netlify';
 const files = fileURLToPath(new URL('./files', import.meta.url).href);
 
@@ -114,11 +97,11 @@ export default function ({ split = false, edge = edge_set_in_env_var } = {}) {
 		},
 
 		supports: {
-			// reading from the filesystem only works in serverless functions
 			read: ({ route }) => {
-				if (edge) {
+				// TODO bump peer dep in next adapter major to simplify this
+				if (edge && kit_major === '2' && kit_minor < '25') {
 					throw new Error(
-						`${name}: Cannot use \`read\` from \`$app/server\` in route \`${route.id}\` when using edge functions`
+						`${name}: Cannot use \`read\` from \`$app/server\` in route \`${route.id}\` when using edge functions and SvelteKit < 2.25.0`
 					);
 				}
 
@@ -161,7 +144,7 @@ async function generate_edge_functions({ builder }) {
 	const path = '/*';
 	// We only need to specify paths without the trailing slash because
 	// Netlify will handle the optional trailing slash for us
-	const excludedPath = [
+	const excluded = [
 		// Contains static files
 		`/${builder.getAppPath()}/*`,
 		...builder.prerendered.paths,
@@ -179,13 +162,13 @@ async function generate_edge_functions({ builder }) {
 		'/.netlify/*'
 	];
 
-	/** @type {HandlerManifest} */
+	/** @type {import('@netlify/edge-functions').Manifest} */
 	const edge_manifest = {
 		functions: [
 			{
 				function: 'render',
 				path,
-				excludedPath
+				excludedPath: /** @type {`/${string}`[]} */ (excluded)
 			}
 		],
 		version: 1
@@ -232,7 +215,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}/esm`, '.netlify', { replace });
+	builder.copy(files, '.netlify', { replace });
 
 	// Configuring the function to use ESM as the output format.
 	const fn_config = JSON.stringify({ config: { nodeModuleFormat: 'esm' }, version: 1 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-netlify",
-  "version": "5.0.2",
+  "version": "5.1.1",
   "description": "A SvelteKit adapter that creates a Netlify app",
   "keywords": [
     "adapter",
@@ -12,7 +12,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/sveltejs/kit",
+    "url": "git+https://github.com/sveltejs/kit.git",
     "directory": "packages/adapter-netlify"
   },
   "license": "MIT",
@@ -37,27 +37,30 @@
     "set-cookie-parser": "^2.6.0"
   },
   "devDependencies": {
-    "@netlify/functions": "^3.0.0",
+    "@netlify/edge-functions": "^2.15.1",
+    "@netlify/functions": "^4.0.0",
     "@rollup/plugin-commonjs": "^28.0.1",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.0",
-    "@sveltejs/vite-plugin-svelte": "^5.0.1",
-    "@types/node": "^18.19.48",
+    "@sveltejs/vite-plugin-svelte": "^6.0.0-next.3",
+    "@types/node": "^18.19.119",
     "@types/set-cookie-parser": "^2.4.7",
     "rollup": "^4.14.2",
     "typescript": "^5.3.3",
-    "vitest": "^3.1.1",
-    "@sveltejs/kit": "^2.20.8"
+    "vitest": "^3.2.3",
+    "@sveltejs/kit": "^2.27.3"
   },
   "peerDependencies": {
     "@sveltejs/kit": "^2.4.0"
   },
   "scripts": {
-    "dev": "node -e \"fs.rmSync('files', { force: true, recursive: true })\" && rollup -cw",
-    "build": "node -e \"fs.rmSync('files', { force: true, recursive: true })\" && rollup -c && node -e \"fs.cpSync('src/edge.js', 'files/edge.js')\"",
-    "test": "vitest run",
+    "dev": "rollup -cw",
+    "build": "rollup -c",
     "check": "tsc",
     "lint": "prettier --check .",
-    "format": "pnpm lint --write"
+    "format": "pnpm lint --write",
+    "test": "pnpm test:unit && pnpm test:integration",
+    "test:unit": "vitest run",
+    "test:integration": "pnpm build && pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test"
   }
 }