refactor(@schematics/angular): remove redundant branchAndMerge rules

Author: clydin

packages/schematics/angular/class/index.ts

@@ -13,7 +13,6 @@ import {
   Tree,
   apply,
   applyTemplates,
-  branchAndMerge,
   chain,
   filter,
   mergeWith,
@@ -57,7 +56,7 @@ export default function (options: ClassOptions): Rule {
     ]);
 
     return chain([
-      branchAndMerge(mergeWith(templateSource)),
+      mergeWith(templateSource),
       options.lintFix ? applyLintFix(options.path) : noop(),
     ]);
   };

packages/schematics/angular/component/index.ts

@@ -12,7 +12,6 @@ import {
   Tree,
   apply,
   applyTemplates,
-  branchAndMerge,
   chain,
   filter,
   mergeWith,
@@ -167,10 +166,8 @@ export default function (options: ComponentOptions): Rule {
     ]);
 
     return chain([
-      branchAndMerge(chain([
-        addDeclarationToNgModule(options),
-        mergeWith(templateSource),
-      ])),
+      addDeclarationToNgModule(options),
+      mergeWith(templateSource),
       options.lintFix ? applyLintFix(options.path) : noop(),
     ]);
   };

packages/schematics/angular/directive/index.ts

@@ -12,7 +12,6 @@ import {
   Tree,
   apply,
   applyTemplates,
-  branchAndMerge,
   chain,
   filter,
   mergeWith,
@@ -135,10 +134,8 @@ export default function (options: DirectiveOptions): Rule {
     ]);
 
     return chain([
-      branchAndMerge(chain([
-        addDeclarationToNgModule(options),
-        mergeWith(templateSource),
-      ])),
+      addDeclarationToNgModule(options),
+      mergeWith(templateSource),
       options.lintFix ? applyLintFix(options.path) : noop(),
     ]);
   };

packages/schematics/angular/enum/index.ts

@@ -13,7 +13,6 @@ import {
   Tree,
   apply,
   applyTemplates,
-  branchAndMerge,
   chain,
   mergeWith,
   move,
@@ -50,9 +49,7 @@ export default function (options: EnumOptions): Rule {
     ]);
 
     return chain([
-      branchAndMerge(chain([
-        mergeWith(templateSource),
-      ])),
+      mergeWith(templateSource),
       options.lintFix ? applyLintFix(options.path) : noop(),
     ]);
   };

packages/schematics/angular/guard/index.ts

@@ -12,7 +12,6 @@ import {
   Tree,
   apply,
   applyTemplates,
-  branchAndMerge,
   chain,
   filter,
   mergeWith,
@@ -70,9 +69,7 @@ export default function (options: GuardOptions): Rule {
     ]);
 
     return chain([
-      branchAndMerge(chain([
-        mergeWith(templateSource),
-      ])),
+      mergeWith(templateSource),
       options.lintFix ? applyLintFix(options.path) : noop(),
     ]);
   };

packages/schematics/angular/interface/index.ts

@@ -12,7 +12,6 @@ import {
   Tree,
   apply,
   applyTemplates,
-  branchAndMerge,
   chain,
   mergeWith,
   move,
@@ -52,9 +51,7 @@ export default function (options: InterfaceOptions): Rule {
     ]);
 
     return chain([
-      branchAndMerge(chain([
-        mergeWith(templateSource),
-      ])),
+      mergeWith(templateSource),
       options.lintFix ? applyLintFix(options.path) : noop(),
     ]);
   };