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

angular · Feb 13, 2019 · d941c2b · d941c2b
1 parent 26f3475
commit d941c2b
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 42 deletions.
diff --git a/packages/schematics/angular/class/index.ts b/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(),
     ]);
   };

diff --git a/packages/schematics/angular/component/index.ts b/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(),
     ]);
   };

diff --git a/packages/schematics/angular/directive/index.ts b/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(),
     ]);
   };

diff --git a/packages/schematics/angular/enum/index.ts b/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(),
     ]);
   };

diff --git a/packages/schematics/angular/guard/index.ts b/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(),
     ]);
   };

diff --git a/packages/schematics/angular/interface/index.ts b/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(),
     ]);
   };

diff --git a/.../files/__projectRoot__/README.md.template → .../angular/library/files/README.md.template b/.../files/__projectRoot__/README.md.template → .../angular/library/files/README.md.template
diff --git a/...es/__projectRoot__/karma.conf.js.template → ...ular/library/files/karma.conf.js.template b/...es/__projectRoot__/karma.conf.js.template → ...ular/library/files/karma.conf.js.template
diff --git a/.../__projectRoot__/ng-package.json.template → ...ar/library/files/ng-package.json.template b/.../__projectRoot__/ng-package.json.template → ...ar/library/files/ng-package.json.template
diff --git a/...les/__projectRoot__/package.json.template → ...gular/library/files/package.json.template b/...les/__projectRoot__/package.json.template → ...gular/library/files/package.json.template
diff --git a/...ojectRoot__/src/__entryFile__.ts.template → ...brary/files/src/__entryFile__.ts.template b/...ojectRoot__/src/__entryFile__.ts.template → ...brary/files/src/__entryFile__.ts.template
diff --git a/...iles/__projectRoot__/src/test.ts.template → ...ngular/library/files/src/test.ts.template b/...iles/__projectRoot__/src/test.ts.template → ...ngular/library/files/src/test.ts.template
diff --git a/..._projectRoot__/tsconfig.lib.json.template → .../library/files/tsconfig.lib.json.template b/..._projectRoot__/tsconfig.lib.json.template → .../library/files/tsconfig.lib.json.template
diff --git a/...projectRoot__/tsconfig.spec.json.template → ...library/files/tsconfig.spec.json.template b/...projectRoot__/tsconfig.spec.json.template → ...library/files/tsconfig.spec.json.template
diff --git a/...iles/__projectRoot__/tslint.json.template → ...ngular/library/files/tslint.json.template b/...iles/__projectRoot__/tslint.json.template → ...ngular/library/files/tslint.json.template
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
@@ -13,9 +13,9 @@ import {
   Tree,
   apply,
   applyTemplates,
-  branchAndMerge,
   chain,
   mergeWith,
+  move,
   noop,
   schematic,
   url,
@@ -215,13 +215,11 @@ export default function (options: LibraryOptions): Rule {
         angularLatestVersion: latestVersions.Angular.replace('~', '').replace('^', ''),
         folderName,
       }),
-      // TODO: Moving inside `branchAndMerge` should work but is bugged right now.
-      // The __projectRoot__ is being used meanwhile.
-      // move(projectRoot),
+      move(projectRoot),
     ]);
 
     return chain([
-      branchAndMerge(mergeWith(templateSource)),
+      mergeWith(templateSource),
       addAppToWorkspaceFile(options, workspace, projectRoot, projectName),
       options.skipPackageJson ? noop() : addDependenciesToPackageJson(),
       options.skipTsConfig ? noop() : updateTsConfig(packageName, distRoot),

diff --git a/packages/schematics/angular/module/index.ts b/packages/schematics/angular/module/index.ts
@@ -12,7 +12,6 @@ import {
   Tree,
   apply,
   applyTemplates,
-  branchAndMerge,
   chain,
   filter,
   mergeWith,
@@ -99,10 +98,8 @@ export default function (options: ModuleOptions): Rule {
     ]);
 
     return chain([
-      branchAndMerge(chain([
-        addDeclarationToNgModule(options),
-        mergeWith(templateSource),
-      ])),
+      addDeclarationToNgModule(options),
+      mergeWith(templateSource),
       options.lintFix ? applyLintFix(options.path) : noop(),
     ]);
   };

diff --git a/packages/schematics/angular/pipe/index.ts b/packages/schematics/angular/pipe/index.ts
@@ -12,7 +12,6 @@ import {
   Tree,
   apply,
   applyTemplates,
-  branchAndMerge,
   chain,
   filter,
   mergeWith,
@@ -115,12 +114,10 @@ export default function (options: PipeOptions): Rule {
       move(parsedPath.path),
     ]);
 
-    return branchAndMerge(
-      chain([
-        addDeclarationToNgModule(options),
-        mergeWith(templateSource),
-        options.lintFix ? applyLintFix(options.path) : noop(),
-      ]),
-    );
+    return chain([
+      addDeclarationToNgModule(options),
+      mergeWith(templateSource),
+      options.lintFix ? applyLintFix(options.path) : noop(),
+    ]);
   };
 }