@sveltejs/adapter-netlify 6.0.0 → 6.0.2

package/index.js

@@ -191,7 +191,7 @@ async function generate_edge_functions({ builder }) {
 			outfile: '.netlify/edge-functions/render.js',
 			...esbuild_config
 		}),
-		builder.hasServerInstrumentationFile?.() &&
+		builder.hasServerInstrumentationFile() &&
 			esbuild.build({
 				entryPoints: [`${builder.getServerDirectory()}/instrumentation.server.js`],
 				outfile: '.netlify/edge/instrumentation.server.js',
@@ -199,8 +199,8 @@ async function generate_edge_functions({ builder }) {
 			})
 	]);
 
-	if (builder.hasServerInstrumentationFile?.()) {
-		builder.instrument?.({
+	if (builder.hasServerInstrumentationFile()) {
+		builder.instrument({
 			entrypoint: '.netlify/edge-functions/render.js',
 			instrumentation: '.netlify/edge/instrumentation.server.js',
 			start: '.netlify/edge/start.js'
@@ -245,7 +245,8 @@ function generate_lambda_functions({ builder, publish, split }) {
 					parts.push('*');
 					break; // Netlify redirects don't allow anything after a *
 				} else if (segment.dynamic) {
-					parts.push(`:${parts.length}`);
+					// URLPattern requires params to start with letters
+					parts.push(`:param${parts.length}`);
 				} else {
 					parts.push(segment.content);
 				}
@@ -274,18 +275,21 @@ function generate_lambda_functions({ builder, publish, split }) {
 				routes
 			});
 
-			const fn = `import { init } from '../serverless.js';\n\nexport default init(${manifest});\n\nexport const config = {\n\tpath: "${pattern}",\n\texcludedPath: "/.netlify/*",\n\tpreferStatic: true\n};\n`;
+			const fn = generate_serverless_function_module(manifest);
+			const config = generate_config_export(pattern);
 
-			writeFileSync(`.netlify/functions-internal/${name}.mjs`, fn);
-			if (builder.hasServerInstrumentationFile?.()) {
-				builder.instrument?.({
+			if (builder.hasServerInstrumentationFile()) {
+				writeFileSync(`.netlify/functions-internal/${name}.mjs`, fn);
+				builder.instrument({
 					entrypoint: `.netlify/functions-internal/${name}.mjs`,
 					instrumentation: '.netlify/server/instrumentation.server.js',
 					start: `.netlify/functions-start/${name}.start.mjs`,
 					module: {
-						exports: ['default']
+						generateText: generate_traced_module(config)
 					}
 				});
+			} else {
+				writeFileSync(`.netlify/functions-internal/${name}.mjs`, `${fn}\n${config}`);
 			}
 		}
 	} else {
@@ -293,18 +297,21 @@ function generate_lambda_functions({ builder, publish, split }) {
 			relativePath: '../server'
 		});
 
-		const fn = `import { init } from '../serverless.js';\n\nexport default init(${manifest});\n\nexport const config = {\n\tpath: "/*",\n\texcludedPath: "/.netlify/*",\n\tpreferStatic: true\n};\n`;
+		const fn = generate_serverless_function_module(manifest);
+		const config = generate_config_export('/*');
 
-		writeFileSync(`.netlify/functions-internal/${FUNCTION_PREFIX}render.mjs`, fn);
-		if (builder.hasServerInstrumentationFile?.()) {
-			builder.instrument?.({
+		if (builder.hasServerInstrumentationFile()) {
+			writeFileSync(`.netlify/functions-internal/${FUNCTION_PREFIX}render.mjs`, fn);
+			builder.instrument({
 				entrypoint: `.netlify/functions-internal/${FUNCTION_PREFIX}render.mjs`,
 				instrumentation: '.netlify/server/instrumentation.server.js',
 				start: `.netlify/functions-start/${FUNCTION_PREFIX}render.start.mjs`,
 				module: {
-					exports: ['default']
+					generateText: generate_traced_module(config)
 				}
 			});
+		} else {
+			writeFileSync(`.netlify/functions-internal/${FUNCTION_PREFIX}render.mjs`, `${fn}\n${config}`);
 		}
 	}
 
@@ -386,3 +393,44 @@ function matches(a, b) {
 		return b.length === 1 && b[0].rest;
 	}
 }
+
+/**
+ * @param {string} manifest
+ * @returns {string}
+ */
+function generate_serverless_function_module(manifest) {
+	return `\
+import { init } from '../serverless.js';
+
+export default init(${manifest});
+`;
+}
+
+/**
+ * @param {string} pattern
+ * @returns {string}
+ */
+function generate_config_export(pattern) {
+	return `\
+export const config = {
+	path: "${pattern}",
+	excludedPath: "/.netlify/*",
+	preferStatic: true
+};
+`;
+}
+
+/**
+ * @param {string} config
+ * @returns {(opts: { instrumentation: string; start: string }) => string}
+ */
+function generate_traced_module(config) {
+	return ({ instrumentation, start }) => {
+		return `\
+import './${instrumentation}';
+const { default: _0 } = await import('./${start}');
+export { _0 as default };
+
+${config}`;
+	};
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-netlify",
-  "version": "6.0.0",
+  "version": "6.0.2",
   "description": "A SvelteKit adapter that creates a Netlify app",
   "keywords": [
     "adapter",
@@ -50,7 +50,7 @@
     "rollup": "^4.14.2",
     "typescript": "^5.3.3",
     "vitest": "^4.0.0",
-    "@sveltejs/kit": "^2.51.0"
+    "@sveltejs/kit": "^2.52.2"
   },
   "peerDependencies": {
     "@sveltejs/kit": "^2.31.0"