feat: deprecate NodeApp

.changeset/big-cups-drive.md

@@ -0,0 +1,5 @@
+---
+'astro': major
+---
+
+Deprecates `loadManifest()` and `loadApp()` from `astro/app/node` (Adapter API) - ([v6 upgrade guidance](https://v6.docs.astro.build/en/guides/upgrade-to/v6/#deprecated-loadmanifest-and-loadapp-from-astroappnode-adapter-api))

.changeset/good-clubs-cover.md

@@ -0,0 +1,21 @@
+---
+'astro': minor
+---
+
+Exports new `createRequest()` and `writeResponse()` utilities from `astro/app/node`
+
+To replace the deprecated `NodeApp.createRequest()` and `NodeApp.writeResponse()` methods, the `astro/app/node` module now exposes new `createRequest()` and `writeResponse()` utilities. These can be used to convert a NodeJS `IncomingMessage` into a web-standard `Request` and stream a web-standard `Response` into a NodeJS `ServerResponse`:
+
+```js
+import { createApp } from 'astro/app/entrypoint';
+import { createRequest, writeResponse } from 'astro/app/node';
+import { createServer } from 'node:http';
+
+const app = createApp();
+
+const server = createServer(async (req, res) => {
+    const request = createRequest(req);
+    const response = await app.render(request);
+    await writeResponse(response, res);
+})
+```

.changeset/olive-dots-jam.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes the types of `createApp()` exported from `astro/app/entrypoint`

.changeset/polite-terms-shop.md

@@ -0,0 +1,5 @@
+---
+'astro': major
+---
+
+Deprecates `NodeApp` from `astro/app/node` (Adapter API) - ([v6 upgrade guidance](https://v6.docs.astro.build/en/guides/upgrade-to/v6/#deprecated-nodeapp-from-astroappnode-adapter-api))

benchmark/packages/timer/src/server.ts

@@ -1,16 +1,17 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
-import type { SSRManifest } from 'astro';
-import { NodeApp } from 'astro/app/node';
+import { createApp } from 'astro/app/entrypoint';
+import { createRequest } from 'astro/app/node';
 
-export function createExports(manifest: SSRManifest) {
-	const app = new NodeApp(manifest);
-	return {
-		handler: async (req: IncomingMessage, res: ServerResponse) => {
-			const start = performance.now();
-			await app.render(req);
-			const end = performance.now();
-			res.write(end - start + '');
-			res.end();
-		},
-	};
+const app = createApp();
+
+export async function handler(req: IncomingMessage, res: ServerResponse): Promise<void> {
+	const start = performance.now();
+	await app.render(
+		createRequest(req, {
+			allowedDomains: app.manifest.allowedDomains,
+		}),
+	);
+	const end = performance.now();
+	res.write(end - start + '');
+	res.end();
 }

packages/astro/package.json

@@ -49,12 +49,12 @@
     "./runtime/*": "./dist/runtime/*",
     "./config": "./dist/config/entrypoint.js",
     "./container": "./dist/container/index.js",
-    "./app": "./dist/core/app/index.js",
-    "./app/node": "./dist/core/app/node.js",
-    "./app/entrypoint": "./dist/core/app/entrypoint.js",
-    "./app/entrypoint/dev": "./dist/core/app/entrypoint/dev.js",
-    "./app/entrypoint/prod": "./dist/core/app/entrypoint/prod.js",
-    "./app/manifest": "./dist/core/app/manifest.js",
+    "./app": "./dist/core/app/entrypoints/index.js",
+    "./app/node": "./dist/core/app/entrypoints/node.js",
+    "./app/entrypoint": "./dist/core/app/entrypoints/virtual/index.js",
+    "./app/entrypoint/dev": "./dist/core/app/entrypoints/virtual/dev.js",
+    "./app/entrypoint/prod": "./dist/core/app/entrypoints/virtual/prod.js",
+    "./app/manifest": "./dist/core/app/entrypoints/manifest.js",
     "./entrypoints/prerender": "./dist/entrypoints/prerender.js",
     "./entrypoints/legacy": "./dist/entrypoints/legacy.js",
     "./client/*": "./dist/runtime/client/*",

packages/astro/src/core/app/entrypoints/index.ts

@@ -0,0 +1,13 @@
+export type { RoutesList } from '../../../types/astro.js';
+export { App } from '../app.js';
+export { BaseApp, type RenderErrorOptions, type RenderOptions } from '../base.js';
+export { fromRoutingStrategy, toRoutingStrategy } from '../common.js';
+export { createConsoleLogger } from '../logging.js';
+export {
+	deserializeManifest,
+	deserializeRouteData,
+	deserializeRouteInfo,
+	serializeRouteData,
+	serializeRouteInfo,
+} from '../manifest.js';
+export { AppPipeline } from '../pipeline.js';

packages/astro/src/core/app/entrypoints/manifest.ts

@@ -0,0 +1,8 @@
+export {
+	type SerializedRouteData,
+	deserializeManifest,
+	deserializeRouteData,
+	deserializeRouteInfo,
+	serializeRouteData,
+	serializeRouteInfo,
+} from '../manifest.js';

packages/astro/src/core/app/entrypoints/node.ts

@@ -0,0 +1 @@
+export { NodeApp, loadApp, loadManifest, createRequest, writeResponse } from '../node.js';

packages/astro/src/core/app/entrypoint/dev.ts → packages/astro/src/core/app/entrypoints/virtual/dev.ts

@@ -1,9 +1,9 @@
 import { manifest } from 'virtual:astro:manifest';
-import type { BaseApp } from '../base.js';
-import { DevApp } from '../dev/app.js';
-import { createConsoleLogger } from '../logging.js';
-import type { RouteInfo } from '../types.js';
-import type { RoutesList } from '../../../types/astro.js';
+import type { BaseApp } from '../../base.js';
+import { DevApp } from '../../dev/app.js';
+import { createConsoleLogger } from '../../logging.js';
+import type { RouteInfo } from '../../types.js';
+import type { RoutesList } from '../../../../types/astro.js';
 
 let currentDevApp: DevApp | null = null;
 

packages/astro/src/core/app/entrypoints/virtual/index.ts

@@ -0,0 +1,4 @@
+import { createApp as _createApp } from 'virtual:astro:app';
+import type { BaseApp } from '../../base.js';
+
+export const createApp: () => BaseApp = _createApp;

packages/astro/src/core/app/entrypoint/prod.ts → packages/astro/src/core/app/entrypoints/virtual/prod.ts

@@ -1,6 +1,6 @@
 import { manifest } from 'virtual:astro:manifest';
-import type { BaseApp } from '../base.js';
-import { App } from '../app.js';
+import type { BaseApp } from '../../base.js';
+import { App } from '../../app.js';
 
 export function createApp(): BaseApp {
 	return new App(manifest);