fix(@schematics/angular): Use branchAndMerge for ng-new

Author: Brocco

packages/schematics/angular/ng-new/index.ts

@@ -10,10 +10,8 @@ import {
  SchematicContext,
  SchematicsException,
  Tree,
- apply,
+ branchAndMerge,
  chain,
- empty,
- mergeWith,
  move,
  schematic,
 } from '@angular-devkit/schematics';
@@ -55,14 +53,14 @@ export default function (options: NgNewOptions): Rule {
  };
 
  return chain([
- mergeWith(
- apply(empty(), [
+ branchAndMerge(
+ chain([
  schematic('workspace', workspaceOptions),
  schematic('application', applicationOptions),
  move(options.directory || options.name),
  ]),
  ),
- (host: Tree, context: SchematicContext) => {
+ (_host: Tree, context: SchematicContext) => {
  let packageTask;
  if (!options.skipInstall) {
  packageTask = context.addTask(new NodePackageInstallTask(options.directory));

packages/schematics/angular/ng-new/index_spec.ts

@@ -46,4 +46,15 @@ describe('Ng New Schematic', () => {
  const content = tree.readContent('/bar/angular.json');
  expect(content).toMatch(/"prefix": "pre"/);
  });
+
+ it('should set up the app module', () => {
+ const options: NgNewOptions = {
+ name: 'foo',
+ version: '6.0.0',
+ };
+
+ const tree = schematicRunner.runSchematic('ng-new', options);
+ const moduleContent = tree.readContent('/foo/src/app/app.module.ts');
+ expect(moduleContent).toMatch(/declarations:\s*\[\s*AppComponent\s*\]/m);
+ });
 });