Merge branch 'main' into fix-first-image-cached

Author: Princesseuh

.changeset/breezy-plums-clap.md

@@ -95,9 +95,12 @@ jobs:
       - name: Build Packages
         run: pnpm run build
 
-      - name: Lint
+      - name: Lint source code
         run: pnpm run lint:ci
 
+      - name: Lint publish code
+        run: pnpm run publint
+
   test:
     name: "Test: ${{ matrix.os }} (node@${{ matrix.NODE_VERSION }})"
     runs-on: ${{ matrix.os }}

.changeset/dull-lemons-check.md

@@ -2,48 +2,62 @@ import path from 'node:path';
 import { withCodSpeed } from '@codspeed/tinybench-plugin';
 import { Bench } from 'tinybench';
 import { exec } from 'tinyexec';
-import { renderPages } from '../make-project/render-default.js';
 import { astroBin } from './_util.js';
 
 export async function run({ memory: _memory, render, stress: _stress }) {
 	const options = {
 		iterations: 10,
 	};
 	const bench = process.env.CODSPEED ? withCodSpeed(new Bench(options)) : new Bench(options);
-	let app;
-	bench.add(
-		'Rendering',
-		async () => {
+	await exec(astroBin, ['build'], {
+		nodeOptions: {
+			cwd: render.root,
+			stdio: 'inherit',
+		},
+	});
+
+	const entry = new URL('./dist/server/entry.mjs', `file://${render.root}`);
+	const { manifest, createApp } = await import(entry);
+	const streamingApp = createApp(manifest, true);
+	const nonStreamingApp = createApp(manifest, false);
+	bench
+		.add('Rendering: streaming [true], .astro file', async () => {
 			console.info('Start task.');
-			const result = {};
-			for (const fileName of renderPages) {
-				const pathname = '/' + fileName.slice(0, -path.extname(fileName).length);
-				const request = new Request(new URL(pathname, 'http://exmpale.com'));
-				const response = await app.render(request);
-				const html = await response.text();
-				if (!result[pathname]) result[pathname] = [];
-				result[pathname].push(html);
-			}
+			const request = new Request(new URL('http://exmpale.com/astro'));
+			await streamingApp.render(request);
 			console.info('Finish task.');
-			return result;
-		},
-		{
-			async beforeAll() {
-				// build for rendering
-				await exec(astroBin, ['build'], {
-					nodeOptions: {
-						cwd: render.root,
-						stdio: 'inherit',
-					},
-				});
+		})
+		.add('Rendering: streaming [true], .md file', async () => {
+			console.info('Start task.');
+			const request = new Request(new URL('http://exmpale.com/md'));
+			await streamingApp.render(request);
+			console.info('Finish task.');
+		})
+		.add('Rendering: streaming [true], .mdx file', async () => {
+			console.info('Start task.');
+			const request = new Request(new URL('http://exmpale.com/mdx'));
+			await streamingApp.render(request);
+			console.info('Finish task.');
+		})
 
-				const entry = new URL('./dist/server/entry.mjs', `file://${render.root}`);
-				const { manifest, createApp } = await import(entry);
-				app = createApp(manifest);
-				app.manifest = manifest;
-			},
-		},
-	);
+		.add('Rendering: streaming [false], .astro file', async () => {
+			console.info('Start task.');
+			const request = new Request(new URL('http://exmpale.com/astro'));
+			await nonStreamingApp.render(request);
+			console.info('Finish task.');
+		})
+		.add('Rendering: streaming [false], .md file', async () => {
+			console.info('Start task.');
+			const request = new Request(new URL('http://exmpale.com/md'));
+			await nonStreamingApp.render(request);
+			console.info('Finish task.');
+		})
+		.add('Rendering: streaming [false], .mdx file', async () => {
+			console.info('Start task.');
+			const request = new Request(new URL('http://exmpale.com/mdx'));
+			await nonStreamingApp.render(request);
+			console.info('Finish task.');
+		});
 
 	await bench.run();
 	console.table(bench.table());

.changeset/nine-mayflies-film.md

@@ -7,11 +7,9 @@ applyPolyfills();
 
 class MyApp extends App {
 	#manifest: SSRManifest | undefined;
-	#streaming: boolean;
 	constructor(manifest: SSRManifest, streaming = false) {
 		super(manifest, streaming);
 		this.#manifest = manifest;
-		this.#streaming = streaming;
 	}
 
 	async render(request: Request) {

.github/workflows/ci.yml

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.16.10"
+    "astro": "^4.16.13"
   }
 }

benchmark/bench/codspeed.js

@@ -14,6 +14,6 @@
     "@astrojs/mdx": "^3.1.9",
     "@astrojs/rss": "^4.0.9",
     "@astrojs/sitemap": "^3.2.1",
-    "astro": "^4.16.10"
+    "astro": "^4.16.13"
   }
 }

benchmark/packages/adapter/src/server.ts

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.16.10"
+    "astro": "^4.16.13"
   },
   "peerDependencies": {
     "astro": "^4.0.0"

examples/basics/package.json

@@ -12,7 +12,7 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "astro": "^4.16.10",
+    "astro": "^4.16.13",
     "@astrojs/react": "^3.6.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",