diff --git a/dist/npmts.cli.d.ts b/dist/npmts.cli.d.ts deleted file mode 100644 index 62d7805..0000000 --- a/dist/npmts.cli.d.ts +++ /dev/null @@ -1 +0,0 @@ -import "typings-global"; diff --git a/dist/npmts.cli.js b/dist/npmts.cli.js deleted file mode 100644 index d9b688b..0000000 --- a/dist/npmts.cli.js +++ /dev/null @@ -1,2 +0,0 @@ -"use strict"; -require("typings-global"); diff --git a/dist/npmts.compile.js b/dist/npmts.compile.js index 6a58100..d988dc3 100644 --- a/dist/npmts.compile.js +++ b/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" }; /** diff --git a/dist/npmts.plugins.d.ts b/dist/npmts.plugins.d.ts index b42017b..fd2a1b4 100644 --- a/dist/npmts.plugins.d.ts +++ b/dist/npmts.plugins.d.ts @@ -3,7 +3,7 @@ export import beautylog = require("beautylog"); export declare let gulp: any; export declare let g: { babel: any; - babelIstanbul: any; + istanbul: any; gFunction: any; injectModules: any; mocha: any; @@ -11,6 +11,7 @@ export declare let g: { sourcemaps: any; typedoc: any; }; +import "babel-preset-es2015"; export declare let lodashObject: any; export declare let merge2: any; export import projectinfo = require("projectinfo"); diff --git a/dist/npmts.plugins.js b/dist/npmts.plugins.js index 88e5825..11b9dd8 100644 --- a/dist/npmts.plugins.js +++ b/dist/npmts.plugins.js @@ -4,7 +4,7 @@ exports.beautylog = require("beautylog"); exports.gulp = require("gulp"); exports.g = { babel: require("gulp-babel"), - babelIstanbul: require("gulp-babel-istanbul"), + istanbul: require("gulp-istanbul"), gFunction: require("gulp-function"), injectModules: require("gulp-inject-modules"), mocha: require("gulp-mocha"), @@ -12,6 +12,7 @@ exports.g = { 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"); diff --git a/dist/npmts.tests.js b/dist/npmts.tests.js index ae86faf..02947e0 100644 --- a/dist/npmts.tests.js +++ b/dist/npmts.tests.js @@ -13,15 +13,20 @@ var mocha = function (configArg) { 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.babelIstanbul()) - .pipe(plugins.g.babelIstanbul.hookRequire()) + .pipe(plugins.g.babel({ + presets: ['es2015'] + })) + .pipe(plugins.g.istanbul()) .pipe(plugins.g.sourcemaps.write()) + .pipe(plugins.g.injectModules()) .on("finish", function () { plugins.gulp.src([plugins.path.join(paths.cwd, "test/test.js")]) - .pipe(plugins.g.babel()) + .pipe(plugins.g.babel({ + presets: ['es2015'] + })) .pipe(plugins.g.injectModules()) .pipe(plugins.g.mocha()) - .pipe(plugins.g.babelIstanbul.writeReports()) + .pipe(plugins.g.istanbul.writeReports()) .pipe(plugins.g.gFunction(function () { plugins.beautylog.ok("Tested!"); done.resolve(configArg); diff --git a/package.json b/package.json index 26bef0f..b69f9c1 100644 --- a/package.json +++ b/package.json @@ -34,20 +34,18 @@ "@types/shelljs": "*", "beautylog": "5.0.14", "early": "^2.0.13", - "esdoc": "^0.4.7", "gulp": "3.9.1", "gulp-babel": "^6.1.2", - "gulp-babel-istanbul": "^1.4.0", "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-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", diff --git a/ts/npmts.cli.ts b/ts/npmts.cli.ts deleted file mode 100644 index 86d430b..0000000 --- a/ts/npmts.cli.ts +++ /dev/null @@ -1 +0,0 @@ -import "typings-global"; \ No newline at end of file diff --git a/ts/npmts.compile.ts b/ts/npmts.compile.ts index b77624c..7979793 100644 --- a/ts/npmts.compile.ts +++ b/ts/npmts.compile.ts @@ -10,7 +10,7 @@ let compileTs = (tsFileArrayArg:string[],tsOptionsArg = {}) => { let tsOptionsDefault = { declaration: true, - target: "ES5", + target: "ES6", module: "commonjs" }; diff --git a/ts/npmts.plugins.ts b/ts/npmts.plugins.ts index e5a532a..f0e4b3a 100644 --- a/ts/npmts.plugins.ts +++ b/ts/npmts.plugins.ts @@ -3,7 +3,7 @@ export import beautylog = require("beautylog"); export let gulp = require("gulp"); export let g = { babel: require("gulp-babel"), - babelIstanbul: require("gulp-babel-istanbul"), + istanbul: require("gulp-istanbul"), gFunction: require("gulp-function"), injectModules: require("gulp-inject-modules"), mocha: require("gulp-mocha"), @@ -11,6 +11,7 @@ export let g = { 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"); diff --git a/ts/npmts.tests.ts b/ts/npmts.tests.ts index ae3432a..bf65c1d 100644 --- a/ts/npmts.tests.ts +++ b/ts/npmts.tests.ts @@ -13,15 +13,20 @@ let mocha = function (configArg) { 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.babelIstanbul()) - .pipe(plugins.g.babelIstanbul.hookRequire()) + .pipe(plugins.g.babel({ + presets: ['es2015'] + })) + .pipe(plugins.g.istanbul()) .pipe(plugins.g.sourcemaps.write()) + .pipe(plugins.g.injectModules()) .on("finish",function(){ plugins.gulp.src([plugins.path.join(paths.cwd,"test/test.js")]) - .pipe(plugins.g.babel()) + .pipe(plugins.g.babel({ + presets: ['es2015'] + })) .pipe(plugins.g.injectModules()) .pipe(plugins.g.mocha()) - .pipe(plugins.g.babelIstanbul.writeReports()) + .pipe(plugins.g.istanbul.writeReports()) .pipe(plugins.g.gFunction(function(){ plugins.beautylog.ok("Tested!"); done.resolve(configArg);