Use webpack contrib logging

dojo · Aug 21, 2020 · bbc8d10 · bbc8d10
1 parent f3b29b6
commit bbc8d10
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/src/dist.config.ts b/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.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')
 			})
 		);
 	}

diff --git a/src/ejected.config.ts b/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;
 }

diff --git a/src/main.ts b/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,15 +11,16 @@ 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');
 import devConfigFactory from './dev.config';
 import unitConfigFactory from './unit.config';
 import functionalConfigFactory from './functional.config';
 import distConfigFactory from './dist.config';
-import logger from './logger';
 import { moveBuildOptions } from './util/eject';
+import logger from './logger';
 import { readFileSync } from 'fs';
 
 export const mainEntry = 'main';
@@ -51,13 +51,13 @@ function createCompiler(config: webpack.Configuration) {
 
 function createWatchCompiler(config: webpack.Configuration) {
 	const compiler = createCompiler(config);
-	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;
 }
@@ -83,13 +83,12 @@ function serveStatic(
 	}
 }
 
-function build(config: webpack.Configuration, args: any, spinner?: ora.Ora) {
+function build(config: webpack.Configuration, args: any) {
 	const compiler = createCompiler(config);
-	spinner = spinner || ora();
-	spinner.start('building');
+	const liveLogger = createLiveLogger('building').start();
 	return new Promise<webpack.Compiler>((resolve, reject) => {
 		compiler.run((err, stats) => {
-			spinner && spinner.stop();
+			liveLogger.stop();
 			if (err) {
 				reject(err);
 			}
@@ -361,15 +360,15 @@ const command: Command = {
 		let config: webpack.Configuration;
 		args.experimental = args.experimental || {};
 
-		const spinner = ora('building');
+		const baseLogger = createLiveLogger('building');
 		if (args.mode === 'dev') {
 			config = devConfigFactory(args);
 		} else if (args.mode === 'unit' || args.mode === 'test') {
 			config = unitConfigFactory(args);
 		} else if (args.mode === 'functional') {
 			config = functionalConfigFactory(args);
 		} else {
-			config = distConfigFactory(args, spinner);
+			config = distConfigFactory(args, baseLogger);
 		}
 
 		if (args.serve) {
@@ -383,7 +382,7 @@ const command: Command = {
 			return fileWatch(config, args);
 		}
 
-		return build(config, args, spinner);
+		return build(config, args);
 	},
 	eject(helper: Helper): EjectOutput {
 		return {

diff --git a/tests/unit/main.ts b/tests/unit/main.ts
@@ -215,8 +215,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);
 		});
 	});
@@ -246,8 +246,8 @@ describe('command', () => {
 		it('shows a building spinner', () => {
 			const main = mockModule.getModuleUnderTest().default;
 			return main.run(getMockHelper(), { watch: true }).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);
 			});
 		});