inikulin · AndreyBelym · Jun 8, 2018
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,11 @@
+* text=auto
+*.json text eol=lf
+*.sh text eol=lf
+*.js text eol=lf
+*.ts text eol=lf
+*.css text eol=lf
+*.html text eol=lf
+*.md text eol=lf
+
+*.png binary
+*.ico binary
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 .idea
-node_modules
+node_modules
+package-lock.json
diff --git a/index.js b/index.js
@@ -1,6 +1,6 @@
 var spawn       = require('child_process').spawn;
 var gulp        = require('gulp');
-var PluginError = require('gulp-util').PluginError;
+var PluginError = require('plugin-error');
 var Promise     = require('pinkie-promise');
 
 function getTaskListFromArgs (args) {
@@ -30,18 +30,26 @@ function GulpLL () {
 }
 
 
+GulpLL.prototype._getWorkerTaskName = function (taskName) {
+    return 'worker:' + taskName;
+};
+
 GulpLL.prototype._getWorkerArgs = function (task) {
     var ll = this;
 
     var args = this.args.filter(function (arg) {
         return ll.allTasks.indexOf(arg) < 0;
     });
 
-    args.splice(1, 0, 'worker:' + task);
-    args.push('--ll-worker');
+    args.splice(1, 0, ll._getWorkerTaskName(task));
+
+    if (!this.isWorker) {
+        args.push('--ll-worker');
+        args.push('--steps-as-tasks');
 
-    if (this.isDebug)
-        args.push('--ll-debug');
+        if (this.isDebug)
+            args.push('--ll-debug');
+    }
 
     return args;
 };
@@ -66,30 +74,57 @@ GulpLL.prototype._isLLTask = function (task) {
     return this.llTasks.indexOf(task) > -1 || (this.isDebug && this.llTasksDebugOnly.indexOf(task) > -1);
 };
 
+GulpLL.prototype._getNameAndFn = function (gulpTaskArgs) {
+    const isNameExplicit = typeof gulpTaskArgs[0] === 'string';
+
+    return {
+        name: isNameExplicit ? gulpTaskArgs[0] : (gulpTaskArgs[0].name || gulpTaskArgs[0].displayName),
+        fn:   isNameExplicit ? gulpTaskArgs[1] : gulpTaskArgs[0],
+
+        isNameExplicit
+    };
+};
+
+GulpLL.prototype._getGulpTaskArgs = function (name, fn, { isNameExplicit }) {
+    let gulpTaskArgs = [];
+
+    if (isNameExplicit)
+        gulpTaskArgs.push(name, fn);
+    else {
+        fn.displayName = name;
+
+        gulpTaskArgs.push(fn);
+    }
+
+    return gulpTaskArgs;
+};
+
+GulpLL.prototype._addTaskToGulp = function (name, fn, { isNameExplicit }) {
+    const ll = this;
+
+    ll.allTasks.push(name);
+    ll.taskFn(...ll._getGulpTaskArgs(name, fn, { isNameExplicit }));
+};
+
 GulpLL.prototype._overrideGulpTaskFn = function () {
     var ll = this;
 
-    gulp.task = function (name, deps, fn) {
-        if (!fn && typeof deps === 'function') {
-            fn   = deps;
-            deps = void 0;
-        }
+    gulp.task = function (...args) {
+        let { name, fn, isNameExplicit } = ll._getNameAndFn(args);
 
         if (ll._isLLTask(name)) {
-            if (ll.isWorker) {
-                deps = void 0;
-                name = 'worker:' + name;
-            }
+            const workerTaskName = ll._getWorkerTaskName(name);
+
+            if (ll.isWorker && ll.args.indexOf(workerTaskName) > -1)
+                ll._addTaskToGulp(workerTaskName, fn, { isNameExplicit });
             else {
                 fn = function () {
                     return ll._createWorker(name);
                 };
             }
         }
 
-
-        ll.allTasks.push(name);
-        ll.taskFn(name, deps, fn);
+        ll._addTaskToGulp(name, fn, { isNameExplicit });
     };
 };
 

diff --git a/package.json b/package.json
@@ -1,8 +1,11 @@
 {
   "name": "gulp-ll",
-  "version": "1.0.4",
+  "version": "2.0.0",
   "description": "Run CPU-consuming Gulp tasks in the separate processes to achieve faster builds.",
   "main": "./index.js",
+  "engines": {
+    "node": ">=6.0.0"
+  },
   "scripts": {
     "test": "mocha"
   },
@@ -31,11 +34,11 @@
     "index.js"
   ],
   "dependencies": {
-    "gulp-util": "^3.0.7",
-    "pinkie-promise": "^1.0.0"
+    "pinkie-promise": "^1.0.0",
+    "plugin-error": "^1.0.1"
   },
   "devDependencies": {
-    "gulp": "^3.9.0",
-    "mocha": "^2.3.4"
+    "gulp": "^4.0.0",
+    "mocha": "^5.2.0"
   }
 }
diff --git a/test/Gulpfile.js b/test/Gulpfile.js
@@ -5,25 +5,27 @@ ll
     .tasks('default', 'task2', 'task3')
     .onlyInDebug('task4');
 
-gulp.task('default', ['task2', 'task3', 'task4'], function () {
-    console.log('%task1:' + process.pid + '%');
-});
-
-
-gulp.task('task2', ['task3'], function () {
-    console.log('%task2:' + process.pid + '%');
+gulp.task('task5', function (done) {
+    console.log('%task5:' + process.pid + '%');
+    done();
 });
 
-
-gulp.task('task3', ['task5'], function () {
+gulp.task('task3', gulp.series('task5', function (done) {
     console.log('%task3:' + process.pid + '%');
-});
+    done();
+}));
 
+gulp.task('task2', gulp.series('task3', function (done) {
+    console.log('%task2:' + process.pid + '%');
+    done();
+}));
 
-gulp.task('task4', function () {
+gulp.task('task4', function (done) {
     console.log('%task4:' + process.pid + '%');
+    done();
 });
 
-gulp.task('task5', function () {
-    console.log('%task5:' + process.pid + '%');
-});
+gulp.task('default', gulp.series(gulp.parallel('task2', 'task4'), function (done) {
+    console.log('%task1:' + process.pid + '%');
+    done();
+}));
diff --git a/test/test.js b/test/test.js
@@ -52,7 +52,7 @@ test('Should run tasks in parallel', function () {
     return runGulp()
         .then(function (runInfo) {
             assert.deepEqual(runInfo.tasks, expectedTasks);
-            assert.strictEqual(runInfo.processCount, 4);
+            assert.strictEqual(runInfo.processCount, 3);
         });
 });