From 71a6b6c06c07021bf5ce59f4eb8f2fe4f8f71930 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sat, 19 Aug 2017 13:55:32 -0700
Subject: [PATCH 01/53] install `gittar`

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index aae9c3241..1dd466183 100644
--- a/package.json
+++ b/package.json
@@ -121,6 +121,7 @@
     "file-loader": "^0.11.1",
     "fs.promised": "^3.0.0",
     "get-port": "^3.1.0",
+    "gittar": "^0.1.0",
     "glob": "^7.1.2",
     "html-webpack-exclude-assets-plugin": "0.0.5",
     "html-webpack-plugin": "^2.28.0",

From d4ff63808d3aa44c7f667d6464ccaf90889b81c9 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sat, 19 Aug 2017 15:16:32 -0700
Subject: [PATCH 02/53] remove flags: css,sass,less,dest,type

---
 README.md              |  6 ------
 src/commands/create.js | 29 -----------------------------
 src/commands/init.js   | 14 --------------
 3 files changed, 49 deletions(-)

diff --git a/README.md b/README.md
index 3026634b9..b94de4e5b 100644
--- a/README.md
+++ b/README.md
@@ -95,12 +95,6 @@ $ preact init
 $ preact create
 
   --name        Directory and package name for the new app.
-  --dest        Directory to create the app within.                 [default: <name>]
-  --type        A project template to start from.
-                  [Options: "full", "root", "simple", "empty"]      [default: "full"]
-  --less        Pre-install LESS support.                [boolean]  [default: false]
-  --sass        Pre-install SASS/SCSS support.           [boolean]  [default: false]
-  --stylus      Pre-install STYLUS support.              [boolean]  [default: false]
   --git         Initialize version control using git.    [boolean]  [default: false]
   --no-install  Disables installing of dependencies.     [boolean]  [default: false]
   --yarn        Installs dependencies with yarn.         [boolean]  [default: false]
