Merge pull request #8 from yukal/dev

Dev

Author: Alexander

.github/workflows/node.js.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [12.x, 14.x, 16.x]
 
     steps:
     - uses: actions/checkout@v2

lib/gulp-json-loader.js

@@ -81,12 +81,7 @@ const loadImportsAsync = (ctx, imports, cachedData) => {
       const options = { ctx, imports, cachedData, pocket: {} };
 
       loadImportsRecursively(options, (error, pocket) => {
-        if (error !== null) {
-          reject(error);
-          return;
-        }
-
-        resolve(pocket);
+        error !== null ? reject(error) : resolve(pocket);
       });
 
     }
@@ -136,7 +131,7 @@ const loadImportsRecursively = async (options, callback) => {
     options.idx = idx + 1;
     loadImportsRecursively(options, callback);
 
-  } else if (callback !== undefined) {
+  } else if (callback instanceof Function) {
     callback(null, pocket);
   }
 }