@sveltejs/adapter-netlify 1.0.0-next.55 → 1.0.0-next.58

package/README.md

@@ -16,19 +16,19 @@ You can then configure it inside of `svelte.config.js`:
 import adapter from '@sveltejs/adapter-netlify';
 
 export default {
-	kit: {
-		// default options are shown
-		adapter: adapter({
-			// if true, will create a Netlify Edge Function rather
-			// than using standard Node-based functions
-			edge: false,
-
-			// if true, will split your app into multiple functions
-			// instead of creating a single one for the entire app.
-			// if `edge` is true, this option cannot be used
-			split: false
-		})
-	}
+  kit: {
+    // default options are shown
+    adapter: adapter({
+      // if true, will create a Netlify Edge Function rather
+      // than using standard Node-based functions
+      edge: false,
+
+      // if true, will split your app into multiple functions
+      // instead of creating a single one for the entire app.
+      // if `edge` is true, this option cannot be used
+      split: false
+    })
+  }
 };
 ```
 
@@ -42,6 +42,10 @@ Then, make sure you have a [netlify.toml](https://docs.netlify.com/configure-bui
 
 If the `netlify.toml` file or the `build.publish` value is missing, a default value of `"build"` will be used. Note that if you have set the publish directory in the Netlify UI to something else then you will need to set it in `netlify.toml` too, or use the default value of `"build"`.
 
+### Node version
+
+New projects will use Node 16 by default. However, if you're upgrading a project you created a while ago it may be stuck on an older version. See [the Netlify docs](https://docs.netlify.com/configure-builds/manage-dependencies/#node-js-and-javascript) for details on manually specifying Node 16 or newer.
+
 ## Netlify Edge Functions (beta)
 
 SvelteKit supports the beta release of Netlify Edge Functions. If you pass the option `edge: true` to the `adapter` function, server-side rendering will happen in a Deno-based edge function that's deployed close to the site visitor. If set to `false` (the default), the site will deploy to standard Node-based Netlify Functions.

package/files/edge.js

@@ -9,24 +9,18 @@ const prefix = `/${manifest.appDir}/`;
  * @param { any } context
  * @returns { Promise<Response> }
  */
-export default async function handler(request, context) {
+export default function handler(request, context) {
 	if (is_static_file(request)) {
 		// Static files can skip the handler
 		return;
 	}
-	try {
-		const response = await server.respond(request, {
-			platform: { context },
-			getClientAddress() {
-				return request.headers.get('x-nf-client-connection-ip');
-			}
-		});
-		return response;
-	} catch (error) {
-		return new Response('Error rendering route:' + (error.message || error.toString()), {
-			status: 500
-		});
-	}
+
+	return server.respond(request, {
+		platform: { context },
+		getClientAddress() {
+			return request.headers.get('x-nf-client-connection-ip');
+		}
+	});
 }
 
 /**

package/index.js

@@ -54,6 +54,19 @@ export default function ({ split = false, edge = edge_set_in_env_var } = {}) {
 
 			builder.log.minor(`Publishing to "${publish}"`);
 
+			builder.log.minor('Copying assets...');
+			builder.writeStatic(publish);
+			builder.writeClient(publish);
+			builder.writePrerendered(publish);
+
+			builder.log.minor('Writing custom headers...');
+			const headers_file = join(publish, '_headers');
+			builder.copy('_headers', headers_file);
+			appendFileSync(
+				headers_file,
+				`\n\n/${builder.config.kit.appDir}/*\n  cache-control: public\n  cache-control: immutable\n  cache-control: max-age=31536000\n`
+			);
+
 			// for esbuild, use ESM
 			// for zip-it-and-ship-it, use CJS until https://github.com/netlify/zip-it-and-ship-it/issues/750
 			const esm = netlify_config?.functions?.node_bundler === 'esbuild';
@@ -67,19 +80,6 @@ export default function ({ split = false, edge = edge_set_in_env_var } = {}) {
 			} else {
 				await generate_lambda_functions({ builder, esm, split, publish });
 			}
-
-			builder.log.minor('Copying assets...');
-			builder.writeStatic(publish);
-			builder.writeClient(publish);
-			builder.writePrerendered(publish);
-
-			builder.log.minor('Writing custom headers...');
-			const headers_file = join(publish, '_headers');
-			builder.copy('_headers', headers_file);
-			appendFileSync(
-				headers_file,
-				`\n\n/${builder.config.kit.appDir}/*\n  cache-control: public\n  cache-control: immutable\n  cache-control: max-age=31536000\n`
-			);
 		}
 	};
 }
@@ -230,6 +230,9 @@ function generate_lambda_functions({ builder, publish, split, esm }) {
 		redirects.push('* /.netlify/functions/render 200');
 	}
 
+	// this should happen at the end, after builder.writeStatic(...),
+	// so that generated redirects are appended to custom redirects
+	// rather than replaced by them
 	builder.log.minor('Writing redirects...');
 	const redirect_file = join(publish, '_redirects');
 	if (existsSync('_redirects')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-netlify",
-  "version": "1.0.0-next.55",
+  "version": "1.0.0-next.58",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -31,7 +31,8 @@
     "@rollup/plugin-commonjs": "^21.0.0",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.0.5",
-    "@sveltejs/kit": "1.0.0-next.320",
+    "@sveltejs/kit": "1.0.0-next.331",
+    "@types/node": "^14.14.20",
     "rimraf": "^3.0.2",
     "rollup": "^2.58.0",
     "typescript": "^4.6.2",