build(broccoli): store DiffResult for re-use only if DiffResult

One of the non-angular broccoli plugins returns a weird object. We can't
assume that all trees meet the contract that we expect them to meet, so
we do a typecheck before storing the result of the rebuild.

Closes #2662

tools/broccoli/diffing-broccoli-plugin.ts

@@ -74,12 +74,12 @@ class DiffingPluginWrapper implements BroccoliTree {
       // Otherwise, `this.diffResult` was produced from the output of the
       // inputTree's rebuild() method, and can be used without being checked.
       // Set `this.diffResult` to null and return the previously stored value.
-      if (!tree.diffResult) {
-        let differ = index === false ? this.treeDiffer : this.treeDiffers[index];
-        return differ.diffTree();
-      }
       let diffResult = tree.diffResult;
       tree.diffResult = null;
+      if (!diffResult) {
+        let differ = index === false ? this.treeDiffer : this.treeDiffers[index];
+        diffResult = differ.diffTree();
+      }
       return diffResult;
     };
 
@@ -93,7 +93,8 @@ class DiffingPluginWrapper implements BroccoliTree {
   }
 
   private maybeStoreDiffResult(value: (DiffResult | void)) {
-    this.diffResult = value ? <DiffResult>(value) : null;
+    if (!(value instanceof DiffResult)) value = null;
+    this.diffResult = <DiffResult>(value);
   }
 
   rebuild() {
@@ -112,12 +113,14 @@ class DiffingPluginWrapper implements BroccoliTree {
           return resultPromise.then((result: (DiffResult | void)) => {
             this.maybeStoreDiffResult(result);
             this.relinkOutputAndCachePaths();
+            return result;
           });
         }
       }
 
       this.maybeStoreDiffResult(<(DiffResult | void)>(result));
       this.relinkOutputAndCachePaths();
+      return result;
     } catch (e) {
       e.message = `[${this.description}]: ${e.message}`;
       throw e;