From 67feff30d2e504e4208b2080e9c65965e373c0ac Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Tue, 19 Jul 2022 10:56:00 -0700
Subject: [PATCH 1/3] [fix] change Vite's output directory from _app to client

---
 .changeset/strong-cats-wonder.md                    | 5 +++++
 packages/kit/src/core/generate_manifest/index.js    | 1 -
 packages/kit/src/vite/build/build_server.js         | 2 +-
 packages/kit/src/vite/build/build_service_worker.js | 2 +-
 packages/kit/src/vite/build/utils.js                | 8 ++++----
 packages/kit/src/vite/index.js                      | 8 ++++----
 6 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/strong-cats-wonder.md

diff --git a/.changeset/strong-cats-wonder.md b/.changeset/strong-cats-wonder.md
new file mode 100644
index 000000000000..1ce278ce755e
--- /dev/null
+++ b/.changeset/strong-cats-wonder.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+[fix] change Vite's output directory from \_app to client
diff --git a/packages/kit/src/core/generate_manifest/index.js b/packages/kit/src/core/generate_manifest/index.js
index 983c8501e99c..ac61b4f21269 100644
--- a/packages/kit/src/core/generate_manifest/index.js
+++ b/packages/kit/src/core/generate_manifest/index.js
@@ -64,7 +64,6 @@ export function generate_manifest({ build_data, relative_path, routes, format =
 
 	// prettier-ignore
 	return `{
-		appDir: ${s(build_data.app_dir)},
 		assets: new Set(${s(assets)}),
 		mimeTypes: ${s(get_mime_lookup(build_data.manifest_data))},
 		_: {
diff --git a/packages/kit/src/vite/build/build_server.js b/packages/kit/src/vite/build/build_server.js
index a36313acbc31..7094cdbd976b 100644
--- a/packages/kit/src/vite/build/build_server.js
+++ b/packages/kit/src/vite/build/build_server.js
@@ -73,7 +73,7 @@ export class Server {
 			manifest,
 			method_override: ${s(config.kit.methodOverride)},
 			paths: { base, assets },
-			prefix: assets + '/${config.kit.appDir}/',
+			prefix: assets + '/',
 			prerender: {
 				default: ${config.kit.prerender.default},
 				enabled: ${config.kit.prerender.enabled}
diff --git a/packages/kit/src/vite/build/build_service_worker.js b/packages/kit/src/vite/build/build_service_worker.js
index 4f4335a27f9e..9ae4441479e3 100644
--- a/packages/kit/src/vite/build/build_service_worker.js
+++ b/packages/kit/src/vite/build/build_service_worker.js
@@ -43,7 +43,7 @@ export async function build_service_worker(
 
 			export const build = [
 				${Array.from(build)
-					.map((file) => `${s(`${config.kit.paths.base}/${config.kit.appDir}/${file}`)}`)
+					.map((file) => `${s(`${config.kit.paths.base}/${file}`)}`)
 					.join(',\n\t\t\t\t')}
 			];
 
diff --git a/packages/kit/src/vite/build/utils.js b/packages/kit/src/vite/build/utils.js
index 68e7d26d1249..70ccb90d50d0 100644
--- a/packages/kit/src/vite/build/utils.js
+++ b/packages/kit/src/vite/build/utils.js
@@ -96,9 +96,9 @@ export const get_default_config = function ({ config, input, ssr, outDir }) {
 				input,
 				output: {
 					format: 'esm',
-					entryFileNames: ssr ? '[name].js' : 'immutable/[name]-[hash].js',
-					chunkFileNames: 'immutable/chunks/[name]-[hash].js',
-					assetFileNames: 'immutable/assets/[name]-[hash][extname]'
+					entryFileNames: ssr ? '[name].js' : `${config.kit.appDir}/immutable/[name]-[hash].js`,
+					chunkFileNames: `${config.kit.appDir}/immutable/chunks/[name]-[hash].js`,
+					assetFileNames: `${config.kit.appDir}/immutable/assets/[name]-[hash][extname]`
 				},
 				preserveEntrySignatures: 'strict'
 			},
@@ -140,7 +140,7 @@ export function assets_base(config) {
 	// during `svelte-kit preview`, because we use a local asset path. This
 	// may be fixed in Vite 3: https://github.com/vitejs/vite/issues/2009
 	const { base, assets } = config.paths;
-	return `${assets || base}/${config.appDir}/`;
+	return `${assets || base}/`;
 }
 
 /**
diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index cd12cc85601a..08dc043cf598 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -180,7 +180,7 @@ function kit() {
 			paths = {
 				build_dir: `${svelte_config.kit.outDir}/build`,
 				output_dir: `${svelte_config.kit.outDir}/output`,
-				client_out_dir: `${svelte_config.kit.outDir}/output/client/${svelte_config.kit.appDir}`
+				client_out_dir: `${svelte_config.kit.outDir}/output/client/`
 			};
 
 			if (is_build) {
@@ -271,7 +271,7 @@ function kit() {
 			});
 
 			fs.writeFileSync(
-				`${paths.client_out_dir}/version.json`,
+				`${paths.client_out_dir}/${svelte_config.kit.appDir}/version.json`,
 				JSON.stringify({ version: svelte_config.kit.version.name })
 			);
 
@@ -316,8 +316,8 @@ function kit() {
 
 			const files = new Set([
 				...static_files,
-				...chunks.map((chunk) => `${svelte_config.kit.appDir}/${chunk.fileName}`),
-				...assets.map((chunk) => `${svelte_config.kit.appDir}/${chunk.fileName}`)
+				...chunks.map((chunk) => chunk.fileName),
+				...assets.map((chunk) => chunk.fileName)
 			]);
 
 			// TODO is this right?

From bff49e241c9488d00384ee8711ab3abcb11aeb1c Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 19 Jul 2022 14:07:35 -0400
Subject: [PATCH 2/3] Update .changeset/strong-cats-wonder.md

---
 .changeset/strong-cats-wonder.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/strong-cats-wonder.md b/.changeset/strong-cats-wonder.md
index 1ce278ce755e..2a1b29c9aa8c 100644
--- a/.changeset/strong-cats-wonder.md
+++ b/.changeset/strong-cats-wonder.md
@@ -2,4 +2,4 @@
 '@sveltejs/kit': patch
 ---
 
-[fix] change Vite's output directory from \_app to client
+[fix] change Vite's output directory from `_app` to client

From 5eddc207045f1678cc2a94e7e651e60210d48df8 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 19 Jul 2022 15:09:24 -0400
Subject: [PATCH 3/3] Update packages/kit/src/core/generate_manifest/index.js

---
 packages/kit/src/core/generate_manifest/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/kit/src/core/generate_manifest/index.js b/packages/kit/src/core/generate_manifest/index.js
index ac61b4f21269..983c8501e99c 100644
--- a/packages/kit/src/core/generate_manifest/index.js
+++ b/packages/kit/src/core/generate_manifest/index.js
@@ -64,6 +64,7 @@ export function generate_manifest({ build_data, relative_path, routes, format =
 
 	// prettier-ignore
 	return `{
+		appDir: ${s(build_data.app_dir)},
 		assets: new Set(${s(assets)}),
 		mimeTypes: ${s(get_mime_lookup(build_data.manifest_data))},
 		_: {