Merge branch 'master' into 4.0

cmtt · Nov 27, 2019 · d10f63c · d10f63c
2 parents 23314ed + 0e4834d
commit d10f63c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/lib/gulp-di.js b/lib/gulp-di.js
@@ -21,7 +21,6 @@ module.exports = (function () {
    */
 
   class GulpDI {
-
     /**
      * @constructor
      * @param {object} gulp The gulp instance to use
@@ -264,7 +263,6 @@ module.exports = (function () {
     tasks (directory) {
       return this.task(readDirectory(normalizePath(parentDir, directory), false));
     }
-
   }
 
   /**

diff --git a/lib/resolver.js b/lib/resolver.js
@@ -118,7 +118,7 @@ class Resolver {
           throw new Error(`Circular: ${entry.key} -> ${key}`);
         }
         const queuedItem = this.byId(key);
-        _resolve({ key, dependencies: queuedItem && queuedItem.dependencies || [] }, unresolved);
+        _resolve({ key, dependencies: (queuedItem && queuedItem.dependencies) || [] }, unresolved);
       }
 
       unresolved = _.without(unresolved, entry.key);

diff --git a/tasks/examples.js b/tasks/examples.js
@@ -12,7 +12,7 @@ module.exports = (Package, basePath, chalk, log, gulp, taskInfo, gutil, runningT
      */
 
     console.log(`${Package.name}s location: `, basePath());
-    console.log(`this file\'s location: ${basePath('tasks', path.basename(__filename))}`);
+    console.log(`this file's location: ${basePath('tasks', path.basename(__filename))}`);
   });
 
   // You can declare multiple gulp tasks in each file.
@@ -22,7 +22,7 @@ module.exports = (Package, basePath, chalk, log, gulp, taskInfo, gutil, runningT
      * Example logging task information from contrib/help.js
      */
 
-    console.log(`${Package.name}\'s task information: `);
+    console.log(`${Package.name}'s task information: `);
     console.log(taskInfo);
     cb();
   });