-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #131 from nwittwer/dev
0.6.5
- Loading branch information
Showing
22 changed files
with
488 additions
and
301 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,40 @@ | ||
| const hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true') | ||
| // const hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true') | ||
|
|
||
| hotClient.subscribe(event => { | ||
| /** | ||
| * Reload browser when HTMLWebpackPlugin emits a new index.html | ||
| * | ||
| * Currently disabled until jantimon/html-webpack-plugin#680 is resolved. | ||
| * https://github.com/SimulatedGREG/electron-vue/issues/437 | ||
| * https://github.com/jantimon/html-webpack-plugin/issues/680 | ||
| */ | ||
| // if (event.action === 'reload') { | ||
| // window.location.reload() | ||
| // } | ||
| // hotClient.subscribe(event => { | ||
| // /** | ||
| // * Reload browser when HTMLWebpackPlugin emits a new index.html | ||
| // * | ||
| // * Currently disabled until jantimon/html-webpack-plugin#680 is resolved. | ||
| // * https://github.com/SimulatedGREG/electron-vue/issues/437 | ||
| // * https://github.com/jantimon/html-webpack-plugin/issues/680 | ||
| // */ | ||
| // if (event.action === 'reload') { | ||
| // window.location.reload() | ||
| // } | ||
|
|
||
| /** | ||
| * Notify `mainWindow` when `main` process is compiling, | ||
| * giving notice for an expected reload of the `electron` process | ||
| */ | ||
| if (event.action === 'compiling') { | ||
| document.body.innerHTML += ` | ||
| <style> | ||
| #dev-client { | ||
| background: #4fc08d; | ||
| border-radius: 4px; | ||
| bottom: 20px; | ||
| box-shadow: 0 4px 5px 0 rgba(0, 0, 0, 0.14), 0 1px 10px 0 rgba(0, 0, 0, 0.12), 0 2px 4px -1px rgba(0, 0, 0, 0.3); | ||
| color: #fff; | ||
| font-family: 'Source Sans Pro', sans-serif; | ||
| left: 20px; | ||
| padding: 8px 12px; | ||
| position: absolute; | ||
| } | ||
| </style> | ||
| // /** | ||
| // * Notify `mainWindow` when `main` process is compiling, | ||
| // * giving notice for an expected reload of the `electron` process | ||
| // */ | ||
| // if (event.action === 'compiling') { | ||
| // document.body.innerHTML += ` | ||
| // <style> | ||
| // #dev-client { | ||
| // background: #4fc08d; | ||
| // border-radius: 4px; | ||
| // bottom: 20px; | ||
| // box-shadow: 0 4px 5px 0 rgba(0, 0, 0, 0.14), 0 1px 10px 0 rgba(0, 0, 0, 0.12), 0 2px 4px -1px rgba(0, 0, 0, 0.3); | ||
| // color: #fff; | ||
| // font-family: 'Source Sans Pro', sans-serif; | ||
| // left: 20px; | ||
| // padding: 8px 12px; | ||
| // position: absolute; | ||
| // } | ||
| // </style> | ||
|
|
||
| <div id="dev-client"> | ||
| Compiling Main Process... | ||
| </div> | ||
| ` | ||
| } | ||
| }) | ||
| // <div id="dev-client"> | ||
| // Compiling Main Process... | ||
| // </div> | ||
| // ` | ||
| // } | ||
| // }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.