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

package/files/edge.js

@@ -0,0 +1,57 @@
+import { Server } from '0SERVER';
+import { manifest, prerendered } from 'MANIFEST';
+
+const server = new Server(manifest);
+const prefix = `/${manifest.appDir}/`;
+
+/**
+ * @param { Request } request
+ * @param { any } context
+ * @returns { Promise<Response> }
+ */
+export default async 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
+		});
+	}
+}
+
+/**
+ * @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 (err) {
+		// ignore
+	}
+
+	return (
+		manifest.assets.has(file) ||
+		manifest.assets.has(file + '/index.html') ||
+		prerendered.has(pathname || '/')
+	);
+}

package/index.js

@@ -1,5 +1,5 @@
 import { appendFileSync, existsSync, readFileSync, writeFileSync } from 'fs';
-import { join, resolve, posix } from 'path';
+import { dirname, join, resolve, posix } from 'path';
 import { fileURLToPath } from 'url';
 import glob from 'tiny-glob/sync.js';
 import esbuild from 'esbuild';
@@ -29,13 +29,13 @@ import toml from '@iarna/toml';
  */
 
 const files = fileURLToPath(new URL('./files', import.meta.url).href);
-const src = fileURLToPath(new URL('./src', import.meta.url).href);
-const edgeSetInEnvVar =
+
+const edge_set_in_env_var =
 	process.env.NETLIFY_SVELTEKIT_USE_EDGE === 'true' ||
 	process.env.NETLIFY_SVELTEKIT_USE_EDGE === '1';
 
 /** @type {import('.')} */
-export default function ({ split = false, edge = edgeSetInEnvVar } = {}) {
+export default function ({ split = false, edge = edge_set_in_env_var } = {}) {
 	return {
 		name: '@sveltejs/adapter-netlify',
 
@@ -50,7 +50,7 @@ export default function ({ split = false, edge = edgeSetInEnvVar } = {}) {
 			builder.rimraf('.netlify/functions-internal');
 			builder.rimraf('.netlify/server');
 			builder.rimraf('.netlify/package.json');
-			builder.rimraf('.netlify/handler.js');
+			builder.rimraf('.netlify/serverless.js');
 
 			builder.log.minor(`Publishing to "${publish}"`);
 
@@ -62,7 +62,7 @@ export default function ({ split = false, edge = edgeSetInEnvVar } = {}) {
 				if (split) {
 					throw new Error('Cannot use `split: true` alongside `edge: true`');
 				}
-				
+
 				await generate_edge_functions({ builder });
 			} else {
 				await generate_lambda_functions({ builder, esm, split, publish });
@@ -88,6 +88,12 @@ export default function ({ split = false, edge = edgeSetInEnvVar } = {}) {
  * @param {import('@sveltejs/kit').Builder} params.builder
  */
 async function generate_edge_functions({ builder }) {
+	const tmp = builder.getBuildDirectory('netlify-tmp');
+	builder.rimraf(tmp);
+	builder.mkdirp(tmp);
+
+	builder.mkdirp('.netlify/edge-functions');
+
 	// Don't match the static directory
 	const pattern = '^/.*$';
 
@@ -104,16 +110,11 @@ async function generate_edge_functions({ builder }) {
 		],
 		version: 1
 	};
-	const tmp = builder.getBuildDirectory('netlify-tmp');
-
-	builder.rimraf(tmp);
-
-	builder.mkdirp('.netlify/edge-functions');
 
 	builder.log.minor('Generating Edge Function...');
 	const relativePath = posix.relative(tmp, builder.getServerDirectory());
 
-	builder.copy(`${src}/edge_function.js`, `${tmp}/entry.js`, {
+	builder.copy(`${files}/edge.js`, `${tmp}/entry.js`, {
 		replace: {
 			'0SERVER': `${relativePath}/index.js`,
 			MANIFEST: './manifest.js'
@@ -204,8 +205,8 @@ function generate_lambda_functions({ builder, publish, split, esm }) {
 					});
 
 					const fn = esm
-						? `import { init } from '../handler.js';\n\nexport const handler = init(${manifest});\n`
-						: `const { init } = require('../handler.js');\n\nexports.handler = init(${manifest});\n`;
+						? `import { init } from '../serverless.js';\n\nexport const handler = init(${manifest});\n`
+						: `const { init } = require('../serverless.js');\n\nexports.handler = init(${manifest});\n`;
 
 					writeFileSync(`.netlify/functions-internal/${name}.js`, fn);
 
@@ -222,8 +223,8 @@ function generate_lambda_functions({ builder, publish, split, esm }) {
 		});
 
 		const fn = esm
-			? `import { init } from '../handler.js';\n\nexport const handler = init(${manifest});\n`
-			: `const { init } = require('../handler.js');\n\nexports.handler = init(${manifest});\n`;
+			? `import { init } from '../serverless.js';\n\nexport const handler = init(${manifest});\n`
+			: `const { init } = require('../serverless.js');\n\nexports.handler = init(${manifest});\n`;
 
 		writeFileSync('.netlify/functions-internal/render.js', fn);
 		redirects.push('* /.netlify/functions/render 200');
@@ -234,6 +235,7 @@ function generate_lambda_functions({ builder, publish, split, esm }) {
 	if (existsSync('_redirects')) {
 		builder.copy('_redirects', redirect_file);
 	}
+	builder.mkdirp(dirname(redirect_file));
 	appendFileSync(redirect_file, `\n\n${redirects.join('\n')}`);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-netlify",
-  "version": "1.0.0-next.52",
+  "version": "1.0.0-next.55",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -31,7 +31,7 @@
     "@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.317",
+    "@sveltejs/kit": "1.0.0-next.320",
     "rimraf": "^3.0.2",
     "rollup": "^2.58.0",
     "typescript": "^4.6.2",
@@ -39,7 +39,7 @@
   },
   "scripts": {
     "dev": "rimraf files && rollup -cw",
-    "build": "rimraf files && rollup -c",
+    "build": "rimraf files && rollup -c && cp src/edge.js files/edge.js",
     "test": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\"",
     "check": "tsc",
     "lint": "eslint --ignore-path .gitignore \"**/*.{ts,js,svelte}\" && npm run check-format",