5.3.17

dist/npmts.cli.d.ts

@@ -1 +0,0 @@
-import "typings-global";

dist/npmts.cli.js

@@ -1,2 +0,0 @@
-"use strict";
-require("typings-global");

dist/npmts.compile.js

@@ -9,7 +9,7 @@ var compileTs = function (tsFileArrayArg, tsOptionsArg) {
     var done = plugins.Q.defer();
     var tsOptionsDefault = {
         declaration: true,
-        target: "ES5",
+        target: "ES6",
         module: "commonjs"
     };
     /**

dist/npmts.plugins.d.ts

@@ -2,13 +2,16 @@ import "typings-global";
 export import beautylog = require("beautylog");
 export declare let gulp: any;
 export declare let g: {
-    gFunction: any;
+    babel: any;
     istanbul: any;
+    gFunction: any;
+    injectModules: any;
     mocha: any;
     replace: any;
     sourcemaps: any;
     typedoc: any;
 };
+import "babel-preset-es2015";
 export declare let lodashObject: any;
 export declare let merge2: any;
 export import projectinfo = require("projectinfo");

dist/npmts.plugins.js

@@ -3,13 +3,16 @@ require("typings-global");
 exports.beautylog = require("beautylog");
 exports.gulp = require("gulp");
 exports.g = {
-    gFunction: require("gulp-function"),
+    babel: require("gulp-babel"),
     istanbul: require("gulp-istanbul"),
+    gFunction: require("gulp-function"),
+    injectModules: require("gulp-inject-modules"),
     mocha: require("gulp-mocha"),
     replace: require("gulp-replace"),
     sourcemaps: require("gulp-sourcemaps"),
     typedoc: require("gulp-typedoc")
 };
+require("babel-preset-es2015");
 exports.lodashObject = require('lodash/fp/object');
 exports.merge2 = require("merge2");
 exports.projectinfo = require("projectinfo");

dist/npmts.tests.js

@@ -7,34 +7,31 @@ var npmts_promisechain_1 = require("./npmts.promisechain");
  *
  * @returns {*}
  */
-var istanbul = function (configArg) {
-    npmts_promisechain_1.npmtsOra.text("Instrumentalizing transpiled JS...");
+var mocha = function (configArg) {
+    npmts_promisechain_1.npmtsOra.text("Instrumentalizing and testing transpiled JS");
+    npmts_promisechain_1.npmtsOra.end(); // end npmtsOra for tests.
     var done = plugins.Q.defer();
     var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "dist/*.js")])
         .pipe(plugins.g.sourcemaps.init())
-        .pipe(plugins.g.istanbul()) // Covering files
+        .pipe(plugins.g.babel({
+        presets: ['es2015']
+    }))
+        .pipe(plugins.g.istanbul())
         .pipe(plugins.g.sourcemaps.write())
