fix(init): fix link and npm install

Author: filipesilva

package.json

@@ -78,7 +78,6 @@
     "less-loader": "^2.2.3",
     "lodash": "^4.11.1",
     "node-sass": "^3.7.0",
-    "npm": "3.10.2",
     "npm-run-all": "^3.0.0",
     "offline-plugin": "^3.4.1",
     "opn": "4.0.1",

packages/angular-cli/commands/init.ts

@@ -1,12 +1,12 @@
 import LinkCli from '../tasks/link-cli';
+import NpmInstall from '../tasks/npm-install';
 
 const Command = require('ember-cli/lib/models/command');
 const Promise = require('ember-cli/lib/ext/promise');
 const SilentError = require('silent-error');
 const validProjectName = require('ember-cli/lib/utilities/valid-project-name');
 const normalizeBlueprint = require('ember-cli/lib/utilities/normalize-blueprint-option');
 const GitInit = require('../tasks/git-init');
-const NpmInstall = require('../tasks/npm-install');
 
 
 const InitCommand: any = Command.extend({
@@ -57,18 +57,18 @@ const InitCommand: any = Command.extend({
       });
     }
 
-    let linkCli: any;
-    if (commandOptions.linkCli) {
-      linkCli = new LinkCli({
+    let npmInstall: any;
+    if (!commandOptions.skipNpm) {
+      npmInstall = new NpmInstall({
         ui: this.ui,
         analytics: this.analytics,
         project: this.project
       });
     }
 
-    let npmInstall: any;
-    if (!commandOptions.skipNpm) {
-      npmInstall = new NpmInstall({
+    let linkCli: any;
+    if (commandOptions.linkCli) {
+      linkCli = new LinkCli({
         ui: this.ui,
         analytics: this.analytics,
         project: this.project
@@ -121,19 +121,13 @@ const InitCommand: any = Command.extend({
         }
       }.bind(this))
       .then(function () {
-        if (commandOptions.linkCli) {
-          return linkCli.run({
-            verbose: commandOptions.verbose,
-            optional: false
-          });
+        if (!commandOptions.skipNpm) {
+          return npmInstall.run();
         }
       })
       .then(function () {
-        if (!commandOptions.skipNpm) {
-          return npmInstall.run({
-            verbose: commandOptions.verbose,
-            optional: false
-          });
+        if (commandOptions.linkCli) {
+          return linkCli.run();
         }
       })
       .then(function () {

packages/angular-cli/package.json

@@ -59,7 +59,6 @@
     "less-loader": "^2.2.3",
     "lodash": "^4.11.1",
     "node-sass": "^3.7.0",
-    "npm": "3.10.2",
     "npm-run-all": "^3.0.0",
     "offline-plugin": "^3.4.1",
     "opn": "4.0.1",

packages/angular-cli/tasks/npm-install.js

@@ -0,0 +1,26 @@
+const Task = require('ember-cli/lib/models/task');
+import * as chalk from 'chalk';
+import {exec} from 'child_process';
+
+
+export default Task.extend({
+  run: function () {
+    const ui = this.ui;
+    let exitCode = 0;
+
+    return new Promise((resolve) => {
+      ui.writeLine(chalk.green('Installing packages for tooling via npm.'));
+      exec(`npm install`,
+        (err: NodeJS.ErrnoException, stdout: string, stderr: string) => {
+          if (err) {
+            ui.writeLine(stderr);
+            ui.writeLine(chalk.red('Package install failed, see above.'));
+            exitCode = 1;
+          } else {
+            ui.writeLine(chalk.green('Installed packages for tooling via npm.'));
+          }
+          resolve(exitCode);
+        });
+    });
+  }
+});