make netlify do the thing

Author: elliott-with-the-longest-name-on-github

packages/adapter-netlify/index.js

@@ -196,21 +196,26 @@ async function generate_edge_functions({ builder }) {
 		external: builtinModules.map((id) => `node:${id}`),
 		alias: Object.fromEntries(builtinModules.map((id) => [id, `node:${id}`]))
 	};
-	await esbuild.build({
-		entryPoints: [`${tmp}/entry.js`],
-		outfile: '.netlify/edge-functions/render.js',
-		...esbuild_config
-	});
-	await esbuild.build({
-		entryPoints: [`${builder.getServerDirectory()}/tracing.server.js`],
-		outfile: '.netlify/edge-functions/tracing.server.js',
-		...esbuild_config
-	});
+	await Promise.all([
+		esbuild.build({
+			entryPoints: [`${tmp}/entry.js`],
+			outfile: '.netlify/edge-functions/render.js',
+			...esbuild_config
+		}),
+		builder.hasServerTracingFile() &&
+			esbuild.build({
+				entryPoints: [`${builder.getServerDirectory()}/tracing.server.js`],
+				outfile: '.netlify/edge/tracing.server.js',
+				...esbuild_config
+			})
+	]);
+
 	if (builder.hasServerTracingFile()) {
 		builder.trace({
 			entrypoint: '.netlify/edge-functions/render.js',
-			tracing: '.netlify/edge-functions/tracing.server.js',
-			tla: false
+			tracing: '.netlify/edge/tracing.server.js',
+			tla: false,
+			start: '.netlify/edge/start.js'
 		});
 	}
 
@@ -294,7 +299,7 @@ function generate_lambda_functions({ builder, publish, split }) {
 				builder.trace({
 					entrypoint: `.netlify/functions-internal/${name}.mjs`,
 					tracing: '.netlify/server/tracing.server.js',
-					start: `${name}.start.mjs`,
+					start: `.netlify/functions-start/${name}.start.mjs`,
 					exports: ['handler']
 				});
 			}
@@ -316,6 +321,7 @@ function generate_lambda_functions({ builder, publish, split }) {
 			builder.trace({
 				entrypoint: `.netlify/functions-internal/${FUNCTION_PREFIX}render.mjs`,
 				tracing: '.netlify/server/tracing.server.js',
+				start: `.netlify/functions-start/${FUNCTION_PREFIX}render.start.mjs`,
 				exports: ['handler']
 			});
 		}

packages/adapter-netlify/test/apps/basic/src/tracing.server.ts

@@ -0,0 +1 @@
+console.log('loaded');

packages/kit/src/core/adapt/builder.js

@@ -240,7 +240,13 @@ export function create_builder({
 			return existsSync(`${config.kit.outDir}/output/server/tracing.server.js`);
 		},
 
-		trace({ entrypoint, tracing, start = 'start.js', tla = true, exports = ['default'] }) {
+		trace({
+			entrypoint,
+			tracing,
+			start = join(dirname(entrypoint), 'start.js'),
+			tla = true,
+			exports = ['default']
+		}) {
 			if (!existsSync(tracing)) {
 				throw new Error(
 					`Tracing file ${tracing} not found. This is probably a bug in your adapter.`
@@ -252,10 +258,9 @@ export function create_builder({
 				);
 			}
 
-			const start_path = join(dirname(entrypoint), start);
-			copy(entrypoint, start_path);
+			copy(entrypoint, start);
 			if (existsSync(`${entrypoint}.map`)) {
-				copy(`${entrypoint}.map`, `${start_path}.map`);
+				copy(`${entrypoint}.map`, `${start}.map`);
 			}
 
 			rimraf(entrypoint);
@@ -299,6 +304,7 @@ async function compress_file(file, format = 'gz') {
  */
 function create_tracing_facade({ entrypoint, tracing, start, exports, tla }) {
 	const relative_tracing = relative(dirname(entrypoint), tracing);
+	const relative_start = relative(dirname(entrypoint), start);
 	const import_tracing = `import './${relative_tracing}';`;
 
 	let alias_index = 0;
@@ -349,8 +355,8 @@ function create_tracing_facade({ entrypoint, tracing, start, exports, tla }) {
 	const default_alias = aliases.get('default');
 	const entrypoint_facade = [
 		tla
-			? `const { ${import_statements.join(', ')} } = await import('./${start}');`
-			: `import { ${import_statements.join(', ')} } from './${start}';`,
+			? `const { ${import_statements.join(', ')} } = await import('./${relative_start}');`
+			: `import { ${import_statements.join(', ')} } from './${relative_start}';`,
 		default_alias ? `export default ${default_alias};` : '',
 		export_statements.length > 0 ? `export { ${export_statements.join(', ')} };` : ''
 	]