From 273642751e0f18f46962f7a04355b6413fe24098 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 12 Apr 2021 18:27:12 -0400
Subject: [PATCH 01/10] remove add_css

---
 packages/create-svelte/cli/index.js           | 13 -----
 .../cli/modifications/add_css.js              | 58 -------------------
 .../template-additions/src/app.less           |  4 --
 .../template-additions/src/app.scss           |  4 --
 .../src/app.css                               |  0
 5 files changed, 79 deletions(-)
 delete mode 100644 packages/create-svelte/cli/modifications/add_css.js
 delete mode 100644 packages/create-svelte/template-additions/src/app.less
 delete mode 100644 packages/create-svelte/template-additions/src/app.scss
 rename packages/create-svelte/{template-additions => template}/src/app.css (100%)

diff --git a/packages/create-svelte/cli/index.js b/packages/create-svelte/cli/index.js
index f17d7e881cac..ff246f58ffbb 100644
--- a/packages/create-svelte/cli/index.js
+++ b/packages/create-svelte/cli/index.js
@@ -7,7 +7,6 @@ import path from 'path';
 import prompts from 'prompts/lib/index';
 import glob from 'tiny-glob/sync.js';
 import gitignore_contents from '../template/.gitignore';
-import add_css from './modifications/add_css';
 import add_typescript from './modifications/add_typescript';
 // import versions from './versions';
 import { version } from '../package.json';
@@ -111,18 +110,6 @@ async function prompt_modifications(target) {
 	});
 	await add_typescript(target, ts_response.value);
 
-	const css_response = await prompts({
-		type: 'select',
-		name: 'value',
-		message: 'What do you want to use for writing Styles in Svelte components?',
-		choices: [
-			{ title: 'CSS', value: 'css' },
-			{ title: 'Less', value: 'less' },
-			{ title: 'SCSS', value: 'scss' }
-		]
-	});
-	await add_css(target, css_response.value);
-
 	const eslint_response = await prompts({
 		type: 'confirm',
 		name: 'value',
diff --git a/packages/create-svelte/cli/modifications/add_css.js b/packages/create-svelte/cli/modifications/add_css.js
deleted file mode 100644
index 0fabe673f275..000000000000
--- a/packages/create-svelte/cli/modifications/add_css.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import { bold, green } from 'kleur/colors';
-import {
-	add_svelte_preprocess_to_config,
-	copy_from_template_additions,
-	update_component,
-	update_package_json_dev_deps
-} from './utils';
-
-/**
- * Add chosen CSS language to the project.
- *
- * @param {string} cwd
- * @param {'css' | 'scss' | 'less'} which
- */
-export default async function add_css(cwd, which) {
-	if (which === 'css') {
-		copy_from_template_additions(cwd, ['src', 'app.css']);
-		console.log('You can add support for CSS preprocessors like SCSS/Less/PostCSS later.');
-	} else if (which === 'less') {
-		update_package_json_dev_deps(cwd, {
-			less: '^3.0.0',
-			'svelte-preprocess': '^4.0.0'
-		});
-		copy_from_template_additions(cwd, ['src', 'app.less']);
-		update_component(cwd, 'src/routes/$layout.svelte', [['../app.css', '../app.less']]);
-		update_component(cwd, 'src/lib/Counter.svelte', [['<style>', '<style lang="less">']]);
-		update_component(cwd, 'src/routes/index.svelte', [['<style>', '<style lang="less">']]);
-		add_svelte_preprocess_to_config(cwd);
-		console.log(
-			bold(
-				green(
-					'✔ Added Less support. ' +
-						'To use it inside Svelte components, add lang="less" to the attributes of a style tag.'
-				)
-			)
-		);
-	} else if (which === 'scss') {
-		update_package_json_dev_deps(cwd, {
-			sass: '^1.0.0',
-			'svelte-preprocess': '^4.0.0'
-		});
-		copy_from_template_additions(cwd, ['src', 'app.scss']);
-		update_component(cwd, 'src/routes/$layout.svelte', [['../app.css', '../app.scss']]);
-		update_component(cwd, 'src/lib/Counter.svelte', [['<style>', '<style lang="scss">']]);
-		update_component(cwd, 'src/routes/index.svelte', [['<style>', '<style lang="scss">']]);
-		add_svelte_preprocess_to_config(cwd);
-		console.log(
-			bold(
-				green(
-					'✔ Added SCSS support. ' +
-						'To use it inside Svelte components, add lang="scss" to the attributes of a style tag.'
-				)
-			)
-		);
-	} else {
-		console.error(`Unknown CSS option "${which}"`);
-	}
-}
diff --git a/packages/create-svelte/template-additions/src/app.less b/packages/create-svelte/template-additions/src/app.less
deleted file mode 100644
index 1d7e28833464..000000000000
--- a/packages/create-svelte/template-additions/src/app.less
+++ /dev/null
@@ -1,4 +0,0 @@
-:root {
-	font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell,
-		'Open Sans', 'Helvetica Neue', sans-serif;
-}
diff --git a/packages/create-svelte/template-additions/src/app.scss b/packages/create-svelte/template-additions/src/app.scss
deleted file mode 100644
index 1d7e28833464..000000000000
--- a/packages/create-svelte/template-additions/src/app.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-:root {
-	font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell,
-		'Open Sans', 'Helvetica Neue', sans-serif;
-}
diff --git a/packages/create-svelte/template-additions/src/app.css b/packages/create-svelte/template/src/app.css
similarity index 100%
rename from packages/create-svelte/template-additions/src/app.css
rename to packages/create-svelte/template/src/app.css

From 35c1a49c98b3cd7e665897bbfecc0094f2bc21f2 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 12 Apr 2021 23:31:51 -0400
Subject: [PATCH 02/10] autogenerate JS template from TS, simplify modifiers

---
 packages/create-svelte/.gitignore             |   2 +-
 packages/create-svelte/cli/global.d.ts        |   2 -
 packages/create-svelte/cli/index.js           | 115 ++++++++---------
 .../cli/modifications/add_eslint.js           |  13 +-
 .../cli/modifications/add_prettier.js         |  13 +-
 .../cli/modifications/add_typescript.js       |  50 +++-----
 .../create-svelte/cli/modifications/utils.js  |  22 +---
 packages/create-svelte/cli/types.d.ts         |   5 +
 .../.eslintrc.cjs                             |   0
 .../.eslintrc.ts.cjs                          |   0
 .../.prettierignore                           |   0
 .../.prettierrc                               |   0
 .../tsconfig.json                             |   0
 packages/create-svelte/package.json           |  15 ++-
 packages/create-svelte/rollup.config.js       |   4 +-
 .../create-svelte/scripts/build-templates.js  | 116 ++++++++++++++++++
 .../create-svelte/scripts/update-versions.js  |  26 ----
 .../default}/.gitignore                       |   0
 .../{template => templates/default}/.npmrc    |   0
 .../{template => templates/default}/README.md |   0
 .../default}/jsconfig.json                    |   0
 .../default}/package.json                     |   0
 .../default}/src/app.css                      |   0
 .../default}/src/app.html                     |   0
 .../default}/src/global.d.ts                  |   0
 .../default}/src/lib/Counter.svelte           |   2 +-
 .../templates/default/src/lib/foo.ts          |   9 ++
 .../default}/src/routes/$layout.svelte        |   0
 .../default}/src/routes/index.svelte          |   2 +-
 .../default}/static/favicon.ico               | Bin
 .../default}/static/robots.txt                |   0
 .../default}/svelte.config.cjs                |   0
 pnpm-lock.yaml                                |  91 +++++++++++++-
 33 files changed, 318 insertions(+), 169 deletions(-)
 create mode 100644 packages/create-svelte/cli/types.d.ts
 rename packages/create-svelte/{template-additions => common}/.eslintrc.cjs (100%)
 rename packages/create-svelte/{template-additions => common}/.eslintrc.ts.cjs (100%)
 rename packages/create-svelte/{template-additions => common}/.prettierignore (100%)
 rename packages/create-svelte/{template-additions => common}/.prettierrc (100%)
 rename packages/create-svelte/{template-additions => common}/tsconfig.json (100%)
 create mode 100644 packages/create-svelte/scripts/build-templates.js
 delete mode 100644 packages/create-svelte/scripts/update-versions.js
 rename packages/create-svelte/{template => templates/default}/.gitignore (100%)
 rename packages/create-svelte/{template => templates/default}/.npmrc (100%)
 rename packages/create-svelte/{template => templates/default}/README.md (100%)
 rename packages/create-svelte/{template => templates/default}/jsconfig.json (100%)
 rename packages/create-svelte/{template => templates/default}/package.json (100%)
 rename packages/create-svelte/{template => templates/default}/src/app.css (100%)
 rename packages/create-svelte/{template => templates/default}/src/app.html (100%)
 rename packages/create-svelte/{template => templates/default}/src/global.d.ts (100%)
 rename packages/create-svelte/{template => templates/default}/src/lib/Counter.svelte (96%)
 create mode 100644 packages/create-svelte/templates/default/src/lib/foo.ts
 rename packages/create-svelte/{template => templates/default}/src/routes/$layout.svelte (100%)
 rename packages/create-svelte/{template => templates/default}/src/routes/index.svelte (97%)
 rename packages/create-svelte/{template => templates/default}/static/favicon.ico (100%)
 rename packages/create-svelte/{template => templates/default}/static/robots.txt (100%)
 rename packages/create-svelte/{template => templates/default}/svelte.config.cjs (100%)

diff --git a/packages/create-svelte/.gitignore b/packages/create-svelte/.gitignore
index 8665020bf991..c340356570fd 100644
--- a/packages/create-svelte/.gitignore
+++ b/packages/create-svelte/.gitignore
@@ -1,4 +1,4 @@
-/bin
+/bin.js
 
 # re-enable this once we're out of prerelease
 /cli/versions.js
\ No newline at end of file
diff --git a/packages/create-svelte/cli/global.d.ts b/packages/create-svelte/cli/global.d.ts
index 639895aac9bc..312d5b9a96cf 100644
--- a/packages/create-svelte/cli/global.d.ts
+++ b/packages/create-svelte/cli/global.d.ts
@@ -1,5 +1,3 @@
-declare module '*.gitignore';
-
 declare module 'gitignore-parser';
 
 declare module 'prompts/lib/index';
diff --git a/packages/create-svelte/cli/index.js b/packages/create-svelte/cli/index.js
index ff246f58ffbb..599b385e3bfd 100644
--- a/packages/create-svelte/cli/index.js
+++ b/packages/create-svelte/cli/index.js
@@ -1,17 +1,14 @@
 //eslint-disable-next-line import/no-unresolved
-import { mkdirp } from '@sveltejs/kit/filesystem';
 import fs from 'fs';
