From 5ab05eb4d57fb3869d2ff5cc169094cfa87b429b Mon Sep 17 00:00:00 2001
From: Nick Demarest <nick.demarest@vertiba.com>
Date: Sat, 18 Aug 2018 14:52:28 -0600
Subject: [PATCH] Adds directory recursion and fixes a webpack v4 deprecation

---
 index.js | 59 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 45 insertions(+), 14 deletions(-)

diff --git a/index.js b/index.js
index b8a0320..5ca4a11 100644
--- a/index.js
+++ b/index.js
@@ -36,31 +36,62 @@ class WebpackSfdcDeployPlugin {
 
         const dir = this.options.filesFolderPath;
 
-        compiler.plugin('done', stats => {
+        const applyFn = stats => {
             if (stats.hasErrors()) {
                 this.printErrors(stats.compilation.errors);
                 return;
             }
             this.prepareFileValidation();
 
-            fs.readdir(dir, (err, files) => {
+            const resourceZip = new Zip();
+
+            this.addDirectoryToZipResource(resourceZip, dir).then(() => {
+              if (this.options.deploy) {
+                  this.deploy(resourceZip);
+              }
+            }).catch(e => { throw(e) });
+
+        };
+
+        if ('hooks' in compiler) {
+          // v4 approach:
+          compiler.hooks.done.tap('SfdcDeployPlugin', applyFn.bind(this));
+        } else {
+          // legacy approach:
+          compiler.plugin('done', applyFn.bind(this));
+        }
+
+
+    }
+
+    addDirectoryToZipResource(resourceZip, dirName) {
+        return new Promise((resolve, reject) => {
+            fs.readdir(dirName, async (err, filesOrDirectories) => {
                 if (err) {
                     this.printErrors(err);
+                    reject(err);
                 }
 
-                const resourceZip = new Zip();
-                files.forEach(fileName => {
-                    if(this.validateFile(fileName)) {
-                        const data = fs.readFileSync(path.resolve(dir, fileName), 'utf8');
-                        resourceZip.file(fileName, data);
-                    }
-                });
-
-                if (this.options.deploy) {
-                    this.deploy(resourceZip);
-                }
+                const zipDirName = dirName.slice(this.options.filesFolderPath.length + 1);
+
+                resolve(Promise.all(
+                    filesOrDirectories.map(async fileOrDirName => {
+                        let fullPathName = path.resolve(dirName, fileOrDirName);
+                        let zipPathName = zipDirName + '/' + fileOrDirName;
+
+                        if(fs.lstatSync(fullPathName).isDirectory()) {
+                            resourceZip.folder(zipPathName)
+                            await this.addDirectoryToZipResource(
+                              resourceZip, dirName + '/' + fileOrDirName
+                            );
+
+                        } else if(this.validateFile(fileOrDirName)) {
+                            const data = fs.readFileSync(fullPathName, 'utf8');
+                            resourceZip.file(zipPathName, data);
+                        }
+                    })
+                ));
             });
-
         });
     }