From b9c751e9cd02cc4f8b02155f65b7c696fa9e5ca1 Mon Sep 17 00:00:00 2001
From: bluwy <bjornlu.dev@gmail.com>
Date: Tue, 26 Dec 2023 21:16:57 +0800
Subject: [PATCH] wip improve base handling

---
 examples/basics/astro.config.mjs              | 14 ++++++++++++-
 examples/basics/src/pages/index.astro         |  3 +++
 .../src/content/vite-plugin-content-assets.ts |  1 +
 packages/astro/src/core/create-vite.ts        |  2 +-
 packages/astro/src/core/util.ts               | 20 +++++++++++--------
 .../src/vite-plugin-astro-server/base.ts      |  2 --
 .../src/vite-plugin-astro-server/request.ts   |  2 +-
 .../src/vite-plugin-astro-server/response.ts  |  7 +++++--
 .../src/vite-plugin-astro-server/route.ts     | 14 ++++++++++---
 .../src/vite-plugin-astro-server/scripts.ts   |  9 +++++----
 10 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/examples/basics/astro.config.mjs b/examples/basics/astro.config.mjs
index 882e6515a6..8f28a06492 100644
--- a/examples/basics/astro.config.mjs
+++ b/examples/basics/astro.config.mjs
@@ -1,4 +1,16 @@
 import { defineConfig } from 'astro/config';
 
 // https://astro.build/config
-export default defineConfig({});
+export default defineConfig({
+  base: '/src',
+  vite: {
+    plugins: [
+      {
+        name:'',
+        configResolved(c) {
+          console.log(c.base)
+        }
+      }
+    ]
+  }
+});
diff --git a/examples/basics/src/pages/index.astro b/examples/basics/src/pages/index.astro
index fb6262872d..455863c9c2 100644
--- a/examples/basics/src/pages/index.astro
+++ b/examples/basics/src/pages/index.astro
@@ -61,6 +61,9 @@ import Card from '../components/Card.astro';
 			/>
 		</ul>
 	</main>
+	<script>
+		console.log('asd')
+	</script>
 </Layout>
 
 <style>
