Merge branch 'main' into fix/missing-css-import-on-404-redirect

.changeset/early-planets-knock.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix filename generation for `.astro` pages

.changeset/new-otters-sell.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/rss': patch
+---
+
+Add URL to RSSOptions.site type

.changeset/quick-eagles-impress.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix inline root resolve logic

.changeset/stupid-pants-press.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Ensure that injected routes from `node_modules` are properly detected

.github/workflows/check.yml

@@ -23,6 +23,7 @@ jobs:
   check:
     name: astro check
     runs-on: ubuntu-latest
+    timeout-minutes: 7
     steps:
       - name: Check out repository
         uses: actions/checkout@v3

.github/workflows/ci.yml

@@ -230,24 +230,23 @@ jobs:
       - name: Remove docs translations except for English and Korean
         run: find smoke/docs/src/content/docs ! -name 'en' ! -name 'ko' -type d -mindepth 1 -maxdepth 1 -exec rm -rf {} +
 
-# TODO: enable when the script is updated
-#      - name: Check if docs changed
-#        id: changes
-#        uses: dorny/paths-filter@v2
-#        with:
-#          filters: |
-#            docs:
-#              - 'packages/integrations/*/README.md'
-#              - 'packages/astro/src/@types/astro.ts'
-#              - 'packages/astro/src/core/errors/errors-data.ts'
-#
-#      - name: Build autogenerated docs pages from current astro branch
-#        if: ${{ steps.changes.outputs.docs == 'true' }}
-#        run: cd smoke/docs && pnpm docgen && pnpm docgen:errors && pnpm docgen:integrations
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#          SOURCE_REPO: ${{ github.event.pull_request.head.repo.full_name || github.event.repository.full_name }}
-#          SOURCE_BRANCH: ${{ github.head_ref || github.ref_name }}
+      - name: Check if docs changed
+        id: changes
+        uses: dorny/paths-filter@v2
+        with:
+          filters: |
+            docs:
+              - 'packages/integrations/*/README.md'
+              - 'packages/astro/src/@types/astro.ts'
+              - 'packages/astro/src/core/errors/errors-data.ts'
+
+      - name: Build autogenerated docs pages from current astro branch
+        if: ${{ steps.changes.outputs.docs == 'true' }}
+        run: cd smoke/docs && pnpm docgen && pnpm docgen:errors && pnpm docgen:integrations
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SOURCE_REPO: ${{ github.event.pull_request.head.repo.full_name || github.event.repository.full_name }}
+          SOURCE_BRANCH: ${{ github.head_ref || github.ref_name }}
 
       - name: Test
         run: pnpm run test:smoke

packages/astro-rss/src/index.ts