diff --git a/src/commands/create.js b/src/commands/create.js
index 83dd83d71..73464da14 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -26,44 +26,15 @@ export default asyncCommand({
 		name: {
 			description: 'directory and package name for the new app'
 		},
-		dest: {
-			description: 'Directory to create the app within',
-			defaultDescription: '<name>'
-		},
 		force: {
 			description: 'Force option to create the directory for the new app',
 			default: false
 		},
-		type: {
-			description: 'A project template to start from',
-			choices: [
-				'full',
-				'root',
-				'simple',
-				'empty'
-			],
-			default: 'full'
-		},
 		yarn: {
 			description: "Use 'yarn' instead of 'npm'",
 			type: 'boolean',
 			default: false
 		},
-		less: {
-			description: 'Pre-install LESS support',
-			type: 'boolean',
-			default: false
-		},
-		sass: {
-			description: 'Pre-install SASS/SCSS support',
-			type: 'boolean',
-			default: false
-		},
-		stylus: {
-			description: 'Pre-install STYLUS support',
-			type: 'boolean',
-			default: false
-		},
 		git: {
 			description: 'Initialize version control using git',
 			type: 'boolean',
diff --git a/src/commands/init.js b/src/commands/init.js
index 3cd9e28e0..533e47b49 100644
--- a/src/commands/init.js
+++ b/src/commands/init.js
@@ -45,20 +45,6 @@ export default asyncCommand({
 				message: 'Directory to create the app within',
 				default: '<name>'
 			},
-			{
-				type: 'list',
-				name: 'type',
-				message: 'A project template to start from',
-				choices: ['full', 'root', 'simple', 'empty'],
-				default: 'full',
-			},
-			{
-				type: 'list',
-				name: 'style',
-				message: 'What do you want to use for your styling?',
-				choices: ['css', 'less', 'sass', 'stylus'],
-				default: 'css'
-			},
 			{
 				type: 'confirm',
 				name: 'yarn',

From 6c3c3aa32ad5384708261e408c94003bddeefca4 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sat, 19 Aug 2017 15:28:07 -0700
Subject: [PATCH 03/53] purge *css flag-related stuffs

---
 src/commands/create.js | 39 +--------------------------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index 73464da14..4d51151af 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -128,25 +128,7 @@ export default asyncCommand({
 				'preact-cli',
 				'if-env',
 				'eslint',
-				'eslint-config-synacor',
-
-				// install sass setup if --sass
-				...(argv.sass ? [
-					'node-sass',
-					'sass-loader'
-				] : []),
-
-				// install less setup if --less
-				...(argv.less ? [
-					'less',
-					'less-loader'
-				] : []),
-
-				// install stylus if --stylus
-				...(argv.stylus ? [
-					'stylus',
-					'stylus-loader'
-				] : [])
+				'eslint-config-synacor'
 			], 'dev');
 
 			spinner.text = 'Installing dependencies';
@@ -160,25 +142,6 @@ export default asyncCommand({
 
 		spinner.succeed('Done!\n');
 
-		if (argv.less || argv.sass || argv.stylus) {
-			let extension;
-
-			if (argv.less) extension = '.less';
-			if (argv.sass) extension = '.scss';
-			if (argv.stylus) extension = '.styl';
-
-			const cssFiles = await promisify(glob)(`${target}/**/*.css`, {
-				ignore: [
-					`${target}/build/**`,
-					`${target}/node_modules/**`
-				]
-			});
-
-			const changeExtension = fileName => fs.rename(fileName, fileName.replace(/.css$/, extension));
-
-			await Promise.all(cssFiles.map(changeExtension));
-		}
-
 		if (argv.git) {
 			await initGit(target);
 		}

From b7f4cdcd814b2155b353620196b19c2a00ed943f Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sat, 19 Aug 2017 15:46:42 -0700
Subject: [PATCH 04/53] extract yarn-vs-npm logic before printing

---
 src/commands/create.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index 4d51151af..c00a22884 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -48,6 +48,7 @@ export default asyncCommand({
 	},
 
 	async handler(argv) {
+		let isYarn = argv.yarn === true;
 		let template = TEMPLATES[argv.type];
 
 		if (!template) {
@@ -102,11 +103,11 @@ export default asyncCommand({
 
 		spinner.text = 'Initializing project';
 
-		await initialize(argv.yarn, target);
+		await initialize(isYarn, target);
 
 		let pkg = JSON.parse(await fs.readFile(path.resolve(target, 'package.json')));
 
-		pkg.scripts = await pkgScripts(argv.yarn, pkg);
+		pkg.scripts = await pkgScripts(isYarn, pkg);
 
 		try {
 			await fs.stat(path.resolve(target, 'src'));
@@ -124,7 +125,7 @@ export default asyncCommand({
 		if (argv.install) {
 			spinner.text = 'Installing dev dependencies';
 
-			await install(argv.yarn, target, [
+			await install(isYarn, target, [
 				'preact-cli',
 				'if-env',
 				'eslint',
@@ -133,7 +134,7 @@ export default asyncCommand({
 
 			spinner.text = 'Installing dependencies';
 
-			await install(argv.yarn, target, [
+			await install(isYarn, target, [
 				'preact',
 				'preact-compat',
 				'preact-router'
@@ -146,18 +147,20 @@ export default asyncCommand({
 			await initGit(target);
 		}
 
+		let pfx = isYarn ? 'yarn' : 'npm run';
+
 		return trimLeft(`
 			To get started, cd into the new directory:
 			  \u001b[32mcd ${path.relative(process.cwd(), target)}\u001b[39m
 
 			To start a development live-reload server:
-			  \u001b[32m${argv.yarn === true ? 'yarn start' : 'npm start'}\u001b[39m
+			  \u001b[32m${pfx} start\u001b[39m
 
 			To create a production build (in ./build):
-			  \u001b[32m${argv.yarn === true ? 'yarn build' : 'npm run build'}\u001b[39m
+			  \u001b[32m${pfx} build\u001b[39m
 
 			To start a production HTTP/2 server:
-			  \u001b[32m${argv.yarn === true ? 'yarn serve' : 'npm run serve'}\u001b[39m
+			  \u001b[32m${pfx} serve\u001b[39m
 		`) + '\n';
 	}
 });

From 427b22ef96f8132a43038ee7094372c4557ec751 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sat, 19 Aug 2017 15:50:22 -0700
Subject: [PATCH 05/53] replace ansi-codes with `chalk.green`

---
 src/commands/create.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index c00a22884..d14c59072 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -1,7 +1,6 @@
 import asyncCommand from '../lib/async-command';
 import fs from 'fs.promised';
 import copy from 'recursive-copy';
-import glob from 'glob';
 import mkdirp from 'mkdirp';
 import ora from 'ora';
 import chalk from 'chalk';
@@ -151,16 +150,16 @@ export default asyncCommand({
 
 		return trimLeft(`
 			To get started, cd into the new directory:
-			  \u001b[32mcd ${path.relative(process.cwd(), target)}\u001b[39m
+			  ${ chalk.green('cd ' + path.relative(process.cwd(), target)) }
 
 			To start a development live-reload server:
-			  \u001b[32m${pfx} start\u001b[39m
+			  ${ chalk.green(pfx + ' start') }
 
 			To create a production build (in ./build):
-			  \u001b[32m${pfx} build\u001b[39m
+			  ${ chalk.green(pfx + ' build') }
 
 			To start a production HTTP/2 server:
-			  \u001b[32m${pfx} serve\u001b[39m
+			  ${ chalk.green(pfx + ' serve') }
 		`) + '\n';
 	}
 });

From 8ab768849ece2b2ce5a0da640da404f9e7254855 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sat, 19 Aug 2017 16:37:01 -0700
Subject: [PATCH 06/53] extract `pkgFile` path

---
 src/commands/create.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index d14c59072..6138ad340 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -104,22 +104,23 @@ export default asyncCommand({
 
 		await initialize(isYarn, target);
 
-		let pkg = JSON.parse(await fs.readFile(path.resolve(target, 'package.json')));
+		// Construct user's `package.json` file
+		let pkgFile = path.resolve(target, 'package.json');
+		let pkgData = JSON.parse(await fs.readFile(pkgFile));
 
-		pkg.scripts = await pkgScripts(isYarn, pkg);
+		pkgData.scripts = await pkgScripts(isYarn, pkgData);
 
 		try {
 			await fs.stat(path.resolve(target, 'src'));
-		}
-		catch (err) {
-			pkg.scripts.test = pkg.scripts.test.replace('src', '.');
+		} catch (_) {
+			pkgData.scripts.test = pkgData.scripts.test.replace('src', '.');
 		}
 
-		pkg.eslintConfig = {
+		pkgData.eslintConfig = {
 			extends: 'eslint-config-synacor'
 		};
 
-		await fs.writeFile(path.resolve(target, 'package.json'), JSON.stringify(pkg, null, 2));
+		await fs.writeFile(pkgFile, JSON.stringify(pkgData, null, 2));
 
 		if (argv.install) {
 			spinner.text = 'Installing dev dependencies';

From 6b878d40e29693fb81b35eb9859c40f9644e9dde Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sat, 19 Aug 2017 17:03:14 -0700
Subject: [PATCH 07/53] use `argv.name` within pkg & manifest (Closes #326)

- declare `log-symbols` as a dependency
  - it is already a direct dependency of `ora`
---
 package.json           |  1 +
 src/commands/create.js | 24 ++++++++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 1dd466183..e6eb2ff12 100644
--- a/package.json
+++ b/package.json
@@ -132,6 +132,7 @@
     "less": "^2.7.2",
     "less-loader": "^4.0.3",
     "loader-utils": "^1.1.0",
+    "log-symbols": "^2.0.0",
     "minimatch": "^3.0.3",
     "mkdirp": "^0.5.1",
     "offline-plugin": "^4.6.2",
diff --git a/src/commands/create.js b/src/commands/create.js
index 6138ad340..0af2b06bc 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -2,9 +2,11 @@ import asyncCommand from '../lib/async-command';
 import fs from 'fs.promised';
 import copy from 'recursive-copy';
 import mkdirp from 'mkdirp';
+import glob from 'glob';
 import ora from 'ora';
 import chalk from 'chalk';
 import inquirer from 'inquirer';
+import logSymbols from 'log-symbols';
 import promisify from 'es6-promisify';
 import path from 'path';
 import { install, initialize, pkgScripts, initGit, trimLeft } from './../lib/setup';
@@ -23,7 +25,7 @@ export default asyncCommand({
 
 	builder: {
 		name: {
-			description: 'directory and package name for the new app'
+			description: 'The application\'s name'
 		},
 		force: {
 			description: 'Force option to create the directory for the new app',
@@ -54,13 +56,12 @@ export default asyncCommand({
 			throw Error(`Unknown app template "${argv.type}".`);
 		}
 
-		let target = path.resolve(process.cwd(), argv.dest || argv.name);
+		let target = path.resolve(process.cwd(), argv.dest);
 
 		let exists = false;
 		try {
 			exists = (await fs.stat(target)).isDirectory();
-		}
-		catch (err) {}
+		} catch (err) {}
 
 		if (exists && argv.force) {
 			const question = {
@@ -110,6 +111,21 @@ export default asyncCommand({
 
 		pkgData.scripts = await pkgScripts(isYarn, pkgData);
 
+		if (argv.name) {
+			pkgData.name = argv.name;
+			// Find a `manifest.json`; use the first match, if any
+			let files = await promisify(glob)(target + '/**/manifest.json');
+			let manifest = files[0] && JSON.parse(await fs.readFile(files[0]));
+			if (manifest) {
+				manifest.name = manifest.short_name = argv.name;
+				await fs.writeFile(files[0], JSON.stringify(manifest, null, 2));
+				if (argv.name.length > 12) {
+					// @see https://developer.chrome.com/extensions/manifest/name#short_name
+					process.stdout.write(`\n${logSymbols.warning} Your \`short_name\` should be fewer than 12 characters.\n`);
+				}
+			}
+		}
+
 		try {
 			await fs.stat(path.resolve(target, 'src'));
 		} catch (_) {

From 86a4f3bad7ae6740edd1aa78761c5c944455d6fb Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sat, 19 Aug 2017 18:04:15 -0700
Subject: [PATCH 08/53] extract an `error` helper

- with nice symbol & formatting
---
 src/commands/create.js | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index 0af2b06bc..8cce0c23e 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -5,21 +5,20 @@ import mkdirp from 'mkdirp';
 import glob from 'glob';
 import ora from 'ora';
 import chalk from 'chalk';
+import gittar from 'gittar';
 import inquirer from 'inquirer';
 import logSymbols from 'log-symbols';
 import promisify from 'es6-promisify';
 import path from 'path';
 import { install, initialize, pkgScripts, initGit, trimLeft } from './../lib/setup';
 
-const TEMPLATES = {
-	full: 'examples/full',
-	empty: 'examples/empty',
-	root: 'examples/root',
-	simple: 'examples/simple'
-};
+function error(text, code) {
+	process.stderr.write(logSymbols.error + chalk.red(' ERROR ') + text + '\n');
+	process.exit(code || 1);
+}
 
 export default asyncCommand({
-	command: 'create <name> [dest]',
+	command: 'create <template> <dest>',
 
 	desc: 'Create a new application.',
 
@@ -50,11 +49,12 @@ export default asyncCommand({
 
 	async handler(argv) {
 		let isYarn = argv.yarn === true;
-		let template = TEMPLATES[argv.type];
 
-		if (!template) {
-			throw Error(`Unknown app template "${argv.type}".`);
-		}
+		// Attempt to fetch the `template`
+		let archive = await gittar.fetch(argv.template).catch(err => {
+			err = err || { message:'An error occured while fetching template.' };
+			return error(err.code === 404 ? `Could not find repostory: ${argv.template}` : err.message);
+		});
 
 		let target = path.resolve(process.cwd(), argv.dest);
 
@@ -76,14 +76,12 @@ export default asyncCommand({
 			if (enableForce) {
 				process.stdout.write('Initializing project in the current directory...\n');
 			} else {
-				process.stderr.write(chalk.red('Error: Cannot initialize in the current directory\n'));
-				process.exit(1);
+				return error('Cannot initialize in the current directory');
 			}
 		}
 
 		if (exists && !argv.force) {
-			process.stderr.write(chalk.red('Error: Cannot initialize in the current directory, please specify a different destination or use --force\n'));
-			process.exit(1);
+			return error('Cannot initialize in the current directory, please specify a different destination or use the `--force` flag');
 		}
 
 		let spinner = ora({

From 1ee0dfcbc236b6a2eceee0a270f59cb0a5c8017c Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 07:39:28 -0700
Subject: [PATCH 09/53] uninstall `recursive-copy`

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index e6eb2ff12..4f3d13d76 100644
--- a/package.json
+++ b/package.json
@@ -146,7 +146,6 @@
     "progress-bar-webpack-plugin": "^1.9.3",
     "promise-polyfill": "^6.0.2",
     "raw-loader": "^0.5.1",
-    "recursive-copy": "^2.0.6",
     "require-relative": "^0.8.7",
     "rimraf": "^2.6.1",
     "script-ext-html-webpack-plugin": "^1.8.0",

From 5e4fdb07ae0407c8b3e60c3c7c34b0db8a944cc7 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 07:40:30 -0700
Subject: [PATCH 10/53] extract `isDir` helper

- uses *sync versions, but oh well
---
 src/commands/create.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index 8cce0c23e..df0b933f1 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -10,6 +10,7 @@ import inquirer from 'inquirer';
 import logSymbols from 'log-symbols';
 import promisify from 'es6-promisify';
 import path from 'path';
+import { statSync, existSync } from 'fs';
 import { install, initialize, pkgScripts, initGit, trimLeft } from './../lib/setup';
 
 function error(text, code) {
@@ -17,6 +18,10 @@ function error(text, code) {
 	process.exit(code || 1);
 }
 
+function isDir(str) {
+	return existSync(str) && statSync(str).isDirectory();
+}
+
 export default asyncCommand({
 	command: 'create <template> <dest>',
 
@@ -124,9 +129,7 @@ export default asyncCommand({
 			}
 		}
 
-		try {
-			await fs.stat(path.resolve(target, 'src'));
-		} catch (_) {
+		if (!isDir(path.resolve(target, 'src'))) {
 			pkgData.scripts.test = pkgData.scripts.test.replace('src', '.');
 		}
 

From a23765e9f7ca150150ada307e68da8808e66838c Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 07:42:04 -0700
Subject: [PATCH 11/53] replace `copy` with `gittar.extract` - with filter

---
 src/commands/create.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index df0b933f1..44ee2077f 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -94,15 +94,13 @@ export default asyncCommand({
 			color: 'magenta'
 		}).start();
 
-		if (!exists) {
-			await promisify(mkdirp)(target);
-		}
-
-		await copy(
-			path.resolve(__dirname, '../..', template),
-			target,
-			{ filter: ['**/*', '!build'] }
-		);
+		// Extract files from `archive` to `target`
+		await gittar.extract(archive, target, {
+			filter(path) {
+				// TODO: remove this?
+				return !path.test(/\/build\//);
+			}
+		});
 
 		spinner.text = 'Initializing project';
 

From 172ff549b1d82879ea90ee9038cf606e182314e8 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 08:03:27 -0700
Subject: [PATCH 12/53] move `target` + `exists` + `force` logic first;

- will need to verify a destination before extracting/downloading
- will prompt (TODO) if incomplete
- will abort if unsafe
---
 src/commands/create.js | 58 ++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index 44ee2077f..018f7ffaa 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -1,12 +1,10 @@
 import asyncCommand from '../lib/async-command';
 import fs from 'fs.promised';
-import copy from 'recursive-copy';
-import mkdirp from 'mkdirp';
 import glob from 'glob';
 import ora from 'ora';
 import chalk from 'chalk';
 import gittar from 'gittar';
-import inquirer from 'inquirer';
+import { prompt } from 'inquirer';
 import logSymbols from 'log-symbols';
 import promisify from 'es6-promisify';
 import path from 'path';
@@ -54,6 +52,32 @@ export default asyncCommand({
 
 	async handler(argv) {
 		let isYarn = argv.yarn === true;
+		let cwd = argv.cwd ? path.resolve(argv.cwd) : process.cwd();
+		let target = argv.dest && path.resolve(cwd, argv.dest);
+		let exists = target && isDir(target);
+
+		if (target) {
+			if (exists && !argv.force) {
+				return error('Refusing to overwrite current directory! Please specify a different destination or use the `--force` flag');
+			}
+
+			if (exists && argv.force) {
+				let { enableForce } = await prompt({
+					type: 'confirm',
+					name: 'enableForce',
+					message: `You are using '--force'. Do you wish to continue?`,
+					default: false
+				});
+
+				if (enableForce) {
+					process.stdout.write('Initializing project in the current directory...\n');
+				} else {
+					return error('Refusing to overwrite current directory!');
+				}
+			}
+		} else {
+			// TODO: interactive
+		}
 
 		// Attempt to fetch the `template`
 		let archive = await gittar.fetch(argv.template).catch(err => {
@@ -61,34 +85,6 @@ export default asyncCommand({
 			return error(err.code === 404 ? `Could not find repostory: ${argv.template}` : err.message);
 		});
 
-		let target = path.resolve(process.cwd(), argv.dest);
-
-		let exists = false;
-		try {
-			exists = (await fs.stat(target)).isDirectory();
-		} catch (err) {}
-
-		if (exists && argv.force) {
-			const question = {
-				type: 'confirm',
-				name: 'enableForce',
-				message: `You are using '--force'. Do you wish to continue?`,
-				default: false,
-			};
-
-			let { enableForce } = await inquirer.prompt(question);
-
-			if (enableForce) {
-				process.stdout.write('Initializing project in the current directory...\n');
-			} else {
-				return error('Cannot initialize in the current directory');
-			}
-		}
-
-		if (exists && !argv.force) {
-			return error('Cannot initialize in the current directory, please specify a different destination or use the `--force` flag');
-		}
-
 		let spinner = ora({
 			text: 'Creating project',
 			color: 'magenta'

From f04532f67ceddc88e553296e5ad17afb73f6a958 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 08:32:45 -0700
Subject: [PATCH 13/53] use `argv.dest` for final instructions

---
 src/commands/create.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index 018f7ffaa..0e5edecb1 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -162,7 +162,7 @@ export default asyncCommand({
 
 		return trimLeft(`
 			To get started, cd into the new directory:
-			  ${ chalk.green('cd ' + path.relative(process.cwd(), target)) }
+			  ${ chalk.green('cd ' + argv.dest) }
 
 			To start a development live-reload server:
 			  ${ chalk.green(pfx + ' start') }

From 4dc79c0d734e6bc19cd6d80ffab965bb509a5162 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 08:39:43 -0700
Subject: [PATCH 14/53] fix typo

---
 src/commands/create.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index 0e5edecb1..dc8916715 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -8,7 +8,7 @@ import { prompt } from 'inquirer';
 import logSymbols from 'log-symbols';
 import promisify from 'es6-promisify';
 import path from 'path';
-import { statSync, existSync } from 'fs';
+import { statSync, existsSync } from 'fs';
 import { install, initialize, pkgScripts, initGit, trimLeft } from './../lib/setup';
 
 function error(text, code) {
@@ -17,7 +17,7 @@ function error(text, code) {
 }
 
 function isDir(str) {
-	return existSync(str) && statSync(str).isDirectory();
+	return existsSync(str) && statSync(str).isDirectory();
 }
 
 export default asyncCommand({

From 8daf60685599b10717e7eeb1f93f3d3b1d0ed32d Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 09:02:15 -0700
Subject: [PATCH 15/53] export `setup` functions directly

---
 src/lib/setup.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/lib/setup.js b/src/lib/setup.js
index 5550748ce..f3b054aea 100644
--- a/src/lib/setup.js
+++ b/src/lib/setup.js
@@ -5,7 +5,7 @@ import promisify from 'es6-promisify';
 import spawn from 'cross-spawn-promise';
 import { commandExists } from './shell';
 
-const initialize = async (yarn, cwd) => {
+export async function initialize(yarn, cwd) {
 	let isYarnAvailable = await commandExists('yarn');
 
 	if (isYarnAvailable && yarn) {
@@ -13,9 +13,9 @@ const initialize = async (yarn, cwd) => {
 	}
 
 	await spawn('npm', ['init', '-y'], { cwd, stdio: 'ignore' });
-};
+}
 
-const install = async (yarn, cwd, packages, env) => {
+export async function install(yarn, cwd, packages, env) {
 	let isDev = env === 'dev' ? true : false;
 	let isYarnAvailable = await commandExists('yarn');
 	let toInstall = packages.filter(Boolean);
@@ -39,9 +39,9 @@ const install = async (yarn, cwd, packages, env) => {
 	}
 
 	await spawn('npm', ['install', isDev ? '--save-dev' : '--save', ...toInstall], { cwd, stdio: 'ignore' });
-};
+}
 
-const pkgScripts = async (yarn, pkg) => {
+export async function pkgScripts(yarn, pkg) {
 	let isYarnAvailable = await commandExists('yarn');
 
 	if (isYarnAvailable && yarn) {
@@ -63,13 +63,13 @@ const pkgScripts = async (yarn, pkg) => {
 		dev: 'preact watch',
 		test: 'eslint src && preact test'
 	};
-};
+}
 
-const trimLeft = (string) => string.trim().replace(/^\t+/gm, '');
+export const trimLeft = str => str.trim().replace(/^\t+/gm, '');
 
 // Initializes the folder using `git init` and a proper `.gitignore` file
 // if `git` is present in the $PATH.
-const initGit = async (target) => {
+export async function initGit(target) {
 	process.stdout.write('inside initGit func');
 	let git;
 
@@ -121,6 +121,4 @@ const initGit = async (target) => {
 			}
 		});
 	}
-};
-
-export { install, initialize, pkgScripts, initGit, trimLeft };
+}

From eccca4f04bfdd5e1736c5250836b9a2f6d306e23 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 09:03:04 -0700
Subject: [PATCH 16/53] remove debug-type stdout from `initGit`

---
 src/lib/setup.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/lib/setup.js b/src/lib/setup.js
index f3b054aea..a7176ba06 100644
--- a/src/lib/setup.js
+++ b/src/lib/setup.js
@@ -70,7 +70,6 @@ export const trimLeft = str => str.trim().replace(/^\t+/gm, '');
 // Initializes the folder using `git init` and a proper `.gitignore` file
 // if `git` is present in the $PATH.
 export async function initGit(target) {
-	process.stdout.write('inside initGit func');
 	let git;
 
 	try {

From 15f1b6b6a5fafc6df84a4658f08b6e711ab824fb Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 09:08:34 -0700
Subject: [PATCH 17/53] move common helpers to `util` file;

- use more partial import statements
---
 src/commands/create.js | 35 +++++++++++++----------------------
 src/util.js            | 22 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 22 deletions(-)
 create mode 100644 src/util.js

diff --git a/src/commands/create.js b/src/commands/create.js
index dc8916715..42cd6bddb 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -2,23 +2,13 @@ import asyncCommand from '../lib/async-command';
 import fs from 'fs.promised';
 import glob from 'glob';
 import ora from 'ora';
-import chalk from 'chalk';
 import gittar from 'gittar';
+import { green } from 'chalk';
 import { prompt } from 'inquirer';
-import logSymbols from 'log-symbols';
 import promisify from 'es6-promisify';
-import path from 'path';
-import { statSync, existsSync } from 'fs';
+import { resolve } from 'path';
 import { install, initialize, pkgScripts, initGit, trimLeft } from './../lib/setup';
-
-function error(text, code) {
-	process.stderr.write(logSymbols.error + chalk.red(' ERROR ') + text + '\n');
-	process.exit(code || 1);
-}
-
-function isDir(str) {
-	return existsSync(str) && statSync(str).isDirectory();
-}
+import { isDir, error, warn } from '../util';
 
 export default asyncCommand({
 	command: 'create <template> <dest>',
@@ -52,8 +42,8 @@ export default asyncCommand({
 
 	async handler(argv) {
 		let isYarn = argv.yarn === true;
-		let cwd = argv.cwd ? path.resolve(argv.cwd) : process.cwd();
-		let target = argv.dest && path.resolve(cwd, argv.dest);
+		let cwd = argv.cwd ? resolve(argv.cwd) : process.cwd();
+		let target = argv.dest && resolve(cwd, argv.dest);
 		let exists = target && isDir(target);
 
 		if (target) {
@@ -103,7 +93,7 @@ export default asyncCommand({
 		await initialize(isYarn, target);
 
 		// Construct user's `package.json` file
-		let pkgFile = path.resolve(target, 'package.json');
+		let pkgFile = resolve(target, 'package.json');
 		let pkgData = JSON.parse(await fs.readFile(pkgFile));
 
 		pkgData.scripts = await pkgScripts(isYarn, pkgData);
@@ -118,12 +108,13 @@ export default asyncCommand({
 				await fs.writeFile(files[0], JSON.stringify(manifest, null, 2));
 				if (argv.name.length > 12) {
 					// @see https://developer.chrome.com/extensions/manifest/name#short_name
-					process.stdout.write(`\n${logSymbols.warning} Your \`short_name\` should be fewer than 12 characters.\n`);
+					process.stdout.write('\n');
+					warn('Your `short_name` should be fewer than 12 characters.');
 				}
 			}
 		}
 
-		if (!isDir(path.resolve(target, 'src'))) {
+		if (!isDir(resolve(target, 'src'))) {
 			pkgData.scripts.test = pkgData.scripts.test.replace('src', '.');
 		}
 
@@ -162,16 +153,16 @@ export default asyncCommand({
 
 		return trimLeft(`
 			To get started, cd into the new directory:
-			  ${ chalk.green('cd ' + argv.dest) }
+			  ${ green('cd ' + argv.dest) }
 
 			To start a development live-reload server:
-			  ${ chalk.green(pfx + ' start') }
+			  ${ green(pfx + ' start') }
 
 			To create a production build (in ./build):
-			  ${ chalk.green(pfx + ' build') }
+			  ${ green(pfx + ' build') }
 
 			To start a production HTTP/2 server:
-			  ${ chalk.green(pfx + ' serve') }
+			  ${ green(pfx + ' serve') }
 		`) + '\n';
 	}
 });
diff --git a/src/util.js b/src/util.js
new file mode 100644
index 000000000..780cd6274
--- /dev/null
+++ b/src/util.js
@@ -0,0 +1,22 @@
+import chalk from 'chalk';
+import { statSync, existsSync } from 'fs';
+import logSymbols from 'log-symbols';
+
+export function isDir(str) {
+	return existsSync(str) && statSync(str).isDirectory();
+}
+
+export function info(text, code) {
+	process.stderr.write(logSymbols.info + chalk.blue(' INFO ') + text + '\n');
+	process.exit(code || 1);
+}
+
+export function warn(text, code) {
+	process.stdout.write(logSymbols.warning + chalk.yellow(' WARN ') + text + '\n');
+	code && process.exit(code);
+}
+
+export function error(text, code) {
+	process.stderr.write(logSymbols.error + chalk.red(' ERROR ') + text + '\n');
+	process.exit(code || 1);
+}

From 45b28c24ab219ad49a9223cad6c87e71ad7ac229 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 09:15:40 -0700
Subject: [PATCH 18/53] =?UTF-8?q?move=20`commandExists`=20=E2=80=94>=20`ut?=
 =?UTF-8?q?il.hasCommand`;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- uses which.sync 🙊
- update function calls
- remove `async` from `pkgScripts`
---
 src/commands/create.js |  2 +-
 src/lib/setup.js       | 18 +++++++-----------
 src/lib/shell.js       | 13 -------------
 src/util.js            |  5 +++++
 4 files changed, 13 insertions(+), 25 deletions(-)
 delete mode 100644 src/lib/shell.js

diff --git a/src/commands/create.js b/src/commands/create.js
index 42cd6bddb..5a7d9ce83 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -96,7 +96,7 @@ export default asyncCommand({
 		let pkgFile = resolve(target, 'package.json');
 		let pkgData = JSON.parse(await fs.readFile(pkgFile));
 
-		pkgData.scripts = await pkgScripts(isYarn, pkgData);
+		pkgData.scripts = pkgScripts(isYarn, pkgData);
 
 		if (argv.name) {
 			pkgData.name = argv.name;
diff --git a/src/lib/setup.js b/src/lib/setup.js
index a7176ba06..d5541c1af 100644
--- a/src/lib/setup.js
+++ b/src/lib/setup.js
@@ -1,12 +1,10 @@
 import path from 'path';
-import which from 'which';
 import fs from 'fs.promised';
-import promisify from 'es6-promisify';
 import spawn from 'cross-spawn-promise';
-import { commandExists } from './shell';
+import { hasCommand } from '../util';
 
 export async function initialize(yarn, cwd) {
-	let isYarnAvailable = await commandExists('yarn');
+	let isYarnAvailable = hasCommand('yarn');
 
 	if (isYarnAvailable && yarn) {
 		return await spawn('yarn', ['init', '-y'], { cwd, stdio: 'ignore' });
@@ -17,7 +15,7 @@ export async function initialize(yarn, cwd) {
 
 export async function install(yarn, cwd, packages, env) {
 	let isDev = env === 'dev' ? true : false;
-	let isYarnAvailable = await commandExists('yarn');
+	let isYarnAvailable = hasCommand('yarn');
 	let toInstall = packages.filter(Boolean);
 
 	// pass null to use yarn only if yarn.lock is present
@@ -41,8 +39,8 @@ export async function install(yarn, cwd, packages, env) {
 	await spawn('npm', ['install', isDev ? '--save-dev' : '--save', ...toInstall], { cwd, stdio: 'ignore' });
 }
 
-export async function pkgScripts(yarn, pkg) {
-	let isYarnAvailable = await commandExists('yarn');
+export function pkgScripts(yarn, pkg) {
+	let isYarnAvailable = hasCommand('yarn');
 
 	if (isYarnAvailable && yarn) {
 		return {
@@ -70,11 +68,9 @@ export const trimLeft = str => str.trim().replace(/^\t+/gm, '');
 // Initializes the folder using `git init` and a proper `.gitignore` file
 // if `git` is present in the $PATH.
 export async function initGit(target) {
-	let git;
+	let git = hasCommand('git');
 
-	try {
-		git = await promisify(which)('git');
-	} catch (e) {
+	if (!git) {
 		process.stderr.write('Could not find git in $PATH.\n');
 		process.stdout.write('Continuing without initializing version control...\n');
 	}
diff --git a/src/lib/shell.js b/src/lib/shell.js
deleted file mode 100644
index b7cdc7380..000000000
--- a/src/lib/shell.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import promisify from 'es6-promisify';
-import which from 'which';
-
-const commandExists = async cmd => {
-	try {
-		await promisify(which)(cmd);
-		return true;
-	} catch (e){
-		return false;
-	}
-};
-
-export { commandExists };
diff --git a/src/util.js b/src/util.js
index 780cd6274..39b1221ea 100644
--- a/src/util.js
+++ b/src/util.js
@@ -1,11 +1,16 @@
 import chalk from 'chalk';
 import { statSync, existsSync } from 'fs';
 import logSymbols from 'log-symbols';
+import which from 'which';
 
 export function isDir(str) {
 	return existsSync(str) && statSync(str).isDirectory();
 }
 
+export function hasCommand(str) {
+	return !!which.sync(str, { nothrow:true });
+}
+
 export function info(text, code) {
 	process.stderr.write(logSymbols.info + chalk.blue(' INFO ') + text + '\n');
 	process.exit(code || 1);

From ce8d3161826cbf1e044d6c39cd241673a4d20ab0 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 10:57:48 -0700
Subject: [PATCH 19/53] check if `yarn` bin exists on flag parsing;

- instead of checking 5x per `setup` function
- return `async` function directly from `initialize`
---
 src/commands/create.js |  6 +++---
 src/lib/setup.js       | 11 +++--------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index 5a7d9ce83..885f600b7 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -8,7 +8,7 @@ import { prompt } from 'inquirer';
 import promisify from 'es6-promisify';
 import { resolve } from 'path';
 import { install, initialize, pkgScripts, initGit, trimLeft } from './../lib/setup';
-import { isDir, error, warn } from '../util';
+import { isDir, hasCommand, error, warn } from '../util';
 
 export default asyncCommand({
 	command: 'create <template> <dest>',
@@ -41,7 +41,7 @@ export default asyncCommand({
 	},
 
 	async handler(argv) {
-		let isYarn = argv.yarn === true;
+		let isYarn = argv.yarn && hasCommand('yarn');
 		let cwd = argv.cwd ? resolve(argv.cwd) : process.cwd();
 		let target = argv.dest && resolve(cwd, argv.dest);
 		let exists = target && isDir(target);
@@ -90,7 +90,7 @@ export default asyncCommand({
 
 		spinner.text = 'Initializing project';
 
-		await initialize(isYarn, target);
+		await initialize(target, isYarn);
 
 		// Construct user's `package.json` file
 		let pkgFile = resolve(target, 'package.json');
diff --git a/src/lib/setup.js b/src/lib/setup.js
index d5541c1af..c3f5b44a8 100644
--- a/src/lib/setup.js
+++ b/src/lib/setup.js
@@ -3,14 +3,9 @@ import fs from 'fs.promised';
 import spawn from 'cross-spawn-promise';
 import { hasCommand } from '../util';
 
-export async function initialize(yarn, cwd) {
-	let isYarnAvailable = hasCommand('yarn');
-
-	if (isYarnAvailable && yarn) {
-		return await spawn('yarn', ['init', '-y'], { cwd, stdio: 'ignore' });
-	}
-
-	await spawn('npm', ['init', '-y'], { cwd, stdio: 'ignore' });
+export function initialize(cwd, isYarn) {
+	let cmd = isYarn ? 'yarn' : 'npm';
+	return spawn(cmd, ['init', '-y'], { cwd, stdio:'ignore' });
 }
 
 export async function install(yarn, cwd, packages, env) {

From 60e48301df3abd13c037e88ecf28220aaed99e23 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 11:10:10 -0700
Subject: [PATCH 20/53] consolidate `setup.pkgScripts` function

---
 src/commands/create.js |  2 +-
 src/lib/setup.js       | 18 +++---------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index 885f600b7..df372a261 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -96,7 +96,7 @@ export default asyncCommand({
 		let pkgFile = resolve(target, 'package.json');
 		let pkgData = JSON.parse(await fs.readFile(pkgFile));
 
-		pkgData.scripts = pkgScripts(isYarn, pkgData);
+		pkgData.scripts = pkgScripts(pkgData, isYarn);
 
 		if (argv.name) {
 			pkgData.name = argv.name;
diff --git a/src/lib/setup.js b/src/lib/setup.js
index c3f5b44a8..980dc0f51 100644
--- a/src/lib/setup.js
+++ b/src/lib/setup.js
@@ -34,23 +34,11 @@ export async function install(yarn, cwd, packages, env) {
 	await spawn('npm', ['install', isDev ? '--save-dev' : '--save', ...toInstall], { cwd, stdio: 'ignore' });
 }
 
-export function pkgScripts(yarn, pkg) {
-	let isYarnAvailable = hasCommand('yarn');
-
-	if (isYarnAvailable && yarn) {
-		return {
-			...(pkg.scripts || {}),
-			start: 'if-env NODE_ENV=production && yarn run -s serve || yarn run -s dev',
-			build: 'preact build',
-			serve: 'preact build && preact serve',
-			dev: 'preact watch',
-			test: 'eslint src && preact test'
-		};
-	}
-
+export function pkgScripts(pkg, isYarn) {
+	let cmd = isYarn ? 'yarn' : 'npm run';
 	return {
 		...(pkg.scripts || {}),
-		start: 'if-env NODE_ENV=production && npm run -s serve || npm run -s dev',
+		start: `if-env NODE_ENV=production && ${cmd} -s serve || ${cmd} -s dev`,
 		build: 'preact build',
 		serve: 'preact build && preact serve',
 		dev: 'preact watch',

From 34379f55da07d275650c63728c90731dd6edcadd Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 11:11:26 -0700
Subject: [PATCH 21/53] do not write a `gitignore` file

- template concern
---
 src/lib/setup.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/lib/setup.js b/src/lib/setup.js
index 980dc0f51..13c56c4de 100644
--- a/src/lib/setup.js
+++ b/src/lib/setup.js
@@ -59,14 +59,6 @@ export async function initGit(target) {
 	}
 
 	if (git) {
-		const gitignore = trimLeft(`
-		node_modules
-		/build
-		/*.log
-		`) + '\n';
-		const gitignorePath = path.resolve(target, '.gitignore');
-		await fs.writeFile(gitignorePath, gitignore);
-
 		const cwd = target;
 
 		await spawn('git', ['init'], { cwd });

From 8dc058301e26d56a81cf109ea92b2ca5c2683781 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 11:14:29 -0700
Subject: [PATCH 22/53] minor cleanup, warn if no `git` binary found

---
 src/lib/setup.js | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/lib/setup.js b/src/lib/setup.js
index 13c56c4de..d028564d6 100644
--- a/src/lib/setup.js
+++ b/src/lib/setup.js
@@ -1,7 +1,7 @@
-import path from 'path';
 import fs from 'fs.promised';
+import { resolve } from 'path';
 import spawn from 'cross-spawn-promise';
-import { hasCommand } from '../util';
+import { hasCommand, warn } from '../util';
 
 export function initialize(cwd, isYarn) {
 	let cmd = isYarn ? 'yarn' : 'npm';
@@ -16,7 +16,7 @@ export async function install(yarn, cwd, packages, env) {
 	// pass null to use yarn only if yarn.lock is present
 	if (!yarn) {
 		try {
-			let stat = await fs.stat(path.resolve(cwd, 'yarn.lock'));
+			let stat = await fs.stat(resolve(cwd, 'yarn.lock'));
 			yarn = stat.isFile();
 		}
 		catch (e) { yarn = false; }
@@ -53,21 +53,15 @@ export const trimLeft = str => str.trim().replace(/^\t+/gm, '');
 export async function initGit(target) {
 	let git = hasCommand('git');
 
-	if (!git) {
-		process.stderr.write('Could not find git in $PATH.\n');
-		process.stdout.write('Continuing without initializing version control...\n');
-	}
-
 	if (git) {
 		const cwd = target;
 
 		await spawn('git', ['init'], { cwd });
 		await spawn('git', ['add', '-A'], { cwd });
 
-		const defaultGitEmail = 'developit@users.noreply.github.com';
+		let gitUser, gitEmail;
 		const defaultGitUser = 'Preact CLI';
-		let gitUser;
-		let gitEmail;
+		const defaultGitEmail = 'developit@users.noreply.github.com';
 
 		try {
 			gitEmail = (await spawn('git', ['config', 'user.email'])).toString();
@@ -90,5 +84,7 @@ export async function initGit(target) {
 				GIT_AUTHOR_EMAIL: defaultGitEmail
 			}
 		});
+	} else {
+		warn('Could not locate `git` binary in `$PATH`. Skipping!');
 	}
 }

From da46a8bb08d999592814cccebcea6e49478556f4 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 11:26:53 -0700
Subject: [PATCH 23/53] oops, fix regex tester

---
 src/commands/create.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index df372a261..28d324201 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -84,7 +84,7 @@ export default asyncCommand({
 		await gittar.extract(archive, target, {
 			filter(path) {
 				// TODO: remove this?
-				return !path.test(/\/build\//);
+				return !/\/build\//.test(path);
 			}
 		});
 

From 1e18c1a67bfa48e3942c68c153324f66a773da71 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 11:31:58 -0700
Subject: [PATCH 24/53] =?UTF-8?q?don=E2=80=99t=20assume=20exit=20within=20?=
 =?UTF-8?q?`util.error`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/commands/create.js | 6 +++---
 src/util.js            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index 28d324201..9f7d2742b 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -48,7 +48,7 @@ export default asyncCommand({
 
 		if (target) {
 			if (exists && !argv.force) {
-				return error('Refusing to overwrite current directory! Please specify a different destination or use the `--force` flag');
+				return error('Refusing to overwrite current directory! Please specify a different destination or use the `--force` flag', 1);
 			}
 
 			if (exists && argv.force) {
@@ -62,7 +62,7 @@ export default asyncCommand({
 				if (enableForce) {
 					process.stdout.write('Initializing project in the current directory...\n');
 				} else {
-					return error('Refusing to overwrite current directory!');
+					return error('Refusing to overwrite current directory!', 1);
 				}
 			}
 		} else {
@@ -72,7 +72,7 @@ export default asyncCommand({
 		// Attempt to fetch the `template`
 		let archive = await gittar.fetch(argv.template).catch(err => {
 			err = err || { message:'An error occured while fetching template.' };
-			return error(err.code === 404 ? `Could not find repostory: ${argv.template}` : err.message);
+			return error(err.code === 404 ? `Could not find repostory: ${argv.template}` : err.message, 1);
 		});
 
 		let spinner = ora({
diff --git a/src/util.js b/src/util.js
index 39b1221ea..1739cbb3a 100644
--- a/src/util.js
+++ b/src/util.js
@@ -13,7 +13,7 @@ export function hasCommand(str) {
 
 export function info(text, code) {
 	process.stderr.write(logSymbols.info + chalk.blue(' INFO ') + text + '\n');
-	process.exit(code || 1);
+	code && process.exit(code);
 }
 
 export function warn(text, code) {
@@ -23,5 +23,5 @@ export function warn(text, code) {
 
 export function error(text, code) {
 	process.stderr.write(logSymbols.error + chalk.red(' ERROR ') + text + '\n');
-	process.exit(code || 1);
+	code && process.exit(code);
 }

From c4435548bd6af26069909647038c160417cbff20 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 11:35:46 -0700
Subject: [PATCH 25/53] use `warn` within watch command

---
 src/commands/watch.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/commands/watch.js b/src/commands/watch.js
index b03e7edd1..af25867d3 100644
--- a/src/commands/watch.js
+++ b/src/commands/watch.js
@@ -1,6 +1,7 @@
-import asyncCommand from '../lib/async-command';
 import getSslCert from '../lib/ssl-cert';
+import asyncCommand from '../lib/async-command';
 import runWebpack, { showStats } from '../lib/webpack/run-webpack';
+import { warn } from '../util';
 
 export default asyncCommand({
 	command: 'watch [src]',
@@ -47,7 +48,7 @@ export default asyncCommand({
 			let ssl = await getSslCert();
 			if (!ssl) {
 				ssl = true;
-				process.stderr.write('Using webpack-dev-server internal certificate.\n');
+				warn('Reverting to `webpack-dev-server` internal certificate.');
 			}
 			argv.https = ssl;
 		}

From 39091a75196fb64dbe3eb1f36e898dd60075d937 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 11:53:15 -0700
Subject: [PATCH 26/53] use `util.isDir` within serve command

---
 src/commands/serve.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/commands/serve.js b/src/commands/serve.js
index fad362c9a..93ae00572 100644
--- a/src/commands/serve.js
+++ b/src/commands/serve.js
@@ -6,6 +6,7 @@ import { execFile } from 'child_process';
 import getSslCert from '../lib/ssl-cert';
 import persistencePath from 'persist-path';
 import simplehttp2server from 'simplehttp2server';
+import { isDir } from '../util';
 
 export default asyncCommand({
 	command: 'serve [dir]',
@@ -175,8 +176,7 @@ const SERVERS = {
 		if (ssl) {
 			await fs.writeFile(path.resolve(options.cwd, 'key.pem'), ssl.key);
 			await fs.writeFile(path.resolve(options.cwd, 'cert.pem'), ssl.cert);
-		}
-		else {
+		} else {
 			options.cwd = persistencePath('preact-cli');
 			process.stderr.write(`Falling back to shared directory + simplehttp2server.\n(dir: ${options.cwd})\n`);
 		}
@@ -201,15 +201,10 @@ const SERVERS = {
 		let dir = process.cwd(),
 			outfile;
 		if (options.dest && options.dest!=='-') {
-			let isDir = false;
-			try {
-				isDir = (await fs.stat(options.dest)).isDirectory();
-			} catch (e) {}
-			if (isDir) {
+			if (isDir(options.dest)) {
 				dir = options.dest;
 				outfile = 'firebase.json';
-			}
-			else {
+			} else {
 				dir = path.dirname(options.dest);
 				outfile = path.basename(options.dest);
 			}
@@ -223,8 +218,7 @@ const SERVERS = {
 		if (outfile) {
 			await fs.writeFile(path.resolve(dir, outfile), config);
 			return `Configuration written to ${outfile}.`;
-		}
-		else {
+		} else {
 			return config;
 		}
 	}

From 8af1c3043c18874ffc595767500d1853f6dd419a Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 12:08:46 -0700
Subject: [PATCH 27/53] remove `init` command publicly

---
 src/index.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/index.js b/src/index.js
index e97c2d856..90215215c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -5,7 +5,6 @@ import create from './commands/create';
 import build from './commands/build';
 import watch from './commands/watch';
 import serve from './commands/serve';
-import init from './commands/init';
 import installHooks from './lib/output-hooks';
 import pkg from '../package.json';
 import logo from './lib/logo';
@@ -18,7 +17,6 @@ checkVersion();
 installHooks();
 
 yargs
-	.command(init)
 	.command(create)
 	.command(build)
 	.command(watch)

From dfec01b76539147c6c8dc000ac7e3467e71ad9b1 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 12:51:31 -0700
Subject: [PATCH 28/53] Merge `master` into `templates`

---
 package.json           | 2 +-
 src/commands/build.js  | 3 +--
 src/commands/create.js | 3 +--
 src/commands/init.js   | 5 ++---
 src/index.js           | 2 +-
 tests/lib/output.js    | 2 +-
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 4f3d13d76..4d683e5e6 100644
--- a/package.json
+++ b/package.json
@@ -110,13 +110,13 @@
     "babel-preset-env": "^1.3.3",
     "babel-preset-stage-1": "^6.24.1",
     "babel-register": "^6.24.1",
+    "bluebird": "^3.5.0",
     "chalk": "^2.1.0",
     "copy-webpack-plugin": "^4.0.1",
     "cross-spawn-promise": "^0.10.1",
     "css-modules-require-hook": "^4.0.6",
     "devcert-san": "^0.3.3",
     "ejs-loader": "^0.3.0",
-    "es6-promisify": "^5.0.0",
     "extract-text-webpack-plugin": "^2.1.2",
     "file-loader": "^0.11.1",
     "fs.promised": "^3.0.0",
diff --git a/src/commands/build.js b/src/commands/build.js
index be3f55f4c..f6aa07c11 100644
--- a/src/commands/build.js
+++ b/src/commands/build.js
@@ -1,5 +1,4 @@
 import { resolve } from 'path';
-import promisify from 'es6-promisify';
 import rimraf from 'rimraf';
 import asyncCommand from '../lib/async-command';
 import runWebpack, { showStats, writeJsonStats } from '../lib/webpack/run-webpack';
@@ -51,7 +50,7 @@ export default asyncCommand({
 	async handler(argv) {
 		if (argv.clean) {
 			let dest = resolve(argv.cwd || process.cwd(), argv.dest || 'build');
-			await promisify(rimraf)(dest);
+			await Promise.promisify(rimraf)(dest);
 		}
 
 		let stats = await runWebpack(false, argv);
diff --git a/src/commands/create.js b/src/commands/create.js
index 9f7d2742b..a2b8f3ecb 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -5,7 +5,6 @@ import ora from 'ora';
 import gittar from 'gittar';
 import { green } from 'chalk';
 import { prompt } from 'inquirer';
-import promisify from 'es6-promisify';
 import { resolve } from 'path';
 import { install, initialize, pkgScripts, initGit, trimLeft } from './../lib/setup';
 import { isDir, hasCommand, error, warn } from '../util';
@@ -101,7 +100,7 @@ export default asyncCommand({
 		if (argv.name) {
 			pkgData.name = argv.name;
 			// Find a `manifest.json`; use the first match, if any
-			let files = await promisify(glob)(target + '/**/manifest.json');
+			let files = await Promise.promisify(glob)(target + '/**/manifest.json');
 			let manifest = files[0] && JSON.parse(await fs.readFile(files[0]));
 			if (manifest) {
 				manifest.name = manifest.short_name = argv.name;
diff --git a/src/commands/init.js b/src/commands/init.js
index 533e47b49..8e545fd07 100644
--- a/src/commands/init.js
+++ b/src/commands/init.js
@@ -6,7 +6,6 @@ import mkdirp from 'mkdirp';
 import ora from 'ora';
 import chalk from 'chalk';
 import inquirer from 'inquirer';
-import promisify from 'es6-promisify';
 import path from 'path';
 import { install, initialize, pkgScripts, initGit, trimLeft } from './../lib/setup';
 
@@ -130,7 +129,7 @@ export default asyncCommand({
 		}).start();
 
 		if (!exists) {
-			await promisify(mkdirp)(target);
+			await Promise.promisify(mkdirp)(target);
 		}
 
 		await copy(
@@ -206,7 +205,7 @@ export default asyncCommand({
 			if (response.style === 'sass') extension = '.scss';
 			if (response.style === 'stylus') extension = '.styl';
 
-			const cssFiles = await promisify(glob)(`${target}/**/*.css`, {
+			const cssFiles = await Promise.promisify(glob)(`${target}/**/*.css`, {
 				ignore: [
 					`${target}/build/**`,
 					`${target}/node_modules/**`
diff --git a/src/index.js b/src/index.js
index 90215215c..cc654767b 100644
--- a/src/index.js
+++ b/src/index.js
@@ -10,7 +10,7 @@ import pkg from '../package.json';
 import logo from './lib/logo';
 import checkVersion from './../check';
 
-global.Promise = require('promise-polyfill');
+global.Promise = require('bluebird');
 
 checkVersion();
 
diff --git a/tests/lib/output.js b/tests/lib/output.js
index 38879fcc9..e68c30d75 100644
--- a/tests/lib/output.js
+++ b/tests/lib/output.js
@@ -1,8 +1,8 @@
 import { resolve } from 'path';
-import promisify from 'es6-promisify';
 import mkdirp from 'mkdirp';
 import uuid from 'uuid/v4';
 import ncp from 'ncp';
+import { promisify } from 'bluebird';
 import spawn from 'cross-spawn-promise';
 import { withLog } from './utils';
 import { shouldInstallDeps } from './tests-config';

From c3430c78e83ad472f71305470b1078ac20d3ac2b Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 17:46:35 -0700
Subject: [PATCH 29/53] =?UTF-8?q?alias=20=E2=80=9Cofficial=E2=80=9D=20prea?=
 =?UTF-8?q?ct-cli=20templates=20by=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- only `default` & `full` for now
---
 src/commands/create.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index a2b8f3ecb..da65264fd 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -9,6 +9,14 @@ import { resolve } from 'path';
 import { install, initialize, pkgScripts, initGit, trimLeft } from './../lib/setup';
 import { isDir, hasCommand, error, warn } from '../util';
 
+const TEMPLATES = {
+	full: 'preactjs-templates/default',
+	default: 'preactjs-templates/default',
+	// simple: 'examples/simple',
+	// empty: 'examples/empty',
+	// root: 'examples/root',
+};
+
 export default asyncCommand({
 	command: 'create <template> <dest>',
 
@@ -68,10 +76,12 @@ export default asyncCommand({
 			// TODO: interactive
 		}
 
+		let repo = TEMPLATES[argv.template] || argv.template;
+
 		// Attempt to fetch the `template`
-		let archive = await gittar.fetch(argv.template).catch(err => {
+		let archive = await gittar.fetch(repo).catch(err => {
 			err = err || { message:'An error occured while fetching template.' };
-			return error(err.code === 404 ? `Could not find repostory: ${argv.template}` : err.message, 1);
+			return error(err.code === 404 ? `Could not find repostory: ${repo}` : err.message, 1);
 		});
 
 		let spinner = ora({

From 54b93ae8fff3501d1cb2e394b75a4f0418598f90 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 17:56:32 -0700
Subject: [PATCH 30/53] =?UTF-8?q?simplify=20`install`=20=E2=80=94=20instal?=
 =?UTF-8?q?l=20template=20deps?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/commands/create.js | 18 ++----------------
 src/lib/setup.js       | 29 +++--------------------------
 2 files changed, 5 insertions(+), 42 deletions(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index da65264fd..ed2bcc218 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -134,22 +134,8 @@ export default asyncCommand({
 		await fs.writeFile(pkgFile, JSON.stringify(pkgData, null, 2));
 
 		if (argv.install) {
-			spinner.text = 'Installing dev dependencies';
-
-			await install(isYarn, target, [
-				'preact-cli',
-				'if-env',
-				'eslint',
-				'eslint-config-synacor'
-			], 'dev');
-
-			spinner.text = 'Installing dependencies';
-
-			await install(isYarn, target, [
-				'preact',
-				'preact-compat',
-				'preact-router'
-			]);
+			spinner.text = 'Installing all dependencies';
+			await install(target, isYarn);
 		}
 
 		spinner.succeed('Done!\n');
diff --git a/src/lib/setup.js b/src/lib/setup.js
index d028564d6..e83e1a5b5 100644
--- a/src/lib/setup.js
+++ b/src/lib/setup.js
@@ -1,5 +1,3 @@
-import fs from 'fs.promised';
-import { resolve } from 'path';
 import spawn from 'cross-spawn-promise';
 import { hasCommand, warn } from '../util';
 
@@ -8,30 +6,9 @@ export function initialize(cwd, isYarn) {
 	return spawn(cmd, ['init', '-y'], { cwd, stdio:'ignore' });
 }
 
-export async function install(yarn, cwd, packages, env) {
-	let isDev = env === 'dev' ? true : false;
-	let isYarnAvailable = hasCommand('yarn');
-	let toInstall = packages.filter(Boolean);
-
-	// pass null to use yarn only if yarn.lock is present
-	if (!yarn) {
-		try {
-			let stat = await fs.stat(resolve(cwd, 'yarn.lock'));
-			yarn = stat.isFile();
-		}
-		catch (e) { yarn = false; }
-	}
-
-	if (isYarnAvailable && yarn) {
-		let args = ['add'];
-		if (isDev) {
-			args.push('-D');
-		}
-
-		return await spawn('yarn', [...args, ...toInstall], { cwd, stdio: 'ignore' });
-	}
-
-	await spawn('npm', ['install', isDev ? '--save-dev' : '--save', ...toInstall], { cwd, stdio: 'ignore' });
+export function install(cwd, isYarn) {
+	let cmd = isYarn ? 'yarn' : 'npm';
+	return spawn(cmd, ['install'], { cwd, stdio:'ignore' });
 }
 
 export function pkgScripts(pkg, isYarn) {

From 2f71fd30e61a81eda6bc2bba37df03a3af6f9b68 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 18:33:16 -0700
Subject: [PATCH 31/53] =?UTF-8?q?move=20`trimLeft`=20=E2=80=94>=20`util.tr?=
 =?UTF-8?q?im`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/commands/create.js | 2 +-
 src/lib/setup.js       | 2 --
 src/util.js            | 4 ++++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index ed2bcc218..3592b6ff9 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -7,7 +7,7 @@ import { green } from 'chalk';
 import { prompt } from 'inquirer';
 import { resolve } from 'path';
 import { install, initialize, pkgScripts, initGit, trimLeft } from './../lib/setup';
-import { isDir, hasCommand, error, warn } from '../util';
+import { isDir, hasCommand, error, trim, warn } from '../util';
 
 const TEMPLATES = {
 	full: 'preactjs-templates/default',
diff --git a/src/lib/setup.js b/src/lib/setup.js
index e83e1a5b5..0b99fdf8c 100644
--- a/src/lib/setup.js
+++ b/src/lib/setup.js
@@ -23,8 +23,6 @@ export function pkgScripts(pkg, isYarn) {
 	};
 }
 
-export const trimLeft = str => str.trim().replace(/^\t+/gm, '');
-
 // Initializes the folder using `git init` and a proper `.gitignore` file
 // if `git` is present in the $PATH.
 export async function initGit(target) {
diff --git a/src/util.js b/src/util.js
index 1739cbb3a..60938411d 100644
--- a/src/util.js
+++ b/src/util.js
@@ -11,6 +11,10 @@ export function hasCommand(str) {
 	return !!which.sync(str, { nothrow:true });
 }
 
+export function trim(str) {
+	return str.trim().replace(/^\t+/gm, '');
+}
+
 export function info(text, code) {
 	process.stderr.write(logSymbols.info + chalk.blue(' INFO ') + text + '\n');
 	code && process.exit(code);

From a18f9687a7dd268ccf05e0449adc8868de20f877 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 18:34:02 -0700
Subject: [PATCH 32/53] remove `initialize` from setup;

- assumed template ships own `package.json` already
---
 src/lib/setup.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/lib/setup.js b/src/lib/setup.js
index 0b99fdf8c..ae42285bc 100644
--- a/src/lib/setup.js
+++ b/src/lib/setup.js
@@ -1,11 +1,6 @@
 import spawn from 'cross-spawn-promise';
 import { hasCommand, warn } from '../util';
 
-export function initialize(cwd, isYarn) {
-	let cmd = isYarn ? 'yarn' : 'npm';
-	return spawn(cmd, ['init', '-y'], { cwd, stdio:'ignore' });
-}
-
 export function install(cwd, isYarn) {
 	let cmd = isYarn ? 'yarn' : 'npm';
 	return spawn(cmd, ['install'], { cwd, stdio:'ignore' });

From 2fd9522ca6ed3fc3df6bc061610d85bedcca0add Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 20:22:31 -0700
Subject: [PATCH 33/53] simplify package-related `create`

- change `pkg.name` & `mani.name` if set
- set default `pkg.scripts` if none provided
   -  will dynamically install `if-env` for `start` script
---
 src/commands/create.js | 45 ++++++++++++++++++++++--------------------
 src/lib/setup.js       | 15 ++++++++------
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index 3592b6ff9..7f97f4ce0 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -1,12 +1,12 @@
-import asyncCommand from '../lib/async-command';
 import fs from 'fs.promised';
-import glob from 'glob';
+import { resolve } from 'path';
 import ora from 'ora';
+import glob from 'glob';
 import gittar from 'gittar';
 import { green } from 'chalk';
 import { prompt } from 'inquirer';
-import { resolve } from 'path';
-import { install, initialize, pkgScripts, initGit, trimLeft } from './../lib/setup';
+import asyncCommand from '../lib/async-command';
+import { install, initGit, addScripts } from './../lib/setup';
 import { isDir, hasCommand, error, trim, warn } from '../util';
 
 const TEMPLATES = {
@@ -97,23 +97,31 @@ export default asyncCommand({
 			}
 		});
 
-		spinner.text = 'Initializing project';
+		spinner.text = 'Parsing `package.json` file';
 
-		await initialize(target, isYarn);
-
-		// Construct user's `package.json` file
+		// Validate user's `package.json` file
+		let pkgData;
 		let pkgFile = resolve(target, 'package.json');
-		let pkgData = JSON.parse(await fs.readFile(pkgFile));
 
-		pkgData.scripts = pkgScripts(pkgData, isYarn);
+		if (pkgFile) {
+			pkgData = JSON.parse(await fs.readFile(pkgFile));
+			// Write default "scripts" if none found
+			pkgData.scripts = pkgData.scripts || (await addScripts(pkgData, target, isYarn));
+		} else {
+			warn('Could not locate `package.json` file!');
+		}
 
 		if (argv.name) {
-			pkgData.name = argv.name;
+			spinner.text = 'Updating `name` within `package.json` file';
+			// Update `package.json` key
+			pkgData && (pkgData.name = argv.name);
 			// Find a `manifest.json`; use the first match, if any
 			let files = await Promise.promisify(glob)(target + '/**/manifest.json');
 			let manifest = files[0] && JSON.parse(await fs.readFile(files[0]));
 			if (manifest) {
+				spinner.text = 'Updating `name` within `manifest.json` file';
 				manifest.name = manifest.short_name = argv.name;
+				// Write changes to `manifest.json`
 				await fs.writeFile(files[0], JSON.stringify(manifest, null, 2));
 				if (argv.name.length > 12) {
 					// @see https://developer.chrome.com/extensions/manifest/name#short_name
@@ -123,18 +131,13 @@ export default asyncCommand({
 			}
 		}
 
-		if (!isDir(resolve(target, 'src'))) {
-			pkgData.scripts.test = pkgData.scripts.test.replace('src', '.');
+		if (pkgData) {
+			// Assume changes were made ¯\_(ツ)_/¯
+			await fs.writeFile(pkgFile, JSON.stringify(pkgData, null, 2));
 		}
 
-		pkgData.eslintConfig = {
-			extends: 'eslint-config-synacor'
-		};
-
-		await fs.writeFile(pkgFile, JSON.stringify(pkgData, null, 2));
-
 		if (argv.install) {
-			spinner.text = 'Installing all dependencies';
+			spinner.text = 'Installing dependencies';
 			await install(target, isYarn);
 		}
 
@@ -146,7 +149,7 @@ export default asyncCommand({
 
 		let pfx = isYarn ? 'yarn' : 'npm run';
 
-		return trimLeft(`
+		return trim(`
 			To get started, cd into the new directory:
 			  ${ green('cd ' + argv.dest) }
 
diff --git a/src/lib/setup.js b/src/lib/setup.js
index ae42285bc..3217f7512 100644
--- a/src/lib/setup.js
+++ b/src/lib/setup.js
@@ -6,15 +6,18 @@ export function install(cwd, isYarn) {
 	return spawn(cmd, ['install'], { cwd, stdio:'ignore' });
 }
 
-export function pkgScripts(pkg, isYarn) {
-	let cmd = isYarn ? 'yarn' : 'npm run';
+export async function addScripts(obj, cwd, isYarn) {
+	let cmd = isYarn ? 'yarn' : 'npm';
+	let args = isYarn ? ['add', '--dev'] : ['install', '--save-dev'];
+
+	// Install `if-env`
+	await spawn(cmd, [...args, 'if-env'], { cwd, stdio:'ignore '});
+
 	return {
-		...(pkg.scripts || {}),
-		start: `if-env NODE_ENV=production && ${cmd} -s serve || ${cmd} -s dev`,
 		build: 'preact build',
 		serve: 'preact build && preact serve',
-		dev: 'preact watch',
-		test: 'eslint src && preact test'
+		start: `if-env NODE_ENV=production && ${cmd} run -s serve || ${cmd} run -s watch`,
+		watch: 'preact watch'
 	};
 }
 

From 6e1509f78e3a11fb52d4766ac871ee3ef5bf3b60 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 20:22:57 -0700
Subject: [PATCH 34/53] only extract `/template/` filepaths
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- strip:2 to remove “template” from dest name
---
 src/commands/create.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index 7f97f4ce0..5418968a5 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -91,9 +91,10 @@ export default asyncCommand({
 
 		// Extract files from `archive` to `target`
 		await gittar.extract(archive, target, {
+			strip: 2,
 			filter(path) {
-				// TODO: remove this?
-				return !/\/build\//.test(path);
+				// TODO: remove `/build/`?
+				return path.includes('/template/') && !path.includes('/build/');
 			}
 		});
 

From e9463b8631cbd07d082719cf7682f2ef74221c6d Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 20 Aug 2017 20:28:35 -0700
Subject: [PATCH 35/53] add extra TODO note

---
 src/commands/create.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index 5418968a5..8ff115a62 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -93,7 +93,8 @@ export default asyncCommand({
 		await gittar.extract(archive, target, {
 			strip: 2,
 			filter(path) {
-				// TODO: remove `/build/`?
+				// TODO: remove `/build/` ??
+				// TODO: read & respond to meta/hooks
 				return path.includes('/template/') && !path.includes('/build/');
 			}
 		});

From 92fec7abf6724f49f242cfa919907168c983e4dc Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Mon, 21 Aug 2017 20:16:54 -0700
Subject: [PATCH 36/53] define `done` handler before export

---
 src/lib/async-command.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/lib/async-command.js b/src/lib/async-command.js
index 04b3fa737..4a090734d 100644
--- a/src/lib/async-command.js
+++ b/src/lib/async-command.js
@@ -1,18 +1,18 @@
+function done(err, result) {
+	if (err) {
+		process.stderr.write(String(err) + '\n');
+		process.exit(err.exitCode || 1);
+	}
+	else {
+		if (result) process.stdout.write(result + '\n');
+		process.exit(0);
+	}
+}
+
 export default function asyncCommand(options) {
 	return {
 		...options,
 		handler(argv) {
-			function done(err, result) {
-				if (err) {
-					process.stderr.write(String(err) + '\n');
-					process.exit(err.exitCode || 1);
-				}
-				else {
-					if (result) process.stdout.write(result + '\n');
-					process.exit(0);
-				}
-			}
-
 			let r = options.handler(argv, done);
 			if (r && r.then) r.then(result => done(null, result), done);
 		}

From 6d0493b5b4772fa0cf067e293bb1a1e93d9c9839 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Tue, 22 Aug 2017 12:28:45 -0700
Subject: [PATCH 37/53] update `test/subjects` names

- fixes test? /shrug
---
 tests/subjects/custom-babelrc/package.json        | 2 +-
 tests/subjects/custom-webpack/package.json        | 2 +-
 tests/subjects/multiple-prerendering/package.json | 2 +-
 tests/subjects/sass/package.json                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/subjects/custom-babelrc/package.json b/tests/subjects/custom-babelrc/package.json
index 9488b959c..d9006e687 100644
--- a/tests/subjects/custom-babelrc/package.json
+++ b/tests/subjects/custom-babelrc/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "preact-app",
+  "name": "preact-babelrc",
   "version": "0.0.1",
   "private": true,
   "dependencies": {
diff --git a/tests/subjects/custom-webpack/package.json b/tests/subjects/custom-webpack/package.json
index 9488b959c..e34a1bb79 100644
--- a/tests/subjects/custom-webpack/package.json
+++ b/tests/subjects/custom-webpack/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "preact-app",
+  "name": "preact-webpack",
   "version": "0.0.1",
   "private": true,
   "dependencies": {
diff --git a/tests/subjects/multiple-prerendering/package.json b/tests/subjects/multiple-prerendering/package.json
index 9488b959c..844e973a5 100644
--- a/tests/subjects/multiple-prerendering/package.json
+++ b/tests/subjects/multiple-prerendering/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "preact-app",
+  "name": "preact-prerender",
   "version": "0.0.1",
   "private": true,
   "dependencies": {
diff --git a/tests/subjects/sass/package.json b/tests/subjects/sass/package.json
index 30fb932cd..55fb7c807 100644
--- a/tests/subjects/sass/package.json
+++ b/tests/subjects/sass/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "preact-app",
+  "name": "preact-sass",
   "version": "0.0.1",
   "private": true,
   "dependencies": {

From 32acd001f8726e60850994b60be0d6f664550197 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Tue, 22 Aug 2017 20:49:27 -0700
Subject: [PATCH 38/53] [MAJOR] tests refactor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- supports new `create` command
- refactor utility methods
- change snapshot handling
  — comparison & taking
- rename `WITH_INSTALL` —> `SKIP_INSTALL`
- remove `setup` step; not needed
---
 .travis.yml                                   |  2 +-
 package.json                                  |  3 +-
 tests/build.snapshot.js                       | 44 ----------
 tests/build.test.js                           | 80 ++++++++++---------
 tests/create.test.js                          | 37 +++------
 tests/images/build.js                         | 79 ++++++++++++++++++
 tests/images/create.js                        | 24 ++++++
 tests/lib/chrome.js                           | 10 +--
 tests/lib/cli.js                              | 64 +++++----------
 tests/lib/filesMatchSnapshot.js               | 69 ----------------
 tests/lib/lsr.js                              | 28 -------
 tests/lib/output.js                           | 33 ++++----
 tests/lib/tests-config.js                     |  2 -
 tests/lib/utils.js                            | 72 +++++++++++++----
 tests/serve.test.js                           |  8 +-
 .../subjects/custom-webpack/preact.config.js  |  8 +-
 tests/watch.test.js                           |  4 +-
 17 files changed, 266 insertions(+), 301 deletions(-)
 create mode 100644 tests/images/build.js
 create mode 100644 tests/images/create.js
 delete mode 100644 tests/lib/filesMatchSnapshot.js
 delete mode 100644 tests/lib/lsr.js
 delete mode 100644 tests/lib/tests-config.js

diff --git a/.travis.yml b/.travis.yml
index 82a650a7f..8ba63c82f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ cache:
 
 before_script:
 - export LIGHTHOUSE_CHROMIUM_PATH=`which google-chrome-stable`
-- if [ "$TRAVIS_BRANCH" = "master" ]; then export WITH_INSTALL=true; export WITH_LOG=true; fi
+- if [ "$TRAVIS_BRANCH" = "master" ]; then export SKIP_INSTALL=true; export WITH_LOG=true; fi
 
 script:
 - npm run lint
diff --git a/package.json b/package.json
index 4d683e5e6..f54af825b 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "lint": "eslint src tests",
     "pretest": "npm run -s build && rimraf ./tests/output",
     "test": "jest",
-    "posttest": "rimraf ./tests/output",
+    "posttest": "rimraf tests/output",
     "postinstall": "node -p 'require(\"./check.js\")()'",
     "test:build": "babel-node src build --cwd examples/root",
     "test:serve": "npm run -s test:build && babel-node src serve --port 3000 --cwd examples/root",
@@ -90,7 +90,6 @@
     "eslint-plugin-react": "^7.0.1",
     "html-looks-like": "^1.0.2",
     "jest": "^20.0.4",
-    "lodash": "^4.17.4",
     "ncp": "^2.0.0",
     "uuid": "^3.0.1"
   },
diff --git a/tests/build.snapshot.js b/tests/build.snapshot.js
index d5a5ad260..0aab8fa7e 100644
--- a/tests/build.snapshot.js
+++ b/tests/build.snapshot.js
@@ -101,47 +101,3 @@ export default {
 		}
 	}
 };
-
-export const sassPrerendered = `
-<body>
-	<div class="background__21gOq">
-		<h1>Header on background</h1>
-		<p>Paragraph on background</p>
-	</div>
-	{{ ... }}
-</body>
-`;
-
-export const withCustomTemplate = `
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<meta charset="utf-8">
-		<title>preact-app</title>
-		<link rel="shortcut icon" href="/favicon.ico"></link>
-	</head>
-	<body>
-		<h1>Guess what</h1>
-		<h2>This is an app with custom template</h2>
-		{{ ... }}
-	</body>
-</html>
-`;
-
-export const multiplePrerenderingHome = `
-<body>
-	<div id="app">
-		<div>Home</div>
-	</div>
-	{{ ... }}
-</body>
-`;
-
-export const multiplePrerenderingRoute = `
-<body>
-	<div id="app">
-		<div>Route66</div>
-	</div>
-	{{ ... }}
-</body>
-`;
diff --git a/tests/build.test.js b/tests/build.test.js
index 52b3f6429..2a8a7b4ee 100644
--- a/tests/build.test.js
+++ b/tests/build.test.js
@@ -1,38 +1,44 @@
-import { resolve } from 'path';
-import fs from 'fs.promised';
-import htmlLooksLike from 'html-looks-like';
+import { join } from 'path';
+import { readFile } from 'fs.promised';
+import looksLike from 'html-looks-like';
 import { create, build } from './lib/cli';
-import lsr from './lib/lsr';
-import { setup, fromSubject } from './lib/output';
-import expectedOutputs, { sassPrerendered, withCustomTemplate, multiplePrerenderingHome, multiplePrerenderingRoute } from './build.snapshot';
-import filesMatchSnapshot from './lib/filesMatchSnapshot';
+import { snapshot, isMatch } from './lib/utils';
+import { fromSubject } from './lib/output';
+import images from './images/build';
+
+const ours = ['default', 'full'];
+// TODO
+// const ours = ['empty', 'full', 'simple', 'root'];
+
+async function getBody(dir, file) {
+	file = join(dir, `build/${file}`);
+	let html = await readFile(file, 'utf-8');
+	return html.match(/<body>.*<\/body>/)[0];
+}
 
 describe('preact build', () => {
-	beforeAll(async () => {
-		await setup();
-	});
+	ours.forEach(key =>
+		it(`builds the '${key}' output`, async () => {
+			let dir = await create(key);
 
-	['empty', 'full', 'simple', 'root'].forEach(template =>
-		it(`should produce output. Veryfing ${template}`, async () => {
-			let app = await create('app', template);
-			await build(app);
+			await build(dir);
+			dir = join(dir, 'build');
 
-			let output = await lsr(resolve(app, 'build'));
+			let output = await snapshot(dir);
 
-			filesMatchSnapshot(output, expectedOutputs[template]);
+			isMatch(output, images[key]);
 		})
 	);
 
-	it(`should prerender using webpack.`, async () => {
-		let app = await fromSubject('sass');
-		await build(app);
+	it('should prerender using webpack', async () => {
+		let dir = await fromSubject('sass');
+		await build(dir);
 
-		let output = await fs.readFile(resolve(app, './build/index.html'), 'utf-8');
-		let html = output.match(/<body>.*<\/body>/)[0];
-		htmlLooksLike(html, sassPrerendered);
+		let body = await getBody(dir, 'index.html');
+		looksLike(body, images.sass);
 	});
 
-	it(`should use custom .babelrc.`, async () => {
+	it('should use custom `.babelrc`', async () => {
 		// app with custom .babelrc enabling async functions
 		let app = await fromSubject('custom-babelrc');
 
@@ -40,25 +46,25 @@ describe('preact build', () => {
 		expect(async () => await build(app)).not;
 	});
 
-	it(`should prerender the routes provided with prerenderUrls.`, async () => {
-		let app = await fromSubject('multiple-prerendering');
-		await build(app);
+	it('should prerender the routes provided with `prerender-urls.json`', async () => {
+		let dir = await fromSubject('multiple-prerendering');
+		await build(dir);
+
+		let body1 = await getBody(dir, 'index.html');
+		looksLike(body1, images.prerender.home);
 
-		let output = await fs.readFile(resolve(app, './build/index.html'), 'utf-8');
-		let html = output.match(/<body>.*<\/body>/)[0];
-		htmlLooksLike(html, multiplePrerenderingHome);
-		output = await fs.readFile(resolve(app, './build/route66/index.html'), 'utf-8');
-		html = output.match(/<body>.*<\/body>/)[0];
-		htmlLooksLike(html, multiplePrerenderingRoute);
+		let body2 = await getBody(dir, 'route66/index.html');
+		looksLike(body2, images.prerender.route);
 	});
 
-	it(`should use custom preact.config.js.`, async () => {
+	it('should use custom `preact.config.js`', async () => {
 		// app with custom template set via preact.config.js
-		let app = await fromSubject('custom-webpack');
+		let dir = await fromSubject('custom-webpack');
+		await build(dir);
 
-		await build(app);
+		let file = join(dir, 'build/index.html');
+		let html = await readFile(file, 'utf-8');
 
-		let html = await fs.readFile(resolve(app, './build/index.html'), 'utf-8');
-		htmlLooksLike(html, withCustomTemplate);
+		looksLike(html, images.webpack);
 	});
 });
diff --git a/tests/create.test.js b/tests/create.test.js
index 52efa0182..ba9a3ed74 100644
--- a/tests/create.test.js
+++ b/tests/create.test.js
@@ -1,32 +1,21 @@
-import { resolve } from 'path';
+import { relative } from 'path';
 import { create } from './lib/cli';
-import lsr from './lib/lsr';
-import { setup } from './lib/output';
-
-const listTemplate = async dir => await lsr(resolve(__dirname, '../examples', dir), ['.gitkeep', 'package.json']);
-const listOutput = async dir => await lsr(dir, ['.gitkeep', 'package.json', 'package-lock.json', 'node_modules']);
+import { expand } from './lib/utils';
+import snapshots from './images/create';
 
+// TODO: Move all `examples/` to `preactjs-templates`
+const ours = ['default', 'full'];
 
 describe('preact create', () => {
-	beforeAll(async () => {
-		await setup();
-	});
+	ours.forEach(key => {
+		it(`scaffolds the '${key}' official template`, async () => {
+			let dir = await create(key);
 
-	it('should create project using full template by default.', async () => {
-		let fullExample = await listTemplate('full');
-		let app = await create('app');
-		let generated = await listOutput(app);
+			let output = await expand(dir).then(arr => {
+				return arr.map(x => relative(dir, x));
+			});
 
-		expect(generated).toEqual(fullExample);
+			expect(output).toEqual(snapshots[key]);
+		});
 	});
-
-	['full', 'root', 'simple', 'empty'].forEach(template =>
-		it(`should create project using provided template. Verifying ${template}`, async () => {
-			let example = await listTemplate(template);
-			let app = await create('app', template);
-			let generated = await listOutput(app);
-
-			expect(generated).toEqual(example);
-		})
-	);
 });
diff --git a/tests/images/build.js b/tests/images/build.js
new file mode 100644
index 000000000..d3469161c
--- /dev/null
+++ b/tests/images/build.js
@@ -0,0 +1,79 @@
+const common = {
+	'polyfills.*.js': 4620,
+	'polyfills.*.js.map': 31760,
+	'favicon.ico': 15086
+};
+
+exports.default = exports.full = {
+	...common,
+	'assets/favicon.ico': 15086,
+	'assets/icons/android-chrome-192x192.png': 14058,
+	'assets/icons/android-chrome-512x512.png': 51484,
+	'assets/icons/apple-touch-icon.png': 12746,
+	'assets/icons/favicon-16x16.png': 626,
+	'assets/icons/favicon-32x32.png': 1487,
+	'assets/icons/mstile-150x150.png': 9050,
+	'push-manifest.json': 327,
+	'manifest.json': 426,
+	'sw.js': 3850,
+	'bundle.*.js': 19300,
+	'bundle.*.js.map': 105590,
+	'route-home.chunk.*.js': 1000,
+	'route-home.chunk.*.js.map': 4981,
+	'route-profile.chunk.*.js': 1650,
+	'route-profile.chunk.*.js.map': 8609,
+	'index.html': 850,
+	'style.*.css': 1065,
+	'style.*.css.map': 2345,
+	'ssr-build/ssr-bundle.js': 41715,
+	'ssr-build/ssr-bundle.js.map': 66661,
+	'ssr-build/style.*.css': 1065,
+	'ssr-build/style.*.css.map': 2345
+};
+
+exports.sass = `
+<body>
+	<div class="background__21gOq">
+		<h1>Header on background</h1>
+		<p>Paragraph on background</p>
+	</div>
+	{{ ... }}
+</body>
+`;
+
+exports.prerender = {};
+
+exports.prerender.home = `
+<body>
+	<div id="app">
+		<div>Home</div>
+	</div>
+	{{ ... }}
+</body>
+`;
+
+exports.prerender.route = `
+<body>
+	<div id="app">
+		<div>Route66</div>
+	</div>
+	{{ ... }}
+</body>
+`;
+
+exports.webpack = `
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="utf-8">
+		<title>preact-webpack</title>
+		<link rel="shortcut icon" href="/favicon.ico"></link>
+	</head>
+	<body>
+		<h1>Guess what</h1>
+		<h2>This is an app with custom template</h2>
+		{{ ... }}
+	</body>
+</html>
+`;
+
diff --git a/tests/images/create.js b/tests/images/create.js
new file mode 100644
index 000000000..41a9fc2c5
--- /dev/null
+++ b/tests/images/create.js
@@ -0,0 +1,24 @@
+exports.default = [
+	'.gitignore',
+	'package.json',
+	'README.md',
+	'src/assets/favicon.ico',
+	'src/assets/icons/android-chrome-192x192.png',
+	'src/assets/icons/android-chrome-512x512.png',
+	'src/assets/icons/apple-touch-icon.png',
+	'src/assets/icons/favicon-16x16.png',
+	'src/assets/icons/favicon-32x32.png',
+	'src/assets/icons/mstile-150x150.png',
+	'src/components/app.js',
+	'src/components/header/index.js',
+	'src/components/header/style.css',
+	'src/index.js',
+	'src/manifest.json',
+	'src/routes/home/index.js',
+	'src/routes/home/style.css',
+	'src/routes/profile/index.js',
+	'src/routes/profile/style.css',
+	'src/style/index.css'
+];
+
+exports.full = exports.default;
diff --git a/tests/lib/chrome.js b/tests/lib/chrome.js
index 59af3076b..d287efe49 100644
--- a/tests/lib/chrome.js
+++ b/tests/lib/chrome.js
@@ -1,6 +1,6 @@
 import { Launcher } from 'chrome-launcher';
 import chrome from 'chrome-remote-interface';
-import { withLog, waitUntil } from './utils';
+import { log, waitUntil } from './utils';
 
 export default async () => {
 	let launcher = new Launcher({
@@ -14,9 +14,9 @@ export default async () => {
 	});
 	launcher.pollInterval = 1000;
 
-	await withLog(() => launcher.launch(), 'Launching Chrome');
+	await log(() => launcher.launch(), 'Launching Chrome');
 
-	let protocol = await withLog(() => setup(launcher.port), 'Connecting to Chrome');
+	let protocol = await log(() => setup(launcher.port), 'Connecting to Chrome');
 
 	return { launcher, protocol };
 };
@@ -29,7 +29,7 @@ export const getElementHtml = async (Runtime, selector) => {
 
 export const waitUntilExpression = async (Runtime, expression, retryCount = 10, retryInterval = 500) => {
 	let evaluate = async () => {
-		let { result } = await withLog(
+		let { result } = await log(
 			() => Runtime.evaluate({ expression }),
 			`Waiting for ${expression} - tries left: ${retryCount}`
 		);
@@ -49,7 +49,7 @@ export const waitUntilExpression = async (Runtime, expression, retryCount = 10,
 };
 
 export const loadPage = async (chrome, url) => {
-	let result = await withLog(
+	let result = await log(
 		() => waitUntil(() => navigateToPage(chrome, url, 5000), `${url} could not be loaded!`),
 		`Navigating to ${url}`
 	);
diff --git a/tests/lib/cli.js b/tests/lib/cli.js
index 49d3c3b27..1bede768b 100644
--- a/tests/lib/cli.js
+++ b/tests/lib/cli.js
@@ -1,60 +1,40 @@
 import crossSpawn from 'cross-spawn-promise';
 import { spawn as spawnChild } from 'child_process';
 import path from 'path';
-import mkdirp from 'mkdirp';
 import fs from 'fs.promised';
-import { createWorkDir } from './output';
-import { waitUntil, withLog } from './utils';
-import { shouldInstallDeps } from './tests-config';
-
-const builtPreactCliPath = path.resolve(__dirname, '../../lib/index.js');
-
-export const create = async (appName, template) => {
-	let workDir = createWorkDir();
-	await withLog(() => mkdirp(workDir), 'Create work directory');
-	await withLog(
-		() => createApp(template, appName, workDir),
-		'preact create'
-	);
-
-	let appDir = path.resolve(workDir, appName);
-
-	if (shouldInstallDeps()) {
-		await withLog(
-			() => run('npm', ['i', '--save-dev', path.relative(appDir, process.cwd())], appDir),
-			'Install local preact-cli'
-		);
-	}
+import { tmpDir } from './output';
+import { waitUntil, log } from './utils';
 
-	return appDir;
-};
+const CLI = require.resolve('../../lib');
+const NOINSTALL = !!process.env.SKIP_INSTALL;
+
+export async function create(template, name) {
+	let dest = tmpDir();
+	let args = [CLI, 'create', template, dest];
+
+	name && args.push(`--name ${name}`);
+	NOINSTALL && args.push('--no-install');
+
+	await run('node', args);
 
-export const build = appDir => withLog(
+	return dest;
+}
+
+export const build = appDir => log(
 	() => preact(['build'], appDir),
 	'preact build'
 );
 
-export const serve = (appDir, port) => withLog(
+export const serve = (appDir, port) => log(
 	() => spawnPreact(['serve', port ? `-p=${port}` : undefined], appDir),
 	'preact serve'
 );
 
-export const watch = (appDir, host, port) => withLog(
+export const watch = (appDir, host, port) => log(
 	() => spawnPreact(['watch', host ? `--host=${host}` : undefined, port ? `-p=${port}` : undefined], appDir),
 	'preact watch'
 );
 
-const createApp = async (template, appName, workDir) => {
-	let cliPath = builtPreactCliPath;
-	let install = process.env.WITH_INSTALL ? '--install' : '--no-install';
-	let args = [cliPath, 'create', '--no-git', install, appName, template ? `--type=${template}` : undefined];
-
-	await exists(cliPath);
-	await exists(workDir);
-
-	await run('node', args, workDir);
-};
-
 const preact = async (args, cwd) => {
 	await run('node', [cliPath(cwd), ...args], cwd);
 };
@@ -108,11 +88,9 @@ const spawnPreact = (args, cwd) => new Promise((resolve, reject) => {
 	}, 500);
 });
 
-const cliPath = (cwd) => shouldInstallDeps()
-		? path.resolve(cwd, './node_modules/.bin/preact')
-		: builtPreactCliPath;
+const cliPath = cwd => NOINSTALL ? CLI : path.resolve(cwd, './node_modules/.bin/preact');
 
 const exists = (path) => waitUntil(
-	() => withLog(() => fs.exists(path), `Check path exists: ${path}`),
+	() => log(() => fs.exists(path), `Check path exists: ${path}`),
 	`${path} doesn\'t exist`
 );
diff --git a/tests/lib/filesMatchSnapshot.js b/tests/lib/filesMatchSnapshot.js
deleted file mode 100644
index 3cfc87df7..000000000
--- a/tests/lib/filesMatchSnapshot.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import { join } from 'path';
-import { Minimatch } from 'minimatch';
-
-const minimumSizeDifference = 10;
-const percentageThreshold = 0.05;
-const minimumFileSize = 1;
-
-export default (actual, expected) => {
-	let normalizedExpected = normalize(expected);
-	let normalizedActual = normalize(actual);
-
-	let expectedPaths = Object.keys(normalizedExpected).map(p => new Minimatch(p));
-	let expectedBoundaries = Object.keys(normalizedExpected)
-		.reduce((acc, path) => Object.assign(acc, {
-			[path]: {
-				min: boundary('down', normalizedExpected[path].size),
-				max: boundary('up', normalizedExpected[path].size)
-			}
-		}), {});
-
-	let comparisonResult = Object.keys(normalizedActual).reduce((acc, path) => {
-		let expectedFilePaths = expectedPaths.filter(p => p.match(path)).map(p => p.pattern);
-
-		if (expectedFilePaths > 1) {
-			throw new Error(`Invalid snapshot configuration!
-				Found duplicate matches for path: ${path}.
-				Mathes: ${expectedFilePaths.join(',')}
-			`);
-		}
-		let expectedPath = expectedFilePaths[0];
-		let expectedValues = expectedBoundaries[expectedPath];
-		let actualValue = normalizedActual[path].size;
-
-		if (expectedValues && expectedValues.min <= actualValue && actualValue <= expectedValues.max) {
-			return Object.assign(acc, { [expectedPath]: expectedValues });
-		}
-
-		return Object.assign(acc, { [path]: actualValue });
-	}, {});
-
-	expect(comparisonResult).toEqual(expectedBoundaries);
-};
-
-const boundary = (direction, val) => {
-	let round = direction === 'up' ? Math.ceil : Math.floor;
-	let rounded = Math.max(minimumSizeDifference, round(val * percentageThreshold));
-	rounded = direction === 'up' ? rounded : -rounded;
-	return Math.max(minimumFileSize, val + rounded);
-};
-
-const normalize = obj => flatten(obj, o => Object.keys(o).length === 1 && typeof o.size === 'number');
-
-const flatten = (obj, stop, path = '') => Object.keys(obj)
-	.reduce((agg, key) => {
-		let combinedPath = path.length ? join(path, key) : key;
-
-		if (stop(obj[key])) {
-			agg[combinedPath] = obj[key];
-			return agg;
-		}
-
-		let flat = flatten(obj[key], stop, combinedPath);
-
-		Object.keys(flat).forEach(path => {
-			agg[path] = flat[path];
-		});
-		return agg;
-	}, {});
-
diff --git a/tests/lib/lsr.js b/tests/lib/lsr.js
deleted file mode 100644
index d3712befd..000000000
--- a/tests/lib/lsr.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import fs from 'fs.promised';
-import { difference } from 'lodash';
-import { resolve } from 'path';
-import { withLog } from './utils';
-
-const lsr = async (path, excludes = []) => {
-	let contents = difference(await fs.readdir(path), excludes);
-	let stats = contents.reduce((agg, p) => Object.assign(agg, { [p]: {} }), {});
-
-	for (let content of contents) {
-		let contentPath = resolve(path, content);
-		let contentStats = await fs.stat(contentPath);
-
-		if (contentStats.isDirectory()) {
-			stats[content] = {
-				...(await lsr(contentPath, excludes))
-			};
-		} else {
-			stats[content] = {
-				size: contentStats.size
-			};
-		}
-	}
-
-	return stats;
-};
-
-export default (path, excludes) => withLog(() => lsr(path, excludes), `List directory: ${path}`);
diff --git a/tests/lib/output.js b/tests/lib/output.js
index e68c30d75..86eb4bed4 100644
--- a/tests/lib/output.js
+++ b/tests/lib/output.js
@@ -1,28 +1,27 @@
-import { resolve } from 'path';
-import mkdirp from 'mkdirp';
-import uuid from 'uuid/v4';
 import ncp from 'ncp';
+import uuid from 'uuid/v4';
+import { resolve } from 'path';
 import { promisify } from 'bluebird';
 import spawn from 'cross-spawn-promise';
-import { withLog } from './utils';
-import { shouldInstallDeps } from './tests-config';
+import { log } from './utils';
 
-const cp = promisify(ncp);
+const INSTALL = !process.env.SKIP_INSTALL;
 
-export const outputPath = resolve(__dirname, '../output');
-const subjectsPath = resolve(__dirname, '../subjects');
+const copy = promisify(ncp);
+const output = resolve(__dirname, '../output');
+const subjects = resolve(__dirname, '../subjects');
 
-export const setup = () => withLog(() => mkdirp(outputPath), 'Setup');
+export const tmpDir = () => resolve(output, uuid());
 
-export const createWorkDir = () => resolve(outputPath, uuid());
+export async function fromSubject(name) {
+	let dest = tmpDir();
+	let dir = resolve(subjects, name);
 
-export const fromSubject = async (subjectName) => {
-	let workDir = createWorkDir();
-	await withLog(() => cp(resolve(subjectsPath, subjectName), workDir), `Copy subject: ${subjectName}`);
+	await log(() => copy(dir, dest), `Copy subject: ${name}`);
 
-	if (shouldInstallDeps()) {
-		await withLog(() => spawn('npm', ['install'], { cwd: workDir }), `Install subject dependencies`);
+	if (INSTALL) {
+		await log(() => spawn('npm', ['install'], { cwd:dest }), `Install subject dependencies`);
 	}
 
-	return workDir;
-};
+	return dest;
+}
diff --git a/tests/lib/tests-config.js b/tests/lib/tests-config.js
deleted file mode 100644
index bcfa52c3c..000000000
--- a/tests/lib/tests-config.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export const shouldInstallDeps = () => process.env.WITH_INSTALL;
-export const shouldLog = () => process.env.WITH_LOG;
diff --git a/tests/lib/utils.js b/tests/lib/utils.js
index e6c12f86a..8ff6eb625 100644
--- a/tests/lib/utils.js
+++ b/tests/lib/utils.js
@@ -1,28 +1,68 @@
 /* eslint-disable no-console */
-import { shouldLog } from './tests-config';
+import path from 'path';
+import { stat } from 'fs.promised';
+import { promisify } from 'bluebird';
+import minimatch from 'minimatch';
+import glob from 'glob';
 
-export const withLog = async (operation, message) => {
-	log('info', `${message} - started...`);
+const PER = 0.05; // % diff
+const LOG = !!process.env.WITH_LOG;
+const logger = (lvl, msg) => (lvl === 'error' || LOG) && console[lvl](msg);
+const globby = promisify(glob);
 
+// `node-glob` ignore pattern buggy?
+const ignores = x => !/node_modules|package-lock|yarn.lock/i.test(x);
+
+export function expand(dir, opts) {
+	dir = path.resolve(dir);
+	opts = Object.assign({ dot:true, nodir:true }, opts);
+	return globby(`${dir}/**`, opts).then(arr => arr.filter(ignores));
+}
+
+export async function bytes(str) {
+	return (await stat(str)).size;
+}
+
+export async function snapshot(dir) {
+	let str, tmp, out={};
+	for (str of await expand(dir)) {
+		tmp = path.relative(dir, str);
+		out[tmp] = await bytes(str);
+	}
+	return out;
+}
+
+const hasKey = (key, arr) => arr.find(k => minimatch(key, k)) || false;
+const isWithin = (val, tar) => (val == tar) || (val > (1-PER)*tar) && (val < (1+PER)*tar);
+
+export function isMatch(src, tar) {
+	let k, tmp;
+	let keys=Object.keys(tar);
+	for (k in src) {
+		tmp = hasKey(k, keys);
+		if (!tmp) return false;
+		if (!isWithin(src[k], tar[tmp])) return false;
+	}
+	return keys.length === Object.keys(src).length;
+}
+
+export async function log(fn, msg) {
+	logger('info', `${msg} - started...`);
 	try {
-		let result = await operation();
-		log('info', `${message} - done.`);
+		let result = await fn();
+		logger('info', `${msg} - done.`);
 		return result;
 	} catch (err) {
-		log('error', `${message} - failed!`);
+		logger('error', `${msg} - failed!`);
 		throw err;
 	}
-};
-
-export const log = (level, message) => {
-	if (level === 'error' || shouldLog()) {
-		console[level](message);
-	}
-};
+}
 
-export const delay = time => new Promise(r => setTimeout(() => r(), time));
+export function delay(ms) {
+	return new Promise(r => setTimeout(r, ms));
+}
 
-export const waitUntil = async (action, errorMessage, retryCount = 10, retryInterval = 100) => {
+export async function waitUntil(action, errorMessage, retryCount = 10, retryInterval = 100) {
 	if (retryCount < 0) {
 		throw new Error(errorMessage);
 	}
@@ -33,4 +73,4 @@ export const waitUntil = async (action, errorMessage, retryCount = 10, retryInte
 
 	await delay(retryInterval);
 	await waitUntil(action, errorMessage, retryCount - 1, retryInterval);
-};
+}
diff --git a/tests/serve.test.js b/tests/serve.test.js
index 567fce0c4..76db77c3c 100644
--- a/tests/serve.test.js
+++ b/tests/serve.test.js
@@ -1,7 +1,6 @@
 import htmlLooksLike from 'html-looks-like';
 import { create, build, serve } from './lib/cli';
 import startChrome, { loadPage,  waitUntilExpression, getElementHtml } from './lib/chrome';
-import { setup } from './lib/output';
 import { waitUntil } from './lib/utils';
 import { homePageHTML, profilePageHtml } from './serve.snapshot';
 
@@ -9,7 +8,6 @@ let chrome, launcher, server;
 
 describe('preact serve', () => {
 	beforeAll(async () => {
-		await setup();
 		let result = await startChrome();
 		chrome = result.protocol;
 		launcher = result.launcher;
@@ -31,7 +29,7 @@ describe('preact serve', () => {
 
 	it(`should spawn server hosting the app.`, async () => {
 		let { Runtime } = chrome;
-		let app = await create('app');
+		let app = await create('default');
 		await build(app);
 		server = await serve(app, 8081);
 
@@ -44,7 +42,7 @@ describe('preact serve', () => {
 
 	it(`should serve interactive page.`, async () => {
 		let { Runtime } = chrome;
-		let app = await create('app');
+		let app = await create('default');
 		await build(app);
 		server = await serve(app, 8081);
 		let url = 'https://localhost:8081/';
@@ -64,7 +62,7 @@ describe('preact serve', () => {
 
 	it(`should register service worker on first visit.`, async () => {
 		let { Runtime } = chrome;
-		let app = await create('app');
+		let app = await create('default');
 		await build(app);
 		server = await serve(app, 8081);
 		let url = 'https://localhost:8081/';
diff --git a/tests/subjects/custom-webpack/preact.config.js b/tests/subjects/custom-webpack/preact.config.js
index a0ea82f67..88e899d89 100644
--- a/tests/subjects/custom-webpack/preact.config.js
+++ b/tests/subjects/custom-webpack/preact.config.js
@@ -1,9 +1,7 @@
 import path from 'path';
 
 export default (config, env, helpers) => {
-	if (env.ssr) {
-		return;
-	}
-	let { plugin: htmlWebpackPlugin } = helpers.getPluginsByName(config, 'HtmlWebpackPlugin')[0];
-	htmlWebpackPlugin.options.template = `!!ejs-loader!${path.resolve(__dirname, './template.html')}`;
+	if (env.ssr) return;
+	let { plugin } = helpers.getPluginsByName(config, 'HtmlWebpackPlugin')[0];
+	plugin.options.template = `!!ejs-loader!${path.resolve(__dirname, './template.html')}`;
 };
diff --git a/tests/watch.test.js b/tests/watch.test.js
index 5239013ab..9a3792ec3 100644
--- a/tests/watch.test.js
+++ b/tests/watch.test.js
@@ -2,13 +2,11 @@ import { resolve } from 'path';
 import fs from 'fs.promised';
 import { create, build, watch } from './lib/cli';
 import startChrome, { loadPage, waitUntilExpression } from './lib/chrome';
-import { setup } from './lib/output';
 
 let chrome, launcher, server;
 
 describe('preact', () => {
 	beforeAll(async () => {
-		await setup();
 		let result = await startChrome();
 		chrome = result.protocol;
 		launcher = result.launcher;
@@ -21,7 +19,7 @@ describe('preact', () => {
 
 	it('should create development server with hot reloading.', async () => {
 		let { Runtime } = chrome;
-		let app = await create('app');
+		let app = await create('default');
 		await build(app);
 		server = await watch(app, '127.0.0.1', 8083);
 		let headerComponentSourceFile = resolve(app, './src/components/header/index.js');

From 1fb1133dbcbfd9ffdf200f589a681f5c794f8560 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Tue, 22 Aug 2017 20:53:38 -0700
Subject: [PATCH 39/53] =?UTF-8?q?move=20`serve.snapshot`=20=E2=80=94>`imag?=
 =?UTF-8?q?es/serve`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/{serve.snapshot.js => images/serve.js} |  4 ++--
 tests/serve.test.js                          | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename tests/{serve.snapshot.js => images/serve.js} (92%)

diff --git a/tests/serve.snapshot.js b/tests/images/serve.js
similarity index 92%
rename from tests/serve.snapshot.js
rename to tests/images/serve.js
index 2e060d503..959fcbd82 100644
--- a/tests/serve.snapshot.js
+++ b/tests/images/serve.js
@@ -1,4 +1,4 @@
-export const homePageHTML = `
+exports.home = `
 <body>
 	<div id="app">
 		<header class="header__3QGkI">
@@ -18,7 +18,7 @@ export const homePageHTML = `
 </body>
 `;
 
-export const profilePageHtml = `
+exports.profile = `
 <body>
 	<div id="app">
 		<header class="header__3QGkI">
diff --git a/tests/serve.test.js b/tests/serve.test.js
index 76db77c3c..283251e04 100644
--- a/tests/serve.test.js
+++ b/tests/serve.test.js
@@ -1,8 +1,8 @@
-import htmlLooksLike from 'html-looks-like';
+import looksLike from 'html-looks-like';
 import { create, build, serve } from './lib/cli';
 import startChrome, { loadPage,  waitUntilExpression, getElementHtml } from './lib/chrome';
 import { waitUntil } from './lib/utils';
-import { homePageHTML, profilePageHtml } from './serve.snapshot';
+import images from './images/serve';
 
 let chrome, launcher, server;
 
@@ -37,7 +37,7 @@ describe('preact serve', () => {
 		await pageIsInteractive(chrome);
 		let html = await getElementHtml(Runtime, 'body');
 
-		htmlLooksLike(html, homePageHTML);
+		looksLike(html, images.home);
 	});
 
 	it(`should serve interactive page.`, async () => {
@@ -57,7 +57,7 @@ describe('preact serve', () => {
 
 		let html = await getElementHtml(Runtime, 'body');
 
-		htmlLooksLike(html, profilePageHtml);
+		looksLike(html, images.profile);
 	});
 
 	it(`should register service worker on first visit.`, async () => {
@@ -83,7 +83,7 @@ describe('preact serve', () => {
 		await pageIsInteractive(chrome);
 		let html = await getElementHtml(Runtime, 'body');
 
-		htmlLooksLike(html, homePageHTML);
+		looksLike(html, images.home);
 	});
 });
 

From 771f43c52d72ef9a0b342a6ce66761c79531a1e9 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Tue, 22 Aug 2017 20:58:45 -0700
Subject: [PATCH 40/53] add `deprecated` notice on `build.snapshot` file

---
 tests/build.snapshot.js | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/tests/build.snapshot.js b/tests/build.snapshot.js
index 0aab8fa7e..1a6b7d5b9 100644
--- a/tests/build.snapshot.js
+++ b/tests/build.snapshot.js
@@ -1,3 +1,8 @@
+/**
+ * Unused
+ * @date 08/22/2017
+ * --> keep stats for other templates
+ */
 
 const commons = {
 	'polyfills.*.js': { size: 4620 },
@@ -81,23 +86,5 @@ export default {
 			'style.*.css': { size: 1065 },
 			'style.*.css.map': { size: 2250 },
 		}
-	},
-	'full': {
-		...fullBuildCommons,
-		'bundle.*.js': { size: 19300 },
-		'bundle.*.js.map': { size: 105590 },
-		'route-home.chunk.*.js': { size: 1000 },
-		'route-home.chunk.*.js.map': { size: 4981 },
-		'route-profile.chunk.*.js': { size: 1650 },
-		'route-profile.chunk.*.js.map': { size: 8609 },
-		'index.html': { size: 850 },
-		'style.*.css': { size: 1065 },
-		'style.*.css.map': { size: 2345 },
-		'ssr-build': {
-			'ssr-bundle.js': { size: 41715 },
-			'ssr-bundle.js.map': { size: 66661 },
-			'style.*.css': { size: 1065 },
-			'style.*.css.map': { size: 2345 },
-		}
 	}
 };

From 1a994b79ef62ba8ea8d43937370a332305cb1bf8 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Tue, 22 Aug 2017 21:21:10 -0700
Subject: [PATCH 41/53] remove unused `exists` helper

---
 tests/lib/cli.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/tests/lib/cli.js b/tests/lib/cli.js
index 1bede768b..9b8356d92 100644
--- a/tests/lib/cli.js
+++ b/tests/lib/cli.js
@@ -1,9 +1,8 @@
+import { resolve } from 'path';
+import { spawn } from 'child_process';
 import crossSpawn from 'cross-spawn-promise';
-import { spawn as spawnChild } from 'child_process';
-import path from 'path';
-import fs from 'fs.promised';
 import { tmpDir } from './output';
-import { waitUntil, log } from './utils';
+import { log } from './utils';
 
 const CLI = require.resolve('../../lib');
 const NOINSTALL = !!process.env.SKIP_INSTALL;
@@ -52,7 +51,7 @@ const run = async (command, args, cwd) => {
 };
 
 const spawnPreact = (args, cwd) => new Promise((resolve, reject) => {
-	let child = spawnChild('node', [cliPath(cwd), ...args.filter(Boolean)], { cwd });
+	let child = spawn('node', [cliPath(cwd), ...args.filter(Boolean)], { cwd });
 	let exitCode, killed = false;
 	let errListener = err => {
 		reject(err);
@@ -88,9 +87,4 @@ const spawnPreact = (args, cwd) => new Promise((resolve, reject) => {
 	}, 500);
 });
 
-const cliPath = cwd => NOINSTALL ? CLI : path.resolve(cwd, './node_modules/.bin/preact');
-
-const exists = (path) => waitUntil(
-	() => log(() => fs.exists(path), `Check path exists: ${path}`),
-	`${path} doesn\'t exist`
-);
+const cliPath = cwd => NOINSTALL ? CLI : resolve(cwd, './node_modules/.bin/preact');

From ca3b2355da71adcc99fe52b1d3599b8b9df87786 Mon Sep 17 00:00:00 2001
From: Anup <allamsetty.anup@gmail.com>
Date: Wed, 23 Aug 2017 23:25:12 +0530
Subject: [PATCH 42/53] Fix tests/image/create.js test error

---
 tests/images/create.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/images/create.js b/tests/images/create.js
index 41a9fc2c5..6a0976e02 100644
--- a/tests/images/create.js
+++ b/tests/images/create.js
@@ -1,7 +1,7 @@
 exports.default = [
 	'.gitignore',
-	'package.json',
 	'README.md',
+	'package.json',
 	'src/assets/favicon.ico',
 	'src/assets/icons/android-chrome-192x192.png',
 	'src/assets/icons/android-chrome-512x512.png',

From 85dfe85b3698a30e5c9135360619ee2ce5016d16 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Wed, 23 Aug 2017 11:04:43 -0700
Subject: [PATCH 43/53] Revert "Fix tests/image/create.js test error"

This reverts commit ca3b2355da71adcc99fe52b1d3599b8b9df87786.
---
 tests/images/create.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/images/create.js b/tests/images/create.js
index 6a0976e02..41a9fc2c5 100644
--- a/tests/images/create.js
+++ b/tests/images/create.js
@@ -1,7 +1,7 @@
 exports.default = [
 	'.gitignore',
-	'README.md',
 	'package.json',
+	'README.md',
 	'src/assets/favicon.ico',
 	'src/assets/icons/android-chrome-192x192.png',
 	'src/assets/icons/android-chrome-512x512.png',

From fb8f273be0e1662465a1371a8e60c96a94fdfd67 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Wed, 23 Aug 2017 11:13:48 -0700
Subject: [PATCH 44/53] [Travis] only build `master` branch

- PRs are still built
---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 8ba63c82f..a6737b0df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,10 @@ node_js:
   - 6
   - 8
 
+branches:
+  only:
+    - master
+
 cache:
   npm: true
   directories:

From b3380e0f41c402ee8ca2501fccb53b8637622499 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Wed, 23 Aug 2017 11:55:02 -0700
Subject: [PATCH 45/53] remove `commands/init` file

- somehow `recursive-copy` was picked up?
---
 src/commands/init.js | 238 -------------------------------------------
 tests/build.test.js  |   2 +-
 2 files changed, 1 insertion(+), 239 deletions(-)
 delete mode 100644 src/commands/init.js

diff --git a/src/commands/init.js b/src/commands/init.js
deleted file mode 100644
index 8e545fd07..000000000
--- a/src/commands/init.js
+++ /dev/null
@@ -1,238 +0,0 @@
-import asyncCommand from '../lib/async-command';
-import fs from 'fs.promised';
-import copy from 'recursive-copy';
-import glob from 'glob';
-import mkdirp from 'mkdirp';
-import ora from 'ora';
-import chalk from 'chalk';
-import inquirer from 'inquirer';
-import path from 'path';
-import { install, initialize, pkgScripts, initGit, trimLeft } from './../lib/setup';
-
-const TEMPLATES = {
-	full: 'examples/full',
-	empty: 'examples/empty',
-	root: 'examples/root',
-	simple: 'examples/simple'
-};
-
-export default asyncCommand({
-	command: 'init',
-
-	desc: 'Create a new application interactively',
-
-	builder: {
-		default: {
-			description: 'Use default values',
-			type: 'boolean',
-			alias: 'y',
-			default: false
-		}
-	},
-
-	async handler(argv) {
-		const questions = [
-			{
-				type: 'input',
-				name: 'name',
-				message: 'Package name for the app',
-				default: 'my_app'
-			},
-			{
-				type: 'input',
-				name: 'dest',
-				message: 'Directory to create the app within',
-				default: '<name>'
-			},
-			{
-				type: 'confirm',
-				name: 'yarn',
-				message: "Use 'YARN' instead of 'NPM'",
-				default: false
-			},
-			{
-				type: 'confirm',
-				name: 'git',
-				message: "Initiate version control using git",
-				default: false
-			},
-			{
-				type: 'confirm',
-				name: 'install',
-				message: 'Install dependencies for the app',
-				deafult: true
-			},
-			{
-				type: 'confirm',
-				name: 'enableForce',
-				message: 'Force option to create the directory for the new app',
-				default: false,
-			}
-		];
-
-		let response;
-
-		if (argv.default) {
-			response = {
-				name: 'my_app',
-				dest: 'my_app',
-				type: 'full',
-				style: 'css',
-				yarn: false,
-				git: false,
-				install: true,
-				enableForce: false
-			};
-
-			process.stdout.write('\nUsing the following default values:\n');
-			process.stdout.write(JSON.stringify(response, null, '  ') + '\n\n');
-		} else {
-			process.stdout.write('\n');
-			response = await inquirer.prompt(questions);
-
-			if (response.dest === '<name>') {
-				response.dest = response.name;
-			}
-		}
-
-		let template = TEMPLATES[response.type];
-
-		if (!template) {
-			throw Error(`Unknown app template "${response.type}".`);
-		}
-
-		let target = path.resolve(process.cwd(), response.dest || response.name);
-
-		let exists = false;
-		try {
-			exists = (await fs.stat(target)).isDirectory();
-		}
-		catch (err) {}
-
-		if (exists && response.force) {
-			if (response.enableForce) {
-				process.stdout.write('Initializing project in the current directory...\n');
-			} else {
-				process.stderr.write(chalk.red('Error: Cannot initialize in the current directory\n'));
-				process.exit(1);
-			}
-		}
-
-		if (exists && !response.force) {
-			process.stderr.write(chalk.red('Error: Cannot initialize in the current directory, please specify a different destination or use --force\n'));
-			process.exit(1);
-		}
-
-		let spinner = ora({
-			text: 'Creating project',
-			color: 'magenta'
-		}).start();
-
-		if (!exists) {
-			await Promise.promisify(mkdirp)(target);
-		}
-
-		await copy(
-			path.resolve(__dirname, '../..', template),
-			target,
-			{ filter: ['**/*', '!build'] }
-		);
-
-		spinner.text = 'Initializing project';
-
-		await initialize(response.yarn, target);
-
-		let pkg = JSON.parse(await fs.readFile(path.resolve(target, 'package.json')));
-
-		pkg.scripts = await pkgScripts(response.yarn, pkg);
-
-		try {
-			await fs.stat(path.resolve(target, 'src'));
-		}
-		catch (err) {
-			pkg.scripts.test = pkg.scripts.test.replace('src', '.');
-		}
-
-		pkg.eslintConfig = {
-			extends: 'eslint-config-synacor'
-		};
-
-		await fs.writeFile(path.resolve(target, 'package.json'), JSON.stringify(pkg, null, 2));
-
-		if (response.install) {
-			spinner.text = 'Installing dev dependencies';
-
-			await install(response.yarn, target, [
-				'preact-cli',
-				'if-env',
-				'eslint',
-				'eslint-config-synacor',
-
-				// install sass setup if --sass
-				...(response.style === 'sass' ? [
-					'node-sass',
-					'sass-loader'
-				] : []),
-
-				// install less setup if --less
-				...(response.style === 'less' ? [
-					'less',
-					'less-loader'
-				] : []),
-
-				// install stylus if --stylus
-				...(response.style === 'stylus' ? [
-					'stylus',
-					'stylus-loader'
-				] : [])
-			], 'dev');
-
-			spinner.text = 'Installing dependencies';
-
-			await install(response.yarn, target, [
-				'preact',
-				'preact-compat',
-				'preact-router'
-			]);
-		}
-
-		spinner.succeed('Done!\n');
-
-		if (response.style !== 'css') {
-			let extension;
-
-			if (response.style === 'less') extension = '.less';
-			if (response.style === 'sass') extension = '.scss';
-			if (response.style === 'stylus') extension = '.styl';
-
-			const cssFiles = await Promise.promisify(glob)(`${target}/**/*.css`, {
-				ignore: [
-					`${target}/build/**`,
-					`${target}/node_modules/**`
-				]
-			});
-
-			const changeExtension = fileName => fs.rename(fileName, fileName.replace(/.css$/, extension));
-
-			await Promise.all(cssFiles.map(changeExtension));
-		}
-
-		if (response.git) {
-			await initGit(target);
-		}
-
-		return trimLeft(`
-			To get started, cd into the new directory:
-			  \u001b[32mcd ${path.relative(process.cwd(), target)}\u001b[39m
-
-			To start a development live-reload server:
-			  \u001b[32m${response.yarn === true ? 'yarn start' : 'npm start'}\u001b[39m
-
-			To create a production build (in ./build):
-			  \u001b[32m${response.yarn === true ? 'yarn build' : 'npm run build'}\u001b[39m
-
-			To start a production HTTP/2 server:
-			  \u001b[32m${response.yarn === true ? 'yarn serve' : 'npm run serve'}\u001b[39m
-		`) + '\n';
-	}
-});
diff --git a/tests/build.test.js b/tests/build.test.js
index 2a8a7b4ee..7680d54ff 100644
--- a/tests/build.test.js
+++ b/tests/build.test.js
@@ -6,9 +6,9 @@ import { snapshot, isMatch } from './lib/utils';
 import { fromSubject } from './lib/output';
 import images from './images/build';
 
-const ours = ['default', 'full'];
 // TODO
 // const ours = ['empty', 'full', 'simple', 'root'];
+const ours = ['default', 'full'];
 
 async function getBody(dir, file) {
 	file = join(dir, `build/${file}`);

From f8f7ec41ffcce4eb2af9c970d67d7818a1d69e20 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Wed, 23 Aug 2017 12:46:05 -0700
Subject: [PATCH 46/53] add console statement for debug

- WTF HAPPENING
---
 src/lib/webpack/dependency-install-loader.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/lib/webpack/dependency-install-loader.js b/src/lib/webpack/dependency-install-loader.js
index ae5563eb9..e901bab76 100644
--- a/src/lib/webpack/dependency-install-loader.js
+++ b/src/lib/webpack/dependency-install-loader.js
@@ -63,5 +63,9 @@ module.exports = function(source, map) {
 			}
 		})
 		.then( () => callback(null, source, map) )
-		.catch( err => callback(`Error installing dependencies: ${err}`) );
+		.catch( err => {
+			/* eslint-disable no-console */
+			console.log('ERROR', err);
+			return callback(`Error installing dependencies: ${err}`);
+		});
 };

From 1880a38f0ab4b15b859e9543c017aec835777db4 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sat, 26 Aug 2017 10:09:36 -0700
Subject: [PATCH 47/53] remove `dependency-install-loader`

- no need anymore!
- templates responsible own dependecies
- and style-* flags removed
---
 src/lib/webpack/dependency-install-loader.js | 71 --------------------
 src/lib/webpack/webpack-base-config.js       | 22 ------
 2 files changed, 93 deletions(-)
 delete mode 100644 src/lib/webpack/dependency-install-loader.js

diff --git a/src/lib/webpack/dependency-install-loader.js b/src/lib/webpack/dependency-install-loader.js
deleted file mode 100644
index e901bab76..000000000
--- a/src/lib/webpack/dependency-install-loader.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import loaderUtils from 'loader-utils';
-import fs from 'fs';
-import path from 'path';
-import { install } from './../setup';
-
-/**
- * This is a pass-through loader that runs `npm install --save` for the specified dependencies when invoked.
- * Chain it before loaders to conditionally install them on first use.
- * Quickly checks if any modules are alread installed and skips them.
- * @param {object} options
- * @param {boolean|string} [options.save=false]  If `true`, runs `npm i --save`. If `"dev"`, runs `npm i --save-dev`.
- * @param {Array<String>|String} modules         A list of modules to install.
- *
- * @example // Install and use less-loader and less when encountering `.less` files:
- *
- * 	use: [
- * 		{
- * 			loader: 'install-loader',
- * 			options: {
- * 				modules: ['less-loader', 'less']
- * 			}
- * 		},
- * 		{
- * 			loader: 'less-loader'
- * 		}
- * 	]
- */
-
-
-const CACHE = {};
-
-function isInstalled(dep) {
-	return CACHE[dep] || (CACHE[dep] = new Promise( resolve => {
-		fs.stat(path.resolve('node_modules', dep), err => {
-			resolve(!err);
-		});
-	}));
-}
-
-function installDeps(deps, save) {
-	process.stdout.write(`\nInstalling ${deps.join(' ')}..`);
-	return install(false, process.cwd(), deps, save).then( () => {
-		process.stdout.write(` ..${deps.length} installed.\n`);
-	});
-}
-
-module.exports = function(source, map) {
-	let query = loaderUtils.getOptions(this) || {};
-
-	let deps = query.modules;
-	if (typeof deps==='string') deps = deps.split(/\s*,\s*/);
-	else if (!Array.isArray(deps)) deps = [deps];
-
-	if (!deps.length) return { source, map };
-
-	let callback = this.async();
-
-	Promise.all(deps.map(isInstalled))
-		.then( installed => {
-			let toInstall = deps.filter( (dep, index) => !installed[index] );
-			if (toInstall.length) {
-				return installDeps(toInstall, query.save);
-			}
-		})
-		.then( () => callback(null, source, map) )
-		.catch( err => {
-			/* eslint-disable no-console */
-			console.log('ERROR', err);
-			return callback(`Error installing dependencies: ${err}`);
-		});
-};
diff --git a/src/lib/webpack/webpack-base-config.js b/src/lib/webpack/webpack-base-config.js
index 7d15bccce..67f602f64 100644
--- a/src/lib/webpack/webpack-base-config.js
+++ b/src/lib/webpack/webpack-base-config.js
@@ -120,13 +120,6 @@ export default (env) => {
 										sourceMap: true
 									}
 								}
-							},
-							{
-								loader: resolve(__dirname, './dependency-install-loader'),
-								options: {
-									modules: ['less', 'less-loader'],
-									save: true
-								}
 							}
 						]
 					},
@@ -141,13 +134,6 @@ export default (env) => {
 									loader: 'sass-loader',
 									options: { sourceMap: true }
 								}
-							},
-							{
-								loader: resolve(__dirname, './dependency-install-loader'),
-								options: {
-									modules: ['node-sass', 'sass-loader'],
-									save: true
-								}
 							}
 						]
 					},
@@ -162,14 +148,6 @@ export default (env) => {
 									loader: 'stylus-loader',
 									options: { sourceMap: true }
 								}
-							},
-							{
-								loader: resolve(__dirname, './dependency-install-loader'),
-								options: {
-									cwd,
-									modules: ['stylus', 'stylus-loader'],
-									save: true
-								}
 							}
 						]
 					},

From bc7af44bb48dd987c564bf2165432dee2cf74f97 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sat, 26 Aug 2017 10:10:37 -0700
Subject: [PATCH 48/53] update scripts path

- OCD strikes again
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f54af825b..81d31d45d 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "prepublish": "npm run -s build",
     "dev": "babel-node src",
     "lint": "eslint src tests",
-    "pretest": "npm run -s build && rimraf ./tests/output",
+    "pretest": "npm run -s build && rimraf tests/output",
     "test": "jest",
     "posttest": "rimraf tests/output",
     "postinstall": "node -p 'require(\"./check.js\")()'",

From 0ed79d134d5db420649affb0dbf55062dce37816 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sat, 26 Aug 2017 10:30:53 -0700
Subject: [PATCH 49/53] exit early if run `build` w/o installing deps;

- tell user to run `npm install` first
---
 src/commands/build.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/commands/build.js b/src/commands/build.js
index f6aa07c11..09bd3b4d4 100644
--- a/src/commands/build.js
+++ b/src/commands/build.js
@@ -1,5 +1,6 @@
-import { resolve } from 'path';
 import rimraf from 'rimraf';
+import { resolve } from 'path';
+import { isDir, error } from '../util';
 import asyncCommand from '../lib/async-command';
 import runWebpack, { showStats, writeJsonStats } from '../lib/webpack/run-webpack';
 
@@ -48,8 +49,15 @@ export default asyncCommand({
 	},
 
 	async handler(argv) {
+		let cwd = argv.cwd ? resolve(argv.cwd) : process.cwd();
+		let modules = resolve(cwd, 'node_modules');
+
+		if (!isDir(modules)) {
+			return error('No `node_modules` found! Please run `npm install` before continuing.', 1);
+		}
+
 		if (argv.clean) {
-			let dest = resolve(argv.cwd || process.cwd(), argv.dest || 'build');
+			let dest = resolve(cwd, argv.dest || 'build');
 			await Promise.promisify(rimraf)(dest);
 		}
 

From faa8cad503aba861676f4e87b0b4b4f136ed2f26 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sat, 26 Aug 2017 10:34:09 -0700
Subject: [PATCH 50/53] always install deps for build subjects

---
 tests/lib/output.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tests/lib/output.js b/tests/lib/output.js
index 86eb4bed4..63b33d974 100644
--- a/tests/lib/output.js
+++ b/tests/lib/output.js
@@ -5,8 +5,6 @@ import { promisify } from 'bluebird';
 import spawn from 'cross-spawn-promise';
 import { log } from './utils';
 
-const INSTALL = !process.env.SKIP_INSTALL;
-
 const copy = promisify(ncp);
 const output = resolve(__dirname, '../output');
 const subjects = resolve(__dirname, '../subjects');
@@ -19,9 +17,8 @@ export async function fromSubject(name) {
 
 	await log(() => copy(dir, dest), `Copy subject: ${name}`);
 
-	if (INSTALL) {
-		await log(() => spawn('npm', ['install'], { cwd:dest }), `Install subject dependencies`);
-	}
+	// always install deps; needs to build
+	await log(() => spawn('npm', ['install'], { cwd:dest }), `Install subject dependencies`);
 
 	return dest;
 }

From 741774e30baee05db9fb8e1a6d2b3454a8e4878b Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sat, 26 Aug 2017 10:47:27 -0700
Subject: [PATCH 51/53] remove `SKIP_INSTALL` global for Travis (temp)

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a6737b0df..44383675e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,8 @@ cache:
 
 before_script:
 - export LIGHTHOUSE_CHROMIUM_PATH=`which google-chrome-stable`
-- if [ "$TRAVIS_BRANCH" = "master" ]; then export SKIP_INSTALL=true; export WITH_LOG=true; fi
+# - if [ "$TRAVIS_BRANCH" = "master" ]; then export SKIP_INSTALL=true; export WITH_LOG=true; fi
+- if [ "$TRAVIS_BRANCH" = "master" ]; then export WITH_LOG=true; fi
 
 script:
 - npm run lint

From 7c1ad416f2423234c477dc8bb621ba42d22ecfcb Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sat, 2 Sep 2017 19:50:30 -0700
Subject: [PATCH 52/53] assume any template without `/` is official lookup

- print `info` message about the assumption
---
 src/commands/create.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/commands/create.js b/src/commands/create.js
index 8ff115a62..4be20f293 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -7,15 +7,9 @@ import { green } from 'chalk';
 import { prompt } from 'inquirer';
 import asyncCommand from '../lib/async-command';
 import { install, initGit, addScripts } from './../lib/setup';
-import { isDir, hasCommand, error, trim, warn } from '../util';
+import { info, isDir, hasCommand, error, trim, warn } from '../util';
 
-const TEMPLATES = {
-	full: 'preactjs-templates/default',
-	default: 'preactjs-templates/default',
-	// simple: 'examples/simple',
-	// empty: 'examples/empty',
-	// root: 'examples/root',
-};
+const ORG = 'preactjs-templates';
 
 export default asyncCommand({
 	command: 'create <template> <dest>',
@@ -76,7 +70,11 @@ export default asyncCommand({
 			// TODO: interactive
 		}
 
-		let repo = TEMPLATES[argv.template] || argv.template;
+		let repo = argv.template;
+		if (!repo.includes('/')) {
+			repo = `${ORG}/${repo}`;
+			info(`Assuming you meant ${repo}...`);
+		}
 
 		// Attempt to fetch the `template`
 		let archive = await gittar.fetch(repo).catch(err => {

From e7ee7f7b060f51d1ba299fa6dbb7cf75bd05f887 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Sun, 3 Sep 2017 15:40:35 -0700
Subject: [PATCH 53/53] update tests, remove `full` alias

---
 tests/build.test.js  | 2 +-
 tests/create.test.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/build.test.js b/tests/build.test.js
index 7680d54ff..7cb067820 100644
--- a/tests/build.test.js
+++ b/tests/build.test.js
@@ -8,7 +8,7 @@ import images from './images/build';
 
 // TODO
 // const ours = ['empty', 'full', 'simple', 'root'];
-const ours = ['default', 'full'];
+const ours = ['default'];
 
 async function getBody(dir, file) {
 	file = join(dir, `build/${file}`);
diff --git a/tests/create.test.js b/tests/create.test.js
index ba9a3ed74..b856b98dd 100644
--- a/tests/create.test.js
+++ b/tests/create.test.js
@@ -4,7 +4,7 @@ import { expand } from './lib/utils';
 import snapshots from './images/create';
 
 // TODO: Move all `examples/` to `preactjs-templates`
-const ours = ['default', 'full'];
+const ours = ['default'];
 
 describe('preact create', () => {
 	ours.forEach(key => {