diff --git a/dist/mod00/index.js b/dist/mod00/index.js index 711adde..8080747 100644 --- a/dist/mod00/index.js +++ b/dist/mod00/index.js @@ -3,14 +3,14 @@ * This module compiles TypeScript files * -------------------------------------------- */ const q = require("smartq"); -const npmts_log_1 = require("../npmts.log"); +const plugins = require("./mod00.plugins"); const NpmtsAssets = require("./mod00.assets"); const NpmtsCheck = require("./mod00.check"); const NpmtsClean = require("./mod00.clean"); const NpmtsCompile = require("./mod00.compile"); exports.run = function (configArg) { let done = q.defer(); - npmts_log_1.npmtsOra.text('starting TypeScript Compilation'); + plugins.beautylog.ora.text('starting TypeScript Compilation'); NpmtsClean.run(configArg) .then(NpmtsCheck.run) .then(NpmtsCompile.run) diff --git a/dist/mod00/mod00.assets.js b/dist/mod00/mod00.assets.js index 1e58fbf..ef8de49 100644 --- a/dist/mod00/mod00.assets.js +++ b/dist/mod00/mod00.assets.js @@ -1,13 +1,12 @@ "use strict"; const q = require("smartq"); const paths = require("../npmts.paths"); -const npmts_log_1 = require("../npmts.log"); const plugins = require("./mod00.plugins"); const mod00_check_1 = require("../mod00/mod00.check"); exports.run = function (configArg) { let done = q.defer(); let config = configArg; - npmts_log_1.npmtsOra.text('now looking at ' + 'required assets'.yellow); + plugins.beautylog.ora.text('now looking at ' + 'required assets'.yellow); if (config.cli === true) { let mainJsPath = mod00_check_1.projectInfo.packageJson.main; let cliJsString = plugins.smartfile.fs.toStringSync(plugins.path.join(paths.npmtsAssetsDir, 'cli.js')); diff --git a/dist/mod00/mod00.check.js b/dist/mod00/mod00.check.js index ed91eef..bbc22b4 100644 --- a/dist/mod00/mod00.check.js +++ b/dist/mod00/mod00.check.js @@ -2,11 +2,10 @@ const q = require("smartq"); const projectinfo_1 = require("projectinfo"); const paths = require("../npmts.paths"); -const npmts_log_1 = require("../npmts.log"); const plugins = require("./mod00.plugins"); let checkProjectTypings = (configArg) => { let done = q.defer(); - npmts_log_1.npmtsOra.text('Check Module: Check Project Typings...'); + plugins.beautylog.ora.text('Check Module: Check Project Typings...'); exports.projectInfo = new projectinfo_1.ProjectinfoNpm(paths.cwd); if (typeof exports.projectInfo.packageJson.typings === 'undefined') { plugins.beautylog.error(`please add typings field to package.json`); @@ -32,7 +31,7 @@ const depcheckOptions = { }; let checkDependencies = (configArg) => { let done = q.defer(); - npmts_log_1.npmtsOra.text('Check Module: Check Dependencies...'); + plugins.beautylog.ora.text('Check Module: Check Dependencies...'); let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, { ignoreDirs: [ 'test', @@ -68,7 +67,7 @@ let checkDependencies = (configArg) => { }; let checkDevDependencies = (configArg) => { let done = q.defer(); - npmts_log_1.npmtsOra.text('Check Module: Check devDependencies...'); + plugins.beautylog.ora.text('Check Module: Check devDependencies...'); let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, { ignoreDirs: [ 'ts', @@ -103,13 +102,13 @@ let checkDevDependencies = (configArg) => { }; let checkNodeVersion = (configArg) => { let done = q.defer(); - npmts_log_1.npmtsOra.text('checking node version'); + plugins.beautylog.ora.text('checking node version'); done.resolve(configArg); return done.promise; }; exports.run = (configArg) => { let done = q.defer(); - npmts_log_1.npmtsOra.text('Check Module: ...'); + plugins.beautylog.ora.text('Check Module: ...'); checkProjectTypings(configArg) .then(checkDependencies) .then(checkDevDependencies) diff --git a/dist/mod00/mod00.clean.js b/dist/mod00/mod00.clean.js index c238300..28afe19 100644 --- a/dist/mod00/mod00.clean.js +++ b/dist/mod00/mod00.clean.js @@ -1,13 +1,12 @@ "use strict"; const q = require("smartq"); const paths = require("../npmts.paths"); -const npmts_log_1 = require("../npmts.log"); const plugins = require("./mod00.plugins"); /** * removes the dist directory which will be entirely rebuild */ let removeDist = function () { - npmts_log_1.npmtsOra.text('cleaning dist folder'); + plugins.beautylog.ora.text('cleaning dist folder'); return plugins.smartfile.fs.remove(paths.distDir); }; /** @@ -25,11 +24,11 @@ let removeTestDeclarations = function () { * remove old pages */ let removePages = function () { - npmts_log_1.npmtsOra.text('cleaning pages folder'); + plugins.beautylog.ora.text('cleaning pages folder'); return plugins.smartfile.fs.remove(paths.pagesDir); }; exports.run = function (configArg) { - npmts_log_1.npmtsOra.text('cleaning up from previous builds...'); + plugins.beautylog.ora.text('cleaning up from previous builds...'); let done = q.defer(); removeDist() .then(removeTestDeclarations) diff --git a/dist/mod00/mod00.compile.js b/dist/mod00/mod00.compile.js index 8b62db3..f51d55a 100644 --- a/dist/mod00/mod00.compile.js +++ b/dist/mod00/mod00.compile.js @@ -1,12 +1,11 @@ "use strict"; const q = require("smartq"); const paths = require("../npmts.paths"); -const npmts_log_1 = require("../npmts.log"); const plugins = require("./mod00.plugins"); exports.run = function (configArg) { let done = q.defer(); let config = configArg; - npmts_log_1.npmtsOra.text('now compiling ' + 'TypeScript'.yellow); + plugins.beautylog.ora.text('now compiling ' + 'TypeScript'.yellow); plugins.tsn.compileGlobStringObject(config.ts, config.tsOptions, paths.cwd) .then(() => { plugins.beautylog.ok('compiled main TypeScript!'); diff --git a/dist/mod02/index.js b/dist/mod02/index.js index 3ac2d40..cb2cad4 100644 --- a/dist/mod02/index.js +++ b/dist/mod02/index.js @@ -13,14 +13,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge const plugins = require("./mod02.plugins"); const paths = require("../npmts.paths"); const q = require("smartq"); -const npmts_log_1 = require("../npmts.log"); /** * runs mocha * @returns INpmtsConfig */ let mocha = function (configArg) { - npmts_log_1.npmtsOra.text('Instrumentalizing and testing transpiled JS'); - npmts_log_1.npmtsOra.end(); // end npmtsOra for tests. + plugins.beautylog.ora.text('Instrumentalizing and testing transpiled JS'); + plugins.beautylog.ora.end(); // end plugins.beautylog.ora for tests. let done = q.defer(); let coverageSmartstream = new plugins.smartstream.Smartstream([ plugins.gulp.src([plugins.path.join(paths.cwd, './ts/**/*.ts')]), @@ -103,7 +102,7 @@ exports.run = function (configArg) { let done = q.defer(); let config = configArg; if (config.test === true) { - npmts_log_1.npmtsOra.text('now starting tests'); + plugins.beautylog.ora.text('now starting tests'); plugins.beautylog.log('------------------------------------------------------\n' + '*************************** TESTS: ***************************\n' + '--------------------------------------------------------------'); @@ -114,7 +113,7 @@ exports.run = function (configArg) { }).catch(err => { console.log(err); }); } else { - npmts_log_1.npmtsOra.end(); + plugins.beautylog.ora.end(); done.resolve(config); } return done.promise; diff --git a/dist/npmts.cli.js b/dist/npmts.cli.js index b6dabc7..649136e 100644 --- a/dist/npmts.cli.js +++ b/dist/npmts.cli.js @@ -6,7 +6,6 @@ const NpmtsConfig = require("./npmts.config"); const NpmtsMods = require("./npmts.mods"); const NpmtsWatch = require("./npmts.watch"); const NpmtsShip = require("./npmts.ship"); -const npmts_log_1 = require("./npmts.log"); exports.run = () => { let done = q.defer(); let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot); @@ -19,7 +18,7 @@ exports.run = () => { }) .then((configArg) => { let done = q.defer(); - npmts_log_1.npmtsOra.start('loading additional modules...'); + plugins.beautylog.ora.start('loading additional modules...'); NpmtsMods.mod00.load() .then((mod00) => { return mod00.run(configArg); diff --git a/dist/npmts.config.js b/dist/npmts.config.js index 26cd74b..6c12ac2 100644 --- a/dist/npmts.config.js +++ b/dist/npmts.config.js @@ -2,7 +2,6 @@ const plugins = require("./npmts.plugins"); const paths = require("./npmts.paths"); const q = require("smartq"); -const npmts_log_1 = require("./npmts.log"); ; exports.run = function (argvArg) { let done = q.defer(); @@ -17,7 +16,7 @@ exports.run = function (argvArg) { watch: false }; // mix with configfile - npmts_log_1.npmtsOra.text('running npmextra'); + plugins.beautylog.ora.text('running npmextra'); let localNpmextra = new plugins.npmextra.Npmextra(paths.cwd); let config = localNpmextra.dataFor('npmts', defaultConfig); // add argv diff --git a/dist/npmts.log.d.ts b/dist/npmts.log.d.ts deleted file mode 100644 index a9f65ec..0000000 --- a/dist/npmts.log.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import { Ora } from 'beautylog'; -export declare let npmtsOra: Ora; diff --git a/dist/npmts.log.js b/dist/npmts.log.js deleted file mode 100644 index b1bb9cf..0000000 --- a/dist/npmts.log.js +++ /dev/null @@ -1,3 +0,0 @@ -"use strict"; -const beautylog_1 = require("beautylog"); -exports.npmtsOra = new beautylog_1.Ora('setting up TaskChain', 'cyan'); diff --git a/package.json b/package.json index f58ba50..fc7e4e4 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@types/gulp-sourcemaps": "0.0.29", "@types/minimatch": "^2.0.29", "@types/through2": "^2.0.32", - "beautylog": "6.0.6", + "beautylog": "6.1.0", "depcheck": "^0.6.7", "early": "^2.0.35", "gulp": "3.9.1", diff --git a/ts/mod00/index.ts b/ts/mod00/index.ts index 85e0307..b5be7c7 100644 --- a/ts/mod00/index.ts +++ b/ts/mod00/index.ts @@ -3,7 +3,6 @@ * -------------------------------------------- */ import * as q from 'smartq' -import { npmtsOra } from '../npmts.log' import { INpmtsConfig } from '../npmts.config' import * as plugins from './mod00.plugins' @@ -15,7 +14,7 @@ import * as NpmtsCompile from './mod00.compile' export let run = function(configArg: INpmtsConfig): Promise { let done = q.defer() - npmtsOra.text('starting TypeScript Compilation') + plugins.beautylog.ora.text('starting TypeScript Compilation') NpmtsClean.run(configArg) .then(NpmtsCheck.run) .then(NpmtsCompile.run) diff --git a/ts/mod00/mod00.assets.ts b/ts/mod00/mod00.assets.ts index af9811c..a794ed1 100644 --- a/ts/mod00/mod00.assets.ts +++ b/ts/mod00/mod00.assets.ts @@ -1,7 +1,6 @@ import * as q from 'smartq' import paths = require('../npmts.paths') -import { npmtsOra } from '../npmts.log' import plugins = require('./mod00.plugins') import { projectInfo } from '../mod00/mod00.check' @@ -9,7 +8,7 @@ import { projectInfo } from '../mod00/mod00.check' export let run = function(configArg){ let done = q.defer() let config = configArg - npmtsOra.text('now looking at ' + 'required assets'.yellow) + plugins.beautylog.ora.text('now looking at ' + 'required assets'.yellow) if (config.cli === true) { let mainJsPath = projectInfo.packageJson.main let cliJsString: string = plugins.smartfile.fs.toStringSync(plugins.path.join(paths.npmtsAssetsDir,'cli.js')) diff --git a/ts/mod00/mod00.check.ts b/ts/mod00/mod00.check.ts index f8ecbc3..7c7c63e 100644 --- a/ts/mod00/mod00.check.ts +++ b/ts/mod00/mod00.check.ts @@ -2,7 +2,6 @@ import * as q from 'smartq' import { ProjectinfoNpm } from 'projectinfo' import * as paths from '../npmts.paths' -import { npmtsOra } from '../npmts.log' import * as plugins from './mod00.plugins' @@ -10,7 +9,7 @@ export let projectInfo: ProjectinfoNpm let checkProjectTypings = (configArg) => { let done = q.defer() - npmtsOra.text('Check Module: Check Project Typings...') + plugins.beautylog.ora.text('Check Module: Check Project Typings...') projectInfo = new ProjectinfoNpm(paths.cwd) if (typeof projectInfo.packageJson.typings === 'undefined') { plugins.beautylog.error(`please add typings field to package.json`) @@ -37,7 +36,7 @@ const depcheckOptions = { let checkDependencies = (configArg) => { let done = q.defer() - npmtsOra.text('Check Module: Check Dependencies...') + plugins.beautylog.ora.text('Check Module: Check Dependencies...') let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, { ignoreDirs: [ // folder with these names will be ignored 'test', @@ -73,7 +72,7 @@ let checkDependencies = (configArg) => { let checkDevDependencies = (configArg) => { let done = q.defer() - npmtsOra.text('Check Module: Check devDependencies...') + plugins.beautylog.ora.text('Check Module: Check devDependencies...') let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, { ignoreDirs: [ // folder with these names will be ignored 'ts', @@ -109,14 +108,14 @@ let checkDevDependencies = (configArg) => { let checkNodeVersion = (configArg) => { let done = q.defer() - npmtsOra.text('checking node version') + plugins.beautylog.ora.text('checking node version') done.resolve(configArg) return done.promise } export let run = (configArg) => { let done = q.defer() - npmtsOra.text('Check Module: ...') + plugins.beautylog.ora.text('Check Module: ...') checkProjectTypings(configArg) .then(checkDependencies) .then(checkDevDependencies) diff --git a/ts/mod00/mod00.clean.ts b/ts/mod00/mod00.clean.ts index f585536..964896a 100644 --- a/ts/mod00/mod00.clean.ts +++ b/ts/mod00/mod00.clean.ts @@ -1,15 +1,13 @@ import * as q from 'smartq' import paths = require('../npmts.paths') -import { npmtsOra } from '../npmts.log' - import plugins = require('./mod00.plugins') /** * removes the dist directory which will be entirely rebuild */ let removeDist = function () { - npmtsOra.text('cleaning dist folder') + plugins.beautylog.ora.text('cleaning dist folder') return plugins.smartfile.fs.remove(paths.distDir) } @@ -29,12 +27,12 @@ let removeTestDeclarations = function () { * remove old pages */ let removePages = function () { - npmtsOra.text('cleaning pages folder') + plugins.beautylog.ora.text('cleaning pages folder') return plugins.smartfile.fs.remove(paths.pagesDir) } export let run = function (configArg) { - npmtsOra.text('cleaning up from previous builds...') + plugins.beautylog.ora.text('cleaning up from previous builds...') let done = q.defer() removeDist() .then(removeTestDeclarations) diff --git a/ts/mod00/mod00.compile.ts b/ts/mod00/mod00.compile.ts index dab1929..e8c1164 100644 --- a/ts/mod00/mod00.compile.ts +++ b/ts/mod00/mod00.compile.ts @@ -1,14 +1,13 @@ import * as q from 'smartq' import * as paths from '../npmts.paths' -import { npmtsOra } from '../npmts.log' import * as plugins from './mod00.plugins' export let run = function (configArg) { let done = q.defer() let config = configArg - npmtsOra.text('now compiling ' + 'TypeScript'.yellow) + plugins.beautylog.ora.text('now compiling ' + 'TypeScript'.yellow) plugins.tsn.compileGlobStringObject(config.ts,config.tsOptions,paths.cwd) .then(() => { plugins.beautylog.ok('compiled main TypeScript!') diff --git a/ts/mod01/index.ts b/ts/mod01/index.ts index cf0d37c..fa6a9a5 100644 --- a/ts/mod01/index.ts +++ b/ts/mod01/index.ts @@ -4,7 +4,6 @@ import * as q from 'smartq' import * as paths from '../npmts.paths' -import { npmtsOra } from '../npmts.log' import { INpmtsConfig } from '../npmts.config' import * as plugins from './mod01.plugins' diff --git a/ts/mod02/index.ts b/ts/mod02/index.ts index 793eed3..7812d55 100644 --- a/ts/mod02/index.ts +++ b/ts/mod02/index.ts @@ -6,7 +6,6 @@ import paths = require('../npmts.paths') import * as q from 'smartq' -import { npmtsOra } from '../npmts.log' import { INpmtsConfig } from '../npmts.config' /** @@ -14,8 +13,8 @@ import { INpmtsConfig } from '../npmts.config' * @returns INpmtsConfig */ let mocha = function (configArg: INpmtsConfig) { - npmtsOra.text('Instrumentalizing and testing transpiled JS') - npmtsOra.end() // end npmtsOra for tests. + plugins.beautylog.ora.text('Instrumentalizing and testing transpiled JS') + plugins.beautylog.ora.end() // end plugins.beautylog.ora for tests. let done = q.defer() let coverageSmartstream = new plugins.smartstream.Smartstream([ @@ -108,7 +107,7 @@ export let run = function (configArg: INpmtsConfig) { let done = q.defer() let config = configArg if (config.test === true) { - npmtsOra.text('now starting tests') + plugins.beautylog.ora.text('now starting tests') plugins.beautylog.log( '------------------------------------------------------\n' + '*************************** TESTS: ***************************\n' + @@ -121,7 +120,7 @@ export let run = function (configArg: INpmtsConfig) { done.resolve(config) }).catch(err => { console.log(err) }) } else { - npmtsOra.end() + plugins.beautylog.ora.end() done.resolve(config) } return done.promise diff --git a/ts/npmts.cli.ts b/ts/npmts.cli.ts index f516e5a..a107504 100644 --- a/ts/npmts.cli.ts +++ b/ts/npmts.cli.ts @@ -7,8 +7,6 @@ import * as NpmtsMods from './npmts.mods' import * as NpmtsWatch from './npmts.watch' import * as NpmtsShip from './npmts.ship' -import { npmtsOra } from './npmts.log' - export let run = () => { let done = q.defer() let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot) @@ -21,7 +19,7 @@ export let run = () => { }) .then((configArg: NpmtsConfig.INpmtsConfig) => { let done = q.defer() - npmtsOra.start('loading additional modules...') + plugins.beautylog.ora.start('loading additional modules...') NpmtsMods.mod00.load() .then((mod00) => { return mod00.run(configArg) diff --git a/ts/npmts.config.ts b/ts/npmts.config.ts index f0d0d92..a154765 100644 --- a/ts/npmts.config.ts +++ b/ts/npmts.config.ts @@ -3,8 +3,6 @@ import paths = require('./npmts.paths') import * as q from 'smartq' -import { npmtsOra } from './npmts.log' - export type npmtsMode = 'default' | 'custom' export interface INpmtsConfig { @@ -33,7 +31,7 @@ export let run = function (argvArg) { } // mix with configfile - npmtsOra.text('running npmextra') + plugins.beautylog.ora.text('running npmextra') let localNpmextra = new plugins.npmextra.Npmextra(paths.cwd) let config: INpmtsConfig = localNpmextra.dataFor( diff --git a/ts/npmts.log.ts b/ts/npmts.log.ts deleted file mode 100644 index a92cae1..0000000 --- a/ts/npmts.log.ts +++ /dev/null @@ -1,2 +0,0 @@ -import {Ora} from 'beautylog' -export let npmtsOra = new Ora('setting up TaskChain','cyan')