Merge branch 'main' into main

.changeset/chatty-walls-happen.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixed a case where dynamic imports tried to preload inlined stylesheets.

.changeset/empty-rings-bow.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes remote assets caching logic to not use expired assets

.changeset/fair-countries-admire.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/svelte': patch
+---
+
+Removed vite warnings.

.changeset/friendly-clocks-act.md

@@ -0,0 +1,6 @@
+---
+'create-astro': patch
+'astro': patch
+---
+
+Support detecting Bun when logging messages with package manager information.

.changeset/modern-guests-float.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/vercel': patch
+---
+
+Fix serverless function naming conflicts for routes with identical filenames but different directory structures

.changeset/twelve-cars-tell.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix markdown page HMR

.changeset/weak-kids-roll.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix scroll position when navigating back from page w/o ViewTransitions

.eslintrc.cjs

@@ -13,7 +13,10 @@ module.exports = {
   rules: {
     // These off/configured-differently-by-default rules fit well for us
     '@typescript-eslint/array-type': ['error', { default: 'array-simple' }],
-    '@typescript-eslint/no-unused-vars': ['error', { ignoreRestSiblings: true }],
+    '@typescript-eslint/no-unused-vars': [
+      'error',
+      { argsIgnorePattern: '^_', ignoreRestSiblings: true },
+    ],
     'no-only-tests/no-only-tests': 'error',
     '@typescript-eslint/no-shadow': ['error'],
     'no-console': 'warn',

packages/astro/components/ViewTransitions.astro

@@ -30,9 +30,11 @@ const { fallback = 'animate' } = Astro.props as Props;
 	// The History API does not tell you if navigation is forward or back, so
 	// you can figure it using an index. On pushState the index is incremented so you
 	// can use that to determine popstate if going forward or back.
-	let currentHistoryIndex = history.state?.index || 0;
-	if (!history.state && transitionEnabledOnThisPage()) {
-		persistState({ index: currentHistoryIndex, scrollY: 0 });
+	let currentHistoryIndex = 0;
+	if (history.state) {
+		// we reloaded a page with history state (e.g. back button or browser reload)
+		currentHistoryIndex = history.state.index;
+		scrollTo({ left: 0, top: history.state.scrollY });
 	}
 
 	const throttle = (cb: (...args: any[]) => any, delay: number) => {
@@ -352,6 +354,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 				// The current page doesn't haven't View Transitions,
 				// respect that with a full page reload
 				// -- but only for transition managed by us (ev.state is set)
+				history.scrollRestoration && (history.scrollRestoration = "manual")
 				location.reload();
 				return;
 			}

packages/astro/e2e/fixtures/view-transitions/src/pages/long-page.astro

@@ -32,6 +32,8 @@ import Layout from '../components/Layout.astro';
 		
 		<div><a id="click-one-again" href="/one">go to 1</a></div>
 		<div><a id="click-scroll-up" href="#longpage">go back up</a></div>
+		<div><a id="click-external" href="/three">leave ViewTransitions</a></div>
+
 		Morbi tristique senectus et netus et. Neque aliquam vestibulum morbi blandit cursus risus. Pharetra pharetra massa massa ultricies mi quis. Sit amet aliquam id diam maecenas ultricies mi eget mauris. Ultrices mi tempus imperdiet nulla malesuada. At consectetur lorem donec massa sapien faucibus et molestie. Non sodales neque sodales ut etiam. Eget nunc lobortis mattis aliquam faucibus purus in massa tempor. Viverra suspendisse potenti nullam ac tortor vitae purus faucibus. Pellentesque eu tincidunt tortor aliquam nulla facilisi cras fermentum. Diam vulputate ut pharetra sit. Felis donec et odio pellentesque diam. Mollis aliquam ut porttitor leo. Vitae nunc sed velit dignissim sodales. Facilisis mauris sit amet massa vitae tortor condimentum lacinia quis.
 		
 		Aliquet enim tortor at auctor urna nunc id cursus. Bibendum at varius vel pharetra vel turpis nunc eget. Mattis molestie a iaculis at erat. Vel turpis nunc eget lorem dolor sed viverra ipsum nunc. Aliquam malesuada bibendum arcu vitae elementum curabitur vitae nunc sed. Nunc congue nisi vitae suscipit. Donec massa sapien faucibus et molestie ac. Nec feugiat nisl pretium fusce. At imperdiet dui accumsan sit amet nulla facilisi. Sed viverra tellus in hac.

packages/astro/e2e/view-transitions.test.js

@@ -502,3 +502,24 @@ test.describe('View Transitions', () => {
 		await downloadPromise;
 	});
 });
+
+test('Scroll position is restored on back navigation from page w/o ViewTransitions', async ({
+	page,
+	astro,
+}) => {
+	// Go to middle of long page
+	await page.goto(astro.resolveUrl('/long-page#click-external'));
+
+	let locator = page.locator('#click-external');
+	await expect(locator).toBeInViewport();
+
+	// Go to a page that has not enabled ViewTransistions
+	await page.click('#click-external');
+	locator = page.locator('#three');
+	await expect(locator).toHaveText('Page 3');
+
+	// Scroll back to long page
+	await page.goBack();
+	locator = page.locator('#click-external');
+	await expect(locator).toBeInViewport();
+});

packages/astro/package.json

@@ -156,7 +156,7 @@
     "ora": "^7.0.1",
     "p-limit": "^4.0.0",
     "path-to-regexp": "^6.2.1",
-    "preferred-pm": "^3.0.3",
+    "preferred-pm": "^3.1.2",
     "prompts": "^2.4.2",
     "rehype": "^12.0.1",
     "resolve": "^1.22.4",
@@ -172,7 +172,7 @@
     "vfile": "^5.3.7",
     "vite": "^4.4.9",
     "vitefu": "^0.2.4",
-    "which-pm": "^2.0.0",
+    "which-pm": "^2.1.1",
     "yargs-parser": "^21.1.1",
     "zod": "3.21.1"
   },

