@sveltejs/adapter-netlify 4.3.6 → 4.4.1

package/files/edge.js

@@ -1,8 +1,7 @@
 import { Server } from '0SERVER';
-import { manifest, prerendered } from 'MANIFEST';
+import { manifest } from 'MANIFEST';
 
 const server = new Server(manifest);
-const prefix = `/${manifest.appPath}/`;
 
 const initialized = server.init({
 	// @ts-ignore
@@ -15,12 +14,6 @@ const initialized = server.init({
  * @returns { Promise<Response> }
  */
 export default async function handler(request, context) {
-	if (is_static_file(request)) {
-		// Static files can skip the handler
-		// TODO can we serve _app/immutable files with an immutable cache header?
-		return;
-	}
-
 	await initialized;
 	return server.respond(request, {
 		platform: { context },
@@ -29,33 +22,3 @@ export default async function handler(request, context) {
 		}
 	});
 }
-
-/**
- * @param {Request} request
- */
-function is_static_file(request) {
-	const url = new URL(request.url);
-
-	// Assets in the app dir
-	if (url.pathname.startsWith(prefix)) {
-		return true;
-	}
-
-	// prerendered pages and index.html files
-	const pathname = url.pathname.replace(/\/$/, '');
-	let file = pathname.substring(1);
-
-	try {
-		file = decodeURIComponent(file);
-	} catch {
-		// ignore
-	}
-
-	return (
-		manifest.assets.has(file) ||
-		manifest.assets.has(file + '/index.html') ||
-		file in manifest._.server_assets ||
-		file + '/index.html' in manifest._.server_assets ||
-		prerendered.has(pathname || '/')
-	);
-}

package/index.d.ts

@@ -1,4 +1,3 @@
 import { Adapter } from '@sveltejs/kit';
-import './ambient.js';
 
 export default function plugin(opts?: { split?: boolean; edge?: boolean }): Adapter;

package/index.js

@@ -14,15 +14,19 @@ import toml from '@iarna/toml';
  */
 
 /**
+ * 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;
@@ -122,23 +126,6 @@ async function generate_edge_functions({ builder }) {
 
 	builder.mkdirp('.netlify/edge-functions');
 
-	// Don't match the static directory
-	const pattern = '^/.*$';
-
-	// Go doesn't support lookarounds, so we can't do this
-	// const pattern = appDir ? `^/(?!${escapeStringRegexp(appDir)}).*$` : '^/.*$';
-
-	/** @type {HandlerManifest} */
-	const edge_manifest = {
-		functions: [
-			{
-				function: 'render',
-				pattern
-			}
-		],
-		version: 1
-	};
-
 	builder.log.minor('Generating Edge Function...');
 	const relativePath = posix.relative(tmp, builder.getServerDirectory());
 
@@ -153,12 +140,43 @@ async function generate_edge_functions({ builder }) {
 		relativePath
 	});
 
-	writeFileSync(
-		`${tmp}/manifest.js`,
-		`export const manifest = ${manifest};\n\nexport const prerendered = new Set(${JSON.stringify(
-			builder.prerendered.paths
-		)});\n`
-	);
+	writeFileSync(`${tmp}/manifest.js`, `export const manifest = ${manifest};\n`);
+
+	/** @type {{ assets: Set<string> }} */
+	const { assets } = (await import(`${tmp}/manifest.js`)).manifest;
+
+	const path = '/*';
+	// We only need to specify paths without the trailing slash because
+	// Netlify will handle the optional trailing slash for us
+	const excludedPath = [
+		// Contains static files
+		`/${builder.getAppPath()}/*`,
+		...builder.prerendered.paths,
+		...Array.from(assets).flatMap((asset) => {
+			if (asset.endsWith('/index.html')) {
+				const dir = asset.replace(/\/index\.html$/, '');
+				return [
+					`${builder.config.kit.paths.base}/${asset}`,
+					`${builder.config.kit.paths.base}/${dir}`
+				];
+			}
+			return `${builder.config.kit.paths.base}/${asset}`;
+		}),
+		// Should not be served by SvelteKit at all
+		'/.netlify/*'
+	];
+
+	/** @type {HandlerManifest} */
+	const edge_manifest = {
+		functions: [
+			{
+				function: 'render',
+				path,
+				excludedPath
+			}
+		],
+		version: 1
+	};
 
 	await esbuild.build({
 		entryPoints: [`${tmp}/entry.js`],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-netlify",
-  "version": "4.3.6",
+  "version": "4.4.1",
   "description": "A SvelteKit adapter that creates a Netlify app",
   "keywords": [
     "adapter",
@@ -33,21 +33,21 @@
   ],
   "dependencies": {
     "@iarna/toml": "^2.2.5",
-    "esbuild": "^0.21.5",
+    "esbuild": "^0.24.0",
     "set-cookie-parser": "^2.6.0"
   },
   "devDependencies": {
-    "@netlify/functions": "^2.4.1",
+    "@netlify/functions": "^3.0.0",
     "@rollup/plugin-commonjs": "^28.0.1",
     "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^15.3.0",
-    "@sveltejs/vite-plugin-svelte": "^3.0.1",
+    "@rollup/plugin-node-resolve": "^16.0.0",
+    "@sveltejs/vite-plugin-svelte": "^5.0.1",
     "@types/node": "^18.19.48",
     "@types/set-cookie-parser": "^2.4.7",
     "rollup": "^4.14.2",
     "typescript": "^5.3.3",
-    "vitest": "^2.0.1",
-    "@sveltejs/kit": "^2.7.3"
+    "vitest": "^3.0.1",
+    "@sveltejs/kit": "^2.16.1"
   },
   "peerDependencies": {
     "@sveltejs/kit": "^2.4.0"