From 8923a66c8fe62727903abd62654e455ee8992cad Mon Sep 17 00:00:00 2001 From: "huangqingpeng@curefun.com" Date: Mon, 29 Jul 2019 16:04:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .electron-vue/dev-runner.js | 27 ++++++++++++------------ dist/electron/.gitkeep | 0 dist/web/.gitkeep | 0 src/index.ejs | 42 ++++++++++++++++++++----------------- 4 files changed, 36 insertions(+), 33 deletions(-) delete mode 100644 dist/electron/.gitkeep delete mode 100644 dist/web/.gitkeep diff --git a/.electron-vue/dev-runner.js b/.electron-vue/dev-runner.js index 3903901..de0a80a 100644 --- a/.electron-vue/dev-runner.js +++ b/.electron-vue/dev-runner.js @@ -16,7 +16,7 @@ let electronProcess = null let manualRestart = false let hotMiddleware -function logStats (proc, data) { +function logStats(proc, data) { let log = '' log += chalk.yellow.bold(`┏ ${proc} Process ${new Array((19 - proc.length) + 1).join('-')}`) @@ -38,14 +38,14 @@ function logStats (proc, data) { console.log(log) } -function startRenderer () { +function startRenderer() { return new Promise((resolve, reject) => { rendererConfig.entry.renderer = [path.join(__dirname, 'dev-client')].concat(rendererConfig.entry.renderer) const compiler = webpack(rendererConfig) - hotMiddleware = webpackHotMiddleware(compiler, { - log: false, - heartbeat: 2500 + hotMiddleware = webpackHotMiddleware(compiler, { + log: false, + heartbeat: 2500 }) compiler.plugin('compilation', compilation => { @@ -60,11 +60,10 @@ function startRenderer () { }) const server = new WebpackDevServer( - compiler, - { + compiler, { contentBase: path.join(__dirname, '../'), quiet: true, - before (app, ctx) { + before(app, ctx) { app.use(hotMiddleware) ctx.middleware.waitUntilValid(() => { resolve() @@ -77,7 +76,7 @@ function startRenderer () { }) } -function startMain () { +function startMain() { return new Promise((resolve, reject) => { mainConfig.entry.main = [path.join(__dirname, '../src/main/index.dev.js')].concat(mainConfig.entry.main) @@ -113,7 +112,7 @@ function startMain () { }) } -function startElectron () { +function startElectron() { electronProcess = spawn(electron, ['--inspect=5858', path.join(__dirname, '../dist/electron/main.js')]) electronProcess.stdout.on('data', data => { @@ -128,7 +127,7 @@ function startElectron () { }) } -function electronLog (data, color) { +function electronLog(data, color) { let log = '' data = data.toString().split(/\r?\n/) data.forEach(line => { @@ -145,7 +144,7 @@ function electronLog (data, color) { } } -function greeting () { +function greeting() { const cols = process.stdout.columns let text = '' @@ -163,7 +162,7 @@ function greeting () { console.log(chalk.blue(' getting ready...') + '\n') } -function init () { +function init() { greeting() Promise.all([startRenderer(), startMain()]) @@ -175,4 +174,4 @@ function init () { }) } -init() +init() \ No newline at end of file diff --git a/dist/electron/.gitkeep b/dist/electron/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/dist/web/.gitkeep b/dist/web/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/src/index.ejs b/src/index.ejs index 5d04cd6..ed73acc 100644 --- a/src/index.ejs +++ b/src/index.ejs @@ -1,22 +1,26 @@ - - - electron-vue-admin - <% if (htmlWebpackPlugin.options.nodeModules) { %> - - - <% } %> - - -
- - - - - + + + electron-vue-admin + <% if (htmlWebpackPlugin.options.nodeModules) { %> + + + <% } %> + + + +
+ + + + + + + \ No newline at end of file