Use webpack contrib logging

Author: maier49

src/dist.config.ts

@@ -18,8 +18,8 @@ import baseConfigFactory, {
 	packageName,
 	libraryName
 } from './base.config';
+import { LiveLogger } from '@dojo/webpack-contrib/logger/logger';
 import { WebAppManifest } from './interfaces';
-import * as ora from 'ora';
 
 const CompressionPlugin = require('compression-webpack-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
@@ -32,7 +32,7 @@ Copyright [JS Foundation](https://js.foundation/) & contributors
 All rights reserved
 `;
 
-function webpackConfig(args: any, spinner?: ora.Ora): webpack.Configuration {
+function webpackConfig(args: any, logger: LiveLogger): webpack.Configuration {
 	const basePath = process.cwd();
 	const base = args.target === 'electron' ? './' : args.base || '/';
 	const config = baseConfigFactory(args);
@@ -155,7 +155,7 @@ function webpackConfig(args: any, spinner?: ora.Ora): webpack.Configuration {
 				baseUrl: base,
 				scope: libraryName,
 				onDemand: Boolean(args.serve && args.watch),
-				spinner
+				logger: logger('BTR')
 			})
 		);
 	}

src/ejected.config.ts

@@ -1,4 +1,5 @@
 import * as webpack from 'webpack';
+import createLiveLogger from '@dojo/webpack-contrib/logger/logger';
 
 import devConfigFactory from './dev.config';
 import distConfigFactory from './dist.config';
@@ -20,7 +21,7 @@ function webpackConfig(env: EnvOptions = {}): webpack.Configuration {
 	} else if (mode === 'functional') {
 		config = functionalConfigFactory(rc);
 	} else {
-		config = distConfigFactory(rc);
+		config = distConfigFactory(rc, createLiveLogger('building'));
 	}
 	return config;
 }

src/main.ts

@@ -1,7 +1,6 @@
 import { Command, EjectOutput, Helper, OptionsHelper } from '@dojo/cli/interfaces';
 import * as express from 'express';
 import * as logUpdate from 'log-update';
-import * as ora from 'ora';
 import * as path from 'path';
 import * as url from 'url';
 import * as webpack from 'webpack';
@@ -12,6 +11,7 @@ import * as expressCompression from 'compression';
 import * as proxy from 'http-proxy-middleware';
 import * as history from 'connect-history-api-fallback';
 import OnDemandBtr from '@dojo/webpack-contrib/build-time-render/BuildTimeRenderMiddleware';
+import createLiveLogger from '@dojo/webpack-contrib/logger/logger';
 
 const pkgDir = require('pkg-dir');
 const expressStaticGzip = require('express-static-gzip');
@@ -22,6 +22,7 @@ import distConfigFactory from './dist.config';
 import electronConfigFactory from './electron.config';
 import logger from './logger';
 import { moveBuildOptions } from './util/eject';
+import logger from './logger';
 import { readFileSync } from 'fs';
 
 const packageJsonPath = path.join(process.cwd(), 'package.json');
@@ -50,13 +51,13 @@ interface MultiCompilerWithHooks extends webpack.MultiCompiler {
 
 function createWatchCompiler(configs: webpack.Configuration[]) {
 	const compiler = webpack(configs) as MultiCompilerWithHooks;
-	const spinner = ora('building').start();
+	const liveLogger = createLiveLogger('building').start();
 	compiler.hooks.invalid.tap('@dojo/cli-build-app', () => {
 		logUpdate('');
-		spinner.start();
+		liveLogger.start();
 	});
 	compiler.hooks.done.tap('@dojo/cli-build-app', () => {
-		spinner.stop();
+		liveLogger.stop();
 	});
 	return compiler;
 }
@@ -84,11 +85,10 @@ function serveStatic(
 
 function build(configs: webpack.Configuration[], args: any, spinner?: ora.Ora) {
 	const compiler = webpack(configs);
-	spinner = spinner || ora();
-	spinner.start('building');
+	const liveLogger = createLiveLogger('building').start();
 	return new Promise<webpack.MultiCompiler>((resolve, reject) => {
 		compiler.run((err, stats) => {
-			spinner && spinner.stop();
+			liveLogger.stop();
 			if (err) {
 				reject(err);
 			}
@@ -377,15 +377,15 @@ const command: Command = {
 			args.base = `${args.base}/`;
 		}
 
-		const spinner = ora('building');
+		const baseLogger = createLiveLogger('building');
 		if (args.mode === 'dev') {
 			configs.push(devConfigFactory(args));
 		} else if (args.mode === 'unit' || args.mode === 'test') {
 			configs.push(unitConfigFactory(args));
 		} else if (args.mode === 'functional') {
 			configs.push(functionalConfigFactory(args));
 		} else {
-			configs.push(distConfigFactory(args, spinner));
+			configs.push(distConfigFactory(args, baseLogger));
 		}
 
 		if (args.target === 'electron') {
@@ -403,7 +403,7 @@ const command: Command = {
 			return fileWatch(configs, args);
 		}
 
-		return build(configs, args, spinner);
+		return build(configs, args);
 	},
 	eject(helper: Helper): EjectOutput {
 		return {

tests/unit/main.ts

@@ -228,8 +228,8 @@ describe('command', () => {
 	it('shows a building spinner on start', () => {
 		const main = mockModule.getModuleUnderTest().default;
 		return main.run(getMockHelper(), {}).then(() => {
-			assert.isTrue(mockModule.getMock('ora').ctor.calledWith('building'));
-			assert.isTrue(mockSpinner.start.called);
+			assert.isTrue(mockModule.getMock('ora').ctor.called);
+			assert.isTrue(mockSpinner.start.calledWith('building'));
 			assert.isTrue(mockSpinner.stop.called);
 		});
 	});
@@ -273,8 +273,8 @@ describe('command', () => {
 			);
 			setTimeout(
 				dfd.callback(() => {
-					assert.isTrue(mockModule.getMock('ora').ctor.calledWith('building'));
-					assert.isTrue(mockSpinner.start.called);
+					assert.isTrue(mockModule.getMock('ora').ctor.called);
+					assert.isTrue(mockSpinner.start.calledWith('building'));
 					assert.isTrue(mockSpinner.stop.called);
 				}),
 				1000