From aa57617fc7ee388b4e382ce2af538e6acf65677b Mon Sep 17 00:00:00 2001 From: PhilKunz Date: Sat, 16 Jul 2016 20:14:43 +0200 Subject: [PATCH] another fix --- dist/npmts.plugins.d.ts | 1 - dist/npmts.plugins.js | 1 - dist/npmts.tests.js | 8 ++++++-- ts/npmts.plugins.ts | 1 - ts/npmts.tests.ts | 8 ++++++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dist/npmts.plugins.d.ts b/dist/npmts.plugins.d.ts index 38ca9f9..c3c2e23 100644 --- a/dist/npmts.plugins.d.ts +++ b/dist/npmts.plugins.d.ts @@ -11,7 +11,6 @@ export declare let g: { sourcemaps: any; typedoc: any; }; -import "babel-preset-es2015"; export declare let lodashObject: any; export import projectinfo = require("projectinfo"); export import path = require("path"); diff --git a/dist/npmts.plugins.js b/dist/npmts.plugins.js index ec2bbe3..63d6688 100644 --- a/dist/npmts.plugins.js +++ b/dist/npmts.plugins.js @@ -12,7 +12,6 @@ exports.g = { sourcemaps: require("gulp-sourcemaps"), typedoc: require("gulp-typedoc") }; -require("babel-preset-es2015"); exports.lodashObject = require('lodash/fp/object'); exports.projectinfo = require("projectinfo"); exports.path = require("path"); diff --git a/dist/npmts.tests.js b/dist/npmts.tests.js index 02947e0..49b2f30 100644 --- a/dist/npmts.tests.js +++ b/dist/npmts.tests.js @@ -14,7 +14,9 @@ var mocha = function (configArg) { var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "dist/*.js")]) .pipe(plugins.g.sourcemaps.init()) .pipe(plugins.g.babel({ - presets: ['es2015'] + presets: [ + plugins.path.join(paths.npmtsPackageRoot, "node_modules/babel-preset-es2015/index.js") + ] })) .pipe(plugins.g.istanbul()) .pipe(plugins.g.sourcemaps.write()) @@ -22,7 +24,9 @@ var mocha = function (configArg) { .on("finish", function () { plugins.gulp.src([plugins.path.join(paths.cwd, "test/test.js")]) .pipe(plugins.g.babel({ - presets: ['es2015'] + presets: [ + plugins.path.join(paths.npmtsPackageRoot, "node_modules/babel-preset-es2015/index.js") + ] })) .pipe(plugins.g.injectModules()) .pipe(plugins.g.mocha()) diff --git a/ts/npmts.plugins.ts b/ts/npmts.plugins.ts index d15c386..b6008ee 100644 --- a/ts/npmts.plugins.ts +++ b/ts/npmts.plugins.ts @@ -11,7 +11,6 @@ export let g = { sourcemaps: require("gulp-sourcemaps"), typedoc: require("gulp-typedoc") }; -import "babel-preset-es2015"; export let lodashObject = require('lodash/fp/object'); export import projectinfo = require("projectinfo"); export import path = require("path"); diff --git a/ts/npmts.tests.ts b/ts/npmts.tests.ts index bf65c1d..7052fb6 100644 --- a/ts/npmts.tests.ts +++ b/ts/npmts.tests.ts @@ -14,7 +14,9 @@ let mocha = function (configArg) { var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"dist/*.js")]) .pipe(plugins.g.sourcemaps.init()) .pipe(plugins.g.babel({ - presets: ['es2015'] + presets: [ + plugins.path.join(paths.npmtsPackageRoot,"node_modules/babel-preset-es2015/index.js") + ] })) .pipe(plugins.g.istanbul()) .pipe(plugins.g.sourcemaps.write()) @@ -22,7 +24,9 @@ let mocha = function (configArg) { .on("finish",function(){ plugins.gulp.src([plugins.path.join(paths.cwd,"test/test.js")]) .pipe(plugins.g.babel({ - presets: ['es2015'] + presets: [ + plugins.path.join(paths.npmtsPackageRoot,"node_modules/babel-preset-es2015/index.js") + ] })) .pipe(plugins.g.injectModules()) .pipe(plugins.g.mocha())