Merge branch 'main' into redirects-ssg

packages/astro-rss/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @astrojs/rss
 
+## 2.4.3
+
+### Patch Changes
+
+- [#7153](https://github.com/withastro/astro/pull/7153) [`e17ed0727`](https://github.com/withastro/astro/commit/e17ed0727ef1acb512c77723a1b641326de8ca84) Thanks [@AkashRajpurohit](https://github.com/AkashRajpurohit)! - exposes RSSFeedItem type
+
 ## 2.4.2
 
 ### Patch Changes

packages/astro-rss/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/rss",
   "description": "Add RSS feeds to your Astro projects",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",

packages/astro-rss/src/index.ts

@@ -32,7 +32,7 @@ export type RSSOptions = {
 	trailingSlash?: z.infer<typeof rssOptionsValidator>['trailingSlash'];
 };
 
-type RSSFeedItem = {
+export type RSSFeedItem = {
 	/** Link to item */
 	link: string;
 	/** Full content of the item. Should be valid HTML */

packages/astro/CHANGELOG.md

@@ -1,5 +1,27 @@
 # astro
 
+## 2.5.2
+
+### Patch Changes
+
+- [#7144](https://github.com/withastro/astro/pull/7144) [`ba0636240`](https://github.com/withastro/astro/commit/ba0636240996f9f082d122a8414240196881cb96) Thanks [@lilnasy](https://github.com/lilnasy)! - Fixed an issue where scripts that weren't safe to inline were inlined.
+
+- [#7150](https://github.com/withastro/astro/pull/7150) [`8f418d13c`](https://github.com/withastro/astro/commit/8f418d13c5d5c9c40f05020205f24380b718654b) Thanks [@MoustaphaDev](https://github.com/MoustaphaDev)! - fix no matched path when using `getStaticPaths` without `prerender` export.
+
+## 2.5.1
+
+### Patch Changes
+
+- [#7128](https://github.com/withastro/astro/pull/7128) [`72f686a68`](https://github.com/withastro/astro/commit/72f686a68930de52f9a274c13c98acad59925b31) Thanks [@johannesspohr](https://github.com/johannesspohr)! - Fix routes created by `injectRoute` for SSR
+
+- [#7132](https://github.com/withastro/astro/pull/7132) [`319a0a7a0`](https://github.com/withastro/astro/commit/319a0a7a0a6a950387c942b467746d590bb32fda) Thanks [@ematipico](https://github.com/ematipico)! - Emit middleware as an entrypoint during build
+
+- [#7036](https://github.com/withastro/astro/pull/7036) [`852d59a8d`](https://github.com/withastro/astro/commit/852d59a8d68e124f10852609e0f1619d5838ac76) Thanks [@ematipico](https://github.com/ematipico)! - Emit pages as dynamic import chunks during the build
+
+- [#7126](https://github.com/withastro/astro/pull/7126) [`530fb9ebe`](https://github.com/withastro/astro/commit/530fb9ebee77646921ec29d45d9b66484bdfb521) Thanks [@bluwy](https://github.com/bluwy)! - Add route information when warning of `getStaticPaths()` ignored
+
+- [#7118](https://github.com/withastro/astro/pull/7118) [`3257dd289`](https://github.com/withastro/astro/commit/3257dd28901c785a6a661211b98c5ef2cb3b9aa4) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fix unnecessary warning showing on start when a collection folder was empty. The warning was also enhanced to add more information about possible causes.
+
 ## 2.5.0
 
 ### Minor Changes

packages/astro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",

packages/astro/src/core/build/plugins/plugin-hoisted-scripts.ts

@@ -4,7 +4,7 @@ import { viteID } from '../../util.js';
 import type { BuildInternals } from '../internal.js';
 import { getPageDataByViteID } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin';
-import type { StaticBuildOptions } from '../types';
+import type { OutputChunk, StaticBuildOptions } from '../types';
 
 function virtualHoistedEntry(id: string) {
 	return id.startsWith('/astro/hoisted.js?q=');
@@ -50,44 +50,53 @@ export function vitePluginHoistedScripts(
 				assetInlineLimit = settings.config.vite?.build.assetsInlineLimit;
 			}
 
+			const considerInlining = new Map<string, OutputChunk>();
+			const importedByOtherScripts = new Set<string>();
+
 			// Find all page entry points and create a map of the entry point to the hashed hoisted script.
 			// This is used when we render so that we can add the script to the head.
-			for (const [id, output] of Object.entries(bundle)) {
+			Object.entries(bundle).forEach(([id, output]) => {
 				if (
 					output.type === 'chunk' &&
 					output.facadeModuleId &&
 					virtualHoistedEntry(output.facadeModuleId)
 				) {
-					const canBeInlined =
-						output.imports.length === 0 &&
-						output.dynamicImports.length === 0 &&
-						Buffer.byteLength(output.code) <= assetInlineLimit;
-					let removeFromBundle = false;
-					const facadeId = output.facadeModuleId!;
-					const pages = internals.hoistedScriptIdToPagesMap.get(facadeId)!;
-					for (const pathname of pages) {
-						const vid = viteID(new URL('.' + pathname, settings.config.root));
-						const pageInfo = getPageDataByViteID(internals, vid);
-						if (pageInfo) {
-							if (canBeInlined) {
-								pageInfo.hoistedScript = {
-									type: 'inline',
-									value: output.code,
-								};
-								removeFromBundle = true;
-							} else {
-								pageInfo.hoistedScript = {
-									type: 'external',
-									value: id,
-								};
-							}
+					considerInlining.set(id, output);
+					output.imports.forEach((imported) => importedByOtherScripts.add(imported));
+				}
+			});
+
+			for (const [id, output] of considerInlining.entries()) {
+				const canBeInlined =
+					importedByOtherScripts.has(output.fileName) === false &&
+					output.imports.length === 0 &&
+					output.dynamicImports.length === 0 &&
+					Buffer.byteLength(output.code) <= assetInlineLimit;
+				let removeFromBundle = false;
+				const facadeId = output.facadeModuleId!;
+				const pages = internals.hoistedScriptIdToPagesMap.get(facadeId)!;
+				for (const pathname of pages) {
+					const vid = viteID(new URL('.' + pathname, settings.config.root));
+					const pageInfo = getPageDataByViteID(internals, vid);
+					if (pageInfo) {
+						if (canBeInlined) {
+							pageInfo.hoistedScript = {
+								type: 'inline',
+								value: output.code,
+							};
+							removeFromBundle = true;
+						} else {
+							pageInfo.hoistedScript = {
+								type: 'external',
+								value: id,
+							};
 						}
 					}
+				}
 
-					// Remove the bundle if it was inlined
-					if (removeFromBundle) {
-						delete bundle[id];
-					}
+				// Remove the bundle if it was inlined
+				if (removeFromBundle) {
+					delete bundle[id];
 				}
 			}
 		},

packages/astro/src/core/build/plugins/plugin-prerender.ts

@@ -1,5 +1,6 @@
 import path from 'node:path';
 import type { Plugin as VitePlugin } from 'vite';
+import { getPrerenderMetadata } from '../../../prerender/metadata.js';
 import type { BuildInternals } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin.js';
 import type { StaticBuildOptions } from '../types';
@@ -20,7 +21,7 @@ function vitePluginPrerender(opts: StaticBuildOptions, internals: BuildInternals
 					if (pageInfo) {
 						// prerendered pages should be split into their own chunk
 						// Important: this can't be in the `pages/` directory!
-						if (meta.getModuleInfo(id)?.meta.astro?.pageOptions?.prerender) {
+						if (getPrerenderMetadata(meta.getModuleInfo(id))) {
 							pageInfo.route.prerender = true;
 							return 'prerender';
 						}

packages/astro/src/core/endpoint/index.ts

@@ -138,7 +138,7 @@ export async function callEndpoint<MiddlewareResult = Response | EndpointOutput>
 		};
 	}
 
-	if (env.ssr && !mod.prerender) {
+	if (env.ssr && !ctx.route?.prerender) {
 		if (response.hasOwnProperty('headers')) {
 			warn(
 				logging,

packages/astro/src/core/render/core.ts

@@ -90,7 +90,7 @@ export async function getParamsAndProps(
 			routeCache.set(route, routeCacheEntry);
 		}
 		const matchedStaticPath = findPathItemByKey(routeCacheEntry.staticPaths, params, route);
-		if (!matchedStaticPath && (ssr ? mod.prerender : true)) {
+		if (!matchedStaticPath && (ssr ? route.prerender : true)) {
 			return GetParamsAndPropsError.NoMatchingStaticPath;
 		}
 		// Note: considered using Object.create(...) for performance

packages/astro/src/core/render/dev/index.ts

@@ -66,6 +66,7 @@ export async function preload({
 	try {
 		// Load the module from the Vite SSR Runtime.
 		const mod = (await env.loader.import(fileURLToPath(filePath))) as ComponentInstance;
+
 		return [renderers, mod];
 	} catch (error) {
 		// If the error came from Markdown or CSS, we already handled it and there's no need to enhance it

packages/astro/src/core/render/route-cache.ts

@@ -31,7 +31,7 @@ export async function callGetStaticPaths({
 }: CallGetStaticPathsOptions): Promise<RouteCacheEntry> {
 	validateDynamicRouteModule(mod, { ssr, logging, route });
 	// No static paths in SSR mode. Return an empty RouteCacheEntry.
-	if (ssr && !mod.prerender) {
+	if (ssr && !route.prerender) {
 		return { staticPaths: Object.assign([], { keyed: new Map() }) };
 	}
 	// Add a check here to make TypeScript happy.

packages/astro/src/core/routing/manifest/create.ts

@@ -264,7 +264,7 @@ export function createRouteManifest(
 	]);
 	const validEndpointExtensions: Set<string> = new Set(['.js', '.ts']);
 	const localFs = fsMod ?? nodeFs;
-	const isPrenderDefault = isHybridOutput(settings.config);
+	const isPrerenderDefault = isHybridOutput(settings.config);
 
 	const foundInvalidFileExtensions: Set<string> = new Set();
 
@@ -377,7 +377,7 @@ export function createRouteManifest(
 					component,
 					generate,
 					pathname: pathname || undefined,
-					prerender: isPrenderDefault,
+					prerender: isPrerenderDefault,
 				});
 			}
 		});
@@ -425,7 +425,7 @@ export function createRouteManifest(
 			routes.unshift({
 				...routeData,
 				type,
-				prerender: isPrenderDefault
+				prerender: isPrerenderDefault,
 			});
 		});
 

packages/astro/src/core/routing/validation.ts

@@ -32,14 +32,14 @@ export function validateDynamicRouteModule(
 		route: RouteData;
 	}
 ) {
-	if (ssr && mod.getStaticPaths && !mod.prerender) {
+	if (ssr && mod.getStaticPaths && !route.prerender) {
 		warn(
 			logging,
 			'getStaticPaths',
 			`getStaticPaths() in ${bold(route.component)} is ignored when "output: server" is set.`
 		);
 	}
-	if ((!ssr || mod.prerender) && !mod.getStaticPaths) {
+	if ((!ssr || route.prerender) && !mod.getStaticPaths) {
 		throw new AstroError({
 			...AstroErrorData.GetStaticPathsRequired,
 			location: { file: route.component },

packages/astro/src/prerender/metadata.ts

@@ -0,0 +1,22 @@
+import type { ModuleInfo, ModuleLoader } from '../core/module-loader';
+import { viteID } from '../core/util.js';
+
+type GetPrerenderStatusParams = {
+	filePath: URL;
+	loader: ModuleLoader;
+};
+
+export function getPrerenderStatus({
+	filePath,
+	loader,
+}: GetPrerenderStatusParams): boolean | undefined {
+	const fileID = viteID(filePath);
+	const moduleInfo = loader.getModuleInfo(fileID);
+	if (!moduleInfo) return;
+	const prerenderStatus = getPrerenderMetadata(moduleInfo);
+	return prerenderStatus;
+}
+
+export function getPrerenderMetadata(moduleInfo: ModuleInfo) {
+	return moduleInfo?.meta?.astro?.pageOptions?.prerender;
+}

packages/astro/src/vite-plugin-astro-server/route.ts

@@ -16,6 +16,7 @@ import { preload, renderPage } from '../core/render/dev/index.js';
 import { getParamsAndProps, GetParamsAndPropsError } from '../core/render/index.js';
 import { createRequest } from '../core/request.js';
 import { matchAllRoutes } from '../core/routing/index.js';
+import { getPrerenderStatus } from '../prerender/metadata.js';
 import { isHybridOutput } from '../prerender/utils.js';
 import { log404 } from './common.js';
 import { handle404Response, writeSSRResult, writeWebResponse } from './response.js';
@@ -50,6 +51,17 @@ export async function matchRoute(
 	for await (const maybeRoute of matches) {
 		const filePath = new URL(`./${maybeRoute.component}`, settings.config.root);
 		const preloadedComponent = await preload({ env, filePath });
+
+		// gets the prerender metadata set by the `astro:scanner` vite plugin
+		const prerenderStatus = getPrerenderStatus({
+			filePath,
+			loader: env.loader,
+		});
+
+		if (prerenderStatus !== undefined) {
+			maybeRoute.prerender = prerenderStatus;
+		}
+
 		const [, mod] = preloadedComponent;
 		// attempt to get static paths
 		// if this fails, we have a bad URL match!