From b813962f607043af7a2411229437b29c4d844012 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Fri, 24 Jun 2022 10:21:51 -0700
Subject: [PATCH 1/4] Ensure vite.config.js works on Windows

---
 .../kit/test/apps/options-2/svelte.config.js    | 12 ------------
 packages/kit/test/apps/options-2/vite.config.js | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 packages/kit/test/apps/options-2/vite.config.js

diff --git a/packages/kit/test/apps/options-2/svelte.config.js b/packages/kit/test/apps/options-2/svelte.config.js
index 5d46d5f640fd..29ef3a0e1285 100644
--- a/packages/kit/test/apps/options-2/svelte.config.js
+++ b/packages/kit/test/apps/options-2/svelte.config.js
@@ -1,5 +1,3 @@
-import * as path from 'path';
-
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
 	kit: {
@@ -8,16 +6,6 @@ const config = {
 		},
 		serviceWorker: {
 			register: false
-		},
-		vite: {
-			server: {
-				// TODO: required to support ipv6, remove on vite 3
-				// https://github.com/vitejs/vite/issues/7075
-				host: 'localhost',
-				fs: {
-					allow: [path.resolve('../../../src')]
-				}
-			}
 		}
 	}
 };
diff --git a/packages/kit/test/apps/options-2/vite.config.js b/packages/kit/test/apps/options-2/vite.config.js
new file mode 100644
index 000000000000..dd0a50ff25b4
--- /dev/null
+++ b/packages/kit/test/apps/options-2/vite.config.js
@@ -0,0 +1,17 @@
+import * as path from 'path';
+import { sveltekit } from '@sveltejs/kit/experimental/vite';
+
+/** @type {import('vite').UserConfig} */
+const config = {
+  plugins: [sveltekit()],
+	server: {
+		// TODO: required to support ipv6, remove on vite 3
+		// https://github.com/vitejs/vite/issues/7075
+		host: 'localhost',
+		fs: {
+			allow: [path.resolve('../../../src')]
+		}
+	}
+};
+
+export default config;

From 8ed31fed823ac045d5c0506ca84e7bad2654f829 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Fri, 24 Jun 2022 10:28:25 -0700
Subject: [PATCH 2/4] format

---
 packages/kit/test/apps/options-2/vite.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/test/apps/options-2/vite.config.js b/packages/kit/test/apps/options-2/vite.config.js
index dd0a50ff25b4..f9b84890d809 100644
--- a/packages/kit/test/apps/options-2/vite.config.js
+++ b/packages/kit/test/apps/options-2/vite.config.js
@@ -3,7 +3,7 @@ import { sveltekit } from '@sveltejs/kit/experimental/vite';
 
 /** @type {import('vite').UserConfig} */
 const config = {
-  plugins: [sveltekit()],
+	plugins: [sveltekit()],
 	server: {
 		// TODO: required to support ipv6, remove on vite 3
 		// https://github.com/vitejs/vite/issues/7075

From 9def0fd9986aaee0b26f36fee5cc83df2b71e1d0 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Fri, 24 Jun 2022 10:40:50 -0700
Subject: [PATCH 3/4] try to fix windows

---
 packages/kit/src/cli.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/kit/src/cli.js b/packages/kit/src/cli.js
index 1dcff209afd4..d08ac2f3e046 100755
--- a/packages/kit/src/cli.js
+++ b/packages/kit/src/cli.js
@@ -4,8 +4,9 @@ import path from 'path';
 import colors from 'kleur';
 import sade from 'sade';
 import * as vite from 'vite';
-import { load_config } from './core/config/index.js';
 import { networkInterfaces, release } from 'os';
+import { pathToFileURL } from 'url';
+import { load_config } from './core/config/index.js';
 import { coalesce_to_error } from './utils/error.js';
 
 /** @param {unknown} e */
@@ -289,7 +290,7 @@ export async function get_vite_config(svelte_config) {
 	for (const file of ['vite.config.js', 'vite.config.mjs', 'vite.config.cjs']) {
 		if (fs.existsSync(file)) {
 			// TODO warn here if config.kit.vite was specified
-			const module = await import(path.resolve(file));
+			const module = await import(pathToFileURL(file).toString());
 			return {
 				...module.default,
 				configFile: false

From 8f46a786d1d6cb6c319b5db85daef151e34eced1 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Fri, 24 Jun 2022 10:41:20 -0700
Subject: [PATCH 4/4] changeset

---
 .changeset/neat-monkeys-dream.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/neat-monkeys-dream.md

diff --git a/.changeset/neat-monkeys-dream.md b/.changeset/neat-monkeys-dream.md
new file mode 100644
index 000000000000..4c6ee0d0afae
--- /dev/null
+++ b/.changeset/neat-monkeys-dream.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+[fix] support vite.config.js on Windows