feat: fix the use of vite.base in Astro Dev Server

.changeset/fresh-badgers-itch.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+nginx proxy pass dev mode

packages/astro/src/container/index.ts

@@ -241,6 +241,7 @@ type AstroContainerConstructor = {
 	streaming?: boolean;
 	renderers?: SSRLoadedRenderer[];
 	manifest?: AstroContainerManifest;
+	config?: any;
 	resolve?: SSRResult['resolve'];
 	astroConfig?: AstroConfig;
 };
@@ -263,6 +264,7 @@ export class experimental_AstroContainer {
 	private constructor({
 		streaming = false,
 		manifest,
+		config,
 		renderers,
 		resolve,
 		astroConfig,
@@ -273,6 +275,7 @@ export class experimental_AstroContainer {
 				dest: nodeLogDestination,
 			}),
 			manifest: createManifest(manifest, renderers),
+			config,
 			streaming,
 			serverLike: true,
 			renderers: renderers ?? manifest?.renderers ?? [],

packages/astro/src/container/pipeline.ts

@@ -22,17 +22,19 @@ export class ContainerPipeline extends Pipeline {
 	static create({
 		logger,
 		manifest,
+		config,
 		renderers,
 		resolve,
 		serverLike,
 		streaming,
 	}: Pick<
 		ContainerPipeline,
-		'logger' | 'manifest' | 'renderers' | 'resolve' | 'serverLike' | 'streaming'
+		'logger' | 'manifest' | 'config' | 'renderers' | 'resolve' | 'serverLike' | 'streaming'
 	>) {
 		return new ContainerPipeline(
 			logger,
 			manifest,
+			config,
 			'development',
 			renderers,
 			resolve,

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

@@ -119,6 +119,7 @@ export class App {
 		return AppPipeline.create(manifestData, {
 			logger: this.#logger,
 			manifest: this.#manifest,
+			config: {},
 			runtimeMode: 'production',
 			renderers: this.#manifest.renderers,
 			defaultRoutes: createDefaultRoutes(this.#manifest),

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

@@ -15,6 +15,7 @@ export class AppPipeline extends Pipeline {
 		{
 			logger,
 			manifest,
+			config,
 			runtimeMode,
 			renderers,
 			resolve,
@@ -25,6 +26,7 @@ export class AppPipeline extends Pipeline {
 			AppPipeline,
 			| 'logger'
 			| 'manifest'
+			| 'config' 
 			| 'runtimeMode'
 			| 'renderers'
 			| 'resolve'
@@ -36,6 +38,7 @@ export class AppPipeline extends Pipeline {
 		const pipeline = new AppPipeline(
 			logger,
 			manifest,
+			config,
 			runtimeMode,
 			renderers,
 			resolve,

packages/astro/src/core/base-pipeline.ts

@@ -28,6 +28,7 @@ export abstract class Pipeline {
 	constructor(
 		readonly logger: Logger,
 		readonly manifest: SSRManifest,
+		readonly config: any,
 		/**
 		 * "development" or "production" only
 		 */

packages/astro/src/core/build/pipeline.ts

@@ -78,6 +78,7 @@ export class BuildPipeline extends Pipeline {
 		super(
 			options.logger,
 			manifest,
+			config,
 			options.runtimeMode,
 			manifest.renderers,
 			resolve,

packages/astro/src/core/render-context.ts

@@ -362,7 +362,7 @@ export class RenderContext {
 
 	async createResult(mod: ComponentInstance) {
 		const { cookies, pathname, pipeline, routeData, status } = this;
-		const { clientDirectives, inlinedScripts, compressHTML, manifest, renderers, resolve } =
+		const { clientDirectives, inlinedScripts, compressHTML, manifest, renderers, resolve, config } =
 			pipeline;
 		const { links, scripts, styles } = await pipeline.headElements(routeData);
 		const componentMetadata =
@@ -389,6 +389,7 @@ export class RenderContext {
 		// calling the render() function will populate the object with scripts, styles, etc.
 		const result: SSRResult = {
 			base: manifest.base,
+			viteBase: config?.vite ? config?.vite.base : '',
 			cancelled: false,
 			clientDirectives,
 			inlinedScripts,

packages/astro/src/runtime/server/render/head.ts

@@ -27,6 +27,9 @@ export function renderAllHeadContent(result: SSRResult) {
 	const scripts = Array.from(result.scripts)
 		.filter(uniqueElements)
 		.map((script) => {
+			if(result.viteBase){
+				script.props.src = (result.base === '/' ? '' : result.base) + result.viteBase + script.props.src;
+			}
 			return renderElement('script', script, false);
 		});
 	const links = Array.from(result.links)

packages/astro/src/runtime/server/render/script.ts

@@ -20,5 +20,5 @@ export async function renderScript(result: SSRResult, id: string) {
 	}
 
 	const resolved = await result.resolve(id);
-	return markHTMLString(`<script type="module" src="${resolved}"></script>`);
+	return markHTMLString(`<script type="module" src="${result.viteBase ? ((result.base === '/' ? '' : result.base)+result.viteBase) : ''}${resolved}"></script>`);
 }

packages/astro/src/types/public/internal.ts

@@ -214,6 +214,7 @@ export interface SSRResult {
 	 */
 	cancelled: boolean;
 	base: string;
+	viteBase: string;
 	styles: Set<SSRElement>;
 	scripts: Set<SSRElement>;
 	links: Set<SSRElement>;

packages/astro/src/vite-plugin-astro-server/pipeline.ts

@@ -48,7 +48,7 @@ export class DevPipeline extends Pipeline {
 		const resolve = createResolve(loader, config.root);
 		const serverLike = settings.buildOutput === 'server';
 		const streaming = true;
-		super(logger, manifest, 'development', [], resolve, serverLike, streaming);
+		super(logger, manifest, config, 'development', [], resolve, serverLike, streaming);
 		manifest.serverIslandMap = settings.serverIslandMap;
 		manifest.serverIslandNameMap = settings.serverIslandNameMap;
 	}