packages/astro/src/assets/build/generate.ts

@@ -75,7 +75,7 @@ export async function generateImage(
 			const JSONData = JSON.parse(readFileSync(cachedFileURL, 'utf-8')) as RemoteCacheEntry;
 
 			// If the cache entry is not expired, use it
-			if (JSONData.expires < Date.now()) {
+			if (JSONData.expires > Date.now()) {
 				await fs.promises.writeFile(finalFileURL, Buffer.from(JSONData.data, 'base64'));
 
 				return {

packages/astro/src/cli/add/index.ts

@@ -620,6 +620,8 @@ async function getInstallIntegrationsCommand({
 			return { pm: 'yarn', command: 'add', flags: [], dependencies };
 		case 'pnpm':
 			return { pm: 'pnpm', command: 'add', flags: [], dependencies };
+		case 'bun':
+			return { pm: 'bun', command: 'add', flags: [], dependencies };
 		default:
 			return null;
 	}

packages/astro/src/cli/install-package.ts

@@ -67,6 +67,8 @@ function getInstallCommand(packages: string[], packageManager: string) {
 			return { pm: 'yarn', command: 'add', flags: [], dependencies: packages };
 		case 'pnpm':
 			return { pm: 'pnpm', command: 'add', flags: [], dependencies: packages };
+		case 'bun':
+			return { pm: 'bun', command: 'add', flags: [], dependencies: packages };
 		default:
 			return null;
 	}

packages/astro/src/cli/telemetry/index.ts

@@ -1,4 +1,5 @@
 /* eslint-disable no-console */
+import whichPm from 'which-pm';
 import type yargs from 'yargs-parser';
 import * as msg from '../../core/messages.js';
 import { telemetry } from '../../events/index.js';
@@ -8,8 +9,9 @@ interface TelemetryOptions {
 }
 
 export async function notify() {
+	const packageManager = (await whichPm(process.cwd())).name ?? 'npm';
 	await telemetry.notify(() => {
-		console.log(msg.telemetryNotice() + '\n');
+		console.log(msg.telemetryNotice(packageManager) + '\n');
 		return true;
 	});
 }

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

@@ -121,8 +121,6 @@ export class App {
 		}
 		return pathname;
 	}
-	// Disable no-unused-vars to avoid breaking signature change
-	// eslint-disable-next-line @typescript-eslint/no-unused-vars
 	match(request: Request, _opts: MatchOptions = {}): RouteData | undefined {
 		const url = new URL(request.url);
 		// ignore requests matching public assets

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

@@ -200,7 +200,7 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
 			const inlineConfig = settings.config.build.inlineStylesheets;
 			const { assetsInlineLimit = 4096 } = settings.config.vite?.build ?? {};
 
-			Object.entries(bundle).forEach(([id, stylesheet]) => {
+			Object.entries(bundle).forEach(([_, stylesheet]) => {
 				if (
 					stylesheet.type !== 'asset' ||
 					stylesheet.name?.endsWith('.css') !== true ||
@@ -217,8 +217,6 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
 						? false
 						: assetSize <= assetsInlineLimit;
 
-				if (toBeInlined) delete bundle[id];
-
 				// there should be a single js object for each stylesheet,
 				// allowing the single reference to be shared and checked for duplicates
 				const sheet: StylesheetAsset = toBeInlined

packages/astro/src/core/messages.ts

@@ -105,10 +105,10 @@ export function serverStart({
 		.join('\n');
 }
 
-export function telemetryNotice() {
+export function telemetryNotice(packageManager = 'npm') {
 	const headline = `${cyan('◆')} Astro collects completely anonymous usage data.`;
 	const why = dim('  This optional program helps shape our roadmap.');
-	const disable = dim('  Run `npm run astro telemetry disable` to opt-out.');
+	const disable = dim(`  Run \`${packageManager} run astro telemetry disable\` to opt-out.`);
 	const details = `  Details: ${underline('https://astro.build/telemetry')}`;
 	return [headline, why, disable, details].map((v) => '  ' + v).join('\n');
 }

packages/astro/src/vite-plugin-markdown/index.ts

@@ -107,7 +107,7 @@ export default function markdown({ settings, logger }: AstroPluginOptions): Plug
 				}
 
 				const code = escapeViteEnvReferences(`
-				import { unescapeHTML, spreadAttributes, createComponent, render, renderComponent } from ${JSON.stringify(
+				import { unescapeHTML, spreadAttributes, createComponent, render, renderComponent, maybeRenderHead } from ${JSON.stringify(
 					astroServerRuntimeModulePath
 				)};
 				import { AstroError, AstroErrorData } from ${JSON.stringify(astroErrorModulePath)};
@@ -180,10 +180,9 @@ export default function markdown({ settings, logger }: AstroPluginOptions): Plug
 							}, {
 								'default': () => render\`\${unescapeHTML(html)}\`
 							})}\`;`
-							: `render\`\${unescapeHTML(html)}\`;`
+							: `render\`\${maybeRenderHead(result)}\${unescapeHTML(html)}\`;`
 					}
 				});
-				Content[Symbol.for('astro.needsHeadRendering')] = ${layout ? 'false' : 'true'};
 				export default Content;
 				`);
 

packages/astro/test/astro-pages.test.js

@@ -49,5 +49,10 @@ describe('Pages', () => {
 
 			expect($('#testing').length).to.be.greaterThan(0);
 		});
+
+		it('should have Vite client in dev', async () => {
+			const html = await fixture.fetch('/').then((res) => res.text());
+			expect(html).to.include('/@vite/client', 'Markdown page does not have Vite client for HMR');
+		});
 	});
 });

packages/astro/test/css-dangling-references.test.js

@@ -0,0 +1,36 @@
+import { expect } from 'chai';
+import { loadFixture } from './test-utils.js';
+
+const cssAssetReferenceRegExp = /_astro\/[A-Za-z0-9\-]+\.[a0-9a-f]{8}\.css/g;
+
+describe("When Vite's preloadModule polyfill is used", async () => {
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/css-dangling-references/',
+		});
+		await fixture.build();
+	});
+
+	it('there are no references to deleted CSS chunks', async () => {
+		const fileNames = await fixture.readdir('/_astro/');
+		const filePaths = fileNames.map((filename) => '_astro/' + filename);
+
+		const expectations = filePaths
+			.filter((filePath) => filePath.endsWith('js'))
+			.map(async (filePath) => {
+				const contents = await fixture.readFile(filePath);
+				const cssReferences = contents.match(cssAssetReferenceRegExp);
+
+				if (cssReferences === null) return;
+
+				expect(filePaths).to.contain.members(
+					cssReferences,
+					filePath + ' contains a reference to a deleted css asset: ' + cssReferences
+				);
+			});
+
+		await Promise.all(expectations);
+	});
+});

packages/astro/test/fixtures/css-dangling-references/astro.config.ts

@@ -0,0 +1,8 @@
+import { defineConfig } from 'astro/config';
+import svelte from '@astrojs/svelte';
+
+// https://astro.build/config
+export default defineConfig({
+    integrations: [svelte()],
+});
+

packages/astro/test/fixtures/css-dangling-references/package.json

@@ -0,0 +1,11 @@
+{
+    "name": "@test/css-dangling-references",
+    "version": "0.0.0",
+    "private": true,
+    "dependencies": {
+      "astro": "workspace:*",
+      "@astrojs/svelte": "workspace:*",
+      "svelte": "4"
+    }
+  }
+  

packages/astro/test/fixtures/css-dangling-references/src/components/DynamicallyImportedComponent1.svelte

@@ -0,0 +1,6 @@
+<style>
+  h1 {
+    background-color: gold;
+  }
+</style>
+<h1>This sentence should have a gold background.</h1>

packages/astro/test/fixtures/css-dangling-references/src/components/DynamicallyImportedComponent2.svelte

@@ -0,0 +1,6 @@
+<style>
+  p {
+    background-color: lavender;
+  }
+</style>
+<p>This sentence should have a lavender background color.</p>

packages/astro/test/fixtures/css-dangling-references/src/components/Wrapper.svelte

@@ -0,0 +1,15 @@
+<script>
+
+  export let path
+  
+  const allAppModules = import.meta.glob('./*.svelte')  
+  
+  const AppModule = Object.entries(allAppModules).find(
+    ([key]) => key.includes(path)
+  )[1]
+
+</script>
+
+{#await AppModule() then Mod}
+    <Mod.default />
+{/await}

packages/astro/test/fixtures/css-dangling-references/src/pages/glob-import-1.astro

@@ -0,0 +1,4 @@
+---
+import Wrapper from "../components/Wrapper.svelte"
+---
+<Wrapper path="1" client:load/>

packages/astro/test/fixtures/css-dangling-references/src/pages/glob-import-2.astro

@@ -0,0 +1,5 @@
+---
+import Wrapper from "../components/Wrapper.svelte"
+---
+<Wrapper path="2" client:load/>
+

packages/astro/test/fixtures/css-inline-stylesheets/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@test/css-inline-stylesheets-always",
+  "name": "@test/css-inline-stylesheets",
   "version": "0.0.0",
   "private": true,
   "dependencies": {

packages/create-astro/src/actions/context.ts

@@ -9,7 +9,7 @@ export interface Context {
 	help: boolean;
 	prompt: typeof prompt;
 	cwd: string;
-	pkgManager: string;
+	packageManager: string;
 	username: string;
 	version: string;
 	skipHouston: boolean;
@@ -51,7 +51,7 @@ export async function getContext(argv: string[]): Promise<Context> {
 		{ argv, permissive: true }
 	);
 
-	const pkgManager = detectPackageManager()?.name ?? 'npm';
+	const packageManager = detectPackageManager()?.name ?? 'npm';
 	const [username, version] = await Promise.all([getName(), getVersion()]);
 	let cwd = flags['_'][0];
 	let {
@@ -85,7 +85,7 @@ export async function getContext(argv: string[]): Promise<Context> {
 	const context: Context = {
 		help,
 		prompt,
-		pkgManager,
+		packageManager,
 		username,
 		version,
 		skipHouston,

packages/create-astro/src/actions/dependencies.ts

@@ -6,7 +6,7 @@ import { shell } from '../shell.js';
 import type { Context } from './context';
 
 export async function dependencies(
-	ctx: Pick<Context, 'install' | 'yes' | 'prompt' | 'pkgManager' | 'cwd' | 'dryRun'>
+	ctx: Pick<Context, 'install' | 'yes' | 'prompt' | 'packageManager' | 'cwd' | 'dryRun'>
 ) {
 	let deps = ctx.install ?? ctx.yes;
 	if (deps === undefined) {
@@ -25,15 +25,15 @@ export async function dependencies(
 		await info('--dry-run', `Skipping dependency installation`);
 	} else if (deps) {
 		await spinner({
-			start: `Installing dependencies with ${ctx.pkgManager}...`,
+			start: `Installing dependencies with ${ctx.packageManager}...`,
 			end: 'Dependencies installed',
 			while: () => {
-				return install({ pkgManager: ctx.pkgManager, cwd: ctx.cwd }).catch((e) => {
+				return install({ packageManager: ctx.packageManager, cwd: ctx.cwd }).catch((e) => {
 					error('error', e);
 					error(
 						'error',
 						`Dependencies failed to install, please run ${color.bold(
-							ctx.pkgManager + ' install'
+							ctx.packageManager + ' install'
 						)}  to install them manually after setup.`
 					);
 				});
@@ -47,9 +47,9 @@ export async function dependencies(
 	}
 }
 
-async function install({ pkgManager, cwd }: { pkgManager: string; cwd: string }) {
-	if (pkgManager === 'yarn') await ensureYarnLock({ cwd });
-	return shell(pkgManager, ['install'], { cwd, timeout: 90_000, stdio: 'ignore' });
+async function install({ packageManager, cwd }: { packageManager: string; cwd: string }) {
+	if (packageManager === 'yarn') await ensureYarnLock({ cwd });
+	return shell(packageManager, ['install'], { cwd, timeout: 90_000, stdio: 'ignore' });
 }
 
 async function ensureYarnLock({ cwd }: { cwd: string }) {

packages/create-astro/src/actions/next-steps.ts

@@ -3,14 +3,17 @@ import type { Context } from './context';
 
 import { nextSteps, say } from '../messages.js';
 
-export async function next(ctx: Pick<Context, 'cwd' | 'pkgManager' | 'skipHouston'>) {
+export async function next(ctx: Pick<Context, 'cwd' | 'packageManager' | 'skipHouston'>) {
 	let projectDir = path.relative(process.cwd(), ctx.cwd);
-	const devCmd =
-		ctx.pkgManager === 'npm'
-			? 'npm run dev'
-			: ctx.pkgManager === 'bun'
-			? 'bun run dev'
-			: `${ctx.pkgManager} dev`;
+
+	const commandMap: { [key: string]: string } = {
+		npm: 'npm run dev',
+		bun: 'bun run dev',
+		yarn: 'yarn dev',
+		pnpm: 'pnpm dev',
+	};
+
+	const devCmd = commandMap[ctx.packageManager as keyof typeof commandMap] || 'npm run dev';
 	await nextSteps({ projectDir, devCmd });
 
 	if (!ctx.skipHouston) {

packages/create-astro/test/dependencies.test.js

@@ -10,7 +10,7 @@ describe('dependencies', () => {
 		const context = {
 			cwd: '',
 			yes: true,
-			pkgManager: 'npm',
+			packageManager: 'npm',
 			dryRun: true,
 			prompt: () => ({ deps: true }),
 		};
@@ -21,7 +21,7 @@ describe('dependencies', () => {
 	it('prompt yes', async () => {
 		const context = {
 			cwd: '',
-			pkgManager: 'npm',
+			packageManager: 'npm',
 			dryRun: true,
 			prompt: () => ({ deps: true }),
 			install: undefined,
@@ -34,7 +34,7 @@ describe('dependencies', () => {
 	it('prompt no', async () => {
 		const context = {
 			cwd: '',
-			pkgManager: 'npm',
+			packageManager: 'npm',
 			dryRun: true,
 			prompt: () => ({ deps: false }),
 			install: undefined,
@@ -48,7 +48,7 @@ describe('dependencies', () => {
 		const context = {
 			cwd: '',
 			install: true,
-			pkgManager: 'npm',
+			packageManager: 'npm',
 			dryRun: true,
 			prompt: () => ({ deps: false }),
 		};
@@ -61,7 +61,7 @@ describe('dependencies', () => {
 		const context = {
 			cwd: '',
 			install: false,
-			pkgManager: 'npm',
+			packageManager: 'npm',
 			dryRun: true,
 			prompt: () => ({ deps: false }),
 		};

packages/create-astro/test/next.test.js

@@ -7,14 +7,14 @@ describe('next steps', () => {
 	const fixture = setup();
 
 	it('no arguments', async () => {
-		await next({ skipHouston: false, cwd: './it/fixtures/not-empty', pkgManager: 'npm' });
+		await next({ skipHouston: false, cwd: './it/fixtures/not-empty', packageManager: 'npm' });
 		expect(fixture.hasMessage('Liftoff confirmed.')).to.be.true;
 		expect(fixture.hasMessage('npm run dev')).to.be.true;
 		expect(fixture.hasMessage('Good luck out there, astronaut!')).to.be.true;
 	});
 
 	it('--skip-houston', async () => {
-		await next({ skipHouston: true, cwd: './it/fixtures/not-empty', pkgManager: 'npm' });
+		await next({ skipHouston: true, cwd: './it/fixtures/not-empty', packageManager: 'npm' });
 		expect(fixture.hasMessage('Good luck out there, astronaut!')).to.be.false;
 	});
 });

packages/integrations/cloudflare/test/basics.test.js

@@ -8,14 +8,18 @@ describe('Basic app', () => {
 	/** @type {import('./test-utils').WranglerCLI} */
 	let cli;
 
-	before(async () => {
+	before(async function () {
 		fixture = await loadFixture({
 			root: './fixtures/basics/',
 		});
 		await fixture.build();
 
 		cli = await runCLI('./fixtures/basics/', { silent: true, port: 8789 });
-		await cli.ready;
+		await cli.ready.catch((e) => {
+			console.log(e);
+			// if fail to start, skip for now as it's very flaky
+			this.skip();
+		});
 	});
 
 	after(async () => {

packages/integrations/cloudflare/test/cf.test.js

@@ -9,7 +9,7 @@ describe('Cf metadata and caches', () => {
 	/** @type {import('./test-utils').WranglerCLI} */
 	let cli;
 
-	before(async () => {
+	before(async function () {
 		fixture = await loadFixture({
 			root: './fixtures/cf/',
 			output: 'server',
@@ -17,8 +17,12 @@ describe('Cf metadata and caches', () => {
 		});
 		await fixture.build();
 
-		cli = await runCLI('./fixtures/cf/', { silent: false, port: 8788 });
-		await cli.ready;
+		cli = await runCLI('./fixtures/cf/', { silent: true, port: 8786 });
+		await cli.ready.catch((e) => {
+			console.log(e);
+			// if fail to start, skip for now as it's very flaky
+			this.skip();
+		});
 	});
 
 	after(async () => {
@@ -26,7 +30,7 @@ describe('Cf metadata and caches', () => {
 	});
 
 	it('Load cf and caches API', async () => {
-		let res = await fetch(`http://127.0.0.1:8788/`);
+		let res = await fetch(`http://127.0.0.1:8786/`);
 		expect(res.status).to.equal(200);
 		let html = await res.text();
 		let $ = cheerio.load(html);

packages/integrations/cloudflare/test/runtime.test.js

@@ -9,7 +9,7 @@ describe('Runtime Locals', () => {
 	/** @type {import('./test-utils.js').WranglerCLI} */
 	let cli;
 
-	before(async () => {
+	before(async function () {
 		fixture = await loadFixture({
 			root: './fixtures/runtime/',
 			output: 'server',
@@ -18,7 +18,11 @@ describe('Runtime Locals', () => {
 		await fixture.build();
 
 		cli = await runCLI('./fixtures/runtime/', { silent: true, port: 8793 });
-		await cli.ready;
+		await cli.ready.catch((e) => {
+			console.log(e);
+			// if fail to start, skip for now as it's very flaky
+			this.skip();
+		});
 	});
 
 	after(async () => {

packages/integrations/cloudflare/test/with-solid-js.test.js

@@ -8,14 +8,18 @@ describe('With SolidJS', () => {
 	/** @type {import('./test-utils').WranglerCLI} */
 	let cli;
 
-	before(async () => {
+	before(async function () {
 		fixture = await loadFixture({
 			root: './fixtures/with-solid-js/',
 		});
 		await fixture.build();
 
 		cli = await runCLI('./fixtures/with-solid-js/', { silent: true, port: 8790 });
-		await cli.ready;
+		await cli.ready.catch((e) => {
+			console.log(e);
+			// if fail to start, skip for now as it's very flaky
+			this.skip();
+		});
 	});
 
 	after(async () => {

packages/integrations/svelte/src/index.ts

@@ -17,7 +17,8 @@ async function svelteConfigHasPreprocess(root: URL) {
 	for (const file of svelteConfigFiles) {
 		const filePath = fileURLToPath(new URL(file, root));
 		try {
-			const config = (await import(filePath)).default;
+			// Suppress warnings by vite: "The above dynamic import cannot be analyzed by Vite."
+			const config = (await import(/* @vite-ignore */ filePath)).default;
 			return !!config.preprocess;
 		} catch {}
 	}

packages/integrations/vercel/src/serverless/adapter.ts

@@ -243,8 +243,18 @@ You can set functionPerRoute: false to prevent surpassing the limit.`
 
 				// Multiple entrypoint support
 				if (_entryPoints.size) {
+					const getRouteFuncName = (route: RouteData) => route.component.replace('src/pages/', '');
+
+					const getFallbackFuncName = (entryFile: URL) =>
+						basename(entryFile.toString())
+							.replace('entry.', '')
+							.replace(/\.mjs$/, '');
+
 					for (const [route, entryFile] of _entryPoints) {
-						const func = basename(entryFile.toString()).replace(/\.mjs$/, '');
+						const func = route.component.startsWith('src/pages/')
+							? getRouteFuncName(route)
+							: getFallbackFuncName(entryFile);
+
 						await createFunctionFolder(func, entryFile, filesToInclude, logger);
 						routeDefinitions.push({
 							src: route.pattern.source,

packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/astro.config.mjs

@@ -0,0 +1,10 @@
+import { defineConfig } from 'astro/config';
+import vercel from '@astrojs/vercel/serverless';
+
+export default defineConfig({
+	adapter: vercel({
+		// Pass some value to make sure it doesn't error out
+		includeFiles: ['included.js'],
+	}),
+	output: 'server'
+});

packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/included.js

@@ -0,0 +1 @@
+'works'

packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "@test/astro-vercel-serverless-with-dynamic-routes",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/vercel": "workspace:*",
+    "astro": "workspace:*"
+  }
+}

packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/[id]/index.astro

@@ -0,0 +1,12 @@
+---
+export const prerender = false;
+---
+
+<html>
+	<head>
+		<title>testing {Astro.params.id}</title>
+	</head>
+	<body>
+		<h1>testing {Astro.params.id}</h1>
+	</body>
+</html>

packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/api/[id].js

@@ -0,0 +1,7 @@
+export const prerender = false;
+
+export async function GET({ params }) {
+	return Response.json({
+		id: params.id
+	});
+}

packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/src/pages/index.astro

@@ -0,0 +1,12 @@
+---
+export const prerender = import.meta.env.PRERENDER;
+---
+
+<html>
+	<head>
+		<title>testing</title>
+	</head>
+	<body>
+		<h1>testing</h1>
+	</body>
+</html>

packages/integrations/vercel/test/serverless-with-dynamic-routes.test.js

@@ -0,0 +1,25 @@
+import { expect } from 'chai';
+import { loadFixture } from './test-utils.js';
+
+describe('Serverless with dynamic routes', () => {
+	/** @type {import('./test-utils.js').Fixture} */
+	let fixture;
+
+	before(async () => {
+		process.env.PRERENDER = true;
+		fixture = await loadFixture({
+			root: './fixtures/serverless-with-dynamic-routes/',
+			output: 'hybrid',
+		});
+		await fixture.build();
+	});
+
+	it('build successful', async () => {
+		expect(await fixture.readFile('../.vercel/output/static/index.html')).to.be.ok;
+		expect(
+			await fixture.readFile('../.vercel/output/functions/[id]/index.astro.func/.vc-config.json')
+		).to.be.ok;
+		expect(await fixture.readFile('../.vercel/output/functions/api/[id].js.func/.vc-config.json'))
+			.to.be.ok;
+	});
+});

pnpm-lock.yaml

@@ -594,8 +594,8 @@ importers:
         specifier: ^6.2.1
         version: 6.2.1
       preferred-pm:
-        specifier: ^3.0.3
-        version: 3.0.3
+        specifier: ^3.1.2
+        version: 3.1.2
       prompts:
         specifier: ^2.4.2
         version: 2.4.2
@@ -642,8 +642,8 @@ importers:
         specifier: ^0.2.4
         version: 0.2.4(vite@4.4.9)
       which-pm:
-        specifier: ^2.0.0
-        version: 2.0.0
+        specifier: ^2.1.1
+        version: 2.1.1
       yargs-parser:
         specifier: ^21.1.1
         version: 21.1.1
@@ -2437,6 +2437,18 @@ importers:
 
   packages/astro/test/fixtures/css-assets/packages/font-awesome: {}
 
+  packages/astro/test/fixtures/css-dangling-references:
+    dependencies:
+      '@astrojs/svelte':
+        specifier: workspace:*
+        version: link:../../../../integrations/svelte
+      astro:
+        specifier: workspace:*
+        version: link:../../..
+      svelte:
+        specifier: '4'
+        version: 4.2.0
+
   packages/astro/test/fixtures/css-import-as-inline:
     dependencies:
       astro:
@@ -4800,6 +4812,15 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
 
+  packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes:
+    dependencies:
+      '@astrojs/vercel':
+        specifier: workspace:*
+        version: link:../../..
+      astro:
+        specifier: workspace:*
+        version: link:../../../../../astro
+
   packages/integrations/vercel/test/fixtures/static-assets:
     dependencies:
       '@astrojs/vercel':
@@ -6831,7 +6852,7 @@ packages:
       meow: 6.1.1
       outdent: 0.5.0
       p-limit: 2.3.0
-      preferred-pm: 3.0.3
+      preferred-pm: 3.1.2
       resolve-from: 5.0.0
       semver: 7.5.4
       spawndamnit: 2.0.0
@@ -15181,8 +15202,8 @@ packages:
       tar-fs: 2.1.1
       tunnel-agent: 0.6.0
 
-  /preferred-pm@3.0.3:
-    resolution: {integrity: sha512-+wZgbxNES/KlJs9q40F/1sfOd/j7f1O9JaHcW5Dsn3aUUOZg3L2bjpVUcKV2jvtElYfoTuQiNeMfQJ4kwUAhCQ==}
+  /preferred-pm@3.1.2:
+    resolution: {integrity: sha512-nk7dKrcW8hfCZ4H6klWcdRknBOXWzNQByJ0oJyX97BOupsYD+FzLS4hflgEu/uPUEHZCuRfMxzCBsuWd7OzT8Q==}
     engines: {node: '>=10'}
     dependencies:
       find-up: 5.0.0
@@ -17875,6 +17896,14 @@ packages:
       load-yaml-file: 0.2.0
       path-exists: 4.0.0
 
+  /which-pm@2.1.1:
+    resolution: {integrity: sha512-xzzxNw2wMaoCWXiGE8IJ9wuPMU+EYhFksjHxrRT8kMT5SnocBPRg69YAMtyV4D12fP582RA+k3P8H9J5EMdIxQ==}
+    engines: {node: '>=8.15'}
+    dependencies:
+      load-yaml-file: 0.2.0
+      path-exists: 4.0.0
+    dev: false
+
   /which-typed-array@1.1.11:
     resolution: {integrity: sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==}
     engines: {node: '>= 0.4'}