fix(@schematics/angular): revert PR 1000

hansl · hansl · commit bddda72f2d96 · 2018-06-05T17:55:19.000-07:00
But keep the test.
diff --git a/packages/schematics/angular/ng-new/index.ts b/packages/schematics/angular/ng-new/index.ts
@@ -10,8 +10,10 @@ import{
 SchematicContext,
 SchematicsException,
 Tree,
- branchAndMerge,
+ apply,
 chain,
+ empty,
+ mergeWith,
 move,
 schematic,
 } from '@angular-devkit/schematics';
@@ -53,8 +55,8 @@ export default function (options: NgNewOptions): Rule{
 };
 
 return chain([
- branchAndMerge(
- chain([
+ mergeWith(
+ apply(empty(), [
 schematic('workspace', workspaceOptions),
 schematic('application', applicationOptions),
 move(options.directory || options.name),

-Original file line number
+Diff line change
 SchematicContext,
 SchematicsException,
 Tree,
 -branchAndMerge,
 +apply,
 chain,
 +empty,
 +mergeWith,
 move,
 schematic,
 }from'@angular-devkit/schematics';
 };
 returnchain([
 -branchAndMerge(
 -chain([
 +mergeWith(
 +apply(empty(),[
 schematic('workspace',workspaceOptions),
 schematic('application',applicationOptions),
 move(options.directory||options.name),