From 8ec3d0da19ded05f7a28dc310436bf95493efca3 Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fkschott@gmail.com>
Date: Tue, 22 Mar 2022 14:49:27 -0700
Subject: [PATCH] audit file urls (#2853)

---
 packages/astro/src/core/build/scan-based-build.ts  | 4 ++--
 packages/astro/src/core/config.ts                  | 2 +-
 packages/astro/src/vite-plugin-build-html/index.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/astro/src/core/build/scan-based-build.ts b/packages/astro/src/core/build/scan-based-build.ts
index 9a08ec1f6..facaf2466 100644
--- a/packages/astro/src/core/build/scan-based-build.ts
+++ b/packages/astro/src/core/build/scan-based-build.ts
@@ -7,7 +7,7 @@ import type { ViteConfigWithSSR } from '../create-vite.js';
 import { fileURLToPath } from 'url';
 import * as vite from 'vite';
 import { createBuildInternals } from '../../core/build/internal.js';
-import { rollupPluginAstroBuildHTML } from '../../vite-plugin-build-html/index.js';
+import { rollupPluginAstroScanHTML } from '../../vite-plugin-build-html/index.js';
 import { rollupPluginAstroBuildCSS } from '../../vite-plugin-build-css/index.js';
 import { RouteCache } from '../render/route-cache.js';
 
@@ -63,7 +63,7 @@ export async function build(opts: ScanBasedBuildOptions) {
 			target: 'es2020', // must match an esbuild target
 		},
 		plugins: [
-			rollupPluginAstroBuildHTML({
+			rollupPluginAstroScanHTML({
 				astroConfig,
 				internals,
 				logging,
diff --git a/packages/astro/src/core/config.ts b/packages/astro/src/core/config.ts
index 6419ab27a..5568519d9 100644
--- a/packages/astro/src/core/config.ts
+++ b/packages/astro/src/core/config.ts
@@ -273,7 +273,7 @@ export async function loadConfig(configOptions: LoadConfigOptions): Promise<Astr
 
 	if (flags?.config) {
 		userConfigPath = /^\.*\//.test(flags.config) ? flags.config : `./${flags.config}`;
-		userConfigPath = fileURLToPath(new URL(userConfigPath, `file://${root}/`));
+		userConfigPath = fileURLToPath(new URL(userConfigPath, pathToFileURL(root)));
 	}
 	// Automatically load config file using Proload
 	// If `userConfigPath` is `undefined`, Proload will search for `astro.config.[cm]?[jt]s`
diff --git a/packages/astro/src/vite-plugin-build-html/index.ts b/packages/astro/src/vite-plugin-build-html/index.ts
index 73051978a..37a68e023 100644
--- a/packages/astro/src/vite-plugin-build-html/index.ts
+++ b/packages/astro/src/vite-plugin-build-html/index.ts
@@ -43,7 +43,7 @@ function relativePath(from: string, to: string): string {
 	return prependDotSlash(rel);
 }
 
-export function rollupPluginAstroBuildHTML(options: PluginOptions): VitePlugin {
+export function rollupPluginAstroScanHTML(options: PluginOptions): VitePlugin {
 	const { astroConfig, internals, logging, origin, allPages, routeCache, viteServer, pageNames } = options;
 
 	// The filepath root of the src folder