Skip to content

refactor: skip check inside createRoutesList #14325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ematipico merged 1 commit into from
Sep 9, 2025
Merged

refactor: skip check inside createRoutesList #14325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/astro/src/core/create-vite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ export async function createVite(
},
plugins: [
await serializedManifestPlugin({ settings }),
await astroPluginRoutes({ settings, logger, fsMod: fs }),
await astroPluginRoutes({ settings, logger, fsMod: fs, command }),
astroVirtualManifestPlugin(),
configAliasVitePlugin({ settings }),
astroLoadFallbackPlugin({ fs, root: settings.config.root }),
Expand Down
16 changes: 14 additions & 2 deletions packages/astro/src/core/routing/manifest/create.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,17 @@ function detectRouteCollision(a: RouteData, b: RouteData, _config: AstroConfig,
export async function createRoutesList(
params: CreateRouteManifestParams,
logger: Logger,
{ dev = false }: { dev?: boolean } = {},
{
dev = false,
skipBuildOutputAssignment = false,
}: {
dev?: boolean;
/**
* When `true`, the assignment of `settings.buildOutput` is skipped.
* Usually, that's needed when this function has already been called.
*/
skipBuildOutputAssignment?: boolean;
} = {},
): Promise<RoutesList> {
const { settings } = params;
const { config } = settings;
Expand Down Expand Up @@ -494,7 +504,9 @@ export async function createRoutesList(
...[...filteredFiledBasedRoutes, ...injectedRoutes, ...redirectRoutes].sort(routeComparator),
];

settings.buildOutput = getPrerenderDefault(config) ? 'static' : 'server';
if (!skipBuildOutputAssignment) {
settings.buildOutput = getPrerenderDefault(config) ? 'static' : 'server';
}

// Check the prerender option for each route
const limit = pLimit(10);
Expand Down
4 changes: 3 additions & 1 deletion packages/astro/src/vite-plugin-routes/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ type Payload = {
settings: AstroSettings;
logger: Logger;
fsMod?: typeof fsMod;
command: 'dev' | 'build';
};

const ASTRO_ROUTES_MODULE_ID = 'astro:routes';
Expand All @@ -30,6 +31,7 @@ export default async function astroPluginRoutes({
settings,
logger,
fsMod,
command,
}: Payload): Promise<Plugin> {
logger.debug('update', 'Re-calculate routes');
let routeList = await createRoutesList(
Expand All @@ -39,7 +41,7 @@ export default async function astroPluginRoutes({
},
logger,
// TODO: the caller should handle this
{ dev: true },
{ dev: true, skipBuildOutputAssignment: command === 'build' },
);

let serializedRouteInfo: SerializedRouteInfo[] = routeList.routes.map(
Expand Down
Loading