diff --git a/dist/index.d.ts b/dist/index.d.ts
index 317822d..e69de29 100644
--- a/dist/index.d.ts
+++ b/dist/index.d.ts
@@ -1 +0,0 @@
-import 'typings-global';
diff --git a/dist/index.js b/dist/index.js
index 3facb18..f199f56 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -1,8 +1,8 @@
-"use strict";
-require("typings-global");
/* ================================================== *
- Starting NPMTS main process.
+ **** NPMTS ****
+ Fabulous TypeScript development
* ================================================== */
+"use strict";
const early = require("early");
early.start('NPMTS');
const plugins = require("./npmts.plugins");
diff --git a/dist/npmts.assets.d.ts b/dist/npmts.assets.d.ts
index 1db7562..c5dc5a4 100644
--- a/dist/npmts.assets.d.ts
+++ b/dist/npmts.assets.d.ts
@@ -1,4 +1,3 @@
///
-import 'typings-global';
-import plugins = require('./npmts.plugins');
-export declare var run: (configArg: any) => plugins.q.Promise<{}>;
+import * as q from 'q';
+export declare var run: (configArg: any) => q.Promise<{}>;
diff --git a/dist/npmts.assets.js b/dist/npmts.assets.js
index 1509d36..41990e3 100644
--- a/dist/npmts.assets.js
+++ b/dist/npmts.assets.js
@@ -1,10 +1,10 @@
"use strict";
-require("typings-global");
const plugins = require("./npmts.plugins");
const paths = require("./npmts.paths");
+const q = require("q");
const npmts_promisechain_1 = require("./npmts.promisechain");
exports.run = function (configArg) {
- let done = plugins.q.defer();
+ let done = q.defer();
let config = configArg;
npmts_promisechain_1.npmtsOra.text('now looking at ' + 'required assets'.yellow);
if (config.cli === true) {
diff --git a/dist/npmts.check.d.ts b/dist/npmts.check.d.ts
index b49fffe..46a8c3f 100644
--- a/dist/npmts.check.d.ts
+++ b/dist/npmts.check.d.ts
@@ -1,5 +1,5 @@
///
-import * as plugins from './npmts.plugins';
+import * as q from 'q';
import { ProjectinfoNpm } from 'projectinfo';
export declare let projectInfo: ProjectinfoNpm;
-export declare let run: (configArg: any) => plugins.q.Promise<{}>;
+export declare let run: (configArg: any) => q.Promise<{}>;
diff --git a/dist/npmts.check.js b/dist/npmts.check.js
index 3fccfc5..dda08db 100644
--- a/dist/npmts.check.js
+++ b/dist/npmts.check.js
@@ -1,10 +1,11 @@
"use strict";
const plugins = require("./npmts.plugins");
const paths = require("./npmts.paths");
+const q = require("q");
const npmts_promisechain_1 = require("./npmts.promisechain");
const projectinfo_1 = require("projectinfo");
let checkProjectTypings = (configArg) => {
- let done = plugins.q.defer();
+ let done = q.defer();
npmts_promisechain_1.npmtsOra.text('Check Module: Check Project Typings...');
exports.projectInfo = new projectinfo_1.ProjectinfoNpm(paths.cwd);
if (typeof exports.projectInfo.packageJson.typings === 'undefined') {
@@ -30,7 +31,7 @@ const depcheckOptions = {
]
};
let checkDependencies = (configArg) => {
- let done = plugins.q.defer();
+ let done = q.defer();
npmts_promisechain_1.npmtsOra.text('Check Module: Check Dependencies...');
let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
ignoreDirs: [
@@ -66,7 +67,7 @@ let checkDependencies = (configArg) => {
return done.promise;
};
let checkDevDependencies = (configArg) => {
- let done = plugins.q.defer();
+ let done = q.defer();
npmts_promisechain_1.npmtsOra.text('Check Module: Check devDependencies...');
let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
ignoreDirs: [
@@ -101,13 +102,13 @@ let checkDevDependencies = (configArg) => {
return done.promise;
};
let checkNodeVersion = (configArg) => {
- let done = plugins.q.defer();
+ let done = q.defer();
npmts_promisechain_1.npmtsOra.text('checking node version');
done.resolve(configArg);
return done.promise;
};
exports.run = (configArg) => {
- let done = plugins.q.defer();
+ let done = q.defer();
npmts_promisechain_1.npmtsOra.text('Check Module: ...');
checkProjectTypings(configArg)
.then(checkDependencies)
diff --git a/dist/npmts.clean.d.ts b/dist/npmts.clean.d.ts
index deb1665..3f12cb0 100644
--- a/dist/npmts.clean.d.ts
+++ b/dist/npmts.clean.d.ts
@@ -1,4 +1,3 @@
///
-import 'typings-global';
-import plugins = require('./npmts.plugins');
-export declare let run: (configArg: any) => plugins.q.Promise<{}>;
+import * as q from 'q';
+export declare let run: (configArg: any) => q.Promise<{}>;
diff --git a/dist/npmts.clean.js b/dist/npmts.clean.js
index 98ce43d..cc68090 100644
--- a/dist/npmts.clean.js
+++ b/dist/npmts.clean.js
@@ -1,7 +1,7 @@
"use strict";
-require("typings-global");
const plugins = require("./npmts.plugins");
const paths = require("./npmts.paths");
+const q = require("q");
const npmts_promisechain_1 = require("./npmts.promisechain");
/**
* removes the dist directory which will be entirely rebuild
@@ -14,7 +14,7 @@ let removeDist = function () {
* remove .d.ts files from testDirctory
*/
let removeTestDeclarations = function () {
- let done = plugins.q.defer();
+ let done = q.defer();
plugins.smartfile.fs.listFileTree('./test/', '**/*.d.ts').then(fileArray => {
let fileArrayToRemove = plugins.smartpath.transform.toAbsolute(fileArray, process.cwd() + '//test/');
plugins.smartfile.fs.removeManySync(fileArrayToRemove);
@@ -30,7 +30,7 @@ let removePages = function () {
};
exports.run = function (configArg) {
npmts_promisechain_1.npmtsOra.text('cleaning up from previous builds...');
- let done = plugins.q.defer();
+ let done = q.defer();
removeDist()
.then(removeTestDeclarations)
.then(removePages)
diff --git a/dist/npmts.compile.d.ts b/dist/npmts.compile.d.ts
index deb1665..3f12cb0 100644
--- a/dist/npmts.compile.d.ts
+++ b/dist/npmts.compile.d.ts
@@ -1,4 +1,3 @@
///
-import 'typings-global';
-import plugins = require('./npmts.plugins');
-export declare let run: (configArg: any) => plugins.q.Promise<{}>;
+import * as q from 'q';
+export declare let run: (configArg: any) => q.Promise<{}>;
diff --git a/dist/npmts.compile.js b/dist/npmts.compile.js
index 10f74be..f4757e3 100644
--- a/dist/npmts.compile.js
+++ b/dist/npmts.compile.js
@@ -1,10 +1,10 @@
"use strict";
-require("typings-global");
const plugins = require("./npmts.plugins");
const paths = require("./npmts.paths");
+const q = require("q");
const npmts_promisechain_1 = require("./npmts.promisechain");
exports.run = function (configArg) {
- let done = plugins.q.defer();
+ let done = q.defer();
let config = configArg;
npmts_promisechain_1.npmtsOra.text('now compiling ' + 'TypeScript'.yellow);
plugins.tsn.compileGlobStringObject(config.ts, config.tsOptions, paths.cwd)
diff --git a/dist/npmts.options.d.ts b/dist/npmts.options.d.ts
index f6ca08a..3570cea 100644
--- a/dist/npmts.options.d.ts
+++ b/dist/npmts.options.d.ts
@@ -1,6 +1,5 @@
///
-import 'typings-global';
-import plugins = require('./npmts.plugins');
+import * as q from 'q';
export declare type npmtsMode = 'default' | 'custom';
export interface INpmtsConfig {
argv: any;
@@ -13,4 +12,4 @@ export interface INpmtsConfig {
tsOptions: any;
watch: boolean;
}
-export declare var run: (argvArg: any) => plugins.q.Promise<{}>;
+export declare var run: (argvArg: any) => q.Promise<{}>;
diff --git a/dist/npmts.options.js b/dist/npmts.options.js
index fd6e019..fed7e54 100644
--- a/dist/npmts.options.js
+++ b/dist/npmts.options.js
@@ -1,11 +1,11 @@
"use strict";
-require("typings-global");
const plugins = require("./npmts.plugins");
const paths = require("./npmts.paths");
+const q = require("q");
const npmts_promisechain_1 = require("./npmts.promisechain");
;
exports.run = function (argvArg) {
- let done = plugins.q.defer();
+ let done = q.defer();
let defaultConfig = {
argv: undefined,
coverageTreshold: 70,
diff --git a/dist/npmts.paths.d.ts b/dist/npmts.paths.d.ts
index 0878f9e..b0480ab 100644
--- a/dist/npmts.paths.d.ts
+++ b/dist/npmts.paths.d.ts
@@ -1,4 +1,3 @@
-import 'typings-global';
export declare let npmtsPackageRoot: string;
export declare let cwd: string;
export declare let tsDir: string;
diff --git a/dist/npmts.paths.js b/dist/npmts.paths.js
index b5cc0b2..89e509f 100644
--- a/dist/npmts.paths.js
+++ b/dist/npmts.paths.js
@@ -1,5 +1,4 @@
"use strict";
-require("typings-global");
const plugins = require("./npmts.plugins");
// NPMTS Paths
exports.npmtsPackageRoot = plugins.path.join(__dirname, '../');
diff --git a/dist/npmts.plugins.d.ts b/dist/npmts.plugins.d.ts
index eea1be2..31c9a23 100644
--- a/dist/npmts.plugins.d.ts
+++ b/dist/npmts.plugins.d.ts
@@ -1,8 +1,8 @@
import 'typings-global';
-export import beautylog = require('beautylog');
-export declare let depcheck: any;
-export import gulp = require('gulp');
-export declare let g: {
+import * as beautylog from 'beautylog';
+declare let depcheck: any;
+import * as gulp from 'gulp';
+declare let g: {
babel: any;
istanbul: any;
gFunction: any;
@@ -11,19 +11,19 @@ export declare let g: {
sourcemaps: any;
typedoc: any;
};
-export import lodash = require('lodash');
-export import npmextra = require('npmextra');
-export import projectinfo = require('projectinfo');
-export import path = require('path');
-export import q = require('q');
-export import shelljs = require('shelljs');
-export import smartchok = require('smartchok');
-export import smartcli = require('smartcli');
-export import smartcov = require('smartcov');
-export import smartenv = require('smartenv');
-export import smartfile = require('smartfile');
-export import smartpath = require('smartpath');
-export import smartstream = require('smartstream');
-export import smartstring = require('smartstring');
+import * as lodash from 'lodash';
+import * as npmextra from 'npmextra';
+import * as projectinfo from 'projectinfo';
+import * as path from 'path';
+import * as shelljs from 'shelljs';
+import * as smartchok from 'smartchok';
+import * as smartcli from 'smartcli';
+import * as smartcov from 'smartcov';
+import * as smartenv from 'smartenv';
+import * as smartfile from 'smartfile';
+import * as smartpath from 'smartpath';
+import * as smartstream from 'smartstream';
+import * as smartstring from 'smartstring';
export declare let sourceMapSupport: any;
-export import tsn = require('tsn');
+import * as tsn from 'tsn';
+export { beautylog, depcheck, gulp, g, lodash, npmextra, projectinfo, path, shelljs, smartchok, smartcli, smartcov, smartenv, smartfile, smartpath, smartstream, smartstring, tsn };
diff --git a/dist/npmts.plugins.js b/dist/npmts.plugins.js
index 2a3639c..7d698c5 100644
--- a/dist/npmts.plugins.js
+++ b/dist/npmts.plugins.js
@@ -1,9 +1,12 @@
"use strict";
require("typings-global");
-exports.beautylog = require("beautylog");
-exports.depcheck = require('depcheck');
-exports.gulp = require("gulp");
-exports.g = {
+const beautylog = require("beautylog");
+exports.beautylog = beautylog;
+let depcheck = require('depcheck');
+exports.depcheck = depcheck;
+const gulp = require("gulp");
+exports.gulp = gulp;
+let g = {
babel: require('gulp-babel'),
istanbul: require('gulp-istanbul'),
gFunction: require('gulp-function'),
@@ -12,19 +15,33 @@ exports.g = {
sourcemaps: require('gulp-sourcemaps'),
typedoc: require('gulp-typedoc')
};
-exports.lodash = require("lodash");
-exports.npmextra = require("npmextra");
-exports.projectinfo = require("projectinfo");
-exports.path = require("path");
-exports.q = require("q");
-exports.shelljs = require("shelljs");
-exports.smartchok = require("smartchok");
-exports.smartcli = require("smartcli");
-exports.smartcov = require("smartcov");
-exports.smartenv = require("smartenv");
-exports.smartfile = require("smartfile");
-exports.smartpath = require("smartpath");
-exports.smartstream = require("smartstream");
-exports.smartstring = require("smartstring");
+exports.g = g;
+const lodash = require("lodash");
+exports.lodash = lodash;
+const npmextra = require("npmextra");
+exports.npmextra = npmextra;
+const projectinfo = require("projectinfo");
+exports.projectinfo = projectinfo;
+const path = require("path");
+exports.path = path;
+const shelljs = require("shelljs");
+exports.shelljs = shelljs;
+const smartchok = require("smartchok");
+exports.smartchok = smartchok;
+const smartcli = require("smartcli");
+exports.smartcli = smartcli;
+const smartcov = require("smartcov");
+exports.smartcov = smartcov;
+const smartenv = require("smartenv");
+exports.smartenv = smartenv;
+const smartfile = require("smartfile");
+exports.smartfile = smartfile;
+const smartpath = require("smartpath");
+exports.smartpath = smartpath;
+const smartstream = require("smartstream");
+exports.smartstream = smartstream;
+const smartstring = require("smartstring");
+exports.smartstring = smartstring;
exports.sourceMapSupport = require('source-map-support').install(); // display errors correctly during testing
-exports.tsn = require("tsn");
+const tsn = require("tsn");
+exports.tsn = tsn;
diff --git a/dist/npmts.promisechain.d.ts b/dist/npmts.promisechain.d.ts
index a1bfda2..eca59ad 100644
--- a/dist/npmts.promisechain.d.ts
+++ b/dist/npmts.promisechain.d.ts
@@ -1,6 +1,5 @@
///
-import 'typings-global';
-import plugins = require('./npmts.plugins');
import { Ora } from 'beautylog';
+import * as q from 'q';
export declare let npmtsOra: Ora;
-export declare let run: (argvArg: any) => plugins.q.Promise<{}>;
+export declare let run: (argvArg: any) => q.Promise<{}>;
diff --git a/dist/npmts.promisechain.js b/dist/npmts.promisechain.js
index 0b3aebf..9c4d26a 100644
--- a/dist/npmts.promisechain.js
+++ b/dist/npmts.promisechain.js
@@ -1,7 +1,7 @@
"use strict";
-require("typings-global");
const plugins = require("./npmts.plugins");
const beautylog_1 = require("beautylog");
+const q = require("q");
exports.npmtsOra = new beautylog_1.Ora('setting up TaskChain', 'cyan');
const NpmtsAssets = require("./npmts.assets");
const NpmtsCheck = require("./npmts.check");
@@ -12,7 +12,7 @@ const NpmtsOptions = require("./npmts.options");
const NpmtsTests = require("./npmts.tests");
const NpmtsWatch = require("./npmts.watch");
exports.run = function (argvArg) {
- let done = plugins.q.defer();
+ let done = q.defer();
exports.npmtsOra.start();
NpmtsOptions.run(argvArg)
.then(NpmtsClean.run)
diff --git a/dist/npmts.tests.d.ts b/dist/npmts.tests.d.ts
index cac7e20..8b19aeb 100644
--- a/dist/npmts.tests.d.ts
+++ b/dist/npmts.tests.d.ts
@@ -1,5 +1,4 @@
///
-import 'typings-global';
-import plugins = require('./npmts.plugins');
+import * as q from 'q';
import { INpmtsConfig } from './npmts.options';
-export declare let run: (configArg: INpmtsConfig) => plugins.q.Promise<{}>;
+export declare let run: (configArg: INpmtsConfig) => q.Promise<{}>;
diff --git a/dist/npmts.tests.js b/dist/npmts.tests.js
index 8378f26..0fd4a63 100644
--- a/dist/npmts.tests.js
+++ b/dist/npmts.tests.js
@@ -1,7 +1,7 @@
"use strict";
-require("typings-global");
const plugins = require("./npmts.plugins");
const paths = require("./npmts.paths");
+const q = require("q");
const npmts_promisechain_1 = require("./npmts.promisechain");
/**
* runs mocha
@@ -10,7 +10,7 @@ const npmts_promisechain_1 = require("./npmts.promisechain");
let mocha = function (configArg) {
npmts_promisechain_1.npmtsOra.text('Instrumentalizing and testing transpiled JS');
npmts_promisechain_1.npmtsOra.end(); // end npmtsOra for tests.
- let done = plugins.q.defer();
+ let done = q.defer();
plugins.gulp.src([plugins.path.join(paths.cwd, 'dist/*.js')])
.pipe(plugins.g.sourcemaps.init())
.pipe(plugins.g.babel({
@@ -50,7 +50,7 @@ let mocha = function (configArg) {
return done.promise;
};
let coverage = function (configArg) {
- let done = plugins.q.defer();
+ let done = q.defer();
plugins.smartcov.get.percentage(plugins.path.join(paths.coverageDir, 'lcov.info'), 2)
.then(function (percentageArg) {
if (percentageArg >= configArg.coverageTreshold) {
@@ -72,7 +72,7 @@ let coverage = function (configArg) {
return done.promise;
};
exports.run = function (configArg) {
- let done = plugins.q.defer();
+ let done = q.defer();
let config = configArg;
if (config.test === true) {
npmts_promisechain_1.npmtsOra.text('now starting tests');
diff --git a/dist/npmts.typedoc.d.ts b/dist/npmts.typedoc.d.ts
index deb1665..3f12cb0 100644
--- a/dist/npmts.typedoc.d.ts
+++ b/dist/npmts.typedoc.d.ts
@@ -1,4 +1,3 @@
///
-import 'typings-global';
-import plugins = require('./npmts.plugins');
-export declare let run: (configArg: any) => plugins.q.Promise<{}>;
+import * as q from 'q';
+export declare let run: (configArg: any) => q.Promise<{}>;
diff --git a/dist/npmts.typedoc.js b/dist/npmts.typedoc.js
index df2c4ef..bc2e94e 100644
--- a/dist/npmts.typedoc.js
+++ b/dist/npmts.typedoc.js
@@ -1,11 +1,11 @@
"use strict";
-require("typings-global");
const plugins = require("./npmts.plugins");
const paths = require("./npmts.paths");
const npmts_promisechain_1 = require("./npmts.promisechain");
+const q = require("q");
const npmts_check_1 = require("./npmts.check");
let genTypeDoc = function (configArg) {
- let done = plugins.q.defer();
+ let done = q.defer();
npmts_promisechain_1.npmtsOra.text('now generating ' + 'TypeDoc documentation'.yellow);
plugins.beautylog.log('TypeDoc Output:');
plugins.gulp.src(plugins.path.join(paths.tsDir, '**/*.ts'))
@@ -28,7 +28,7 @@ let genTypeDoc = function (configArg) {
return done.promise;
};
exports.run = function (configArg) {
- let done = plugins.q.defer();
+ let done = q.defer();
if (configArg.docs) {
genTypeDoc(configArg)
.then(() => {
diff --git a/dist/npmts.watch.d.ts b/dist/npmts.watch.d.ts
index 0c6b4b8..8b19aeb 100644
--- a/dist/npmts.watch.d.ts
+++ b/dist/npmts.watch.d.ts
@@ -1,4 +1,4 @@
///
-import * as plugins from './npmts.plugins';
+import * as q from 'q';
import { INpmtsConfig } from './npmts.options';
-export declare let run: (configArg: INpmtsConfig) => plugins.q.Promise<{}>;
+export declare let run: (configArg: INpmtsConfig) => q.Promise<{}>;
diff --git a/dist/npmts.watch.js b/dist/npmts.watch.js
index 8812029..ac64d40 100644
--- a/dist/npmts.watch.js
+++ b/dist/npmts.watch.js
@@ -1,9 +1,10 @@
"use strict";
const plugins = require("./npmts.plugins");
const promisechain = require("./npmts.promisechain");
+const q = require("q");
let npmtsSmartchok = null;
exports.run = (configArg) => {
- let done = plugins.q.defer();
+ let done = q.defer();
if (configArg.watch && npmtsSmartchok === null) {
let pathsToWatch = [];
for (let key in configArg.ts) {
diff --git a/ts/index.ts b/ts/index.ts
index 06a3e60..400131e 100644
--- a/ts/index.ts
+++ b/ts/index.ts
@@ -1,8 +1,8 @@
-import 'typings-global'
-
/* ================================================== *
- Starting NPMTS main process.
+ **** NPMTS ****
+ Fabulous TypeScript development
* ================================================== */
+
import * as early from 'early'
early.start('NPMTS')
import * as plugins from './npmts.plugins'
diff --git a/ts/npmts.assets.ts b/ts/npmts.assets.ts
index 78d2822..0343194 100644
--- a/ts/npmts.assets.ts
+++ b/ts/npmts.assets.ts
@@ -1,10 +1,11 @@
-import 'typings-global'
import plugins = require('./npmts.plugins')
import paths = require('./npmts.paths')
+
+import * as q from 'q'
import {npmtsOra} from './npmts.promisechain'
export var run = function(configArg){
- let done = plugins.q.defer()
+ let done = q.defer()
let config = configArg
npmtsOra.text('now looking at ' + 'required assets'.yellow)
if (config.cli === true) {
diff --git a/ts/npmts.check.ts b/ts/npmts.check.ts
index 7e2bba6..9ca19f4 100644
--- a/ts/npmts.check.ts
+++ b/ts/npmts.check.ts
@@ -1,13 +1,15 @@
import * as plugins from './npmts.plugins'
import * as paths from './npmts.paths'
-import { npmtsOra } from './npmts.promisechain'
+import * as q from 'q'
+
+import { npmtsOra } from './npmts.promisechain'
import {ProjectinfoNpm} from 'projectinfo'
export let projectInfo: ProjectinfoNpm
let checkProjectTypings = (configArg) => {
- let done = plugins.q.defer()
+ let done = q.defer()
npmtsOra.text('Check Module: Check Project Typings...')
projectInfo = new ProjectinfoNpm(paths.cwd)
if (typeof projectInfo.packageJson.typings === 'undefined') {
@@ -34,7 +36,7 @@ const depcheckOptions = {
}
let checkDependencies = (configArg) => {
- let done = plugins.q.defer()
+ let done = q.defer()
npmtsOra.text('Check Module: Check Dependencies...')
let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
ignoreDirs: [ // folder with these names will be ignored
@@ -70,7 +72,7 @@ let checkDependencies = (configArg) => {
}
let checkDevDependencies = (configArg) => {
- let done = plugins.q.defer()
+ let done = q.defer()
npmtsOra.text('Check Module: Check devDependencies...')
let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
ignoreDirs: [ // folder with these names will be ignored
@@ -106,14 +108,14 @@ let checkDevDependencies = (configArg) => {
}
let checkNodeVersion = (configArg) => {
- let done = plugins.q.defer()
+ let done = q.defer()
npmtsOra.text('checking node version')
done.resolve(configArg)
return done.promise
}
export let run = (configArg) => {
- let done = plugins.q.defer()
+ let done = q.defer()
npmtsOra.text('Check Module: ...')
checkProjectTypings(configArg)
.then(checkDependencies)
diff --git a/ts/npmts.clean.ts b/ts/npmts.clean.ts
index c886d51..3218350 100644
--- a/ts/npmts.clean.ts
+++ b/ts/npmts.clean.ts
@@ -1,6 +1,8 @@
-import 'typings-global'
import plugins = require('./npmts.plugins')
import paths = require('./npmts.paths')
+
+import * as q from 'q'
+
import { npmtsOra } from './npmts.promisechain'
/**
@@ -15,7 +17,7 @@ let removeDist = function () {
* remove .d.ts files from testDirctory
*/
let removeTestDeclarations = function () {
- let done = plugins.q.defer()
+ let done = q.defer()
plugins.smartfile.fs.listFileTree('./test/', '**/*.d.ts').then(fileArray => {
let fileArrayToRemove = plugins.smartpath.transform.toAbsolute(fileArray, process.cwd() + '//test/')
plugins.smartfile.fs.removeManySync(fileArrayToRemove)
@@ -33,7 +35,7 @@ let removePages = function () {
export let run = function (configArg) {
npmtsOra.text('cleaning up from previous builds...')
- let done = plugins.q.defer()
+ let done = q.defer()
removeDist()
.then(removeTestDeclarations)
.then(removePages)
diff --git a/ts/npmts.compile.ts b/ts/npmts.compile.ts
index cff8bf2..ac536dd 100644
--- a/ts/npmts.compile.ts
+++ b/ts/npmts.compile.ts
@@ -1,10 +1,12 @@
-import 'typings-global'
import plugins = require('./npmts.plugins')
import paths = require('./npmts.paths')
+
+import * as q from 'q'
+
import {npmtsOra} from './npmts.promisechain'
export let run = function (configArg) {
- let done = plugins.q.defer()
+ let done = q.defer()
let config = configArg
npmtsOra.text('now compiling ' + 'TypeScript'.yellow)
plugins.tsn.compileGlobStringObject(config.ts,config.tsOptions,paths.cwd)
diff --git a/ts/npmts.options.ts b/ts/npmts.options.ts
index cae4f0c..67e3a6c 100644
--- a/ts/npmts.options.ts
+++ b/ts/npmts.options.ts
@@ -1,6 +1,8 @@
-import 'typings-global'
import plugins = require('./npmts.plugins')
import paths = require('./npmts.paths')
+
+import * as q from 'q'
+
import { npmtsOra } from './npmts.promisechain'
export type npmtsMode = 'default' | 'custom'
@@ -19,7 +21,7 @@ export interface INpmtsConfig {
};
export var run = function (argvArg) {
- let done = plugins.q.defer()
+ let done = q.defer()
let defaultConfig: INpmtsConfig = {
argv: undefined,
coverageTreshold: 70,
diff --git a/ts/npmts.paths.ts b/ts/npmts.paths.ts
index 2444fc2..d38fa8c 100644
--- a/ts/npmts.paths.ts
+++ b/ts/npmts.paths.ts
@@ -1,4 +1,3 @@
-import 'typings-global'
import plugins = require('./npmts.plugins')
// NPMTS Paths
diff --git a/ts/npmts.plugins.ts b/ts/npmts.plugins.ts
index 4b34779..0db0a9c 100644
--- a/ts/npmts.plugins.ts
+++ b/ts/npmts.plugins.ts
@@ -1,8 +1,8 @@
import 'typings-global'
-export import beautylog = require('beautylog')
-export let depcheck = require('depcheck')
-export import gulp = require('gulp')
-export let g = {
+import * as beautylog from 'beautylog'
+let depcheck = require('depcheck')
+import * as gulp from 'gulp'
+let g = {
babel: require('gulp-babel'),
istanbul: require('gulp-istanbul'),
gFunction: require('gulp-function'),
@@ -11,19 +11,39 @@ export let g = {
sourcemaps: require('gulp-sourcemaps'),
typedoc: require('gulp-typedoc')
}
-export import lodash = require('lodash')
-export import npmextra = require('npmextra')
-export import projectinfo = require('projectinfo')
-export import path = require('path')
-export import q = require('q')
-export import shelljs = require('shelljs')
-export import smartchok = require('smartchok')
-export import smartcli = require('smartcli')
-export import smartcov = require('smartcov')
-export import smartenv = require('smartenv')
-export import smartfile = require('smartfile')
-export import smartpath = require('smartpath')
-export import smartstream = require('smartstream')
-export import smartstring = require('smartstring')
+import * as lodash from 'lodash'
+import * as npmextra from 'npmextra'
+import * as projectinfo from 'projectinfo'
+import * as path from 'path'
+import * as shelljs from 'shelljs'
+import * as smartchok from 'smartchok'
+import * as smartcli from 'smartcli'
+import * as smartcov from 'smartcov'
+import * as smartenv from 'smartenv'
+import * as smartfile from 'smartfile'
+import * as smartpath from 'smartpath'
+import * as smartstream from 'smartstream'
+import * as smartstring from 'smartstring'
export let sourceMapSupport = require('source-map-support').install() // display errors correctly during testing
-export import tsn = require('tsn')
+import * as tsn from 'tsn'
+
+export {
+ beautylog,
+ depcheck,
+ gulp,
+ g,
+ lodash,
+ npmextra,
+ projectinfo,
+ path,
+ shelljs,
+ smartchok,
+ smartcli,
+ smartcov,
+ smartenv,
+ smartfile,
+ smartpath,
+ smartstream,
+ smartstring,
+ tsn
+}
diff --git a/ts/npmts.promisechain.ts b/ts/npmts.promisechain.ts
index 1f4db67..debd344 100644
--- a/ts/npmts.promisechain.ts
+++ b/ts/npmts.promisechain.ts
@@ -1,7 +1,8 @@
-import 'typings-global'
import plugins = require('./npmts.plugins')
import {Ora} from 'beautylog'
+import * as q from 'q'
+
export let npmtsOra = new Ora('setting up TaskChain','cyan')
import * as NpmtsAssets from './npmts.assets'
@@ -14,7 +15,7 @@ import * as NpmtsTests from './npmts.tests'
import * as NpmtsWatch from './npmts.watch'
export let run = function(argvArg){
- let done = plugins.q.defer()
+ let done = q.defer()
npmtsOra.start()
NpmtsOptions.run(argvArg)
.then(NpmtsClean.run)
diff --git a/ts/npmts.tests.ts b/ts/npmts.tests.ts
index e460b0f..c0049b6 100644
--- a/ts/npmts.tests.ts
+++ b/ts/npmts.tests.ts
@@ -1,6 +1,8 @@
-import 'typings-global'
import plugins = require('./npmts.plugins')
import paths = require('./npmts.paths')
+
+import * as q from 'q'
+
import { npmtsOra } from './npmts.promisechain'
import { INpmtsConfig } from './npmts.options'
@@ -11,7 +13,7 @@ import { INpmtsConfig } from './npmts.options'
let mocha = function (configArg: INpmtsConfig) {
npmtsOra.text('Instrumentalizing and testing transpiled JS')
npmtsOra.end() // end npmtsOra for tests.
- let done = plugins.q.defer()
+ let done = q.defer()
plugins.gulp.src([plugins.path.join(paths.cwd, 'dist/*.js')])
.pipe(plugins.g.sourcemaps.init())
.pipe(plugins.g.babel({
@@ -52,7 +54,7 @@ let mocha = function (configArg: INpmtsConfig) {
}
let coverage = function (configArg: INpmtsConfig) {
- let done = plugins.q.defer()
+ let done = q.defer()
plugins.smartcov.get.percentage(plugins.path.join(paths.coverageDir, 'lcov.info'), 2)
.then(function (percentageArg) {
if (percentageArg >= configArg.coverageTreshold) {
@@ -76,7 +78,7 @@ let coverage = function (configArg: INpmtsConfig) {
}
export let run = function (configArg: INpmtsConfig) {
- let done = plugins.q.defer()
+ let done = q.defer()
let config = configArg
if (config.test === true) {
npmtsOra.text('now starting tests')
diff --git a/ts/npmts.typedoc.ts b/ts/npmts.typedoc.ts
index 44fd753..0598a96 100644
--- a/ts/npmts.typedoc.ts
+++ b/ts/npmts.typedoc.ts
@@ -1,12 +1,13 @@
-import 'typings-global'
import plugins = require('./npmts.plugins')
import paths = require('./npmts.paths')
import { npmtsOra } from './npmts.promisechain'
+import * as q from 'q'
+
import { projectInfo } from './npmts.check'
let genTypeDoc = function (configArg) {
- let done = plugins.q.defer()
+ let done = q.defer()
npmtsOra.text('now generating ' + 'TypeDoc documentation'.yellow)
plugins.beautylog.log('TypeDoc Output:')
plugins.gulp.src(plugins.path.join(paths.tsDir, '**/*.ts'))
@@ -32,7 +33,7 @@ let genTypeDoc = function (configArg) {
}
export let run = function (configArg) {
- let done = plugins.q.defer()
+ let done = q.defer()
if (configArg.docs) {
genTypeDoc(configArg)
.then(() => {
diff --git a/ts/npmts.watch.ts b/ts/npmts.watch.ts
index f69422b..2602b07 100644
--- a/ts/npmts.watch.ts
+++ b/ts/npmts.watch.ts
@@ -1,10 +1,13 @@
import * as plugins from './npmts.plugins'
import * as promisechain from './npmts.promisechain'
-let npmtsSmartchok: plugins.smartchok.Smartchok = null
+
+import * as q from 'q'
+
import { INpmtsConfig } from './npmts.options'
+let npmtsSmartchok: plugins.smartchok.Smartchok = null
export let run = (configArg: INpmtsConfig) => {
- let done = plugins.q.defer()
+ let done = q.defer()
if (configArg.watch && npmtsSmartchok === null) {
let pathsToWatch: string[] = []
for (let key in configArg.ts) {