Rewrite the generator to be much more comprehensive

.gitattributes

@@ -1,2 +1 @@
-* text=auto
-*.js text eol=lf
+* text=auto eol=lf

.gitignore

@@ -1,2 +1,3 @@
 node_modules
+yarn.lock
 temp

.npmrc

@@ -0,0 +1 @@
+package-lock=false

.travis.yml

@@ -1,5 +1,5 @@
-sudo: false
 language: node_js
 node_js:
-  - '6'
-  - '4'
+  - '12'
+  - '10'
+  - '8'

app/index.js

@@ -6,12 +6,11 @@ const Generator = require('yeoman-generator');
 const _s = require('underscore.string');
 
 module.exports = class extends Generator {
-	init() {
-		return this.prompt([{
+	async init() {
+		const props = await this.prompt([{
 			name: 'appName',
 			message: 'What do you want to name your app?',
-			default: _s.slugify(this.appname),
-			filter: x => _s.slugify(x)
+			default: this.appname
 		}, {
 			name: 'githubUsername',
 			message: 'What is your GitHub username?',
@@ -23,29 +22,39 @@ module.exports = class extends Generator {
 			store: true,
 			validate: x => x.length > 0 ? true : 'You have to provide a website URL',
 			filter: x => normalizeUrl(x)
-		}]).then(props => {
-			const tpl = {
-				appName: props.appName,
-				classifiedAppName: _s.classify(props.appName),
-				githubUsername: props.githubUsername,
-				name: this.user.git.name(),
-				email: this.user.git.email(),
-				website: props.website,
-				humanizedWebsite: humanizeUrl(props.website),
-				superb: superb()
-			};
+		}]);
 
-			const mv = (from, to) => {
-				this.fs.move(this.destinationPath(from), this.destinationPath(to));
-			};
+		const template = {
+			appName: props.appName,
+			slugifiedAppName: _s.slugify(props.appName),
+			classifiedAppName: _s.classify(props.appName),
+			githubUsername: props.githubUsername,
+			repoUrl: `https://github.com/${props.githubUsername}/${props.slugifiedAppName}`,
+			name: this.user.git.name(),
+			email: this.user.git.email(),
+			website: props.website,
+			humanizedWebsite: humanizeUrl(props.website),
+			superb: superb.random()
+		};
 
-			this.fs.copyTpl(`${this.templatePath()}/**`, this.destinationPath(), tpl);
-			mv('editorconfig', '.editorconfig');
-			mv('gitattributes', '.gitattributes');
-			mv('gitignore', '.gitignore');
-			mv('_package.json', 'package.json');
-		});
+		const moveDest = (from, to) => {
+			this.fs.move(this.destinationPath(from), this.destinationPath(to));
+		};
+
+		const copy = (from, to) => {
+			this.fs.copy(this.templatePath(from), this.destinationPath(to || from));
+		};
+
+		this.fs.copyTpl(`${this.templatePath()}/*`, this.destinationPath(), template);
+		copy('build');
+		copy('static');
+		moveDest('editorconfig', '.editorconfig');
+		moveDest('gitattributes', '.gitattributes');
+		moveDest('gitignore', '.gitignore');
+		moveDest('travis.yml', '.travis.yml');
+		moveDest('_package.json', 'package.json');
 	}
+
 	install() {
 		this.installDependencies({bower: false});
 	}

app/templates/_package.json

@@ -1,33 +1,75 @@
 {
-  "name": "<%= appName %>",
-  "productName": "<%= classifiedAppName %>",
-  "version": "0.0.0",
-  "description": "My <%= superb %> app",
-  "license": "MIT",
-  "repository": "<%= githubUsername %>/<%= appName %>",
-  "author": {
-    "name": "<%= name %>",
-    "email": "<%= email %>",
-    "url": "<%= humanizedWebsite %>"
-  },
-  "scripts": {
-    "test": "xo",
-    "start": "electron .",
-    "build": "electron-packager . --out=dist --asar --overwrite --all"
-  },
-  "dependencies": {
-    "electron-debug": "^1.0.0"
-  },
-  "devDependencies": {
-    "devtron": "^1.1.0",
-    "electron-packager": "^8.0.0",
-    "electron": "^1.6.6",
-    "xo": "^0.18.0"
-  },
-  "xo": {
-    "envs": [
-      "node",
-      "browser"
-    ]
-  }
+	"name": "<%= slugifiedAppName %>",
+	"productName": "<%= appName %>",
+	"version": "0.0.0",
+	"description": "My <%= superb %> app",
+	"license": "MIT",
+	"repository": "<%= githubUsername %>/<%= slugifiedAppName %>",
+	"author": {
+		"name": "<%= name %>",
+		"email": "<%= email %>",
+		"url": "<%= humanizedWebsite %>"
+	},
+	"scripts": {
+		"postinstall": "electron-builder install-app-deps",
+		"lint": "xo",
+		"test": "npm run lint",
+		"start": "electron .",
+		"pack": "electron-builder --dir",
+		"dist": "electron-builder --macos --linux --windows",
+		"release": "np"
+	},
+	"dependencies": {
+		"electron-context-menu": "^0.12.1",
+		"electron-debug": "^3.0.0",
+		"electron-store": "^3.3.0",
+		"electron-unhandled": "^2.2.0",
+		"electron-updater": "^4.0.6",
+		"electron-util": "^0.12.0"
+	},
+	"devDependencies": {
+		"electron": "^5.0.4",
+		"electron-builder": "^20.43.0",
+		"np": "^5.0.3",
+		"xo": "^0.24.0"
+	},
+	"xo": {
+		"envs": [
+			"node",
+			"browser"
+		]
+	},
+	"np": {
+		"publish": false,
+		"releaseDraft": false
+	},
+	"build": {
+		"appId": "com.<%= githubUsername %>.<%= slugifiedAppName %>",
+		"mac": {
+			"category": "public.app-category.social-networking",
+			"darkModeSupport": true
+		},
+		"dmg": {
+			"iconSize": 160,
+			"contents": [
+				{
+					"x": 180,
+					"y": 170
+				},
+				{
+					"x": 480,
+					"y": 170,
+					"type": "link",
+					"path": "/Applications"
+				}
+			]
+		},
+		"linux": {
+			"target": [
+				"AppImage",
+				"deb"
+			],
+			"category": "Network;Chat"
+		}
+	}
 }

app/templates/config.js

@@ -0,0 +1,8 @@
+'use strict';
+const Store = require('electron-store');
+
+module.exports = new Store({
+	defaults: {
+		favoriteAnimal: '🦄'
+	}
+});

app/templates/editorconfig

@@ -6,3 +6,7 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+[*.yml]
+indent_style = space
+indent_size = 2

app/templates/gitattributes

@@ -1,2 +1 @@
-* text=auto
-*.js text eol=lf
+* text=auto eol=lf

app/templates/gitignore

@@ -1,2 +1,3 @@
 node_modules
+yarn.lock
 /dist

app/templates/index.css

@@ -2,10 +2,25 @@ html,
 body {
 	padding: 0;
 	margin: 0;
+	background: transparent;
 }
 
+/* Use OS default fonts */
 body {
-	font-family: -apple-system, 'Helvetica Neue', Helvetica, sans-serif;
+	font-family: -apple-system,
+		BlinkMacSystemFont,
+		'Segoe UI',
+		Roboto,
+		Oxygen-Sans,
+		Ubuntu,
+		Cantarell,
+		'Helvetica Neue',
+		sans-serif,
+		'Apple Color Emoji',
+		'Segoe UI Emoji',
+		'Segoe UI Symbol';
+	text-rendering: optimizeLegibility;
+	font-feature-settings: 'liga', 'clig', 'kern';
 }
 
 header {
@@ -21,7 +36,8 @@ header {
 
 header h1 {
 	font-size: 60px;
-	font-weight: 100;
+	font-weight: 200;
 	margin: 0;
 	padding: 0;
+	opacity: 0.7;
 }

app/templates/index.html

@@ -2,13 +2,14 @@
 <html>
 	<head>
 		<meta charset="utf-8">
-		<title>Electron boilerplate</title>
+		<title><%= appName %></title>
 		<link rel="stylesheet" href="index.css">
 	</head>
 	<body>
 		<div class="container">
 			<header>
-				<h1>Electron boilerplate</h1>
+				<h1><%= appName %></h1>
+				<p></p>
 			</header>
 			<section class="main"></section>
 			<footer></footer>

app/templates/index.js

@@ -1,34 +1,75 @@
 'use strict';
-const electron = require('electron');
+const path = require('path');
+const {app, BrowserWindow, Menu} = require('electron');
+/// const {autoUpdater} = require('electron-updater');
+const {is} = require('electron-util');
+const unhandled = require('electron-unhandled');
+const debug = require('electron-debug');
+const contextMenu = require('electron-context-menu');
+const config = require('./config');
+const menu = require('./menu');
 
-const app = electron.app;
+unhandled();
+debug();
+contextMenu();
 
-// Adds debug features like hotkeys for triggering dev tools and reload
-require('electron-debug')();
+// Note: Must match `build.appId` in package.json
+app.setAppUserModelId('com.<%= githubUsername %>.<%= slugifiedAppName %>');
 
-// Prevent window being garbage collected
-let mainWindow;
+// Uncomment this before publishing your first version.
+// It's commented out as it throws an error if there are no published versions.
+// if (!is.development) {
+// 	const FOUR_HOURS = 1000 * 60 * 60 * 4;
+// 	setInterval(() => {
+// 		autoUpdater.checkForUpdates();
+// 	}, FOUR_HOURS);
+//
+// 	autoUpdater.checkForUpdates();
+// }
 
-function onClosed() {
-	// Dereference the window
-	// For multiple windows store them in an array
-	mainWindow = null;
-}
+// Prevent window from being garbage collected
+let mainWindow;
 
-function createMainWindow() {
-	const win = new electron.BrowserWindow({
+const createMainWindow = async () => {
+	const win = new BrowserWindow({
+		title: app.getName(),
+		show: false,
 		width: 600,
 		height: 400
 	});
 
-	win.loadURL(`file://${__dirname}/index.html`);
-	win.on('closed', onClosed);
+	win.on('ready-to-show', () => {
+		win.show();
+	});
+
+	win.on('closed', () => {
+		// Dereference the window
+		// For multiple windows store them in an array
+		mainWindow = undefined;
+	});
+
+	await win.loadFile(path.join(__dirname, 'index.html'));
 
 	return win;
+};
+
+// Prevent multiple instances of the app
+if (!app.requestSingleInstanceLock()) {
+	app.quit();
 }
 
+app.on('second-instance', () => {
+	if (mainWindow) {
+		if (mainWindow.isMinimized()) {
+			mainWindow.restore();
+		}
+
+		mainWindow.show();
+	}
+});
+
 app.on('window-all-closed', () => {
-	if (process.platform !== 'darwin') {
+	if (!is.macos) {
 		app.quit();
 	}
 });
@@ -39,6 +80,11 @@ app.on('activate', () => {
 	}
 });
 
-app.on('ready', () => {
-	mainWindow = createMainWindow();
-});
+(async () => {
+	await app.whenReady();
+	Menu.setApplicationMenu(menu);
+	mainWindow = await createMainWindow();
+
+	const favoriteAnimal = config.get('favoriteAnimal');
+	mainWindow.webContents.executeJavaScript(`document.querySelector('header p').textContent = 'Your favorite animal is ${favoriteAnimal}'`);
+})();