aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-12-19 22:32:04 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-12-19 22:41:49 +0800
commit85be2fbf19ef937709f747b0c9169a2cf3e6697e (patch)
treed30f38a72403cb9736fbe9218ef1725f0e80b538
parent69de1d05efcadc1a6e70e98a0e77f32e8976560e (diff)
downloaddexon-sol-tools-85be2fbf19ef937709f747b0c9169a2cf3e6697e.tar
dexon-sol-tools-85be2fbf19ef937709f747b0c9169a2cf3e6697e.tar.gz
dexon-sol-tools-85be2fbf19ef937709f747b0c9169a2cf3e6697e.tar.bz2
dexon-sol-tools-85be2fbf19ef937709f747b0c9169a2cf3e6697e.tar.lz
dexon-sol-tools-85be2fbf19ef937709f747b0c9169a2cf3e6697e.tar.xz
dexon-sol-tools-85be2fbf19ef937709f747b0c9169a2cf3e6697e.tar.zst
dexon-sol-tools-85be2fbf19ef937709f747b0c9169a2cf3e6697e.zip
Move logWithTime to logUtils
-rw-r--r--packages/sol-compiler/src/compiler.ts10
-rw-r--r--packages/sol-compiler/src/utils/utils.ts6
-rw-r--r--packages/utils/CHANGELOG.json9
-rw-r--r--packages/utils/package.json1
-rw-r--r--packages/utils/src/log_utils.ts5
5 files changed, 20 insertions, 11 deletions
diff --git a/packages/sol-compiler/src/compiler.ts b/packages/sol-compiler/src/compiler.ts
index 519712e20..eca887ce9 100644
--- a/packages/sol-compiler/src/compiler.ts
+++ b/packages/sol-compiler/src/compiler.ts
@@ -134,18 +134,18 @@ export class Compiler {
}
public async watchAsync(): Promise<void> {
console.clear(); // tslint:disable-line:no-console
- utils.logWithTime('Starting compilation in watch mode...');
+ logUtils.logWithTime('Starting compilation in watch mode...');
const watcher = chokidar.watch('^$', { ignored: /(^|[\/\\])\../ });
const onFileChangedAsync = async () => {
watcher.unwatch('*'); // Stop watching
try {
await this.compileAsync();
- utils.logWithTime('Found 0 errors. Watching for file changes.');
+ logUtils.logWithTime('Found 0 errors. Watching for file changes.');
} catch (err) {
if (err.typeName === 'CompilationError') {
- utils.logWithTime(`Found ${err.errorsCount} ${pluralize('error', err.errorsCount)}. Watching for file changes.`);
+ logUtils.logWithTime(`Found ${err.errorsCount} ${pluralize('error', err.errorsCount)}. Watching for file changes.`);
} else {
- utils.logWithTime('Found errors. Watching for file changes.');
+ logUtils.logWithTime('Found errors. Watching for file changes.');
}
}
@@ -155,7 +155,7 @@ export class Compiler {
await onFileChangedAsync();
watcher.on('change', (changedFilePath: string) => {
console.clear(); // tslint:disable-line:no-console
- utils.logWithTime('File change detected. Starting incremental compilation...');
+ logUtils.logWithTime('File change detected. Starting incremental compilation...');
// NOTE: We can't await it here because that's a callback.
// Instead we stop watching inside of it and start it again when we're finished.
onFileChangedAsync(); // tslint:disable-line no-floating-promises
diff --git a/packages/sol-compiler/src/utils/utils.ts b/packages/sol-compiler/src/utils/utils.ts
index 538efc61a..4f2de2caa 100644
--- a/packages/sol-compiler/src/utils/utils.ts
+++ b/packages/sol-compiler/src/utils/utils.ts
@@ -1,12 +1,6 @@
-import { logUtils } from '@0x/utils';
-import chalk from 'chalk';
-
export const utils = {
stringifyWithFormatting(obj: any): string {
const stringifiedObj = JSON.stringify(obj, null, '\t');
return stringifiedObj;
},
- logWithTime(arg: string): void {
- logUtils.log(`[${chalk.gray(new Date().toLocaleTimeString())}] ${arg}`);
- },
};
diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json
index fe66d3f31..605151fb6 100644
--- a/packages/utils/CHANGELOG.json
+++ b/packages/utils/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "version": "2.1.0",
+ "changes": [
+ {
+ "note": "Add `logWithTime` to `logUtils`",
+ "pr": 1461
+ }
+ ]
+ },
+ {
"version": "2.0.8",
"changes": [
{
diff --git a/packages/utils/package.json b/packages/utils/package.json
index a25dc9cff..5ffec049a 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -49,6 +49,7 @@
"@types/node": "*",
"abortcontroller-polyfill": "^1.1.9",
"bignumber.js": "~4.1.0",
+ "chalk": "^2.4.1",
"detect-node": "2.0.3",
"ethereum-types": "^1.1.4",
"ethereumjs-util": "^5.1.1",
diff --git a/packages/utils/src/log_utils.ts b/packages/utils/src/log_utils.ts
index 87f8479b5..6d9996c67 100644
--- a/packages/utils/src/log_utils.ts
+++ b/packages/utils/src/log_utils.ts
@@ -1,3 +1,5 @@
+import chalk from 'chalk';
+
export const logUtils = {
log(...args: any[]): void {
console.log(...args); // tslint:disable-line:no-console
@@ -5,4 +7,7 @@ export const logUtils = {
warn(...args: any[]): void {
console.warn(...args); // tslint:disable-line:no-console
},
+ logWithTime(arg: string): void {
+ logUtils.log(`[${chalk.gray(new Date().toLocaleTimeString())}] ${arg}`);
+ },
};