Merge branch 'feat/environment-api' into tests/env-config-alias

matthewp · web-flow · commit 20843d781bc2 · 2025-11-20T13:46:24.000-05:00
diff --git a/biome.jsonc b/biome.jsonc
@@ -28,7 +28,7 @@
   "assist": {
     "actions": {
       "source": {
-        "organizeImports": "on"
+        "organizeImports": "off"
       }
     }
   },
diff --git a/packages/astro/src/core/routing/index.ts b/packages/astro/src/core/routing/index.ts
@@ -1,3 +1,3 @@
-export { getFallbackRoute, routeIsFallback, routeIsRedirect } from './helpers.js';
+export { routeIsRedirect } from './helpers.js';
 export { createRoutesList } from './manifest/create.js';
 export { matchAllRoutes } from './match.js';
diff --git a/packages/astro/test/0-css.test.js b/packages/astro/test/0-css.test.js
@@ -106,6 +106,18 @@ describe('CSS', function () {
 				assert.match(style, /\.comp-c\{/);
 				assert.doesNotMatch(style, /\.comp-b/);
 			});
+
+			it('CSS modules imported in both frontmatter and script should not duplicate', async () => {
+				const duplicateHtml = await fixture.readFile('/css-module-duplicate/index.html');
+				const $duplicate = cheerio.load(duplicateHtml);
+				const cssHref = $duplicate('link[rel=stylesheet][href^=/_astro/]').attr('href');
+				const css = await fixture.readFile(cssHref.replace(/^\/?/, '/'));
+
+				const normalizedCSS = css.replace(/\s+/g, '');
+
+				assert.equal((normalizedCSS.match(/\._duplicate-blue_\w+\{[^}]+\}/gi) || []).length, 1);
+				assert.equal((normalizedCSS.match(/\._duplicate-red_\w+\{[^}]+\}/gi) || []).length, 1);
+			});
 		});
 
 		describe('Styles in src/', () => {
diff --git a/packages/astro/test/fixtures/0-css/src/pages/css-module-duplicate/index.astro b/packages/astro/test/fixtures/0-css/src/pages/css-module-duplicate/index.astro
@@ -0,0 +1,16 @@
+---
+import styles from "../../styles/duplicate.module.css";
+---
+<html>
+	<head>
+		<title>CSS Module Duplicate Test</title>
+	</head>
+	<body>
+		<div id="duplicate-blue" class={styles['duplicate-blue']}>Blue from front matter</div>
+		<div id="duplicate-red" class={styles['duplicate-red']}>Red from front matter</div>
+	</body>
+</html>
+
+<script>
+	import styles from "../../styles/duplicate.module.css";
+</script>
diff --git a/packages/astro/test/fixtures/0-css/src/styles/duplicate.module.css b/packages/astro/test/fixtures/0-css/src/styles/duplicate.module.css
@@ -0,0 +1,7 @@
+.duplicate-blue {
+	color: blue;
+}
+
+.duplicate-red {
+	color: red;
+}
diff --git a/packages/astro/test/i18n-routing.test.js b/packages/astro/test/i18n-routing.test.js
@@ -2523,3 +2523,4 @@ describe('i18n routing with server islands and base path', () => {
 		assert.equal(serverIslandScript.length, 1, 'has the island script');
 	});
 });
+});
diff --git a/packages/astro/test/units/routing/route-matching.test.js b/packages/astro/test/units/routing/route-matching.test.js
@@ -143,14 +143,7 @@ describe('Route matching', () => {
 		});
 
 		const loader = createViteLoader(container.viteServer);
-		const manifest = createDevelopmentManifest(container.settings);
-		pipeline = DevPipeline.create(undefined, {
-			loader,
-			logger: defaultLogger,
-			manifest,
-			settings,
-			getDebugInfo: async () => '',
-		});
+		manifest = await createDevelopmentManifest(container.settings);
 		manifestData = await createRoutesList(
 			{
 				cwd: fixture.path,
diff --git a/packages/astro/test/units/vite-plugin-astro-server/request.test.js b/packages/astro/test/units/vite-plugin-astro-server/request.test.js
@@ -9,26 +9,6 @@ import {
 	defaultLogger,
 } from '../test-utils.js';
 
-async function createDevPipeline(overrides = {}, root) {
-	const settings = overrides.settings ?? (await createBasicSettings({ root }));
-	const loader = overrides.loader ?? createLoader();
-	const manifest = createDevelopmentManifest(settings);
-	const routesList = await createRoutesList(
-		{
-			cwd: root,
-			settings: settings,
-		},
-		defaultLogger,
-	);
-	return DevPipeline.create(routesList, {
-		loader,
-		logger: defaultLogger,
-		manifest,
-		settings,
-		getDebugInfo: async () => '',
-	});
-}
-
 describe('vite-plugin-astro-server', () => {
 	describe('url', () => {
 		let container;

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`"assist": {`
`29`	`29`	`"actions": {`
`30`	`30`	`"source": {`
`31`		`- "organizeImports": "on"`
	`31`	`+ "organizeImports": "off"`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`},`
-Original file line number
+Diff line change
 		assert.equal(serverIslandScript.length, 1, 'has the island script');
 	});
 });
 +});