-import parser from 'gitignore-parser';
-import { bold, cyan, gray, green, red } from 'kleur/colors';
 import path from 'path';
+import { mkdirp } from '@sveltejs/kit/filesystem';
+import { bold, cyan, gray, green, red } from 'kleur/colors';
 import prompts from 'prompts/lib/index';
-import glob from 'tiny-glob/sync.js';
-import gitignore_contents from '../template/.gitignore';
 import add_typescript from './modifications/add_typescript';
-// import versions from './versions';
-import { version } from '../package.json';
 import add_prettier from './modifications/add_prettier';
 import add_eslint from './modifications/add_eslint';
+import { fileURLToPath } from 'url';
+import { version } from '../package.json';
 
 const disclaimer = `
 Welcome to the SvelteKit setup wizard!
@@ -20,14 +17,16 @@ SvelteKit is in public beta now. There are definitely bugs and some feature migh
 If you encounter an issue, have a look at https://github.com/sveltejs/kit/issues and open a new one, if it is not already tracked.
 `;
 
+const modifiers = [add_typescript, add_eslint, add_prettier];
+
 async function main() {
 	console.log(gray(`\ncreate-svelte version ${version}`));
 	console.log(red(disclaimer));
 
-	const target = process.argv[2] || '.';
+	const cwd = process.argv[2] || '.';
 
-	if (fs.existsSync(target)) {
-		if (fs.readdirSync(target).length > 0) {
+	if (fs.existsSync(cwd)) {
+		if (fs.readdirSync(cwd).length > 0) {
 			const response = await prompts({
 				type: 'confirm',
 				name: 'value',
@@ -40,40 +39,39 @@ async function main() {
 			}
 		}
 	} else {
-		mkdirp(target);
+		mkdirp(cwd);
 	}
 
-	const cwd = path.join(__dirname, 'template');
-	const gitignore = parser.compile(gitignore_contents);
-
-	const files = glob('**/*', { cwd }).filter(gitignore.accepts);
-
-	files.forEach((file) => {
-		const src = path.join(cwd, file);
-		const dest = path.join(target, file);
-
-		if (fs.statSync(src).isDirectory()) {
-			mkdirp(dest);
-		} else {
-			fs.copyFileSync(src, dest);
+	const options = /** @type {import('./types').Options} */ (await prompts([
+		{
+			type: 'confirm',
+			name: 'typescript',
+			message: 'Use TypeScript?',
+			initial: false
+		},
+		{
+			type: 'confirm',
+			name: 'eslint',
+			message: 'Add ESLint for code linting?',
+			initial: false
+		},
+		{
+			type: 'confirm',
+			name: 'prettier',
+			message: 'Add Prettier for code formatting?',
+			initial: false
 		}
-	});
-
-	fs.writeFileSync(path.join(target, '.gitignore'), gitignore_contents);
+	]));
 
-	const name = path.basename(path.resolve(target));
+	const name = path.basename(path.resolve(cwd));
 
-	const pkg_file = path.join(target, 'package.json');
-	const pkg_json = fs
-		.readFileSync(pkg_file, 'utf-8')
-		.replace('~TODO~', name)
-		.replace(/"(.+)": "workspace:.+"/g, (_m, name) => `"${name}": "next"`); // TODO ^${versions[name]}
-
-	fs.writeFileSync(pkg_file, pkg_json);
+	instantiate(`default-${options.typescript ? 'ts' : 'js'}`, name, cwd);
 
 	console.log(bold(green('✔ Copied project files')));
 
-	await prompt_modifications(target);
+	for (const modifier of modifiers) {
+		await modifier(cwd, options);
+	}
 
 	console.log(
 		'\nWant to add other parts to your code base? ' +
@@ -84,7 +82,7 @@ async function main() {
 	console.log('\nNext steps:');
 	let i = 1;
 
-	const relative = path.relative(process.cwd(), target);
+	const relative = path.relative(process.cwd(), cwd);
 	if (relative !== '') {
 		console.log(`  ${i++}: ${bold(cyan(`cd ${relative}`))}`);
 	}
@@ -97,34 +95,27 @@ async function main() {
 }
 
 /**
- * Go through the prompts to let the user setup his project.
- *
- * @param {string} target
+ * @param {string} id
+ * @param {string} name
+ * @param {string} cwd
  */
-async function prompt_modifications(target) {
-	const ts_response = await prompts({
-		type: 'confirm',
-		name: 'value',
-		message: 'Use TypeScript in components?',
-		initial: false
-	});
-	await add_typescript(target, ts_response.value);
-
-	const eslint_response = await prompts({
-		type: 'confirm',
-		name: 'value',
-		message: 'Add ESLint for code linting?',
-		initial: false
-	});
-	await add_eslint(target, eslint_response.value, ts_response.value);
+function instantiate(id, name, cwd) {
+	const template = fileURLToPath(new URL(`./dist/${id}.json`, import.meta.url).href);
+	const files = /** @type {Array<{ name: string, contents: string, encoding: 'base64' | 'utf8'}>} */ (JSON.parse(
+		fs.readFileSync(template, 'utf-8')
+	));
 
-	const prettier_response = await prompts({
-		type: 'confirm',
-		name: 'value',
-		message: 'Add Prettier for code formatting?',
-		initial: false
+	files.forEach((file) => {
+		const dest = path.join(cwd, file.name);
+		mkdirp(path.dirname(dest));
+
+		fs.writeFileSync(
+			dest,
+			file.encoding === 'base64'
+				? Buffer.from(file.contents, 'base64')
+				: file.contents.replace(/~TODO~/g, name)
+		);
 	});
-	await add_prettier(target, prettier_response.value, eslint_response.value);
 }
 
 main();
diff --git a/packages/create-svelte/cli/modifications/add_eslint.js b/packages/create-svelte/cli/modifications/add_eslint.js
index 76cd18732923..f1aaf5c417cc 100644
--- a/packages/create-svelte/cli/modifications/add_eslint.js
+++ b/packages/create-svelte/cli/modifications/add_eslint.js
@@ -6,22 +6,17 @@ import {
 } from './utils';
 
 /**
- * Add ESLint if user wants it.
- *
  * @param {string} cwd
- * @param {boolean} yes
- * @param {boolean} use_typescript
+ * @param {import('../types').Options} options
  */
-export default async function add_eslint(cwd, yes, use_typescript) {
-	if (!yes) {
-		return;
-	}
+export default async function add_eslint(cwd, options) {
+	if (!options.eslint) return;
 
 	upsert_package_json_scripts(cwd, {
 		lint: 'eslint --ignore-path .gitignore .'
 	});
 
-	if (use_typescript) {
+	if (options.typescript) {
 		update_package_json_dev_deps(cwd, {
 			'@typescript-eslint/eslint-plugin': '^4.19.0',
 			'@typescript-eslint/parser': '^4.19.0',
diff --git a/packages/create-svelte/cli/modifications/add_prettier.js b/packages/create-svelte/cli/modifications/add_prettier.js
index 474baaf588c3..0764b52e07f4 100644
--- a/packages/create-svelte/cli/modifications/add_prettier.js
+++ b/packages/create-svelte/cli/modifications/add_prettier.js
@@ -8,16 +8,11 @@ import {
 } from './utils';
 
 /**
- * Add TypeScript if user wants it.
- *
  * @param {string} cwd
- * @param {boolean} yes
- * @param {boolean} usesEslint
+ * @param {import('../types').Options} options
  */
-export default async function add_prettier(cwd, yes, usesEslint) {
-	if (!yes) {
-		return;
-	}
+export default async function add_prettier(cwd, options) {
+	if (!options.prettier) return;
 
 	update_package_json_dev_deps(cwd, {
 		prettier: '~2.2.1',
@@ -26,7 +21,7 @@ export default async function add_prettier(cwd, yes, usesEslint) {
 	copy_from_template_additions(cwd, ['.prettierrc']);
 	copy_from_template_additions(cwd, ['.prettierignore']);
 
-	if (usesEslint) {
+	if (options.eslint) {
 		update_package_json_dev_deps(cwd, {
 			'eslint-config-prettier': '^8.1.0'
 		});
diff --git a/packages/create-svelte/cli/modifications/add_typescript.js b/packages/create-svelte/cli/modifications/add_typescript.js
index 0fae932026e2..68d44b45d85d 100644
--- a/packages/create-svelte/cli/modifications/add_typescript.js
+++ b/packages/create-svelte/cli/modifications/add_typescript.js
@@ -4,47 +4,35 @@ import { join } from 'path';
 import {
 	add_svelte_preprocess_to_config,
 	copy_from_template_additions,
-	update_component,
 	update_package_json_dev_deps
 } from './utils';
 
 /**
- * Add TypeScript if user wants it.
- *
  * @param {string} cwd
- * @param {boolean} yes
+ * @param {import('../types').Options} options
  */
-export default async function add_typescript(cwd, yes) {
-	if (yes) {
-		update_package_json_dev_deps(cwd, {
-			typescript: '^4.0.0',
-			tslib: '^2.0.0',
-			'svelte-preprocess': '^4.0.0'
-		});
-		update_component(cwd, 'src/lib/Counter.svelte', [
-			['<script>', '<script lang="ts">'],
-			['const increment = () => {', 'const increment = (): void => {']
-		]);
-		update_component(cwd, 'src/routes/index.svelte', [['<script>', '<script lang="ts">']]);
-		add_svelte_preprocess_to_config(cwd);
-		add_tsconfig(cwd);
+export default async function add_typescript(cwd, options) {
+	if (!options.typescript) return;
 
-		console.log(
-			bold(
-				green(
-					'✔ Added TypeScript support. ' +
-						'To use it inside Svelte components, add lang="ts" to the attributes of a script tag.'
-				)
+	update_package_json_dev_deps(cwd, {
+		typescript: '^4.0.0',
+		tslib: '^2.0.0',
+		'svelte-preprocess': '^4.0.0'
+	});
+	add_svelte_preprocess_to_config(cwd);
+	add_tsconfig(cwd);
+
+	console.log(
+		bold(
+			green(
+				'✔ Added TypeScript support. ' +
+					'To use it inside Svelte components, add lang="ts" to the attributes of a script tag.'
 			)
-		);
-	} else {
-		console.log("You can add TypeScript support later. We'll let you know soon how to do it.");
-	}
+		)
+	);
 }
 
-/**
- * @param {string} cwd
- */
+/** @param {string} cwd */
 function add_tsconfig(cwd) {
 	fs.unlinkSync(join(cwd, 'jsconfig.json'));
 	copy_from_template_additions(cwd, ['tsconfig.json']);
diff --git a/packages/create-svelte/cli/modifications/utils.js b/packages/create-svelte/cli/modifications/utils.js
index aeca8620c431..047255c6171d 100644
--- a/packages/create-svelte/cli/modifications/utils.js
+++ b/packages/create-svelte/cli/modifications/utils.js
@@ -1,5 +1,6 @@
 import fs from 'fs';
 import { join } from 'path';
+import { fileURLToPath } from 'url';
 
 /**
  * Updates package.json with given devDependencies
@@ -17,22 +18,6 @@ export function update_package_json_dev_deps(cwd, newDevDeps) {
 	});
 }
 
-/**
- * Updates a Svelte component, doing all given replacements.
- *
- * @param {string} cwd
- * @param {string} filepath
- * @param {[string, string][]} replacements
- */
-export function update_component(cwd, filepath, replacements) {
-	const file = join(cwd, filepath);
-
-	let code = fs.readFileSync(file, 'utf-8');
-	replacements.forEach((replacement) => (code = code.replace(replacement[0], replacement[1])));
-
-	fs.writeFileSync(file, code);
-}
-
 /**
  * Adds `svelte-preprocess` to `svelte.config.cjs`, if there's no preprocessor already.
  *
@@ -67,7 +52,10 @@ export function add_svelte_preprocess_to_config(cwd) {
 export function copy_from_template_additions(cwd, path) {
 	const from = Array.isArray(path) ? path : path.from;
 	const to = Array.isArray(path) ? path : path.to;
-	fs.copyFileSync(join(__dirname, 'template-additions', ...from), join(cwd, ...to));
+
+	const common = fileURLToPath(new URL('./common', import.meta.url).href);
+	console.log({ common, cwd });
+	fs.copyFileSync(join(common, ...from), join(cwd, ...to));
 }
 
 /**
diff --git a/packages/create-svelte/cli/types.d.ts b/packages/create-svelte/cli/types.d.ts
new file mode 100644
index 000000000000..0bd091ba3d88
--- /dev/null
+++ b/packages/create-svelte/cli/types.d.ts
@@ -0,0 +1,5 @@
+export type Options = {
+	typescript: boolean;
+	prettier: boolean;
+	eslint: boolean;
+};
diff --git a/packages/create-svelte/template-additions/.eslintrc.cjs b/packages/create-svelte/common/.eslintrc.cjs
similarity index 100%
rename from packages/create-svelte/template-additions/.eslintrc.cjs
rename to packages/create-svelte/common/.eslintrc.cjs
diff --git a/packages/create-svelte/template-additions/.eslintrc.ts.cjs b/packages/create-svelte/common/.eslintrc.ts.cjs
similarity index 100%
rename from packages/create-svelte/template-additions/.eslintrc.ts.cjs
rename to packages/create-svelte/common/.eslintrc.ts.cjs
diff --git a/packages/create-svelte/template-additions/.prettierignore b/packages/create-svelte/common/.prettierignore
similarity index 100%
rename from packages/create-svelte/template-additions/.prettierignore
rename to packages/create-svelte/common/.prettierignore
diff --git a/packages/create-svelte/template-additions/.prettierrc b/packages/create-svelte/common/.prettierrc
similarity index 100%
rename from packages/create-svelte/template-additions/.prettierrc
rename to packages/create-svelte/common/.prettierrc
diff --git a/packages/create-svelte/template-additions/tsconfig.json b/packages/create-svelte/common/tsconfig.json
similarity index 100%
rename from packages/create-svelte/template-additions/tsconfig.json
rename to packages/create-svelte/common/tsconfig.json
diff --git a/packages/create-svelte/package.json b/packages/create-svelte/package.json
index 4fdee641b6eb..91ffc3c82fd2 100644
--- a/packages/create-svelte/package.json
+++ b/packages/create-svelte/package.json
@@ -1,27 +1,32 @@
 {
 	"name": "create-svelte",
 	"version": "2.0.0-next.47",
-	"bin": "./bin",
+	"bin": "./bin.js",
 	"devDependencies": {
 		"@rollup/plugin-json": "^4.1.0",
 		"@sveltejs/adapter-node": "workspace:*",
 		"@sveltejs/kit": "workspace:*",
 		"gitignore-parser": "^0.0.2",
 		"kleur": "^4.1.4",
+		"prettier": "^2.2.1",
+		"prettier-plugin-svelte": "^2.2.0",
 		"prompts": "^2.4.0",
 		"rollup": "^2.41.1",
+		"sucrase": "^3.18.1",
 		"tiny-glob": "^0.2.8"
 	},
 	"scripts": {
 		"dev": "rollup -cw",
-		"build": "node scripts/update-versions && rollup -c",
+		"build": "node scripts/build-templates && rollup -c",
 		"lint": "eslint --ignore-path .gitignore --ignore-pattern template/ \"**/*.{ts,js,svelte}\" && npm run check-format",
 		"format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore",
 		"check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
 		"prepublishOnly": "npm run build"
 	},
 	"files": [
-		"template",
-		"template-additions"
-	]
+		"common",
+		"dist",
+		"bin.js"
+	],
+	"type": "module"
 }
diff --git a/packages/create-svelte/rollup.config.js b/packages/create-svelte/rollup.config.js
index acf468ea27e2..4cc828feb218 100644
--- a/packages/create-svelte/rollup.config.js
+++ b/packages/create-svelte/rollup.config.js
@@ -5,8 +5,8 @@ import json from '@rollup/plugin-json';
 export default {
 	input: 'cli/index.js',
 	output: {
-		file: 'bin',
-		format: 'cjs',
+		file: 'bin.js',
+		format: 'esm',
 		banner: '#!/usr/bin/env node',
 		interop: false
 	},
diff --git a/packages/create-svelte/scripts/build-templates.js b/packages/create-svelte/scripts/build-templates.js
new file mode 100644
index 000000000000..d0276aa7547b
--- /dev/null
+++ b/packages/create-svelte/scripts/build-templates.js
@@ -0,0 +1,116 @@
+import fs from 'fs';
+import path from 'path';
+import parser from 'gitignore-parser';
+import prettier from 'prettier';
+import { transform } from 'sucrase';
+import glob from 'tiny-glob/sync.js';
+
+async function main() {
+	const templates = fs.readdirSync('templates');
+
+	try {
+		fs.mkdirSync('dist');
+	} catch {
+		// ignore
+	}
+
+	for (const name of templates) {
+		const cwd = path.resolve('templates', name);
+		const gitignore_file = path.join(cwd, '.gitignore');
+
+		if (!fs.existsSync(gitignore_file)) {
+			throw new Error('Template must have a .gitignore file');
+		}
+
+		const gitignore = parser.compile(fs.readFileSync(gitignore_file, 'utf-8'));
+
+		const ts = glob('**/*', { cwd, filesOnly: true })
+			.filter(gitignore.accepts)
+			.map((name) => {
+				const encoding = /\.(ico|png|jpe?g)$/.test(name) ? 'base64' : 'utf8';
+				let contents = fs.readFileSync(path.join(cwd, name), encoding);
+
+				if (name === 'package.json') {
+					// TODO package-specific versions
+					contents = contents.replace(/workspace:\*/g, 'next');
+				}
+
+				return {
+					name,
+					contents,
+					encoding
+				};
+			});
+
+		const js = [];
+
+		for (const file of ts) {
+			if (file.name.endsWith('.d.ts')) continue;
+
+			if (file.name.endsWith('.ts')) {
+				const transformed = transform(file.contents, {
+					transforms: ['typescript']
+				});
+
+				const contents = prettier.format(transformed.code, {
+					parser: 'babel',
+					useTabs: true,
+					singleQuote: true,
+					trailingComma: 'none'
+				});
+
+				js.push({
+					name: file.name.replace(/\.ts$/, '.js'),
+					contents
+				});
+			} else if (file.name.endsWith('.svelte')) {
+				const contents = file.contents.replace(
+					/<script([^>]+)>([\s\S]+)<\/script>/g,
+					(m, attrs, typescript) => {
+						const imports = [];
+						const import_pattern = /import (.+?) from/g;
+						let import_match;
+						while ((import_match = import_pattern.exec(typescript))) {
+							const word_pattern = /[a-z_$][a-z0-9_$]*/gi;
+							let word_match;
+							while ((word_match = word_pattern.exec(import_match[1]))) {
+								imports.push(word_match[0]);
+							}
+						}
+
+						const suffix = `\n${imports.join(',')}`;
+
+						const transformed = transform(typescript + suffix, {
+							transforms: ['typescript']
+						}).code.slice(0, -suffix.length);
+
+						const contents = prettier
+							.format(transformed, {
+								parser: 'babel',
+								useTabs: true,
+								singleQuote: true,
+								trailingComma: 'none'
+							})
+							.trim()
+							.split('\n')
+							.join('\n\t');
+
+						return `<script${attrs.replace(' lang="ts"', '')}>\n\t${contents}\n</script>`;
+					}
+				);
+
+				js.push({
+					name: file.name,
+					contents
+				});
+			} else {
+				js.push(file);
+			}
+		}
+
+		fs.writeFileSync(`dist/${name}-ts.json`, JSON.stringify(ts, null, '\t'));
+		fs.writeFileSync(`dist/${name}-js.json`, JSON.stringify(js, null, '\t'));
+	}
+}
+
+main();
diff --git a/packages/create-svelte/scripts/update-versions.js b/packages/create-svelte/scripts/update-versions.js
deleted file mode 100644
index af3c40a6fff3..000000000000
--- a/packages/create-svelte/scripts/update-versions.js
+++ /dev/null
@@ -1,26 +0,0 @@
-const { writeFileSync } = require('fs');
-const { join } = require('path');
-const glob = require('tiny-glob/sync.js');
-const template_pkg = require('../template/package.json');
-
-const cwd = join(__dirname, '../../');
-const pkgs = glob('*/package.json', { cwd }).map((file) => require(`${cwd}/${file}`));
-
-const versions = {};
-
-[template_pkg.dependencies, template_pkg.devDependencies].forEach((deps) => {
-	for (const key in deps) {
-		const value = deps[key];
-		if (value.startsWith('workspace:')) {
-			const pkg = pkgs.find((pkg) => pkg.name === key);
-			if (pkg) {
-				versions[key] = pkg.version;
-			}
-		}
-	}
-});
-
-writeFileSync(
-	join(__dirname, '../cli/versions.js'),
-	`export default ${JSON.stringify(versions, null, '\t')};`
-);
diff --git a/packages/create-svelte/template/.gitignore b/packages/create-svelte/templates/default/.gitignore
similarity index 100%
rename from packages/create-svelte/template/.gitignore
rename to packages/create-svelte/templates/default/.gitignore
diff --git a/packages/create-svelte/template/.npmrc b/packages/create-svelte/templates/default/.npmrc
similarity index 100%
rename from packages/create-svelte/template/.npmrc
rename to packages/create-svelte/templates/default/.npmrc
diff --git a/packages/create-svelte/template/README.md b/packages/create-svelte/templates/default/README.md
similarity index 100%
rename from packages/create-svelte/template/README.md
rename to packages/create-svelte/templates/default/README.md
diff --git a/packages/create-svelte/template/jsconfig.json b/packages/create-svelte/templates/default/jsconfig.json
similarity index 100%
rename from packages/create-svelte/template/jsconfig.json
rename to packages/create-svelte/templates/default/jsconfig.json
diff --git a/packages/create-svelte/template/package.json b/packages/create-svelte/templates/default/package.json
similarity index 100%
rename from packages/create-svelte/template/package.json
rename to packages/create-svelte/templates/default/package.json
diff --git a/packages/create-svelte/template/src/app.css b/packages/create-svelte/templates/default/src/app.css
similarity index 100%
rename from packages/create-svelte/template/src/app.css
rename to packages/create-svelte/templates/default/src/app.css
diff --git a/packages/create-svelte/template/src/app.html b/packages/create-svelte/templates/default/src/app.html
similarity index 100%
rename from packages/create-svelte/template/src/app.html
rename to packages/create-svelte/templates/default/src/app.html
diff --git a/packages/create-svelte/template/src/global.d.ts b/packages/create-svelte/templates/default/src/global.d.ts
similarity index 100%
rename from packages/create-svelte/template/src/global.d.ts
rename to packages/create-svelte/templates/default/src/global.d.ts
diff --git a/packages/create-svelte/template/src/lib/Counter.svelte b/packages/create-svelte/templates/default/src/lib/Counter.svelte
similarity index 96%
rename from packages/create-svelte/template/src/lib/Counter.svelte
rename to packages/create-svelte/templates/default/src/lib/Counter.svelte
index 986b6f0d10d2..2a5c980a430f 100644
--- a/packages/create-svelte/template/src/lib/Counter.svelte
+++ b/packages/create-svelte/templates/default/src/lib/Counter.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
 	let count = 0;
 
 	const increment = () => {
diff --git a/packages/create-svelte/templates/default/src/lib/foo.ts b/packages/create-svelte/templates/default/src/lib/foo.ts
new file mode 100644
index 000000000000..d2eb50a9226a
--- /dev/null
+++ b/packages/create-svelte/templates/default/src/lib/foo.ts
@@ -0,0 +1,9 @@
+type Foo = {
+	bar: number;
+};
+
+const foo: Foo = {
+	bar: 42
+};
+
+console.log(foo);
diff --git a/packages/create-svelte/template/src/routes/$layout.svelte b/packages/create-svelte/templates/default/src/routes/$layout.svelte
similarity index 100%
rename from packages/create-svelte/template/src/routes/$layout.svelte
rename to packages/create-svelte/templates/default/src/routes/$layout.svelte
diff --git a/packages/create-svelte/template/src/routes/index.svelte b/packages/create-svelte/templates/default/src/routes/index.svelte
similarity index 97%
rename from packages/create-svelte/template/src/routes/index.svelte
rename to packages/create-svelte/templates/default/src/routes/index.svelte
index b2ccc7177ca4..8d71585cff99 100644
--- a/packages/create-svelte/template/src/routes/index.svelte
+++ b/packages/create-svelte/templates/default/src/routes/index.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
 	import Counter from '$lib/Counter.svelte';
 </script>
 
diff --git a/packages/create-svelte/template/static/favicon.ico b/packages/create-svelte/templates/default/static/favicon.ico
similarity index 100%
rename from packages/create-svelte/template/static/favicon.ico
rename to packages/create-svelte/templates/default/static/favicon.ico
diff --git a/packages/create-svelte/template/static/robots.txt b/packages/create-svelte/templates/default/static/robots.txt
similarity index 100%
rename from packages/create-svelte/template/static/robots.txt
rename to packages/create-svelte/templates/default/static/robots.txt
diff --git a/packages/create-svelte/template/svelte.config.cjs b/packages/create-svelte/templates/default/svelte.config.cjs
similarity index 100%
rename from packages/create-svelte/template/svelte.config.cjs
rename to packages/create-svelte/templates/default/svelte.config.cjs
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a89451fa8a48..f3c0bb136512 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -155,8 +155,11 @@ importers:
       '@sveltejs/kit': link:../kit
       gitignore-parser: 0.0.2
       kleur: 4.1.4
+      prettier: 2.2.1
+      prettier-plugin-svelte: 2.2.0_prettier@2.2.1
       prompts: 2.4.0
       rollup: 2.41.1
+      sucrase: 3.18.1
       tiny-glob: 0.2.8
     specifiers:
       '@rollup/plugin-json': ^4.1.0
@@ -164,8 +167,11 @@ importers:
       '@sveltejs/kit': workspace:*
       gitignore-parser: ^0.0.2
       kleur: ^4.1.4
+      prettier: ^2.2.1
+      prettier-plugin-svelte: ^2.2.0
       prompts: ^2.4.0
       rollup: ^2.41.1
+      sucrase: ^3.18.1
       tiny-glob: ^0.2.8
   packages/kit:
     dependencies:
@@ -939,6 +945,10 @@ packages:
       node: '>=8'
     resolution:
       integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  /any-promise/1.3.0:
+    dev: true
+    resolution:
+      integrity: sha1-q8av7tzqUugJzcA3au0845Y10X8=
   /argparse/1.0.10:
     dependencies:
       sprintf-js: 1.0.3
@@ -989,10 +999,10 @@ packages:
       node: '>=8'
     resolution:
       integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-  /balanced-match/1.0.0:
+  /balanced-match/1.0.2:
     dev: true
     resolution:
-      integrity: sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+      integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
   /better-path-resolve/1.0.0:
     dependencies:
       is-windows: 1.0.2
@@ -1017,7 +1027,7 @@ packages:
       integrity: sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==
   /brace-expansion/1.1.11:
     dependencies:
-      balanced-match: 1.0.0
+      balanced-match: 1.0.2
       concat-map: 0.0.1
     dev: true
     resolution:
@@ -1211,6 +1221,12 @@ packages:
     dev: true
     resolution:
       integrity: sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
+  /commander/4.1.1:
+    dev: true
+    engines:
+      node: '>= 6'
+    resolution:
+      integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
   /commander/6.2.1:
     dev: true
     engines:
@@ -2606,6 +2622,14 @@ packages:
   /ms/2.1.2:
     resolution:
       integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+  /mz/2.7.0:
+    dependencies:
+      any-promise: 1.3.0
+      object-assign: 4.1.1
+      thenify-all: 1.6.0
+    dev: true
+    resolution:
+      integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
   /nanoid/3.1.22:
     dev: true
     engines:
@@ -2643,6 +2667,12 @@ packages:
       node: '>= 6.0.0'
     resolution:
       integrity: sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
+  /node-modules-regexp/1.0.0:
+    dev: true
+    engines:
+      node: '>=0.10.0'
+    resolution:
+      integrity: sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
   /normalize-package-data/2.5.0:
     dependencies:
       hosted-git-info: 2.8.8
@@ -2660,6 +2690,12 @@ packages:
       node: '>=4'
     resolution:
       integrity: sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+  /object-assign/4.1.1:
+    dev: true
+    engines:
+      node: '>=0.10.0'
+    resolution:
+      integrity: sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
   /object-inspect/1.9.0:
     dev: true
     resolution:
@@ -2903,6 +2939,14 @@ packages:
       node: '>=6'
     resolution:
       integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+  /pirates/4.0.1:
+    dependencies:
+      node-modules-regexp: 1.0.0
+    dev: true
+    engines:
+      node: '>= 6'
+    resolution:
+      integrity: sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
   /pkg-dir/2.0.0:
     dependencies:
       find-up: 2.1.0
@@ -2987,6 +3031,15 @@ packages:
       node: '>= 0.8.0'
     resolution:
       integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+  /prettier-plugin-svelte/2.2.0_prettier@2.2.1:
+    dependencies:
+      prettier: 2.2.1
+    dev: true
+    peerDependencies:
+      prettier: ^1.16.4 || ^2.0.0
+      svelte: ^3.2.0
+    resolution:
+      integrity: sha512-Xdmqgr71tAuMqqzNCK52/v94g/Yv7V7lz+nmbO9NEA+9ol15VV3uUHOfydMNOo3SWvFaVlBcp947ebEaMWqVfQ==
   /prettier/1.19.1:
     dev: true
     engines:
@@ -3483,6 +3536,20 @@ packages:
       node: '>=8'
     resolution:
       integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+  /sucrase/3.18.1:
+    dependencies:
+      commander: 4.1.1
+      glob: 7.1.6
+      lines-and-columns: 1.1.6
+      mz: 2.7.0
+      pirates: 4.0.1
+      ts-interface-checker: 0.1.13
+    dev: true
+    engines:
+      node: '>=8'
+    hasBin: true
+    resolution:
+      integrity: sha512-TRyO38wwOPhLLlM8QLOG3TgMj0FKk+arlTrS9pRAanF8cAcHvgRPKIYWGO25mPSp/Rj87zMMTjFfkqIZGI6ZdA==
   /supports-color/5.5.0:
     dependencies:
       has-flag: 3.0.0
@@ -3551,6 +3618,20 @@ packages:
     dev: true
     resolution:
       integrity: sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+  /thenify-all/1.6.0:
+    dependencies:
+      thenify: 3.3.1
+    dev: true
+    engines:
+      node: '>=0.8'
+    resolution:
+      integrity: sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=
+  /thenify/3.3.1:
+    dependencies:
+      any-promise: 1.3.0
+    dev: true
+    resolution:
+      integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
   /tiny-glob/0.2.8:
     dependencies:
       globalyzer: 0.1.0
@@ -3604,6 +3685,10 @@ packages:
       node: '>=6'
     resolution:
       integrity: sha512-rLLXbhTObLy2MBVjLC+jTnoIKw99n0GuJs9ov10J870vDw5qhTurPzsDrudNtBf5w/CZ9ctZy2p2IMmhGcel2w==
+  /ts-interface-checker/0.1.13:
+    dev: true
+    resolution:
+      integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==
   /tsconfig-paths/3.9.0:
     dependencies:
       '@types/json5': 0.0.29

From b12dfe24402d099a58fe1f3a2d92ff4afcba9b63 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 12 Apr 2021 23:34:36 -0400
Subject: [PATCH 03/10] remove unused dependency

---
 packages/create-svelte/package.json | 1 -
 pnpm-lock.yaml                      | 2 --
 2 files changed, 3 deletions(-)

diff --git a/packages/create-svelte/package.json b/packages/create-svelte/package.json
index 91ffc3c82fd2..9c5a199bb122 100644
--- a/packages/create-svelte/package.json
+++ b/packages/create-svelte/package.json
@@ -4,7 +4,6 @@
 	"bin": "./bin.js",
 	"devDependencies": {
 		"@rollup/plugin-json": "^4.1.0",
-		"@sveltejs/adapter-node": "workspace:*",
 		"@sveltejs/kit": "workspace:*",
 		"gitignore-parser": "^0.0.2",
 		"kleur": "^4.1.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f3c0bb136512..958251be2e60 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -151,7 +151,6 @@ importers:
   packages/create-svelte:
     devDependencies:
       '@rollup/plugin-json': 4.1.0_rollup@2.41.1
-      '@sveltejs/adapter-node': link:../adapter-node
       '@sveltejs/kit': link:../kit
       gitignore-parser: 0.0.2
       kleur: 4.1.4
@@ -163,7 +162,6 @@ importers:
       tiny-glob: 0.2.8
     specifiers:
       '@rollup/plugin-json': ^4.1.0
-      '@sveltejs/adapter-node': workspace:*
       '@sveltejs/kit': workspace:*
       gitignore-parser: ^0.0.2
       kleur: ^4.1.4

From 57b40b3db2a1fc71626a7a0ba5443b452c93079a Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 12 Apr 2021 23:50:21 -0400
Subject: [PATCH 04/10] future-proofing

---
 packages/create-svelte/cli/index.js           |  2 +-
 .../create-svelte/cli/modifications/utils.js  |  1 -
 packages/create-svelte/cli/types.d.ts         | 11 ++++
 .../create-svelte/scripts/build-templates.js  | 60 ++++++++++---------
 .../templates/default/.meta.json              |  3 +
 5 files changed, 47 insertions(+), 30 deletions(-)
 create mode 100644 packages/create-svelte/templates/default/.meta.json

diff --git a/packages/create-svelte/cli/index.js b/packages/create-svelte/cli/index.js
index 599b385e3bfd..8320277b7307 100644
--- a/packages/create-svelte/cli/index.js
+++ b/packages/create-svelte/cli/index.js
@@ -101,7 +101,7 @@ async function main() {
  */
 function instantiate(id, name, cwd) {
 	const template = fileURLToPath(new URL(`./dist/${id}.json`, import.meta.url).href);
-	const files = /** @type {Array<{ name: string, contents: string, encoding: 'base64' | 'utf8'}>} */ (JSON.parse(
+	const { files } = /** @type {import('./types').Template} */ (JSON.parse(
 		fs.readFileSync(template, 'utf-8')
 	));
 
diff --git a/packages/create-svelte/cli/modifications/utils.js b/packages/create-svelte/cli/modifications/utils.js
index 047255c6171d..64772b2e78e7 100644
--- a/packages/create-svelte/cli/modifications/utils.js
+++ b/packages/create-svelte/cli/modifications/utils.js
@@ -54,7 +54,6 @@ export function copy_from_template_additions(cwd, path) {
 	const to = Array.isArray(path) ? path : path.to;
 
 	const common = fileURLToPath(new URL('./common', import.meta.url).href);
-	console.log({ common, cwd });
 	fs.copyFileSync(join(common, ...from), join(cwd, ...to));
 }
 
diff --git a/packages/create-svelte/cli/types.d.ts b/packages/create-svelte/cli/types.d.ts
index 0bd091ba3d88..3e4da7541e2d 100644
--- a/packages/create-svelte/cli/types.d.ts
+++ b/packages/create-svelte/cli/types.d.ts
@@ -3,3 +3,14 @@ export type Options = {
 	prettier: boolean;
 	eslint: boolean;
 };
+
+export type Template = {
+	meta: {
+		description: string;
+	};
+	files: Array<{
+		name: string;
+		contents: string;
+		encoding: 'base64' | 'utf8';
+	}>;
+};
diff --git a/packages/create-svelte/scripts/build-templates.js b/packages/create-svelte/scripts/build-templates.js
index d0276aa7547b..28609432736d 100644
--- a/packages/create-svelte/scripts/build-templates.js
+++ b/packages/create-svelte/scripts/build-templates.js
@@ -16,35 +16,39 @@ async function main() {
 
 	for (const name of templates) {
 		const cwd = path.resolve('templates', name);
-		const gitignore_file = path.join(cwd, '.gitignore');
-
-		if (!fs.existsSync(gitignore_file)) {
-			throw new Error('Template must have a .gitignore file');
-		}
-
-		const gitignore = parser.compile(fs.readFileSync(gitignore_file, 'utf-8'));
 
-		const ts = glob('**/*', { cwd, filesOnly: true })
-			.filter(gitignore.accepts)
-			.map((name) => {
-				const encoding = /\.(ico|png|jpe?g)$/.test(name) ? 'base64' : 'utf8';
-				let contents = fs.readFileSync(path.join(cwd, name), encoding);
-
-				if (name === 'package.json') {
-					// TODO package-specific versions
-					contents = contents.replace(/workspace:\*/g, 'next');
-				}
+		const gitignore_file = path.join(cwd, '.gitignore');
+		if (!fs.existsSync(gitignore_file)) throw new Error('Template must have a .gitignore file');
+		const gitignore = parser.compile(fs.readFileSync(gitignore_file, 'utf-8') + '\n/.meta.json');
+
+		const meta_file = path.join(cwd, '.meta.json');
+		if (!fs.existsSync(meta_file)) throw new Error('Template must have a .meta.json file');
+		const meta = JSON.parse(fs.readFileSync(meta_file, 'utf-8'));
+
+		const ts = {
+			meta,
+			files: glob('**/*', { cwd, filesOnly: true })
+				.filter(gitignore.accepts)
+				.map((name) => {
+					const encoding = /\.(ico|png|jpe?g)$/.test(name) ? 'base64' : 'utf8';
+					let contents = fs.readFileSync(path.join(cwd, name), encoding);
+
+					if (name === 'package.json') {
+						// TODO package-specific versions
+						contents = contents.replace(/workspace:\*/g, 'next');
+					}
 
-				return {
-					name,
-					contents,
-					encoding
-				};
-			});
+					return {
+						name,
+						contents,
+						encoding
+					};
+				})
+		};
 
-		const js = [];
+		const js = { meta, files: [] };
 
-		for (const file of ts) {
+		for (const file of ts.files) {
 			if (file.name.endsWith('.d.ts')) continue;
 
 			if (file.name.endsWith('.ts')) {
@@ -59,7 +63,7 @@ async function main() {
 					trailingComma: 'none'
 				});
 
-				js.push({
+				js.files.push({
 					name: file.name.replace(/\.ts$/, '.js'),
 					contents
 				});
@@ -99,12 +103,12 @@ async function main() {
 					}
 				);
 
-				js.push({
+				js.files.push({
 					name: file.name,
 					contents
 				});
 			} else {
-				js.push(file);
+				js.files.push(file);
 			}
 		}
 
diff --git a/packages/create-svelte/templates/default/.meta.json b/packages/create-svelte/templates/default/.meta.json
new file mode 100644
index 000000000000..b560eb88c15e
--- /dev/null
+++ b/packages/create-svelte/templates/default/.meta.json
@@ -0,0 +1,3 @@
+{
+	"description": "Demo project"
+}

From 1892a0479b52debfbada328bc232f80dd53ae236 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 13 Apr 2021 00:55:02 -0400
Subject: [PATCH 05/10] file-based additions, rather than code-based

---
 packages/create-svelte/cli/global.d.ts        |   4 -
 packages/create-svelte/cli/index.js           | 121 ++++++++++++++++--
 .../cli/modifications/add_eslint.js           |  43 -------
 .../cli/modifications/add_prettier.js         |  62 ---------
 .../cli/modifications/add_typescript.js       |  39 ------
 .../create-svelte/cli/modifications/utils.js  |  97 --------------
 packages/create-svelte/cli/types.d.ts         |   9 ++
 packages/create-svelte/package.json           |   1 -
 .../create-svelte/scripts/build-templates.js  |  42 +++++-
 .../+eslint+prettier+typescript/.eslintrc.cjs |  20 +++
 .../+eslint+prettier-typescript/.eslintrc.cjs |  15 +++
 .../shared/+eslint+prettier/package.json      |   9 ++
 .../+eslint+typescript/.eslintrc.cjs}         |   0
 .../shared/+eslint+typescript/package.json    |   6 +
 .../shared/+eslint-prettier/package.json      |   5 +
 .../+eslint-typescript}/.eslintrc.cjs         |   0
 .../create-svelte/shared/+eslint/package.json |   6 +
 .../+prettier}/.prettierignore                |   0
 .../{common => shared/+prettier}/.prettierrc  |   0
 .../shared/+prettier/package.json             |   6 +
 .../shared/+typescript/package.json           |   7 +
 .../shared/+typescript/svelte.config.cjs      |  26 ++++
 .../+typescript}/tsconfig.json                |   0
 .../shared/-eslint+prettier/package.json      |   6 +
 .../shared/-typescript/jsconfig.json          |  10 ++
 .../shared/-typescript/svelte.config.cjs      |  21 +++
 26 files changed, 295 insertions(+), 260 deletions(-)
 delete mode 100644 packages/create-svelte/cli/modifications/add_eslint.js
 delete mode 100644 packages/create-svelte/cli/modifications/add_prettier.js
 delete mode 100644 packages/create-svelte/cli/modifications/add_typescript.js
 delete mode 100644 packages/create-svelte/cli/modifications/utils.js
 create mode 100644 packages/create-svelte/shared/+eslint+prettier+typescript/.eslintrc.cjs
 create mode 100644 packages/create-svelte/shared/+eslint+prettier-typescript/.eslintrc.cjs
 create mode 100644 packages/create-svelte/shared/+eslint+prettier/package.json
 rename packages/create-svelte/{common/.eslintrc.ts.cjs => shared/+eslint+typescript/.eslintrc.cjs} (100%)
 create mode 100644 packages/create-svelte/shared/+eslint+typescript/package.json
 create mode 100644 packages/create-svelte/shared/+eslint-prettier/package.json
 rename packages/create-svelte/{common => shared/+eslint-typescript}/.eslintrc.cjs (100%)
 create mode 100644 packages/create-svelte/shared/+eslint/package.json
 rename packages/create-svelte/{common => shared/+prettier}/.prettierignore (100%)
 rename packages/create-svelte/{common => shared/+prettier}/.prettierrc (100%)
 create mode 100644 packages/create-svelte/shared/+prettier/package.json
 create mode 100644 packages/create-svelte/shared/+typescript/package.json
 create mode 100644 packages/create-svelte/shared/+typescript/svelte.config.cjs
 rename packages/create-svelte/{common => shared/+typescript}/tsconfig.json (100%)
 create mode 100644 packages/create-svelte/shared/-eslint+prettier/package.json
 create mode 100644 packages/create-svelte/shared/-typescript/jsconfig.json
 create mode 100644 packages/create-svelte/shared/-typescript/svelte.config.cjs

diff --git a/packages/create-svelte/cli/global.d.ts b/packages/create-svelte/cli/global.d.ts
index 312d5b9a96cf..271d59added9 100644
--- a/packages/create-svelte/cli/global.d.ts
+++ b/packages/create-svelte/cli/global.d.ts
@@ -1,9 +1,5 @@
-declare module 'gitignore-parser';
-
 declare module 'prompts/lib/index';
 
-declare module 'tiny-glob/sync';
-
 declare module '*.json';
 
 // TODO make this depend on the real types from the kit package
diff --git a/packages/create-svelte/cli/index.js b/packages/create-svelte/cli/index.js
index 8320277b7307..9b055791e143 100644
--- a/packages/create-svelte/cli/index.js
+++ b/packages/create-svelte/cli/index.js
@@ -4,9 +4,6 @@ import path from 'path';
 import { mkdirp } from '@sveltejs/kit/filesystem';
 import { bold, cyan, gray, green, red } from 'kleur/colors';
 import prompts from 'prompts/lib/index';
-import add_typescript from './modifications/add_typescript';
-import add_prettier from './modifications/add_prettier';
-import add_eslint from './modifications/add_eslint';
 import { fileURLToPath } from 'url';
 import { version } from '../package.json';
 
@@ -17,8 +14,6 @@ SvelteKit is in public beta now. There are definitely bugs and some feature migh
 If you encounter an issue, have a look at https://github.com/sveltejs/kit/issues and open a new one, if it is not already tracked.
 `;
 
-const modifiers = [add_typescript, add_eslint, add_prettier];
-
 async function main() {
 	console.log(gray(`\ncreate-svelte version ${version}`));
 	console.log(red(disclaimer));
@@ -65,12 +60,43 @@ async function main() {
 
 	const name = path.basename(path.resolve(cwd));
 
-	instantiate(`default-${options.typescript ? 'ts' : 'js'}`, name, cwd);
+	write_template_files(`default-${options.typescript ? 'ts' : 'js'}`, name, cwd);
+	write_common_files(cwd, options);
 
 	console.log(bold(green('✔ Copied project files')));
 
-	for (const modifier of modifiers) {
-		await modifier(cwd, options);
+	if (options.typescript) {
+		console.log(
+			bold(
+				green(
+					'✔ Added TypeScript support. ' +
+						'To use it inside Svelte components, add lang="ts" to the attributes of a script tag.'
+				)
+			)
+		);
+	}
+
+	if (options.eslint) {
+		console.log(
+			bold(
+				green(
+					'✔ Added ESLint.\n' +
+						'Readme for ESLint and Svelte: https://github.com/sveltejs/eslint-plugin-svelte3'
+				)
+			)
+		);
+	}
+
+	if (options.prettier) {
+		console.log(
+			bold(
+				green(
+					'✔ Added Prettier.\n' +
+						'General formatting options: https://prettier.io/docs/en/options.html\n' +
+						'Svelte-specific formatting options: https://github.com/sveltejs/prettier-plugin-svelte#options'
+				)
+			)
+		);
 	}
 
 	console.log(
@@ -99,8 +125,8 @@ async function main() {
  * @param {string} name
  * @param {string} cwd
  */
-function instantiate(id, name, cwd) {
-	const template = fileURLToPath(new URL(`./dist/${id}.json`, import.meta.url).href);
+function write_template_files(id, name, cwd) {
+	const template = fileURLToPath(new URL(`./dist/templates/${id}.json`, import.meta.url).href);
 	const { files } = /** @type {import('./types').Template} */ (JSON.parse(
 		fs.readFileSync(template, 'utf-8')
 	));
@@ -118,4 +144,79 @@ function instantiate(id, name, cwd) {
 	});
 }
 
+/**
+ *
+ * @param {string} cwd
+ * @param {import('./types').Options} options
+ */
+function write_common_files(cwd, options) {
+	const shared = fileURLToPath(new URL('./dist/shared.json', import.meta.url).href);
+	const { files } = /** @type {import('./types').Common} */ (JSON.parse(
+		fs.readFileSync(shared, 'utf-8')
+	));
+
+	const pkg_file = path.join(cwd, 'package.json');
+	const pkg = /** @type {any} */ (JSON.parse(fs.readFileSync(pkg_file, 'utf-8')));
+
+	files.forEach((file) => {
+		const include = file.include.every((condition) => options[condition]);
+		const exclude = file.exclude.some((condition) => options[condition]);
+
+		if (exclude || !include) return;
+
+		if (file.name === 'package.json') {
+			const new_pkg = JSON.parse(file.contents);
+			merge(pkg, new_pkg);
+		} else {
+			const dest = path.join(cwd, file.name);
+			mkdirp(path.dirname(dest));
+			fs.writeFileSync(dest, file.contents);
+		}
+	});
+
+	pkg.dependencies = sort_keys(pkg.dependencies);
+	pkg.devDependencies = sort_keys(pkg.devDependencies);
+
+	fs.writeFileSync(pkg_file, JSON.stringify(pkg, null, '  '));
+}
+
+/**
+ * @param {any} target
+ * @param {any} source
+ */
+function merge(target, source) {
+	for (const key in source) {
+		if (key in target) {
+			const target_value = target[key];
+			const source_value = source[key];
+
+			if (
+				typeof source_value !== typeof target_value ||
+				Array.isArray(source_value) !== Array.isArray(target_value)
+			) {
+				throw new Error('Mismatched values');
+			}
+
+			merge(target_value, source_value);
+		} else {
+			target[key] = source[key];
+		}
+	}
+}
+
+/** @param {Record<string, any>} obj */
+function sort_keys(obj) {
+	if (!obj) return;
+
+	/** @type {Record<string, any>} */
+	const sorted = {};
+	Object.keys(obj)
+		.sort()
+		.forEach((key) => {
+			sorted[key] = obj[key];
+		});
+
+	return sorted;
+}
+
 main();
diff --git a/packages/create-svelte/cli/modifications/add_eslint.js b/packages/create-svelte/cli/modifications/add_eslint.js
deleted file mode 100644
index f1aaf5c417cc..000000000000
--- a/packages/create-svelte/cli/modifications/add_eslint.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import { bold, green } from 'kleur/colors';
-import {
-	copy_from_template_additions,
-	update_package_json_dev_deps,
-	upsert_package_json_scripts
-} from './utils';
-
-/**
- * @param {string} cwd
- * @param {import('../types').Options} options
- */
-export default async function add_eslint(cwd, options) {
-	if (!options.eslint) return;
-
-	upsert_package_json_scripts(cwd, {
-		lint: 'eslint --ignore-path .gitignore .'
-	});
-
-	if (options.typescript) {
-		update_package_json_dev_deps(cwd, {
-			'@typescript-eslint/eslint-plugin': '^4.19.0',
-			'@typescript-eslint/parser': '^4.19.0',
-			eslint: '^7.22.0',
-			'eslint-plugin-svelte3': '^3.1.0'
-		});
-		copy_from_template_additions(cwd, { from: ['.eslintrc.ts.cjs'], to: ['.eslintrc.cjs'] });
-	} else {
-		update_package_json_dev_deps(cwd, {
-			eslint: '^7.22.0',
-			'eslint-plugin-svelte3': '^3.1.0'
-		});
-		copy_from_template_additions(cwd, ['.eslintrc.cjs']);
-	}
-
-	console.log(
-		bold(
-			green(
-				'✔ Added ESLint.\n' +
-					'Readme for ESLint and Svelte: https://github.com/sveltejs/eslint-plugin-svelte3'
-			)
-		)
-	);
-}
diff --git a/packages/create-svelte/cli/modifications/add_prettier.js b/packages/create-svelte/cli/modifications/add_prettier.js
deleted file mode 100644
index 0764b52e07f4..000000000000
--- a/packages/create-svelte/cli/modifications/add_prettier.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import fs from 'fs';
-import { bold, green } from 'kleur/colors';
-import { join } from 'path';
-import {
-	copy_from_template_additions,
-	update_package_json_dev_deps,
-	upsert_package_json_scripts
-} from './utils';
-
-/**
- * @param {string} cwd
- * @param {import('../types').Options} options
- */
-export default async function add_prettier(cwd, options) {
-	if (!options.prettier) return;
-
-	update_package_json_dev_deps(cwd, {
-		prettier: '~2.2.1',
-		'prettier-plugin-svelte': '^2.2.0'
-	});
-	copy_from_template_additions(cwd, ['.prettierrc']);
-	copy_from_template_additions(cwd, ['.prettierignore']);
-
-	if (options.eslint) {
-		update_package_json_dev_deps(cwd, {
-			'eslint-config-prettier': '^8.1.0'
-		});
-		add_prettier_to_eslint_extends(cwd);
-		upsert_package_json_scripts(cwd, {
-			lint: 'prettier --check . && eslint --ignore-path .gitignore .',
-			format: 'prettier --write .'
-		});
-	} else {
-		upsert_package_json_scripts(cwd, {
-			lint: 'prettier --check .',
-			format: 'prettier --write .'
-		});
-	}
-
-	console.log(
-		bold(
-			green(
-				'✔ Added Prettier.\n' +
-					'General formatting options: https://prettier.io/docs/en/options.html\n' +
-					'Svelte-specific formatting options: https://github.com/sveltejs/prettier-plugin-svelte#options'
-			)
-		)
-	);
-}
-
-/**
- * @param {string} cwd
- */
-function add_prettier_to_eslint_extends(cwd) {
-	const file = join(cwd, '.eslintrc.cjs');
-	let code = fs.readFileSync(file, 'utf-8');
-
-	const insertIdx = code.indexOf(']', code.indexOf('extends: ['));
-	code = code.substring(0, insertIdx) + ", 'prettier'" + code.substring(insertIdx);
-
-	fs.writeFileSync(file, code, 'utf-8');
-}
diff --git a/packages/create-svelte/cli/modifications/add_typescript.js b/packages/create-svelte/cli/modifications/add_typescript.js
deleted file mode 100644
index 68d44b45d85d..000000000000
--- a/packages/create-svelte/cli/modifications/add_typescript.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import fs from 'fs';
-import { bold, green } from 'kleur/colors';
-import { join } from 'path';
-import {
-	add_svelte_preprocess_to_config,
-	copy_from_template_additions,
-	update_package_json_dev_deps
-} from './utils';
-
-/**
- * @param {string} cwd
- * @param {import('../types').Options} options
- */
-export default async function add_typescript(cwd, options) {
-	if (!options.typescript) return;
-
-	update_package_json_dev_deps(cwd, {
-		typescript: '^4.0.0',
-		tslib: '^2.0.0',
-		'svelte-preprocess': '^4.0.0'
-	});
-	add_svelte_preprocess_to_config(cwd);
-	add_tsconfig(cwd);
-
-	console.log(
-		bold(
-			green(
-				'✔ Added TypeScript support. ' +
-					'To use it inside Svelte components, add lang="ts" to the attributes of a script tag.'
-			)
-		)
-	);
-}
-
-/** @param {string} cwd */
-function add_tsconfig(cwd) {
-	fs.unlinkSync(join(cwd, 'jsconfig.json'));
-	copy_from_template_additions(cwd, ['tsconfig.json']);
-}
diff --git a/packages/create-svelte/cli/modifications/utils.js b/packages/create-svelte/cli/modifications/utils.js
deleted file mode 100644
index 64772b2e78e7..000000000000
--- a/packages/create-svelte/cli/modifications/utils.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import fs from 'fs';
-import { join } from 'path';
-import { fileURLToPath } from 'url';
-
-/**
- * Updates package.json with given devDependencies
- *
- * @param {string} cwd
- * @param {Record<string, string>} newDevDeps
- */
-export function update_package_json_dev_deps(cwd, newDevDeps) {
-	update_package_json(cwd, (pkg) => {
-		pkg.devDependencies = sortObj({
-			...pkg.devDependencies,
-			...newDevDeps
-		});
-		return pkg;
-	});
-}
-
-/**
- * Adds `svelte-preprocess` to `svelte.config.cjs`, if there's no preprocessor already.
- *
- * @param {string} cwd
- */
-export function add_svelte_preprocess_to_config(cwd) {
-	const file = join(cwd, 'svelte.config.cjs');
-	let config = fs.readFileSync(file, 'utf-8');
-
-	if (config.includes('preprocess:')) {
-		return;
-	}
-
-	config = `const sveltePreprocess = require('svelte-preprocess');\n${config}`;
-	config = config.replace(
-		'module.exports = {',
-		`module.exports = {
-	// Consult https://github.com/sveltejs/svelte-preprocess
-	// for more information about preprocessors
-	preprocess: sveltePreprocess(),`
-	);
-
-	fs.writeFileSync(file, config);
-}
-
-/**
- * Copy over a specific file from the template-additions folder.
- *
- * @param {string} cwd
- * @param  {string[] | {from: string[], to: string[]}} path
- */
-export function copy_from_template_additions(cwd, path) {
-	const from = Array.isArray(path) ? path : path.from;
-	const to = Array.isArray(path) ? path : path.to;
-
-	const common = fileURLToPath(new URL('./common', import.meta.url).href);
-	fs.copyFileSync(join(common, ...from), join(cwd, ...to));
-}
-
-/**
- * Update or insert package.json scripts
- *
- * @param {string} cwd
- * @param {Record<string, string>} newScripts
- */
-export function upsert_package_json_scripts(cwd, newScripts) {
-	update_package_json(cwd, (pkg) => {
-		pkg.scripts = sortObj({
-			...pkg.scripts,
-			...newScripts
-		});
-		return pkg;
-	});
-}
-
-/**
- *
- * @param {string} cwd
- * @param {(pkg: any) => any} modify
- */
-function update_package_json(cwd, modify) {
-	const pkg_file = join(cwd, 'package.json');
-	const pkg_json = fs.readFileSync(pkg_file, 'utf-8');
-	const pkg = modify(JSON.parse(pkg_json));
-	fs.writeFileSync(pkg_file, JSON.stringify(pkg, null, '\t') + '\n', 'utf-8');
-}
-
-/**
- * @param {Record<string, any>} obj
- * @returns Record<string, any>
- */
-function sortObj(obj) {
-	return Object.keys(obj).reduce((/** @type {Record<string, any>} */ newObj, key) => {
-		newObj[key] = obj[key];
-		return newObj;
-	}, {});
-}
diff --git a/packages/create-svelte/cli/types.d.ts b/packages/create-svelte/cli/types.d.ts
index 3e4da7541e2d..de5304c0127b 100644
--- a/packages/create-svelte/cli/types.d.ts
+++ b/packages/create-svelte/cli/types.d.ts
@@ -14,3 +14,12 @@ export type Template = {
 		encoding: 'base64' | 'utf8';
 	}>;
 };
+
+export type Common = {
+	files: Array<{
+		name: string;
+		include: Array<'eslint' | 'prettier' | 'typescript'>;
+		exclude: Array<'eslint' | 'prettier' | 'typescript'>;
+		contents: string;
+	}>;
+};
diff --git a/packages/create-svelte/package.json b/packages/create-svelte/package.json
index 9c5a199bb122..b910c6dd8dcf 100644
--- a/packages/create-svelte/package.json
+++ b/packages/create-svelte/package.json
@@ -23,7 +23,6 @@
 		"prepublishOnly": "npm run build"
 	},
 	"files": [
-		"common",
 		"dist",
 		"bin.js"
 	],
diff --git a/packages/create-svelte/scripts/build-templates.js b/packages/create-svelte/scripts/build-templates.js
index 28609432736d..a367de3999a6 100644
--- a/packages/create-svelte/scripts/build-templates.js
+++ b/packages/create-svelte/scripts/build-templates.js
@@ -5,11 +5,11 @@ import prettier from 'prettier';
 import { transform } from 'sucrase';
 import glob from 'tiny-glob/sync.js';
 
-async function main() {
+async function generate_templates() {
 	const templates = fs.readdirSync('templates');
 
 	try {
-		fs.mkdirSync('dist');
+		fs.mkdirSync('dist/templates', { recursive: true });
 	} catch {
 		// ignore
 	}
@@ -112,9 +112,43 @@ async function main() {
 			}
 		}
 
-		fs.writeFileSync(`dist/${name}-ts.json`, JSON.stringify(ts, null, '\t'));
-		fs.writeFileSync(`dist/${name}-js.json`, JSON.stringify(js, null, '\t'));
+		fs.writeFileSync(`dist/templates/${name}-ts.json`, JSON.stringify(ts, null, '\t'));
+		fs.writeFileSync(`dist/templates/${name}-js.json`, JSON.stringify(js, null, '\t'));
 	}
 }
 
+async function generate_common() {
+	const cwd = path.resolve('shared');
+
+	const files = glob('**/*', { cwd, filesOnly: true, dot: true })
+		.map((file) => {
+			const [conditions, ...rest] = file.split('/');
+
+			const include = [];
+			const exclude = [];
+
+			const pattern = /([+-])([a-z]+)/g;
+			let match;
+			while ((match = pattern.exec(conditions))) {
+				const set = match[1] === '+' ? include : exclude;
+				set.push(match[2]);
+			}
+
+			return {
+				name: rest.join('/'),
+				include,
+				exclude,
+				contents: fs.readFileSync(path.join(cwd, file), 'utf8')
+			};
+		})
+		.sort((a, b) => a.include.length + a.exclude.length - (b.include.length + b.exclude.length));
+
+	fs.writeFileSync('dist/shared.json', JSON.stringify({ files }, null, '\t'));
+}
+
+async function main() {
+	await generate_templates();
+	await generate_common();
+}
+
 main();
diff --git a/packages/create-svelte/shared/+eslint+prettier+typescript/.eslintrc.cjs b/packages/create-svelte/shared/+eslint+prettier+typescript/.eslintrc.cjs
new file mode 100644
index 000000000000..496e134facbb
--- /dev/null
+++ b/packages/create-svelte/shared/+eslint+prettier+typescript/.eslintrc.cjs
@@ -0,0 +1,20 @@
+module.exports = {
+	root: true,
+	parser: '@typescript-eslint/parser',
+	extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'prettier'],
+	plugins: ['svelte3', '@typescript-eslint'],
+	ignorePatterns: ['*.cjs'],
+	overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }],
+	settings: {
+		'svelte3/typescript': require('typescript')
+	},
+	parserOptions: {
+		sourceType: 'module',
+		ecmaVersion: 2019
+	},
+	env: {
+		browser: true,
+		es2017: true,
+		node: true
+	}
+};
diff --git a/packages/create-svelte/shared/+eslint+prettier-typescript/.eslintrc.cjs b/packages/create-svelte/shared/+eslint+prettier-typescript/.eslintrc.cjs
new file mode 100644
index 000000000000..e496918ef220
--- /dev/null
+++ b/packages/create-svelte/shared/+eslint+prettier-typescript/.eslintrc.cjs
@@ -0,0 +1,15 @@
+module.exports = {
+	root: true,
+	extends: ['eslint:recommended', 'prettier'],
+	plugins: ['svelte3'],
+	overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }],
+	parserOptions: {
+		sourceType: 'module',
+		ecmaVersion: 2019
+	},
+	env: {
+		browser: true,
+		es2017: true,
+		node: true
+	}
+};
diff --git a/packages/create-svelte/shared/+eslint+prettier/package.json b/packages/create-svelte/shared/+eslint+prettier/package.json
new file mode 100644
index 000000000000..5c6a27585ad6
--- /dev/null
+++ b/packages/create-svelte/shared/+eslint+prettier/package.json
@@ -0,0 +1,9 @@
+{
+	"devDependencies": {
+		"eslint-config-prettier": "^8.1.0"
+	},
+	"scripts": {
+		"lint": "prettier --check . && eslint --ignore-path .gitignore .",
+		"format": "prettier --write ."
+	}
+}
diff --git a/packages/create-svelte/common/.eslintrc.ts.cjs b/packages/create-svelte/shared/+eslint+typescript/.eslintrc.cjs
similarity index 100%
rename from packages/create-svelte/common/.eslintrc.ts.cjs
rename to packages/create-svelte/shared/+eslint+typescript/.eslintrc.cjs
diff --git a/packages/create-svelte/shared/+eslint+typescript/package.json b/packages/create-svelte/shared/+eslint+typescript/package.json
new file mode 100644
index 000000000000..e90eac2ef3c7
--- /dev/null
+++ b/packages/create-svelte/shared/+eslint+typescript/package.json
@@ -0,0 +1,6 @@
+{
+	"devDependencies": {
+		"@typescript-eslint/eslint-plugin": "^4.19.0",
+		"@typescript-eslint/parser": "^4.19.0"
+	}
+}
diff --git a/packages/create-svelte/shared/+eslint-prettier/package.json b/packages/create-svelte/shared/+eslint-prettier/package.json
new file mode 100644
index 000000000000..061cf9122f28
--- /dev/null
+++ b/packages/create-svelte/shared/+eslint-prettier/package.json
@@ -0,0 +1,5 @@
+{
+	"scripts": {
+		"lint": "eslint --ignore-path .gitignore ."
+	}
+}
diff --git a/packages/create-svelte/common/.eslintrc.cjs b/packages/create-svelte/shared/+eslint-typescript/.eslintrc.cjs
similarity index 100%
rename from packages/create-svelte/common/.eslintrc.cjs
rename to packages/create-svelte/shared/+eslint-typescript/.eslintrc.cjs
diff --git a/packages/create-svelte/shared/+eslint/package.json b/packages/create-svelte/shared/+eslint/package.json
new file mode 100644
index 000000000000..6fccfe1a5846
--- /dev/null
+++ b/packages/create-svelte/shared/+eslint/package.json
@@ -0,0 +1,6 @@
+{
+	"devDependencies": {
+		"eslint": "^7.22.0",
+		"eslint-plugin-svelte3": "^3.1.0"
+	}
+}
diff --git a/packages/create-svelte/common/.prettierignore b/packages/create-svelte/shared/+prettier/.prettierignore
similarity index 100%
rename from packages/create-svelte/common/.prettierignore
rename to packages/create-svelte/shared/+prettier/.prettierignore
diff --git a/packages/create-svelte/common/.prettierrc b/packages/create-svelte/shared/+prettier/.prettierrc
similarity index 100%
rename from packages/create-svelte/common/.prettierrc
rename to packages/create-svelte/shared/+prettier/.prettierrc
diff --git a/packages/create-svelte/shared/+prettier/package.json b/packages/create-svelte/shared/+prettier/package.json
new file mode 100644
index 000000000000..26ff9cb7092f
--- /dev/null
+++ b/packages/create-svelte/shared/+prettier/package.json
@@ -0,0 +1,6 @@
+{
+	"devDependencies": {
+		"prettier": "~2.2.1",
+		"prettier-plugin-svelte": "^2.2.0"
+	}
+}
diff --git a/packages/create-svelte/shared/+typescript/package.json b/packages/create-svelte/shared/+typescript/package.json
new file mode 100644
index 000000000000..343a1d723cb6
--- /dev/null
+++ b/packages/create-svelte/shared/+typescript/package.json
@@ -0,0 +1,7 @@
+{
+	"devDependencies": {
+		"typescript": "^4.0.0",
+		"tslib": "^2.0.0",
+		"svelte-preprocess": "^4.0.0"
+	}
+}
diff --git a/packages/create-svelte/shared/+typescript/svelte.config.cjs b/packages/create-svelte/shared/+typescript/svelte.config.cjs
new file mode 100644
index 000000000000..8f3f1d4d56b9
--- /dev/null
+++ b/packages/create-svelte/shared/+typescript/svelte.config.cjs
@@ -0,0 +1,26 @@
+const sveltePreprocess = require('svelte-preprocess');
+const node = require('@sveltejs/adapter-node');
+const pkg = require('./package.json');
+
+/** @type {import('@sveltejs/kit').Config} */
+module.exports = {
+	kit: {
+		// By default, `npm run build` will create a standard Node app.
+		// You can create optimized builds for different platforms by
+		// specifying a different adapter
+		adapter: node(),
+
+		// Consult https://github.com/sveltejs/svelte-preprocess
+		// for more information about preprocessors
+		preprocess: sveltePreprocess(),
+
+		// hydrate the <div id="svelte"> element in src/app.html
+		target: '#svelte',
+
+		vite: {
+			ssr: {
+				noExternal: Object.keys(pkg.dependencies || {})
+			}
+		}
+	}
+};
diff --git a/packages/create-svelte/common/tsconfig.json b/packages/create-svelte/shared/+typescript/tsconfig.json
similarity index 100%
rename from packages/create-svelte/common/tsconfig.json
rename to packages/create-svelte/shared/+typescript/tsconfig.json
diff --git a/packages/create-svelte/shared/-eslint+prettier/package.json b/packages/create-svelte/shared/-eslint+prettier/package.json
new file mode 100644
index 000000000000..bcdff7cf9402
--- /dev/null
+++ b/packages/create-svelte/shared/-eslint+prettier/package.json
@@ -0,0 +1,6 @@
+{
+	"scripts": {
+		"lint": "prettier --check .",
+		"format": "prettier --write ."
+	}
+}
diff --git a/packages/create-svelte/shared/-typescript/jsconfig.json b/packages/create-svelte/shared/-typescript/jsconfig.json
new file mode 100644
index 000000000000..266034f4f054
--- /dev/null
+++ b/packages/create-svelte/shared/-typescript/jsconfig.json
@@ -0,0 +1,10 @@
+{
+	"compilerOptions": {
+		"baseUrl": ".",
+		"paths": {
+			"$app/*": [".svelte/dev/runtime/app/*", ".svelte/build/runtime/app/*"],
+			"$lib/*": ["src/lib/*"]
+		}
+	},
+	"include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.svelte"]
+}
diff --git a/packages/create-svelte/shared/-typescript/svelte.config.cjs b/packages/create-svelte/shared/-typescript/svelte.config.cjs
new file mode 100644
index 000000000000..621098e71839
--- /dev/null
+++ b/packages/create-svelte/shared/-typescript/svelte.config.cjs
@@ -0,0 +1,21 @@
+const node = require('@sveltejs/adapter-node');
+const pkg = require('./package.json');
+
+/** @type {import('@sveltejs/kit').Config} */
+module.exports = {
+	kit: {
+		// By default, `npm run build` will create a standard Node app.
+		// You can create optimized builds for different platforms by
+		// specifying a different adapter
+		adapter: node(),
+
+		// hydrate the <div id="svelte"> element in src/app.html
+		target: '#svelte',
+
+		vite: {
+			ssr: {
+				noExternal: Object.keys(pkg.dependencies || {})
+			}
+		}
+	}
+};

From fb873cc8d88bbf72144ae79739661003b9d48040 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 13 Apr 2021 00:59:23 -0400
Subject: [PATCH 06/10] lint

---
 packages/create-svelte/cli/index.js | 2 +-
 packages/create-svelte/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/create-svelte/cli/index.js b/packages/create-svelte/cli/index.js
index 9b055791e143..34596ca5a53a 100644
--- a/packages/create-svelte/cli/index.js
+++ b/packages/create-svelte/cli/index.js
@@ -1,7 +1,7 @@
 //eslint-disable-next-line import/no-unresolved
 import fs from 'fs';
 import path from 'path';
-import { mkdirp } from '@sveltejs/kit/filesystem';
+import { mkdirp } from '@sveltejs/kit/filesystem'; // eslint-disable-line
 import { bold, cyan, gray, green, red } from 'kleur/colors';
 import prompts from 'prompts/lib/index';
 import { fileURLToPath } from 'url';
diff --git a/packages/create-svelte/package.json b/packages/create-svelte/package.json
index b910c6dd8dcf..d52e6d964e88 100644
--- a/packages/create-svelte/package.json
+++ b/packages/create-svelte/package.json
@@ -17,7 +17,7 @@
 	"scripts": {
 		"dev": "rollup -cw",
 		"build": "node scripts/build-templates && rollup -c",
-		"lint": "eslint --ignore-path .gitignore --ignore-pattern template/ \"**/*.{ts,js,svelte}\" && npm run check-format",
+		"lint": "eslint --ignore-path .gitignore \"cli/*.js\" && npm run check-format",
 		"format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore",
 		"check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
 		"prepublishOnly": "npm run build"

From f282685e6502fa99b3a31d3a5fc870f2961da021 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 13 Apr 2021 01:00:32 -0400
Subject: [PATCH 07/10] changeset

---
 .changeset/new-walls-prove.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/new-walls-prove.md

diff --git a/.changeset/new-walls-prove.md b/.changeset/new-walls-prove.md
new file mode 100644
index 000000000000..5ce23ab0303d
--- /dev/null
+++ b/.changeset/new-walls-prove.md
@@ -0,0 +1,5 @@
+---
+'create-svelte': patch
+---
+
+Remove CSS option and simplify

From 64c91a2f21f7484f83d827b9ab76329c540e2c60 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@hey.com>
Date: Tue, 13 Apr 2021 09:41:39 -0400
Subject: [PATCH 08/10] Update
 packages/create-svelte/templates/default/jsconfig.json

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 packages/create-svelte/templates/default/jsconfig.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/create-svelte/templates/default/jsconfig.json b/packages/create-svelte/templates/default/jsconfig.json
index 266034f4f054..893781f65ca0 100644
--- a/packages/create-svelte/templates/default/jsconfig.json
+++ b/packages/create-svelte/templates/default/jsconfig.json
@@ -2,7 +2,6 @@
 	"compilerOptions": {
 		"baseUrl": ".",
 		"paths": {
-			"$app/*": [".svelte/dev/runtime/app/*", ".svelte/build/runtime/app/*"],
 			"$lib/*": ["src/lib/*"]
 		}
 	},

From 750c06034ed8bb6fb5c4a0da137b9ca9350df474 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 13 Apr 2021 09:57:30 -0400
Subject: [PATCH 09/10] fix linting

---
 packages/create-svelte/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/create-svelte/.gitignore b/packages/create-svelte/.gitignore
index c340356570fd..7e1457c65914 100644
--- a/packages/create-svelte/.gitignore
+++ b/packages/create-svelte/.gitignore
@@ -1,4 +1,5 @@
 /bin.js
+/dist
 
 # re-enable this once we're out of prerelease
 /cli/versions.js
\ No newline at end of file

From 119dd804a3e85362318135922822b543bb5c290c Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 13 Apr 2021 10:21:08 -0400
Subject: [PATCH 10/10] explain the sucrase thing

---
 packages/create-svelte/scripts/build-templates.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/create-svelte/scripts/build-templates.js b/packages/create-svelte/scripts/build-templates.js
index a367de3999a6..895109de864a 100644
--- a/packages/create-svelte/scripts/build-templates.js
+++ b/packages/create-svelte/scripts/build-templates.js
@@ -68,9 +68,17 @@ async function generate_templates() {
 					contents
 				});
 			} else if (file.name.endsWith('.svelte')) {
+				// we jump through some hoops, rather than just using svelte.preprocess,
+				// so that the output preserves the original formatting to the extent
+				// possible (e.g. preserving double line breaks). Sucrase is the best
+				// tool for the job because it just removes the types; Prettier then
+				// tidies up the end result
 				const contents = file.contents.replace(
 					/<script([^>]+)>([\s\S]+)<\/script>/g,
 					(m, attrs, typescript) => {
+						// Sucrase assumes 'unused' imports (which _are_ used, but only
+						// in the markup) are type imports, and strips them. This step
+						// prevents it from drawing that conclusion
 						const imports = [];
 						const import_pattern = /import (.+?) from/g;
 						let import_match;