From 09ced91c0d85e758efff8eab4cf77227e894f2da Mon Sep 17 00:00:00 2001 From: Joshua Davis Date: Thu, 12 May 2016 10:35:11 -0400 Subject: [PATCH] replaced es6-promise with Q; removed gulp-shell which was blacklisted and replaced with child_process.spawn --- index.js | 28 +++++++++++++++------------- package.json | 3 +-- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/index.js b/index.js index 4fbef2c..133c125 100644 --- a/index.js +++ b/index.js @@ -2,12 +2,13 @@ var _ = require('lodash'), gulp = require('gulp'), - shell = require('gulp-shell'), gutil = require('gulp-util'), fileExists = require('file-exists'), - file = require('gulp-file'); + file = require('gulp-file'), + Q = require('Q'); + +var spawn = require('child_process').spawn; -require('es6-promise').polyfill(); var PLUGIN_NAME = 'config-transform'; @@ -67,6 +68,7 @@ function setup(options) { } function createProj(options) { + var deferred = Q.defer(); var _project = ''; @@ -76,13 +78,13 @@ function createProj(options) { .replace('{transform}', options.transform) .replace('{destination}', options.destination); - return Promise.all([ - new Promise(function(resolve, reject) { - file('_msbuild.proj', _project, { src: true }) - .pipe(gulp.dest('.')) - .on('end', resolve) - }) - ]); + file('_msbuild.proj', _project, { src: true }) + .pipe(gulp.dest('.')) + .on('end', function() { + deferred.resolve(); + }); + + return deferred.promise; } function transform(options) { @@ -100,9 +102,9 @@ function transform(options) { setup(_options); - return createProj(_options).then(function() { - return gulp.task('transform', shell.task(_options.msBuildPath + ' ./_msbuild.proj /t:Transform')); - }); + createProj(_options).then(function() { + spawn(_options.msBuildPath, ['./_msbuild.proj', '/t:Transform'], {stdio: 'inherit'}); + }).done(); } module.exports = transform; \ No newline at end of file diff --git a/package.json b/package.json index b734c6d..4d14eb9 100644 --- a/package.json +++ b/package.json @@ -27,11 +27,10 @@ "homepage": "https://github.com/a11smiles/gulp-config-transform", "dependencies": { "gulp": "^3.8.6", - "gulp-shell": "^0.5.1", "gulp-util": "^3.0.7", "lodash": "^3.9.3", "file-exists": "1.0.0", "gulp-file": "0.2.0", - "es6-promise": "*" + "q": "1.4.1" } }