aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSindre Sorhus <[email protected]>2017-05-09 00:00:15 +0800
committerSindre Sorhus <[email protected]>2017-05-09 00:00:15 +0800
commitb4909804c00f4c08878be0bf1c2d438dca325dab (patch)
tree929f11223d3bfb515a94d43221d2b3d976dc40a5
parent6b86f16e791a95a7122f214eed63d5835f166215 (diff)
downloadelectron-boilerplate-b4909804c00f4c08878be0bf1c2d438dca325dab.tar.xz
electron-boilerplate-b4909804c00f4c08878be0bf1c2d438dca325dab.zip
Tweaks
-rw-r--r--.gitattributes1
-rw-r--r--boilerplate/.editorconfig4
-rw-r--r--boilerplate/.gitattributes1
-rw-r--r--boilerplate/index.js8
-rw-r--r--boilerplate/package.json14
-rw-r--r--readme.md2
6 files changed, 9 insertions, 21 deletions
diff --git a/.gitattributes b/.gitattributes
index 176a458..391f0a4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
* text=auto
+*.js text eol=lf
diff --git a/boilerplate/.editorconfig b/boilerplate/.editorconfig
index 173fe04..aaac325 100644
--- a/boilerplate/.editorconfig
+++ b/boilerplate/.editorconfig
@@ -6,7 +6,3 @@ end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
-
-[package.json]
-indent_style = space
-indent_size = 2
diff --git a/boilerplate/.gitattributes b/boilerplate/.gitattributes
index 176a458..391f0a4 100644
--- a/boilerplate/.gitattributes
+++ b/boilerplate/.gitattributes
@@ -1 +1,2 @@
* text=auto
+*.js text eol=lf
diff --git a/boilerplate/index.js b/boilerplate/index.js
index 6c54173..24fca6b 100644
--- a/boilerplate/index.js
+++ b/boilerplate/index.js
@@ -3,15 +3,15 @@ const electron = require('electron');
const app = electron.app;
-// adds debug features like hotkeys for triggering dev tools and reload
+// Adds debug features like hotkeys for triggering dev tools and reload
require('electron-debug')();
-// prevent window being garbage collected
+// Prevent window being garbage collected
let mainWindow;
function onClosed() {
- // dereference the window
- // for multiple windows store them in an array
+ // Dereference the window
+ // For multiple windows store them in an array
mainWindow = null;
}
diff --git a/boilerplate/package.json b/boilerplate/package.json
index df067aa..9b8fea7 100644
--- a/boilerplate/package.json
+++ b/boilerplate/package.json
@@ -15,26 +15,16 @@
"start": "electron .",
"build": "electron-packager . --out=dist --asar --overwrite --all"
},
- "files": [
- "index.js",
- "index.html",
- "index.css"
- ],
- "keywords": [
- "electron-app",
- "electron"
- ],
"dependencies": {
"electron-debug": "^1.0.0"
},
"devDependencies": {
"devtron": "^1.1.0",
"electron-packager": "^8.0.0",
- "electron": "^1.0.1",
- "xo": "^0.16.0"
+ "electron": "^1.6.6",
+ "xo": "^0.18.0"
},
"xo": {
- "esnext": true,
"envs": [
"node",
"browser"
diff --git a/readme.md b/readme.md
index 26b00c0..7a3d854 100644
--- a/readme.md
+++ b/readme.md
@@ -6,7 +6,7 @@
---
-<p align="center"><b>⚛ Learn React in just a couple of afternoons with this awesome <a href="https://ReactForBeginners.com/friend/AWESOME">React course</a> by Wes Bos</b></p>
+<p align="center"><b>⚛ Learn React in just a couple of afternoons with this awesome <a href="https://ReactForBeginners.com/friend/AWESOME">React course</a> by Wes Bos</b><br><sub>Try his free <a href="https://javascript30.com/friend/AWESOME">JavaScript 30</a> course for a taste of what to expect and check out his <a href="https://learnnode.com/friend/AWESOME">Node.js</a>, <a href="https://ES6.io/friend/AWESOME">ES6</a>, <a href="https://ReactForBeginners.com/friend/AWESOME">React</a>, <a href="https://SublimeTextBook.com/friend/AWESOME">Sublime</a> courses.</sub></p>
---