Skip to content

refactor: dedicated App for astro server and for external servers #14345

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
merged 7 commits into from
Sep 15, 2025
Merged

refactor: dedicated App for astro server and for external servers #14345

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
93b9fe2
refactor: dev app without settings and loader
ematipico Sep 11, 2025
6656b77
address comments
ematipico Sep 12, 2025
1202d66
chore: refactor to use proper dev pipeline
ematipico Sep 12, 2025
414ff0c
revert changes
ematipico Sep 12, 2025
3021455
chore: update lockfile
ematipico Sep 12, 2025
ee5eb8b
conditionally propagate metadata
ematipico Sep 12, 2025
4327fed
revert exports
ematipico Sep 12, 2025
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
3 changes: 3 additions & 0 deletions packages/astro/src/config/entrypoint.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// IMPORTANT: this file is the entrypoint for "astro/config". Keep it as light as possible!

import type { SharpImageServiceConfig } from '../assets/services/sharp.js';

export { createConsoleLogger, createNodeLogger } from '../core/config/index.js';
Copy link
Contributor

@ascorbic ascorbic Sep 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason to export this from here?

Copy link
Member Author

@ematipico ematipico Sep 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. It's not needed anymore


import type { ImageServiceConfig } from '../types/public/index.js';

export { defineAstroFontProvider, fontProviders } from '../assets/fonts/providers/index.js';
Expand Down
15 changes: 8 additions & 7 deletions packages/astro/src/container/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,15 @@ function createManifest(
};
}

const root = new URL(import.meta.url);
return {
hrefRoot: import.meta.url,
srcDir: manifest?.srcDir ?? ASTRO_CONFIG_DEFAULTS.srcDir,
buildClientDir: manifest?.buildClientDir ?? ASTRO_CONFIG_DEFAULTS.build.client,
buildServerDir: manifest?.buildServerDir ?? ASTRO_CONFIG_DEFAULTS.build.server,
publicDir: manifest?.publicDir ?? ASTRO_CONFIG_DEFAULTS.publicDir,
outDir: manifest?.outDir ?? ASTRO_CONFIG_DEFAULTS.outDir,
cacheDir: manifest?.cacheDir ?? ASTRO_CONFIG_DEFAULTS.cacheDir,
rootDir: root,
srcDir: manifest?.srcDir ?? new URL(ASTRO_CONFIG_DEFAULTS.srcDir, root),
buildClientDir: manifest?.buildClientDir ?? new URL(ASTRO_CONFIG_DEFAULTS.build.client, root),
buildServerDir: manifest?.buildServerDir ?? new URL(ASTRO_CONFIG_DEFAULTS.build.server, root),
publicDir: manifest?.publicDir ?? new URL(ASTRO_CONFIG_DEFAULTS.publicDir, root),
outDir: manifest?.outDir ?? new URL(ASTRO_CONFIG_DEFAULTS.outDir, root),
cacheDir: manifest?.cacheDir ?? new URL(ASTRO_CONFIG_DEFAULTS.cacheDir, root),
trailingSlash: manifest?.trailingSlash ?? ASTRO_CONFIG_DEFAULTS.trailingSlash,
buildFormat: manifest?.buildFormat ?? ASTRO_CONFIG_DEFAULTS.build.format,
compressHTML: manifest?.compressHTML ?? ASTRO_CONFIG_DEFAULTS.compressHTML,
Expand Down
4 changes: 4 additions & 0 deletions packages/astro/src/content/types-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { bold, cyan } from 'kleur/colors';
import { glob } from 'tinyglobby';
import {
type DevEnvironment,
isRunnableDevEnvironment,
normalizePath,
type RunnableDevEnvironment,
type ViteDevServer,
Expand Down Expand Up @@ -347,6 +348,9 @@ export async function createContentTypesGenerator({
logger,
settings,
});
if (!isRunnableDevEnvironment(viteServer.environments.ssr)) {
return;
}
invalidateVirtualMod(viteServer.environments.ssr);
}
}
Expand Down
1 change: 0 additions & 1 deletion packages/astro/src/core/app/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ export abstract class BaseApp<P extends Pipeline = AppPipeline> {
pathname = prependForwardSlash(this.removeBase(url.pathname));
}
let routeData = matchRoute(decodeURI(pathname), this.manifestData);

if (!routeData) return undefined;
if (allowPrerenderedRoutes) {
return routeData;
Expand Down
7 changes: 7 additions & 0 deletions packages/astro/src/core/app/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ export function deserializeManifest(
return { onRequest: NOOP_MIDDLEWARE_FN };
},
...serializedManifest,
rootDir: new URL(serializedManifest.rootDir),
srcDir: new URL(serializedManifest.srcDir),
publicDir: new URL(serializedManifest.publicDir),
outDir: new URL(serializedManifest.outDir),
cacheDir: new URL(serializedManifest.cacheDir),
buildClientDir: new URL(serializedManifest.buildClientDir),
buildServerDir: new URL(serializedManifest.buildServerDir),
assets,
componentMetadata,
inlinedScripts,
Expand Down
Loading
Loading