diff --git a/internals/scripts/CheckNodeEnv.js b/internals/scripts/CheckNodeEnv.js index 62bda0c8..a06be612 100644 --- a/internals/scripts/CheckNodeEnv.js +++ b/internals/scripts/CheckNodeEnv.js @@ -7,7 +7,6 @@ export default function CheckNodeEnv(expectedEnv: string) { } if (process.env.NODE_ENV !== expectedEnv) { - console.log(chalk.whiteBright.bgRed.bold(`"process.env.NODE_ENV" must be "${expectedEnv}" to use this webpack config`)) - process.exit(2) + throw new Error(chalk.whiteBright.bgRed.bold(`"process.env.NODE_ENV" must be "${expectedEnv}" to use this webpack config`)) } } diff --git a/webpack.config.renderer.dev.js b/webpack.config.renderer.dev.js index aa943d21..41478af6 100644 --- a/webpack.config.renderer.dev.js +++ b/webpack.config.renderer.dev.js @@ -10,12 +10,12 @@ import path from 'path' import fs from 'fs' import webpack from 'webpack' -import chalk from 'chalk' import merge from 'webpack-merge' import { spawn, execSync } from 'child_process' import ExtractTextPlugin from 'extract-text-webpack-plugin' import baseConfig from './webpack.config.base' import CheckNodeEnv from './internals/scripts/CheckNodeEnv' +import { mainLog } from './app/utils/log' CheckNodeEnv('development') @@ -28,7 +28,7 @@ const manifest = path.resolve(dll, 'renderer.json') * Warn if the DLL is not built */ if (!(fs.existsSync(dll) && fs.existsSync(manifest))) { - console.log(chalk.black.bgYellow.bold('The DLL files are missing. Sit back while we build them for you with "npm run build-dll"')) + mainLog.info('The DLL files are missing. Sit back while we build them for you with "npm run build-dll"') execSync('npm run build-dll') } @@ -264,14 +264,13 @@ export default merge.smart(baseConfig, { }, before() { if (process.env.START_HOT) { - console.log('Starting Main Process...') spawn( 'npm', ['run', 'start-main-dev'], { shell: true, env: process.env, stdio: 'inherit' } ) .on('close', code => process.exit(code)) - .on('error', spawnError => console.error(spawnError)) + .on('error', spawnError => mainLog.error(spawnError)) } } },