-        .pipe(plugins.g.istanbul.hookRequire()) // Force `require` to return covered files
-        .pipe(plugins.g.gFunction(function () {
-        plugins.beautylog.ok("JS has been instrumentalized to get test code coverage!");
-        done.resolve(configArg);
-    }, "atEnd"));
-    return done.promise;
-};
-/**
- *
- * @returns {*}
- */
-var mocha = function (configArg) {
-    var done = plugins.Q.defer();
-    npmts_promisechain_1.npmtsOra.end(); // end npmtsOra for tests.
-    var stream = plugins.gulp.src(["./test/test.js"])
+        .pipe(plugins.g.injectModules())
+        .on("finish", function () {
+        plugins.gulp.src([plugins.path.join(paths.cwd, "test/test.js")])
+            .pipe(plugins.g.babel({
+            presets: ['es2015']
+        }))
+            .pipe(plugins.g.injectModules())
             .pipe(plugins.g.mocha())
-        .pipe(plugins.g.istanbul.writeReports()) // Creating the reports after tests ran
+            .pipe(plugins.g.istanbul.writeReports())
             .pipe(plugins.g.gFunction(function () {
-        plugins.beautylog.ok("Tests have passed!");
+            plugins.beautylog.ok("Tested!");
             done.resolve(configArg);
         }, "atEnd"));
+    });
     return done.promise;
 };
 var coverage = function (configArg) {
@@ -63,8 +60,7 @@ exports.run = function (configArg) {
         plugins.beautylog.log("-------------------------------------------------------\n" +
             "*************************** TESTS: ***************************\n" +
             "--------------------------------------------------------------");
-        istanbul(config)
-            .then(mocha)
+        mocha(config)
             .then(coverage)
             .then(function () {
             done.resolve(config);

dist/npmts.typedoc.js

@@ -5,7 +5,7 @@ var paths = require("./npmts.paths");
 var npmts_promisechain_1 = require("./npmts.promisechain");
 var genTypeDoc = function (configArg) {
     var done = plugins.Q.defer();
-    npmts_promisechain_1.npmtsOra.text("now generating " + "EsDoc documentation".yellow);
+    npmts_promisechain_1.npmtsOra.text("now generating " + "TypeDoc documentation".yellow);
     plugins.beautylog.log("TypeDoc Output:");
     plugins.gulp.src(plugins.path.join(paths.tsDir, "**/*.ts"))
         .pipe(plugins.g.typedoc({
@@ -19,7 +19,7 @@ var genTypeDoc = function (configArg) {
         // TypeDoc options (see typedoc docs) 
         name: "my-project",
         //theme: "default",
-        ignoreCompilerErrors: false,
+        ignoreCompilerErrors: true,
         version: true,
     }))
         .pipe(plugins.g.gFunction(done.resolve, "atEnd"));

npm-debug.log

@@ -0,0 +1,30 @@
+0 info it worked if it ends with ok
+1 verbose cli [ '/Users/philkunz/.nvm/versions/node/v4.4.5/bin/node',
+1 verbose cli   '/Users/philkunz/.nvm/versions/node/v4.4.5/bin/npm',
+1 verbose cli   'version',
+1 verbose cli   'patch' ]
+2 info using npm@3.10.3
+3 info using node@v4.4.5
+4 info git [ 'status', '--porcelain' ]
+5 verbose stack Error: Git working directory not clean.
+5 verbose stack M package.json
+5 verbose stack     at /Users/philkunz/.nvm/versions/node/v4.4.5/lib/node_modules/npm/lib/version.js:247:19
+5 verbose stack     at /Users/philkunz/.nvm/versions/node/v4.4.5/lib/node_modules/npm/lib/utils/no-progress-while-running.js:21:8
+5 verbose stack     at ChildProcess.exithandler (child_process.js:204:7)
+5 verbose stack     at emitTwo (events.js:87:13)
+5 verbose stack     at ChildProcess.emit (events.js:172:7)
+5 verbose stack     at maybeClose (internal/child_process.js:827:16)
+5 verbose stack     at Socket.<anonymous> (internal/child_process.js:319:11)
+5 verbose stack     at emitOne (events.js:77:13)
+5 verbose stack     at Socket.emit (events.js:169:7)
+5 verbose stack     at Pipe._onclose (net.js:477:12)
+6 verbose cwd /Users/philkunz/gitlab/pushrocks/npmts
+7 error Darwin 15.5.0
+8 error argv "/Users/philkunz/.nvm/versions/node/v4.4.5/bin/node" "/Users/philkunz/.nvm/versions/node/v4.4.5/bin/npm" "version" "patch"
+9 error node v4.4.5
+10 error npm  v3.10.3
+11 error Git working directory not clean.
+11 error M package.json
+12 error If you need help, you may report this error at:
+12 error     <https://github.com/npm/npm/issues>
+13 verbose exit [ 1, true ]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmts",
-  "version": "5.3.12",
+  "version": "5.3.17",
   "description": "write npm modules with TypeScript",
   "main": "dist/index.js",
   "bin": {
@@ -32,21 +32,21 @@
     "@types/minimatch": "*",
     "@types/q": "*",
     "@types/shelljs": "*",
+    "babel-preset-es2015": "^6.9.0",
     "beautylog": "5.0.14",
     "early": "^2.0.13",
-    "esdoc": "^0.4.7",
     "gulp": "3.9.1",
+    "gulp-babel": "^6.1.2",
     "gulp-concat": "^2.6.0",
     "gulp-function": "^1.3.6",
     "gulp-if": "^2.0.1",
+    "gulp-inject-modules": "^1.0.0",
     "gulp-istanbul": "^1.0.0",
-    "gulp-jsdoc3": "^0.3.0",
     "gulp-mocha": "^2.2.0",
     "gulp-replace": "^0.5.4",
     "gulp-sourcemaps": "^1.6.0",
     "gulp-typedoc": "^2.0.0",
     "lodash": "^4.13.1",
-    "merge2": "1.0.2",
     "projectinfo": "1.0.3",
     "q": "^1.4.1",
     "shelljs": "^0.7.0",

ts/npmts.cli.ts

@@ -1 +0,0 @@
-import "typings-global";

ts/npmts.compile.ts

@@ -10,7 +10,7 @@ let compileTs = (tsFileArrayArg:string[],tsOptionsArg = {}) => {
 
     let tsOptionsDefault = {
         declaration: true,
-        target: "ES5",
+        target: "ES6",
         module: "commonjs"
     };
     

ts/npmts.plugins.ts

@@ -2,13 +2,16 @@ import "typings-global";
 export import beautylog = require("beautylog");
 export let gulp = require("gulp");
 export let g = {
-    gFunction: require("gulp-function"),
+    babel: require("gulp-babel"),
     istanbul: require("gulp-istanbul"),
+    gFunction: require("gulp-function"),
+    injectModules: require("gulp-inject-modules"),
     mocha: require("gulp-mocha"),
     replace: require("gulp-replace"),
     sourcemaps: require("gulp-sourcemaps"),
     typedoc: require("gulp-typedoc")
 };
+import "babel-preset-es2015";
 export let lodashObject = require('lodash/fp/object');
 export let merge2 = require("merge2");
 export import projectinfo = require("projectinfo");

ts/npmts.tests.ts

@@ -7,35 +7,31 @@ import {npmtsOra} from "./npmts.promisechain";
  *
  * @returns {*}
  */
-let istanbul = function (configArg) {
-    npmtsOra.text("Instrumentalizing transpiled JS...");
+let mocha = function (configArg) {
+    npmtsOra.text("Instrumentalizing and testing transpiled JS");
+    npmtsOra.end(); // end npmtsOra for tests.
     let done = plugins.Q.defer();
     var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"dist/*.js")])
         .pipe(plugins.g.sourcemaps.init())
-        .pipe(plugins.g.istanbul()) // Covering files
+        .pipe(plugins.g.babel({
+            presets: ['es2015']
+        }))
+        .pipe(plugins.g.istanbul())
         .pipe(plugins.g.sourcemaps.write())
-        .pipe(plugins.g.istanbul.hookRequire()) // Force `require` to return covered files
-        .pipe(plugins.g.gFunction(function(){
-            plugins.beautylog.ok("JS has been instrumentalized to get test code coverage!");
-            done.resolve(configArg);
-        },"atEnd"));
-    return done.promise;
-};
-
-/**
- *
- * @returns {*}
- */
-let mocha = function (configArg) {
-    let done = plugins.Q.defer();
-    npmtsOra.end(); // end npmtsOra for tests.
-    let stream = plugins.gulp.src(["./test/test.js"])
+        .pipe(plugins.g.injectModules())
+        .on("finish",function(){
+            plugins.gulp.src([plugins.path.join(paths.cwd,"test/test.js")])
+            .pipe(plugins.g.babel({
+                presets: ['es2015']
+            }))
+            .pipe(plugins.g.injectModules())
             .pipe(plugins.g.mocha())
-        .pipe(plugins.g.istanbul.writeReports()) // Creating the reports after tests ran
+            .pipe(plugins.g.istanbul.writeReports())
             .pipe(plugins.g.gFunction(function(){
-            plugins.beautylog.ok("Tests have passed!");
+                plugins.beautylog.ok("Tested!");
                 done.resolve(configArg);
             },"atEnd"));
+        });
     return done.promise;
 };
 
@@ -72,8 +68,7 @@ export let run = function(configArg) {
             "--------------------------------------------------------------"
         );
 
-        istanbul(config)
-            .then(mocha)
+        mocha(config)
             .then(coverage)
             .then(() => {
                 done.resolve(config);

ts/npmts.typedoc.ts

@@ -5,7 +5,7 @@ import {npmtsOra} from "./npmts.promisechain";
 
 let genTypeDoc = function(configArg){
     let done = plugins.Q.defer();
-    npmtsOra.text("now generating " + "EsDoc documentation".yellow);
+    npmtsOra.text("now generating " + "TypeDoc documentation".yellow);
     plugins.beautylog.log("TypeDoc Output:");
     plugins.gulp.src(plugins.path.join(paths.tsDir,"**/*.ts"))
         .pipe(plugins.g.typedoc({
@@ -22,7 +22,7 @@ let genTypeDoc = function(configArg){
 			name: "my-project",
 			
             //theme: "default",
-			ignoreCompilerErrors: false,
+			ignoreCompilerErrors: true,
 			version: true,
 		}))
         .pipe(plugins.g.gFunction(done.resolve,"atEnd"));