diff --git a/packages/astro/src/content/vite-plugin-content-assets.ts b/packages/astro/src/content/vite-plugin-content-assets.ts
index 5b79d5653e..fbab3bf049 100644
--- a/packages/astro/src/content/vite-plugin-content-assets.ts
+++ b/packages/astro/src/content/vite-plugin-content-assets.ts
@@ -73,6 +73,7 @@ export function astroContentAssetPropagationPlugin({
 					const hoistedScripts = await getScriptsForURL(
 						pathToFileURL(basePath),
 						settings.config.root,
+						settings.config.base,
 						devModuleLoader
 					);
 
diff --git a/packages/astro/src/core/create-vite.ts b/packages/astro/src/core/create-vite.ts
index a3edff3b91..71b994289b 100644
--- a/packages/astro/src/core/create-vite.ts
+++ b/packages/astro/src/core/create-vite.ts
@@ -107,7 +107,6 @@ export async function createVite(
 	const commonConfig: vite.InlineConfig = {
 		// Tell Vite not to combine config from vite.config.js with our provided inline config
 		configFile: false,
-		cacheDir: fileURLToPath(new URL('./node_modules/.vite/', settings.config.root)), // using local caches allows Astro to be used in monorepos, etc.
 		clearScreen: false, // we want to control the output, not Vite
 		customLogger: createViteLogger(logger, settings.config.vite.logLevel),
 		appType: 'custom',
@@ -147,6 +146,7 @@ export async function createVite(
 		],
 		publicDir: fileURLToPath(settings.config.publicDir),
 		root: fileURLToPath(settings.config.root),
+		base: new URL(settings.config.base, settings.config.site ?? 'http://localhost').pathname,
 		envPrefix: settings.config.vite?.envPrefix ?? 'PUBLIC_',
 		define: {
 			'import.meta.env.SITE': settings.config.site
diff --git a/packages/astro/src/core/util.ts b/packages/astro/src/core/util.ts
index bcfa9a511b..9f3f8985fe 100644
--- a/packages/astro/src/core/util.ts
+++ b/packages/astro/src/core/util.ts
@@ -6,7 +6,7 @@ import type { AstroConfig, AstroSettings, RouteType } from '../@types/astro.js';
 import { isServerLikeOutput } from '../prerender/utils.js';
 import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from './constants.js';
 import type { ModuleLoader } from './module-loader/index.js';
-import { prependForwardSlash, removeTrailingForwardSlash, slash } from './path.js';
+import { joinPaths, prependForwardSlash, removeTrailingForwardSlash, slash } from './path.js';
 
 /** Returns true if argument is an object of any prototype/class (but not null). */
 export function isObject(value: unknown): value is Record<string, any> {
@@ -189,25 +189,29 @@ export function emoji(char: string, fallback: string) {
  * through a script tag or a dynamic import as-is.
  */
 // NOTE: `/@id/` should only be used when the id is fully resolved
-export async function resolveIdToUrl(loader: ModuleLoader, id: string, root?: URL) {
+export async function resolveIdToUrl(loader: ModuleLoader, id: string, root?: URL, base?: string) {
 	let resultId = await loader.resolveId(id, undefined);
 	// Try resolve jsx to tsx
 	if (!resultId && id.endsWith('.jsx')) {
 		resultId = await loader.resolveId(id.slice(0, -4), undefined);
 	}
 	if (!resultId) {
-		return VALID_ID_PREFIX + id;
-	}
-	if (path.isAbsolute(resultId)) {
+		resultId = VALID_ID_PREFIX + id;
+	} else if (path.isAbsolute(resultId)) {
 		const normalizedRoot = root && normalizePath(fileURLToPath(root));
 		// Convert to root-relative path if path is inside root
 		if (normalizedRoot && resultId.startsWith(normalizedRoot)) {
-			return resultId.slice(normalizedRoot.length - 1);
+			resultId = resultId.slice(normalizedRoot.length - 1);
 		} else {
-			return '/@fs' + prependForwardSlash(resultId);
+			resultId = '/@fs' + prependForwardSlash(resultId);
 		}
+	} else {
+		resultId = VALID_ID_PREFIX + resultId;
 	}
-	return VALID_ID_PREFIX + resultId;
+	if (base) {
+		resultId = joinPaths(base, resultId);
+	}
+	return resultId;
 }
 
 export function resolveJsToTs(filePath: string) {
diff --git a/packages/astro/src/vite-plugin-astro-server/base.ts b/packages/astro/src/vite-plugin-astro-server/base.ts
index 68eeae21a3..cb49f534d3 100644
--- a/packages/astro/src/vite-plugin-astro-server/base.ts
+++ b/packages/astro/src/vite-plugin-astro-server/base.ts
@@ -15,7 +15,6 @@ export function baseMiddleware(
 	const site = config.site ? new URL(config.base, config.site) : undefined;
 	const devRootURL = new URL(config.base, 'http://localhost');
 	const devRoot = site ? site.pathname : devRootURL.pathname;
-	const devRootReplacement = devRoot.endsWith('/') ? '/' : '';
 
 	return function devBaseMiddleware(req, res, next) {
 		const url = req.url!;
@@ -23,7 +22,6 @@ export function baseMiddleware(
 		const pathname = decodeURI(new URL(url, 'http://localhost').pathname);
 
 		if (pathname.startsWith(devRoot)) {
-			req.url = url.replace(devRoot, devRootReplacement);
 			return next();
 		}
 
diff --git a/packages/astro/src/vite-plugin-astro-server/request.ts b/packages/astro/src/vite-plugin-astro-server/request.ts
index 5dd507c75b..e57da444e9 100644
--- a/packages/astro/src/vite-plugin-astro-server/request.ts
+++ b/packages/astro/src/vite-plugin-astro-server/request.ts
@@ -87,7 +87,7 @@ export async function handleRequest({
 		},
 		onError(_err) {
 			const { error, errorWithMetadata } = recordServerError(moduleLoader, config, pipeline, _err);
-			handle500Response(moduleLoader, incomingResponse, errorWithMetadata);
+			handle500Response(moduleLoader, config.base, incomingResponse, errorWithMetadata);
 			return error;
 		},
 	});
diff --git a/packages/astro/src/vite-plugin-astro-server/response.ts b/packages/astro/src/vite-plugin-astro-server/response.ts
index ac36e703b0..7378ddb09e 100644
--- a/packages/astro/src/vite-plugin-astro-server/response.ts
+++ b/packages/astro/src/vite-plugin-astro-server/response.ts
@@ -6,6 +6,7 @@ import { Readable } from 'stream';
 import { getSetCookiesFromResponse } from '../core/cookies/index.js';
 import { getViteErrorPayload } from '../core/errors/dev/index.js';
 import notFoundTemplate from '../template/4xx.js';
+import { joinPaths } from '@astrojs/internal-helpers/path';
 
 export async function handle404Response(
 	origin: string,
@@ -25,20 +26,22 @@ export async function handle404Response(
 
 export async function handle500Response(
 	loader: ModuleLoader,
+	base: string,
 	res: http.ServerResponse,
 	err: ErrorWithMetadata
 ) {
 	res.on('close', async () =>
 		setTimeout(async () => loader.webSocketSend(await getViteErrorPayload(err)), 200)
 	);
+	const viteClientPath = joinPaths(base, '/@vite/client');
 	if (res.headersSent) {
-		res.write(`<script type="module" src="/@vite/client"></script>`);
+		res.write(`<script type="module" src="${viteClientPath}"></script>`);
 		res.end();
 	} else {
 		writeHtmlResponse(
 			res,
 			500,
-			`<title>${err.name}</title><script type="module" src="/@vite/client"></script>`
+			`<title>${err.name}</title><script type="module" src="${viteClientPath}"></script>`
 		);
 	}
 }
diff --git a/packages/astro/src/vite-plugin-astro-server/route.ts b/packages/astro/src/vite-plugin-astro-server/route.ts
index 3196b951a7..472d4959fb 100644
--- a/packages/astro/src/vite-plugin-astro-server/route.ts
+++ b/packages/astro/src/vite-plugin-astro-server/route.ts
@@ -35,6 +35,7 @@ import { getComponentMetadata } from './metadata.js';
 import { handle404Response, writeSSRResult, writeWebResponse } from './response.js';
 import { getScriptsForURL } from './scripts.js';
 import { normalizeTheLocale } from '../i18n/index.js';
+import { joinPaths } from '@astrojs/internal-helpers/path';
 
 const clientLocalsSymbol = Symbol.for('astro.locals');
 
@@ -384,13 +385,14 @@ async function getScriptsAndStyles({ pipeline, filePath }: GetScriptsAndStylesPa
 	const moduleLoader = pipeline.getModuleLoader();
 	const settings = pipeline.getSettings();
 	const mode = pipeline.getEnvironment().mode;
+	const { root, base } = settings.config;
 	// Add hoisted script tags
-	const scripts = await getScriptsForURL(filePath, settings.config.root, moduleLoader);
+	const scripts = await getScriptsForURL(filePath, root, base, moduleLoader);
 
 	// Inject HMR scripts
 	if (isPage(filePath, settings) && mode === 'development') {
 		scripts.add({
-			props: { type: 'module', src: '/@vite/client' },
+			props: { type: 'module', src: joinPaths(base, '/@vite/client') },
 			children: '',
 		});
 
@@ -401,7 +403,12 @@ async function getScriptsAndStyles({ pipeline, filePath }: GetScriptsAndStylesPa
 			scripts.add({
 				props: {
 					type: 'module',
-					src: await resolveIdToUrl(moduleLoader, 'astro/runtime/client/dev-overlay/entrypoint.js'),
+					src: await resolveIdToUrl(
+						moduleLoader,
+						'astro/runtime/client/dev-overlay/entrypoint.js',
+						root,
+						base
+					),
 				},
 				children: '',
 			});
@@ -441,6 +448,7 @@ async function getScriptsAndStyles({ pipeline, filePath }: GetScriptsAndStylesPa
 		moduleLoader,
 		mode
 	);
+	console.log(filePath, styleUrls, importedStyles);
 	let links = new Set<SSRElement>();
 	[...styleUrls].forEach((href) => {
 		links.add({
diff --git a/packages/astro/src/vite-plugin-astro-server/scripts.ts b/packages/astro/src/vite-plugin-astro-server/scripts.ts
index 00bc4054b0..c09262c3fd 100644
--- a/packages/astro/src/vite-plugin-astro-server/scripts.ts
+++ b/packages/astro/src/vite-plugin-astro-server/scripts.ts
@@ -8,24 +8,25 @@ import { crawlGraph } from './vite.js';
 export async function getScriptsForURL(
 	filePath: URL,
 	root: URL,
+	base: string,
 	loader: ModuleLoader
 ): Promise<Set<SSRElement>> {
 	const elements = new Set<SSRElement>();
 	const rootID = viteID(filePath);
 	const modInfo = loader.getModuleInfo(rootID);
-	addHoistedScripts(elements, modInfo, root);
+	addHoistedScripts(elements, modInfo, root, base);
 	for await (const moduleNode of crawlGraph(loader, rootID, true)) {
 		const id = moduleNode.id;
 		if (id) {
 			const info = loader.getModuleInfo(id);
-			addHoistedScripts(elements, info, root);
+			addHoistedScripts(elements, info, root, base);
 		}
 	}
 
 	return elements;
 }
 
-function addHoistedScripts(set: Set<SSRElement>, info: ModuleInfo | null, root: URL) {
+function addHoistedScripts(set: Set<SSRElement>, info: ModuleInfo | null, root: URL, base: string) {
 	if (!info?.meta?.astro) {
 		return;
 	}
@@ -35,7 +36,7 @@ function addHoistedScripts(set: Set<SSRElement>, info: ModuleInfo | null, root:
 	for (let i = 0; i < astro.scripts.length; i++) {
 		let scriptId = `${id}?astro&type=script&index=${i}&lang.ts`;
 		scriptId = rootRelativePath(root, scriptId);
-		const element = createModuleScriptElementWithSrc(scriptId);
+		const element = createModuleScriptElementWithSrc(scriptId, base);
 		set.add(element);
 	}
 }