From 9a25b4ef9112c8a0d7b6a6883902488f0dfeb91b Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Wed, 18 Jan 2017 00:58:09 +0100 Subject: [PATCH] remove q in favour of smartq --- dist/mod00/index.d.ts | 4 +--- dist/mod00/index.js | 2 +- dist/mod00/mod00.assets.d.ts | 4 +--- dist/mod00/mod00.assets.js | 2 +- dist/mod00/mod00.check.d.ts | 4 +--- dist/mod00/mod00.check.js | 2 +- dist/mod00/mod00.clean.d.ts | 4 +--- dist/mod00/mod00.clean.js | 2 +- dist/mod00/mod00.compile.d.ts | 4 +--- dist/mod00/mod00.compile.js | 2 +- dist/mod01/index.d.ts | 4 +--- dist/mod01/index.js | 2 +- dist/mod02/index.d.ts | 4 +--- dist/mod02/index.js | 6 +++--- dist/npmts.cli.d.ts | 4 +--- dist/npmts.cli.js | 2 +- dist/npmts.config.d.ts | 4 +--- dist/npmts.config.js | 2 +- dist/npmts.ship.js | 2 +- dist/npmts.watch.d.ts | 4 +--- dist/npmts.watch.js | 2 +- package.json | 3 +-- ts/mod00/index.ts | 4 ++-- ts/mod00/mod00.assets.ts | 4 ++-- ts/mod00/mod00.check.ts | 4 ++-- ts/mod00/mod00.clean.ts | 2 +- ts/mod00/mod00.compile.ts | 2 +- ts/mod01/index.ts | 2 +- ts/mod02/index.ts | 2 +- ts/npmts.cli.ts | 2 +- ts/npmts.config.ts | 4 ++-- ts/npmts.ship.ts | 2 +- ts/npmts.watch.ts | 2 +- 33 files changed, 39 insertions(+), 60 deletions(-) diff --git a/dist/mod00/index.d.ts b/dist/mod00/index.d.ts index 1a5cec1..aa3ff3b 100644 --- a/dist/mod00/index.d.ts +++ b/dist/mod00/index.d.ts @@ -1,4 +1,2 @@ -/// -import * as q from 'q'; import { INpmtsConfig } from '../npmts.config'; -export declare let run: (configArg: INpmtsConfig) => q.Promise; +export declare let run: (configArg: INpmtsConfig) => Promise; diff --git a/dist/mod00/index.js b/dist/mod00/index.js index afb4544..711adde 100644 --- a/dist/mod00/index.js +++ b/dist/mod00/index.js @@ -2,7 +2,7 @@ /* ------------------------------------------ * This module compiles TypeScript files * -------------------------------------------- */ -const q = require("q"); +const q = require("smartq"); const npmts_log_1 = require("../npmts.log"); const NpmtsAssets = require("./mod00.assets"); const NpmtsCheck = require("./mod00.check"); diff --git a/dist/mod00/mod00.assets.d.ts b/dist/mod00/mod00.assets.d.ts index c5dc5a4..2fea5ab 100644 --- a/dist/mod00/mod00.assets.d.ts +++ b/dist/mod00/mod00.assets.d.ts @@ -1,3 +1 @@ -/// -import * as q from 'q'; -export declare var run: (configArg: any) => q.Promise<{}>; +export declare let run: (configArg: any) => Promise<{}>; diff --git a/dist/mod00/mod00.assets.js b/dist/mod00/mod00.assets.js index d6c375e..1e58fbf 100644 --- a/dist/mod00/mod00.assets.js +++ b/dist/mod00/mod00.assets.js @@ -1,5 +1,5 @@ "use strict"; -const q = require("q"); +const q = require("smartq"); const paths = require("../npmts.paths"); const npmts_log_1 = require("../npmts.log"); const plugins = require("./mod00.plugins"); diff --git a/dist/mod00/mod00.check.d.ts b/dist/mod00/mod00.check.d.ts index 46a8c3f..f52bcae 100644 --- a/dist/mod00/mod00.check.d.ts +++ b/dist/mod00/mod00.check.d.ts @@ -1,5 +1,3 @@ -/// -import * as q from 'q'; import { ProjectinfoNpm } from 'projectinfo'; export declare let projectInfo: ProjectinfoNpm; -export declare let run: (configArg: any) => q.Promise<{}>; +export declare let run: (configArg: any) => Promise<{}>; diff --git a/dist/mod00/mod00.check.js b/dist/mod00/mod00.check.js index c28af99..ed91eef 100644 --- a/dist/mod00/mod00.check.js +++ b/dist/mod00/mod00.check.js @@ -1,5 +1,5 @@ "use strict"; -const q = require("q"); +const q = require("smartq"); const projectinfo_1 = require("projectinfo"); const paths = require("../npmts.paths"); const npmts_log_1 = require("../npmts.log"); diff --git a/dist/mod00/mod00.clean.d.ts b/dist/mod00/mod00.clean.d.ts index 3f12cb0..2fea5ab 100644 --- a/dist/mod00/mod00.clean.d.ts +++ b/dist/mod00/mod00.clean.d.ts @@ -1,3 +1 @@ -/// -import * as q from 'q'; -export declare let run: (configArg: any) => q.Promise<{}>; +export declare let run: (configArg: any) => Promise<{}>; diff --git a/dist/mod00/mod00.clean.js b/dist/mod00/mod00.clean.js index 7baeada..c238300 100644 --- a/dist/mod00/mod00.clean.js +++ b/dist/mod00/mod00.clean.js @@ -1,5 +1,5 @@ "use strict"; -const q = require("q"); +const q = require("smartq"); const paths = require("../npmts.paths"); const npmts_log_1 = require("../npmts.log"); const plugins = require("./mod00.plugins"); diff --git a/dist/mod00/mod00.compile.d.ts b/dist/mod00/mod00.compile.d.ts index 3f12cb0..2fea5ab 100644 --- a/dist/mod00/mod00.compile.d.ts +++ b/dist/mod00/mod00.compile.d.ts @@ -1,3 +1 @@ -/// -import * as q from 'q'; -export declare let run: (configArg: any) => q.Promise<{}>; +export declare let run: (configArg: any) => Promise<{}>; diff --git a/dist/mod00/mod00.compile.js b/dist/mod00/mod00.compile.js index 93de4fa..8b62db3 100644 --- a/dist/mod00/mod00.compile.js +++ b/dist/mod00/mod00.compile.js @@ -1,5 +1,5 @@ "use strict"; -const q = require("q"); +const q = require("smartq"); const paths = require("../npmts.paths"); const npmts_log_1 = require("../npmts.log"); const plugins = require("./mod00.plugins"); diff --git a/dist/mod01/index.d.ts b/dist/mod01/index.d.ts index 1a5cec1..aa3ff3b 100644 --- a/dist/mod01/index.d.ts +++ b/dist/mod01/index.d.ts @@ -1,4 +1,2 @@ -/// -import * as q from 'q'; import { INpmtsConfig } from '../npmts.config'; -export declare let run: (configArg: INpmtsConfig) => q.Promise; +export declare let run: (configArg: INpmtsConfig) => Promise; diff --git a/dist/mod01/index.js b/dist/mod01/index.js index 0292651..8dd21f5 100644 --- a/dist/mod01/index.js +++ b/dist/mod01/index.js @@ -2,7 +2,7 @@ /* ------------------------------------------ * This module creates TypeScript documentation * -------------------------------------------- */ -const q = require("q"); +const q = require("smartq"); exports.run = function (configArg) { let done = q.defer(); done.resolve(configArg); diff --git a/dist/mod02/index.d.ts b/dist/mod02/index.d.ts index 1a5cec1..aa3ff3b 100644 --- a/dist/mod02/index.d.ts +++ b/dist/mod02/index.d.ts @@ -1,4 +1,2 @@ -/// -import * as q from 'q'; import { INpmtsConfig } from '../npmts.config'; -export declare let run: (configArg: INpmtsConfig) => q.Promise; +export declare let run: (configArg: INpmtsConfig) => Promise; diff --git a/dist/mod02/index.js b/dist/mod02/index.js index bb9a930..6a23e86 100644 --- a/dist/mod02/index.js +++ b/dist/mod02/index.js @@ -12,7 +12,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge * -------------------------------------------- */ const plugins = require("./mod02.plugins"); const paths = require("../npmts.paths"); -const q = require("q"); +const q = require("smartq"); const npmts_log_1 = require("../npmts.log"); /** * runs mocha @@ -29,7 +29,7 @@ let mocha = function (configArg) { target: 'ES5', emitDecoratorMetadata: true, experimentalDecorators: true, - lib: ['ES2015.Promise', 'ES5', 'ES2015.Generator'] + lib: ['ES2015.Promise', 'ES5', 'ES2015.Generator', 'ES2015.Iterable'] }), plugins.gulpIstanbul({}), plugins.gulpSourcemaps.write(), @@ -49,7 +49,7 @@ let mocha = function (configArg) { target: 'ES5', emitDecoratorMetadata: true, experimentalDecorators: true, - lib: ['ES2015.Promise', 'ES5', 'ES2015.Generator'] + lib: ['ES2015.Promise', 'ES5', 'ES2015.Generator', 'ES2015.Iterable'] }), plugins.gulpInjectModules(), plugins.gulpMocha(), diff --git a/dist/npmts.cli.d.ts b/dist/npmts.cli.d.ts index 138ced2..c9fa9e1 100644 --- a/dist/npmts.cli.d.ts +++ b/dist/npmts.cli.d.ts @@ -1,3 +1 @@ -/// -import * as q from 'q'; -export declare let run: () => q.Promise<{}>; +export declare let run: () => Promise<{}>; diff --git a/dist/npmts.cli.js b/dist/npmts.cli.js index 47a220b..b6dabc7 100644 --- a/dist/npmts.cli.js +++ b/dist/npmts.cli.js @@ -1,5 +1,5 @@ "use strict"; -const q = require("q"); +const q = require("smartq"); const plugins = require("./npmts.plugins"); const paths = require("./npmts.paths"); const NpmtsConfig = require("./npmts.config"); diff --git a/dist/npmts.config.d.ts b/dist/npmts.config.d.ts index 0e0ad25..888f07a 100644 --- a/dist/npmts.config.d.ts +++ b/dist/npmts.config.d.ts @@ -1,5 +1,3 @@ -/// -import * as q from 'q'; export declare type npmtsMode = 'default' | 'custom'; export interface INpmtsConfig { argv: any; @@ -11,4 +9,4 @@ export interface INpmtsConfig { tsOptions: any; watch: boolean; } -export declare var run: (argvArg: any) => q.Promise<{}>; +export declare let run: (argvArg: any) => Promise<{}>; diff --git a/dist/npmts.config.js b/dist/npmts.config.js index e0ea569..26cd74b 100644 --- a/dist/npmts.config.js +++ b/dist/npmts.config.js @@ -1,7 +1,7 @@ "use strict"; const plugins = require("./npmts.plugins"); const paths = require("./npmts.paths"); -const q = require("q"); +const q = require("smartq"); const npmts_log_1 = require("./npmts.log"); ; exports.run = function (argvArg) { diff --git a/dist/npmts.ship.js b/dist/npmts.ship.js index e94ba87..cd045b5 100644 --- a/dist/npmts.ship.js +++ b/dist/npmts.ship.js @@ -1,5 +1,5 @@ "use strict"; -const q = require("q"); +const q = require("smartq"); const plugins = require("./npmts.plugins"); exports.run = (configArg) => { let done = q.defer(); diff --git a/dist/npmts.watch.d.ts b/dist/npmts.watch.d.ts index ca10474..fc1e64d 100644 --- a/dist/npmts.watch.d.ts +++ b/dist/npmts.watch.d.ts @@ -1,4 +1,2 @@ -/// -import * as q from 'q'; import { INpmtsConfig } from './npmts.config'; -export declare let run: (configArg: INpmtsConfig) => q.Promise<{}>; +export declare let run: (configArg: INpmtsConfig) => Promise<{}>; diff --git a/dist/npmts.watch.js b/dist/npmts.watch.js index 9b44fa8..41c05a9 100644 --- a/dist/npmts.watch.js +++ b/dist/npmts.watch.js @@ -1,5 +1,5 @@ "use strict"; -const q = require("q"); +const q = require("smartq"); const smartchok = require("smartchok"); const plugins = require("./npmts.plugins"); const cli = require("./npmts.cli"); diff --git a/package.json b/package.json index ac68015..b8b9c68 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,6 @@ "@types/gulp-mocha": "0.0.29", "@types/gulp-sourcemaps": "0.0.29", "@types/minimatch": "^2.0.29", - "@types/q": "^0.x.x", "@types/shelljs": "^0.3.33", "@types/through2": "^2.0.32", "beautylog": "6.0.0", @@ -55,7 +54,6 @@ "lodash": "^4.17.4", "npmextra": "^2.0.3", "projectinfo": "3.0.1", - "q": "^1.4.1", "shelljs": "^0.7.6", "smartchok": "^1.0.4", "smartcli": "2.0.1", @@ -63,6 +61,7 @@ "smartenv": "2.0.0", "smartfile": "4.1.2", "smartpath": "3.2.7", + "smartq": "^1.0.2", "smartstream": "^1.0.5", "smartstring": "^2.0.22", "smartsystem": "^1.0.12", diff --git a/ts/mod00/index.ts b/ts/mod00/index.ts index 63d719a..85e0307 100644 --- a/ts/mod00/index.ts +++ b/ts/mod00/index.ts @@ -1,7 +1,7 @@ /* ------------------------------------------ * This module compiles TypeScript files * -------------------------------------------- */ -import * as q from 'q' +import * as q from 'smartq' import { npmtsOra } from '../npmts.log' import { INpmtsConfig } from '../npmts.config' @@ -13,7 +13,7 @@ import * as NpmtsCheck from './mod00.check' import * as NpmtsClean from './mod00.clean' import * as NpmtsCompile from './mod00.compile' -export let run = function(configArg: INpmtsConfig): q.Promise { +export let run = function(configArg: INpmtsConfig): Promise { let done = q.defer() npmtsOra.text('starting TypeScript Compilation') NpmtsClean.run(configArg) diff --git a/ts/mod00/mod00.assets.ts b/ts/mod00/mod00.assets.ts index ba4bcb9..af9811c 100644 --- a/ts/mod00/mod00.assets.ts +++ b/ts/mod00/mod00.assets.ts @@ -1,4 +1,4 @@ -import * as q from 'q' +import * as q from 'smartq' import paths = require('../npmts.paths') import { npmtsOra } from '../npmts.log' @@ -6,7 +6,7 @@ import { npmtsOra } from '../npmts.log' import plugins = require('./mod00.plugins') import { projectInfo } from '../mod00/mod00.check' -export var run = function(configArg){ +export let run = function(configArg){ let done = q.defer() let config = configArg npmtsOra.text('now looking at ' + 'required assets'.yellow) diff --git a/ts/mod00/mod00.check.ts b/ts/mod00/mod00.check.ts index a16aff7..f8ecbc3 100644 --- a/ts/mod00/mod00.check.ts +++ b/ts/mod00/mod00.check.ts @@ -1,4 +1,4 @@ -import * as q from 'q' +import * as q from 'smartq' import { ProjectinfoNpm } from 'projectinfo' import * as paths from '../npmts.paths' @@ -11,7 +11,7 @@ export let projectInfo: ProjectinfoNpm let checkProjectTypings = (configArg) => { let done = q.defer() npmtsOra.text('Check Module: Check Project Typings...') - projectInfo = new ProjectinfoNpm(paths.cwd) + projectInfo = new ProjectinfoNpm(paths.cwd) if (typeof projectInfo.packageJson.typings === 'undefined') { plugins.beautylog.error(`please add typings field to package.json`) process.exit(1) diff --git a/ts/mod00/mod00.clean.ts b/ts/mod00/mod00.clean.ts index d011f66..f585536 100644 --- a/ts/mod00/mod00.clean.ts +++ b/ts/mod00/mod00.clean.ts @@ -1,4 +1,4 @@ -import * as q from 'q' +import * as q from 'smartq' import paths = require('../npmts.paths') import { npmtsOra } from '../npmts.log' diff --git a/ts/mod00/mod00.compile.ts b/ts/mod00/mod00.compile.ts index 3735f51..dab1929 100644 --- a/ts/mod00/mod00.compile.ts +++ b/ts/mod00/mod00.compile.ts @@ -1,4 +1,4 @@ -import * as q from 'q' +import * as q from 'smartq' import * as paths from '../npmts.paths' import { npmtsOra } from '../npmts.log' diff --git a/ts/mod01/index.ts b/ts/mod01/index.ts index d411663..cf0d37c 100644 --- a/ts/mod01/index.ts +++ b/ts/mod01/index.ts @@ -1,7 +1,7 @@ /* ------------------------------------------ * This module creates TypeScript documentation * -------------------------------------------- */ -import * as q from 'q' +import * as q from 'smartq' import * as paths from '../npmts.paths' import { npmtsOra } from '../npmts.log' diff --git a/ts/mod02/index.ts b/ts/mod02/index.ts index 876c13f..c522b98 100644 --- a/ts/mod02/index.ts +++ b/ts/mod02/index.ts @@ -4,7 +4,7 @@ import plugins = require('./mod02.plugins') import paths = require('../npmts.paths') -import * as q from 'q' +import * as q from 'smartq' import { npmtsOra } from '../npmts.log' import { INpmtsConfig } from '../npmts.config' diff --git a/ts/npmts.cli.ts b/ts/npmts.cli.ts index 7721efe..f516e5a 100644 --- a/ts/npmts.cli.ts +++ b/ts/npmts.cli.ts @@ -1,4 +1,4 @@ -import * as q from 'q' +import * as q from 'smartq' import * as plugins from './npmts.plugins' import * as paths from './npmts.paths' diff --git a/ts/npmts.config.ts b/ts/npmts.config.ts index 244280a..f0d0d92 100644 --- a/ts/npmts.config.ts +++ b/ts/npmts.config.ts @@ -1,7 +1,7 @@ import plugins = require('./npmts.plugins') import paths = require('./npmts.paths') -import * as q from 'q' +import * as q from 'smartq' import { npmtsOra } from './npmts.log' @@ -19,7 +19,7 @@ export interface INpmtsConfig { }; -export var run = function (argvArg) { +export let run = function (argvArg) { let done = q.defer() let defaultConfig: INpmtsConfig = { argv: undefined, diff --git a/ts/npmts.ship.ts b/ts/npmts.ship.ts index b779e8c..c467e02 100644 --- a/ts/npmts.ship.ts +++ b/ts/npmts.ship.ts @@ -1,4 +1,4 @@ -import * as q from 'q' +import * as q from 'smartq' import * as plugins from './npmts.plugins' diff --git a/ts/npmts.watch.ts b/ts/npmts.watch.ts index f11e2ac..05d9062 100644 --- a/ts/npmts.watch.ts +++ b/ts/npmts.watch.ts @@ -1,4 +1,4 @@ -import * as q from 'q' +import * as q from 'smartq' import * as smartchok from 'smartchok' import * as plugins from './npmts.plugins'