@@ -16,7 +16,7 @@ export type RSSOptions = {
 	 * We recommend using the [endpoint context object](https://docs.astro.build/en/reference/api-reference/#contextsite),
 	 * which includes the `site` configured in your project's `astro.config.*`
 	 */
-	site: z.infer<typeof rssOptionsValidator>['site'];
+	site: z.infer<typeof rssOptionsValidator>['site'] | URL;
 	/** List of RSS feed items to render. */
 	items: RSSFeedItem[] | GlobResult;
 	/** Specify arbitrary metadata on opening <xml> tag */

packages/astro/src/@types/astro.ts

@@ -1316,16 +1316,20 @@ export interface AstroUserConfig {
  */
 export type InjectedScriptStage = 'before-hydration' | 'head-inline' | 'page' | 'page-ssr';
 
-/**
- * Resolved Astro Config
- * Config with user settings along with all defaults filled in.
- */
-
 export interface InjectedRoute {
 	pattern: string;
 	entryPoint: string;
 	prerender?: boolean;
 }
+
+export interface ResolvedInjectedRoute extends InjectedRoute {
+	resolvedEntryPoint?: URL;
+}
+
+/**
+ * Resolved Astro Config
+ * Config with user settings along with all defaults filled in.
+ */
 export interface AstroConfig extends z.output<typeof AstroConfigSchema> {
 	// Public:
 	// This is a more detailed type than zod validation gives us.
@@ -1414,6 +1418,7 @@ export interface AstroSettings {
 	config: AstroConfig;
 	adapter: AstroAdapter | undefined;
 	injectedRoutes: InjectedRoute[];
+	resolvedInjectedRoutes: ResolvedInjectedRoute[];
 	pageExtensions: string[];
 	contentEntryTypes: ContentEntryType[];
 	dataEntryTypes: DataEntryType[];

packages/astro/src/core/build/static-build.ts

@@ -448,19 +448,12 @@ export function makeAstroPageEntryPointFileName(
 	const pageModuleId = facadeModuleId
 		.replace(prefix, '')
 		.replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, '.');
-	let route = routes.find((routeData) => {
-		return routeData.route === pageModuleId;
-	});
-	let name = pageModuleId;
-	if (route) {
-		name = route.route;
-	}
-	if (name.endsWith('/')) name += 'index';
-	const fileName = `${name.replaceAll('[', '_').replaceAll(']', '_').replaceAll('...', '---')}.mjs`;
-	if (name.startsWith('..')) {
-		return `pages${fileName}`;
-	}
-	return fileName;
+	const route = routes.find((routeData) => routeData.component === pageModuleId);
+	const name = route?.route ?? pageModuleId;
+	return `pages${name
+		.replace(/\/$/, '/index')
+		.replaceAll(/[\[\]]/g, '_')
+		.replaceAll('...', '---')}.astro.mjs`;
 }
 
 /**

packages/astro/src/core/config/config.ts

@@ -211,6 +211,10 @@ async function loadConfig(
 	}
 }
 
+/**
+ * `AstroInlineConfig` is a union of `AstroUserConfig` and `AstroInlineOnlyConfig`.
+ * This functions splits it up.
+ */
 function splitInlineConfig(inlineConfig: AstroInlineConfig): {
 	inlineUserConfig: AstroUserConfig;
 	inlineOnlyConfig: AstroInlineOnlyConfig;
@@ -231,6 +235,12 @@ interface ResolveConfigResult {
 	astroConfig: AstroConfig;
 }
 
+/**
+ * Resolves the Astro config with a given inline config.
+ *
+ * @param inlineConfig An inline config that takes highest priority when merging and resolving the final config.
+ * @param command The running command that uses this config. Usually 'dev' or 'build'.
+ */
 export async function resolveConfig(
 	inlineConfig: AstroInlineConfig,
 	command: string,
@@ -239,6 +249,11 @@ export async function resolveConfig(
 	const root = resolveRoot(inlineConfig.root);
 	const { inlineUserConfig, inlineOnlyConfig } = splitInlineConfig(inlineConfig);
 
+	// If the root is specified, assign the resolved path so it takes the highest priority
+	if (inlineConfig.root) {
+		inlineUserConfig.root = root;
+	}
+
 	const userConfig = await loadConfig(root, inlineOnlyConfig.configFile, fsMod);
 	const mergedConfig = mergeConfig(userConfig, inlineUserConfig);
 	const astroConfig = await validateConfig(mergedConfig, root, command);

packages/astro/src/core/config/settings.ts

@@ -21,6 +21,7 @@ export function createBaseSettings(config: AstroConfig): AstroSettings {
 
 		adapter: undefined,
 		injectedRoutes: [],
+		resolvedInjectedRoutes: [],
 		pageExtensions: ['.astro', '.html', ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS],
 		contentEntryTypes: [markdownContentEntryType],
 		dataEntryTypes: [

packages/astro/src/core/util.ts

@@ -113,8 +113,9 @@ function isInPagesDir(file: URL, config: AstroConfig): boolean {
 }
 
 function isInjectedRoute(file: URL, settings: AstroSettings) {
-	for (const route of settings.injectedRoutes) {
-		if (file.toString().endsWith(route.entryPoint)) return true;
+	let fileURL = file.toString();
+	for (const route of settings.resolvedInjectedRoutes) {
+		if (route.resolvedEntryPoint && fileURL === route.resolvedEntryPoint.toString()) return true;
 	}
 	return false;
 }

packages/astro/src/vite-plugin-integrations-container/index.ts

@@ -1,6 +1,9 @@
+import type { PluginContext } from 'rollup';
 import type { Plugin as VitePlugin } from 'vite';
-import type { AstroSettings } from '../@types/astro.js';
+import type { AstroSettings, InjectedRoute, ResolvedInjectedRoute } from '../@types/astro.js';
 import type { LogOptions } from '../core/logger/core.js';
+
+import { normalizePath } from 'vite';
 import { runHookServerSetup } from '../integrations/index.js';
 
 /** Connect Astro integrations into Vite, as needed. */
@@ -16,5 +19,24 @@ export default function astroIntegrationsContainerPlugin({
 		configureServer(server) {
 			runHookServerSetup({ config: settings.config, server, logging });
 		},
+		async buildStart() {
+			// Ensure the injectedRoutes are all resolved to their final paths through Rollup
+			settings.resolvedInjectedRoutes = await Promise.all(
+				settings.injectedRoutes.map((route) => resolveEntryPoint.call(this, route))
+			);
+		},
 	};
 }
+
+async function resolveEntryPoint(
+	this: PluginContext,
+	route: InjectedRoute
+): Promise<ResolvedInjectedRoute> {
+	const resolvedId = await this.resolve(route.entryPoint)
+		.then((res) => res?.id)
+		.catch(() => undefined);
+	if (!resolvedId) return route;
+
+	const resolvedEntryPoint = new URL(`file://${normalizePath(resolvedId)}`);
+	return { ...route, resolvedEntryPoint };
+}

packages/astro/test/units/build/static-build.test.js

@@ -0,0 +1,58 @@
+import { expect } from 'chai';
+import { makeAstroPageEntryPointFileName } from '../../../dist/core/build/static-build.js';
+
+describe('astro/src/core/build', () => {
+	describe('makeAstroPageEntryPointFileName', () => {
+		const routes = [
+			{
+				route: '/',
+				component: 'src/pages/index.astro',
+				pathname: '/',
+			},
+			{
+				route: '/injected',
+				component: '../node_modules/my-dep/injected.astro',
+				pathname: '/injected',
+			},
+			{
+				route: '/injected-workspace',
+				component: '../../packages/demo/[...all].astro',
+				pathname: undefined,
+			},
+			{
+				route: '/blog/[year]/[...slug]',
+				component: 'src/pages/blog/[year]/[...slug].astro',
+				pathname: undefined,
+			},
+		];
+
+		it('handles local pages', async () => {
+			const input = '@astro-page:src/pages/index@_@astro';
+			const output = 'pages/index.astro.mjs';
+			const result = makeAstroPageEntryPointFileName('@astro-page:', input, routes);
+			expect(result).to.equal(output);
+		});
+
+		it('handles dynamic pages', async () => {
+			const input = '@astro-page:src/pages/blog/[year]/[...slug]@_@astro';
+			const output = 'pages/blog/_year_/_---slug_.astro.mjs';
+			const result = makeAstroPageEntryPointFileName('@astro-page:', input, routes);
+			expect(result).to.equal(output);
+		});
+
+		it('handles node_modules pages', async () => {
+			const input = '@astro-page:../node_modules/my-dep/injected@_@astro';
+			const output = 'pages/injected.astro.mjs';
+			const result = makeAstroPageEntryPointFileName('@astro-page:', input, routes);
+			expect(result).to.equal(output);
+		});
+
+		// Fix #7561
+		it('handles local workspace pages', async () => {
+			const input = '@astro-page:../../packages/demo/[...all]@_@astro';
+			const output = 'pages/injected-workspace.astro.mjs';
+			const result = makeAstroPageEntryPointFileName('@astro-page:', input, routes);
+			expect(result).to.equal(output);
+		});
+	});
+});

packages/astro/test/units/config/config-resolve.test.js

@@ -0,0 +1,18 @@
+import { expect } from 'chai';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { resolveConfig } from '../../../dist/core/config/index.js';
+
+describe('resolveConfig', () => {
+	it('resolves relative inline root correctly', async () => {
+		const { astroConfig } = await resolveConfig(
+			{
+				configFile: false,
+				root: 'relative/path',
+			},
+			'dev'
+		);
+		const expectedRoot = path.join(process.cwd(), 'relative/path/');
+		expect(fileURLToPath(astroConfig.root)).to.equal(expectedRoot);
+	});
+});

packages/integrations/lit/README.md

@@ -79,9 +79,7 @@ customElements.define('my-element', MyElement);
 Now, the component is ready to be imported via the Astro frontmatter:
 
 ```astro
-// src/pages/index.astro
-
-import { MyElement } from '../components/my-element.js';
+// src/pages/index.astro import {MyElement} from '../components/my-element.js';
 <MyElement />
 ```