From d9ad1d1b10dadb3e3f2743823e4f13a58ac4b9bc Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 1 Oct 2018 15:21:35 -0400
Subject: [PATCH 1/2] put server assets in subfolder

---
 src/cli.ts     | 2 +-
 src/rollup.ts  | 6 ++++--
 src/webpack.ts | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/cli.ts b/src/cli.ts
index de702b7..4342571 100755
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -58,7 +58,7 @@ prog.command('build [dest]')
 				process.env.PORT = process.env.PORT || ${opts.port || 3000};
 
 				console.log('Starting server on port ' + process.env.PORT);
-				require('./server.js');
+				require('./server');
 			`.replace(/^\t+/gm, '').trim());
 
 			console.error(`\n> Finished in ${elapsed(start)}. Type ${colors.bold.cyan(`node ${dest}`)} to run the app.`);
diff --git a/src/rollup.ts b/src/rollup.ts
index 3910f93..cb4902a 100644
--- a/src/rollup.ts
+++ b/src/rollup.ts
@@ -24,12 +24,14 @@ export default {
 
 	server: {
 		input: () => {
-			return `${locations.src()}/server.js`
+			return {
+				index: `${locations.src()}/server.js`
+			};
 		},
 
 		output: () => {
 			return {
-				dir: locations.dest(),
+				dir: `${locations.dest()}/server`,
 				format: 'cjs',
 				sourcemap: dev()
 			};
diff --git a/src/webpack.ts b/src/webpack.ts
index 6fc0ccb..626fc18 100644
--- a/src/webpack.ts
+++ b/src/webpack.ts
@@ -23,13 +23,13 @@ export default {
 	server: {
 		entry: () => {
 			return {
-				server: `${locations.src()}/server`
+				index: `${locations.src()}/server`
 			};
 		},
 
 		output: () => {
 			return {
-				path: locations.dest(),
+				path: `${locations.dest()}/server`,
 				filename: '[name].js',
 				chunkFilename: '[hash]/[name].[id].js',
 				libraryTarget: 'commonjs2'

From 01a519a4d914ad1faf9618e8f3078ef51b095185 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 1 Oct 2018 15:47:01 -0400
Subject: [PATCH 2/2] fix everything i just broke

---
 src/api/export.ts   | 2 +-
 src/cli.ts          | 2 +-
 src/rollup.ts       | 2 +-
 src/webpack.ts      | 2 +-
 test/common/test.js | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/api/export.ts b/src/api/export.ts
index e136398..9b9fa46 100644
--- a/src/api/export.ts
+++ b/src/api/export.ts
@@ -71,7 +71,7 @@ async function execute(emitter: EventEmitter, opts: Opts) {
 		message: `Crawling ${root.href}`
 	});
 
-	const proc = child_process.fork(path.resolve(`${opts.build}/server.js`), [], {
+	const proc = child_process.fork(path.resolve(`${opts.build}/server/server.js`), [], {
 		cwd: process.cwd(),
 		env: Object.assign({
 			PORT: port,
diff --git a/src/cli.ts b/src/cli.ts
index 4342571..e44e5d3 100755
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -58,7 +58,7 @@ prog.command('build [dest]')
 				process.env.PORT = process.env.PORT || ${opts.port || 3000};
 
 				console.log('Starting server on port ' + process.env.PORT);
-				require('./server');
+				require('./server/server.js');
 			`.replace(/^\t+/gm, '').trim());
 
 			console.error(`\n> Finished in ${elapsed(start)}. Type ${colors.bold.cyan(`node ${dest}`)} to run the app.`);
diff --git a/src/rollup.ts b/src/rollup.ts
index cb4902a..8dd591e 100644
--- a/src/rollup.ts
+++ b/src/rollup.ts
@@ -25,7 +25,7 @@ export default {
 	server: {
 		input: () => {
 			return {
-				index: `${locations.src()}/server.js`
+				server: `${locations.src()}/server.js`
 			};
 		},
 
diff --git a/src/webpack.ts b/src/webpack.ts
index 626fc18..c3424e0 100644
--- a/src/webpack.ts
+++ b/src/webpack.ts
@@ -23,7 +23,7 @@ export default {
 	server: {
 		entry: () => {
 			return {
-				index: `${locations.src()}/server`
+				server: `${locations.src()}/server`
 			};
 		},
 
diff --git a/test/common/test.js b/test/common/test.js
index 1291be6..644b033 100644
--- a/test/common/test.js
+++ b/test/common/test.js
@@ -184,7 +184,7 @@ function run({ mode, basepath = '' }) {
 					assert.ok(fs.existsSync('__sapper__/build/index.js'));
 				}
 
-				proc = require('child_process').fork(`${dir}/server.js`, {
+				proc = require('child_process').fork(`${dir}/server/server.js`, {
 					cwd: process.cwd(),
 					env: {
 						NODE_ENV: mode,