Make --incremental work with passthrough copy #108

11ty · Sep 18, 2019 · f7fb085 · f7fb085
1 parent be76af7
commit f7fb085
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 15 deletions.
diff --git a/src/Eleventy.js b/src/Eleventy.js
@@ -406,6 +406,8 @@ Arguments:
     let isInclude =
       path &&
       TemplatePath.startsWithSubPath(path, this.eleventyFiles.getIncludesDir());
+    let isJavaScriptDependency =
+      path && this.watchTargets.isJavaScriptDependency(path);
 
     let localProjectConfigPath = config.getLocalProjectConfigFile();
     // reset and reload global configuration :O
@@ -417,7 +419,7 @@ Arguments:
     await this.restart();
     this.watchTargets.clearDependencyRequireCache();
 
-    if (path && !isInclude && this.isIncremental) {
+    if (path && !isInclude && !isJavaScriptDependency && this.isIncremental) {
       this.writer.setIncrementalFile(path);
     }
 

diff --git a/src/EleventyWatchTargets.js b/src/EleventyWatchTargets.js
@@ -18,6 +18,10 @@ class EleventyWatchTargets {
     return this._watchJavaScriptDependencies;
   }
 
+  isJavaScriptDependency(path) {
+    return this.dependencies.has(path);
+  }
+
   _normalizeTargets(targets) {
     if (!targets) {
       return [];

diff --git a/src/TemplatePassthroughManager.js b/src/TemplatePassthroughManager.js
@@ -15,6 +15,7 @@ class TemplatePassthroughManager {
 
   reset() {
     this.count = 0;
+    this.incrementalFile = null;
     debug("Resetting counts to 0");
   }
 
@@ -34,6 +35,10 @@ class TemplatePassthroughManager {
     this.isDryRun = !!isDryRun;
   }
 
+  setIncrementalFile(path) {
+    this.incrementalFile = path;
+  }
+
   _normalizePaths(path, outputPath) {
     return {
       inputPath: TemplatePath.addLeadingDotSlash(path),
@@ -87,16 +92,21 @@ class TemplatePassthroughManager {
 
   async copyPath(path) {
     let pass = new TemplatePassthrough(path, this.outputDir, this.inputDir);
-    pass.setDryRun(this.isDryRun);
+
+    if (this.incrementalFile && path.inputPath !== this.incrementalFile) {
+      pass.setDryRun(true);
+    } else {
+      pass.setDryRun(this.isDryRun);
+    }
 
     return pass
       .write()
-      .then(
-        function() {
+      .then(() => {
+        if (!pass.isDryRun) {
           this.count++;
           debug("Copied %o", path.inputPath);
-        }.bind(this)
-      )
+        }
+      })
       .catch(function(e) {
         return Promise.reject(
           new TemplatePassthroughManagerCopyError(

diff --git a/src/TemplateWriter.js b/src/TemplateWriter.js
@@ -151,16 +151,19 @@ TemplateWriter.prototype.write = async function() {
   let promises = [];
   let paths = await this._getAllPaths();
   debug("Found: %o", paths);
+
+  let passthroughManager = this.getFileManager().getPassthroughManager();
+  passthroughManager.setIncrementalFile(
+    this.incrementalFile ? this.incrementalFile : false
+  );
+
   promises.push(
-    this.getFileManager()
-      .getPassthroughManager()
-      .copyAll(paths)
-      .catch(e => {
-        EleventyErrorHandler.warn(e, "Error with passthrough copy");
-        return Promise.reject(
-          new TemplateWriterWriteError(`Having trouble copying`, e)
-        );
-      })
+    passthroughManager.copyAll(paths).catch(e => {
+      EleventyErrorHandler.warn(e, "Error with passthrough copy");
+      return Promise.reject(
+        new TemplateWriterWriteError("Having trouble copying", e)
+      );
+    })
   );
 
   // TODO optimize await here