Browse Source

enhance(logging): Output webpack errors to the main log

Rather than console.log

In case of CheckNodeEnv, throw rather than console.log and exit.
renovate/lint-staged-8.x
Ben Woosley 7 years ago
parent
commit
81e1b2ec78
No known key found for this signature in database GPG Key ID: 6EE5F3785F78B345
  1. 3
      internals/scripts/CheckNodeEnv.js
  2. 7
      webpack.config.renderer.dev.js

3
internals/scripts/CheckNodeEnv.js

@ -7,7 +7,6 @@ export default function CheckNodeEnv(expectedEnv: string) {
} }
if (process.env.NODE_ENV !== expectedEnv) { if (process.env.NODE_ENV !== expectedEnv) {
console.log(chalk.whiteBright.bgRed.bold(`"process.env.NODE_ENV" must be "${expectedEnv}" to use this webpack config`)) throw new Error(chalk.whiteBright.bgRed.bold(`"process.env.NODE_ENV" must be "${expectedEnv}" to use this webpack config`))
process.exit(2)
} }
} }

7
webpack.config.renderer.dev.js

@ -10,12 +10,12 @@
import path from 'path' import path from 'path'
import fs from 'fs' import fs from 'fs'
import webpack from 'webpack' import webpack from 'webpack'
import chalk from 'chalk'
import merge from 'webpack-merge' import merge from 'webpack-merge'
import { spawn, execSync } from 'child_process' import { spawn, execSync } from 'child_process'
import ExtractTextPlugin from 'extract-text-webpack-plugin' import ExtractTextPlugin from 'extract-text-webpack-plugin'
import baseConfig from './webpack.config.base' import baseConfig from './webpack.config.base'
import CheckNodeEnv from './internals/scripts/CheckNodeEnv' import CheckNodeEnv from './internals/scripts/CheckNodeEnv'
import { mainLog } from './app/utils/log'
CheckNodeEnv('development') CheckNodeEnv('development')
@ -28,7 +28,7 @@ const manifest = path.resolve(dll, 'renderer.json')
* Warn if the DLL is not built * Warn if the DLL is not built
*/ */
if (!(fs.existsSync(dll) && fs.existsSync(manifest))) { 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') execSync('npm run build-dll')
} }
@ -264,14 +264,13 @@ export default merge.smart(baseConfig, {
}, },
before() { before() {
if (process.env.START_HOT) { if (process.env.START_HOT) {
console.log('Starting Main Process...')
spawn( spawn(
'npm', 'npm',
['run', 'start-main-dev'], ['run', 'start-main-dev'],
{ shell: true, env: process.env, stdio: 'inherit' } { shell: true, env: process.env, stdio: 'inherit' }
) )
.on('close', code => process.exit(code)) .on('close', code => process.exit(code))
.on('error', spawnError => console.error(spawnError)) .on('error', spawnError => mainLog.error(spawnError))
} }
} }
}, },

Loading…
Cancel
Save