正在显示
7 个修改的文件
包含
25 行增加
和
32 行删除
| ... | @@ -5,7 +5,6 @@ process.env.NODE_ENV = 'production' | ... | @@ -5,7 +5,6 @@ process.env.NODE_ENV = 'production' |
| 5 | const { say } = require('cfonts') | 5 | const { say } = require('cfonts') |
| 6 | const chalk = require('chalk') | 6 | const chalk = require('chalk') |
| 7 | const del = require('del') | 7 | const del = require('del') |
| 8 | -const { spawn } = require('child_process') | ||
| 9 | const webpack = require('webpack') | 8 | const webpack = require('webpack') |
| 10 | const Multispinner = require('multispinner') | 9 | const Multispinner = require('multispinner') |
| 11 | 10 | ... | ... |
| ... | @@ -77,7 +77,6 @@ function startRenderer() { | ... | @@ -77,7 +77,6 @@ function startRenderer() { |
| 77 | 77 | ||
| 78 | function startMain() { | 78 | function startMain() { |
| 79 | return new Promise((resolve) => { | 79 | return new Promise((resolve) => { |
| 80 | - mainConfig.entry.main = [path.join(__dirname, '../src/main/index.dev.js')].concat(mainConfig.entry.main) | ||
| 81 | mainConfig.mode = 'development' | 80 | mainConfig.mode = 'development' |
| 82 | const compiler = webpack(mainConfig) | 81 | const compiler = webpack(mainConfig) |
| 83 | 82 | ... | ... |
| ... | @@ -102,12 +102,10 @@ | ... | @@ -102,12 +102,10 @@ |
| 102 | "cross-env": "^5.1.6", | 102 | "cross-env": "^5.1.6", |
| 103 | "css-loader": "^3.1.0", | 103 | "css-loader": "^3.1.0", |
| 104 | "del": "^5.0.0", | 104 | "del": "^5.0.0", |
| 105 | - "devtron": "^1.4.0", | ||
| 106 | "electron": "^6.0.2", | 105 | "electron": "^6.0.2", |
| 107 | "electron-builder": "^21.2.0", | 106 | "electron-builder": "^21.2.0", |
| 108 | - "electron-debug": "^3.0.1", | ||
| 109 | "electron-devtools-installer": "^2.2.4", | 107 | "electron-devtools-installer": "^2.2.4", |
| 110 | - "eslint": "^6.1.0", | 108 | + "eslint": "^6.2.0", |
| 111 | "eslint-config-standard": "^13.0.1", | 109 | "eslint-config-standard": "^13.0.1", |
| 112 | "eslint-friendly-formatter": "^4.0.1", | 110 | "eslint-friendly-formatter": "^4.0.1", |
| 113 | "eslint-loader": "^2.2.1", | 111 | "eslint-loader": "^2.2.1", |
| ... | @@ -131,7 +129,7 @@ | ... | @@ -131,7 +129,7 @@ |
| 131 | "vue-style-loader": "^4.1.2", | 129 | "vue-style-loader": "^4.1.2", |
| 132 | "vue-template-compiler": "^2.6.10", | 130 | "vue-template-compiler": "^2.6.10", |
| 133 | "webpack": "^4.39.2", | 131 | "webpack": "^4.39.2", |
| 134 | - "webpack-cli": "^3.3.6", | 132 | + "webpack-cli": "^3.3.7", |
| 135 | "webpack-dev-server": "^3.7.2", | 133 | "webpack-dev-server": "^3.7.2", |
| 136 | "webpack-hot-middleware": "^2.25.0", | 134 | "webpack-hot-middleware": "^2.25.0", |
| 137 | "webpack-merge": "^4.2.1" | 135 | "webpack-merge": "^4.2.1" | ... | ... |
src/main/config/DisableButton.js
0 → 100644
src/main/index.dev.js
deleted
100644 → 0
| 1 | -/** | ||
| 2 | - * This file is used specifically and only for development. It installs | ||
| 3 | - * `electron-debug` & `vue-devtools`. There shouldn't be any need to | ||
| 4 | - * modify this file, but it can be used to extend your development | ||
| 5 | - * environment. | ||
| 6 | - */ | ||
| 7 | - | ||
| 8 | -/* eslint-disable */ | ||
| 9 | - | ||
| 10 | -// Install `electron-debug` with `devtron` | ||
| 11 | -require('electron-debug')({ showDevTools: true }) | ||
| 12 | - | ||
| 13 | -// Install `vue-devtools` | ||
| 14 | -require('electron').app.on('ready', () => { | ||
| 15 | - let installExtension = require('electron-devtools-installer') | ||
| 16 | - installExtension.default(installExtension.VUEJS_DEVTOOLS) | ||
| 17 | - .then((name) => { console.log(`installed: ${name}`) }) | ||
| 18 | - .catch(err => { console.log('Unable to install `vue-devtools`: \n', err) }) | ||
| 19 | -}) | ||
| 20 | - | ||
| 21 | -// Require `main` process to boot app | ||
| 22 | -require('./index') | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| 1 | import { BrowserWindow, Menu } from 'electron' | 1 | import { BrowserWindow, Menu } from 'electron' |
| 2 | import menuconfig from '../config/menu' | 2 | import menuconfig from '../config/menu' |
| 3 | import config from '@config' | 3 | import config from '@config' |
| 4 | +import electronDevtoolsInstaller, { VUEJS_DEVTOOLS } from 'electron-devtools-installer' | ||
| 4 | 5 | ||
| 5 | const winURL = process.env.NODE_ENV === 'development' ? `http://localhost:9080` : `file://${__dirname}/index.html` | 6 | const winURL = process.env.NODE_ENV === 'development' ? `http://localhost:9080` : `file://${__dirname}/index.html` |
| 6 | 7 | ||
| ... | @@ -24,9 +25,18 @@ function createMainWindow () { | ... | @@ -24,9 +25,18 @@ function createMainWindow () { |
| 24 | Menu.setApplicationMenu(menu) | 25 | Menu.setApplicationMenu(menu) |
| 25 | mainWindow.loadURL(winURL) | 26 | mainWindow.loadURL(winURL) |
| 26 | 27 | ||
| 27 | - mainWindow.once('ready-to-show', () => { | 28 | + if (process.env.NODE_ENV === 'development') { |
| 28 | - mainWindow.show() | 29 | + mainWindow.webContents.once('dom-ready', () => { |
| 29 | - }) | 30 | + mainWindow.show() |
| 31 | + electronDevtoolsInstaller(VUEJS_DEVTOOLS) | ||
| 32 | + .then((name) => console.log(`installed: ${name}`)) | ||
| 33 | + .catch(err => console.log('Unable to install `vue-devtools`: \n', err)) | ||
| 34 | + }) | ||
| 35 | + } else { | ||
| 36 | + mainWindow.webContents.once('dom-ready', () => { | ||
| 37 | + mainWindow.show() | ||
| 38 | + }) | ||
| 39 | + } | ||
| 30 | 40 | ||
| 31 | mainWindow.on('closed', () => { | 41 | mainWindow.on('closed', () => { |
| 32 | mainWindow = null | 42 | mainWindow = null | ... | ... |
-
请 注册 或 登录 后发表评论