Merge branch 'master' into patch-1

README.md

@@ -103,3 +103,8 @@ Take a look at some of the amazing projects built with electron-vue. Want to hav
 * [**Netsix**](https://github.com/pulsardev/netsix): Share videos with your friends in a real peer-to-peer manner using WebRTC.
 * [**code-notes**](https://github.com/lauthieb/code-notes): A simple code snippet manager for developers built with Electron & Vue.js.
 * [**Pomotroid**](https://github.com/Splode/pomotroid): A simple and visually-pleasing Pomodoro timer
+* [**MarkText**](https://github.com/marktext/marktext): Mark Text is a realtime Markdown Editor.
+* [**vue-design**](https://github.com/L-Chris/vue-design): the best website visualization builder with Vue and Electron
+* [**ImapSync Client**](https://github.com/ridaamirini/ImapSyncClient): It's only an Internet Message Access Protocol Synchronization Client
+* [**Hve**](https://github.com/hellohve/hve): A static blog client tool you may like.
+* [**MarkdownFox**](https://github.com/lx4r/markdownfox): A simple Markdown viewer with auto update and PDF export.

docs/cn/end-to-end_testing.md

@@ -40,7 +40,7 @@ my-project
 
 ### 关于 Spectron
 
-Spectron 是使用 [ChromeDriver](https://sites.google.com/a/chromium.org/chromedriver/) 和 [WebDriverIO](http://webdriver.io/) 来操作 DOM 元素的 [electron]（http://electron.atom.io）官方测试框架。
+Spectron 是使用 [ChromeDriver](https://sites.google.com/a/chromium.org/chromedriver/) 和 [WebDriverIO](http://webdriver.io/) 来操作 DOM 元素的 [electron](http://electron.atom.io) 官方测试框架。
 
 #### WebDriverIO 的使用
 

docs/cn/npm_scripts.md

@@ -1,6 +1,6 @@
 # NPM 脚本
 
-为了帮助n你消除开发过程中的冗余任务，请注意一些可用的 NPM 脚本。以下命令应该运行在项目的根目录下。当然，你可以使用 `yarn run <command>` 的方式运行下列任何命令。
+为了帮助你消除开发过程中的冗余任务，请注意一些可用的 NPM 脚本。以下命令应该运行在项目的根目录下。当然，你可以使用 `yarn run <command>` 的方式运行下列任何命令。
 
 ### `npm run build`
 

docs/en/project_structure.md

@@ -1,6 +1,6 @@
 # Project Structure
 
-When it comes to making electron apps, project structure is a little different. If you have used the official [`vuejs-templates/webpack`](https://github.com/vuejs-templates/webpack) setup before, then the structure should feel quite familiar. The documentation in this section attempts to explain a general overview of how the boilerplate works and the differences when your application in built.
+When it comes to making electron apps, project structure is a little different. If you have used the official [`vuejs-templates/webpack`](https://github.com/vuejs-templates/webpack) setup before, then the structure should feel quite familiar. The documentation in this section attempts to explain a general overview of how the boilerplate works and the differences when your application is built.
 
 ### Single `package.json` Setup
 

docs/en/renderer-process.md

@@ -51,4 +51,3 @@ Describing `vuex` is not the easiest thing to do, so please read [this](http://v
 electron-vue takes advantage of `vuex`'s module structure to create multiple data stores, which are saved in `src/renderer/store/modules`.
 
 Having multiple data stores can be great for organization, but it can also be annoying to have to import each and every one. But don't fret, as `src/renderer/store/modules/index.js` does the dirty work for us! This little script lets `src/renderer/store/index.js` import all of our modules in a one-shot manner. If all that didn't make sense, just know you can easily duplicate the given `Counter.js` module and it will be loaded in "magically".
-

template/.electron-vue/dev-runner.js

@@ -114,7 +114,7 @@ function startMain () {
 }
 
 function startElectron () {
-  electronProcess = spawn(electron, ['--inspect=5858', path.join(__dirname, '../dist/electron/main.js')])
+  electronProcess = spawn(electron, ['--inspect=5858', '.'])
 
   electronProcess.stdout.on('data', data => {
     electronLog(data, 'blue')

template/appveyor.yml

@@ -23,7 +23,6 @@ init:
 
 install:
   - ps: Install-Product node 8 x64
-  - choco install yarn --ignore-dependencies
   - git reset --hard HEAD
   - yarn
   - node --version