feat(tracking): Third party NPM replacements

docs/documentation/new.md

@@ -10,7 +10,7 @@ Default applications are created in a directory of the same name, with an initia
 ## Options
 `--dry-run` (`-d`) run through without making any changes
 
-`--skip-npm` (`-sn`) skip installing npm packages
+`--skip-install` (`-si`) skip installing packages
 
 `--skip-git` (`-sg`) skip initializing a git repository
 

docs/documentation/update.md

@@ -10,7 +10,7 @@ Initialization is done in-place, meaning that the generated application is initi
 ## Options
 `--dry-run` (`-d`) run through without making any changes
 
-`--skip-npm` (`-sn`) skip installing npm packages
+`--skip-install` (`-si`) skip installing packages
 
 `--skip-git` (`-sg`) skip initializing a git repository
 

packages/@angular/cli/commands/init.ts

@@ -11,7 +11,7 @@ const InitCommand: any = Command.extend({
     { name: 'verbose', type: Boolean, default: false, aliases: ['v'] },
     { name: 'link-cli', type: Boolean, default: false, aliases: ['lc'] },
     { name: 'ng4', type: Boolean, default: false },
-    { name: 'skip-npm', type: Boolean, default: false, aliases: ['sn'] },
+    { name: 'skip-install', type: Boolean, default: false, aliases: ['si'] },
     { name: 'skip-git', type: Boolean, default: false, aliases: ['sg'] },
     { name: 'skip-tests', type: Boolean, default: false, aliases: ['st'] },
     { name: 'skip-commit', type: Boolean, default: false, aliases: ['sc'] },

packages/@angular/cli/commands/new.ts

@@ -16,7 +16,7 @@ const NewCommand = Command.extend({
     { name: 'verbose', type: Boolean, default: false, aliases: ['v'] },
     { name: 'link-cli', type: Boolean, default: false, aliases: ['lc'] },
     { name: 'ng4', type: Boolean, default: false },
-    { name: 'skip-npm', type: Boolean, default: false, aliases: ['sn'] },
+    { name: 'skip-install', type: Boolean, default: false, aliases: ['si'] },
     { name: 'skip-git', type: Boolean, default: false, aliases: ['sg'] },
     { name: 'skip-tests', type: Boolean, default: false, aliases: ['st'] },
     { name: 'skip-commit', type: Boolean, default: false, aliases: ['sc'] },

packages/@angular/cli/lib/config/schema.json

@@ -292,6 +292,11 @@
       },
       "additionalProperties": false
     },
+    "packageManager": {
+        "enum": [ "npm", "cnpm", "yarn", "default" ],
+        "default": "default",
+        "type": "string"
+    },
     "warnings": {
       "description": "Allow people to disable console warnings.",
       "type": "object",

packages/@angular/cli/tasks/init.ts

@@ -2,6 +2,8 @@ import * as chalk from 'chalk';
 import LinkCli from '../tasks/link-cli';
 import NpmInstall from '../tasks/npm-install';
 import { validateProjectName } from '../utilities/validate-project-name';
+import {checkYarnOrCNPM} from '../utilities/check-package-manager';
+import {CliConfig} from '../models/config';
 
 const Task = require('../ember-cli/lib/models/task');
 const Promise = require('../ember-cli/lib/ext/promise');
@@ -13,7 +15,7 @@ const GitInit = require('../tasks/git-init');
 export default Task.extend({
   run: function (commandOptions: any, rawArgs: string[]) {
     if (commandOptions.dryRun) {
-      commandOptions.skipNpm = true;
+      commandOptions.skipInstall = true;
     }
 
     const installBlueprint = new this.tasks.InstallBlueprint({
@@ -32,10 +34,12 @@ export default Task.extend({
     }
 
     let npmInstall: any;
-    if (!commandOptions.skipNpm) {
+    if (!commandOptions.skipInstall) {
+      const packageManager = CliConfig.fromGlobal().get('packageManager');
       npmInstall = new NpmInstall({
         ui: this.ui,
-        project: this.project
+        project: this.project,
+        packageManager
       });
     }
 
@@ -87,7 +91,7 @@ export default Task.extend({
         }
       })
       .then(function () {
-        if (!commandOptions.skipNpm) {
+        if (!commandOptions.skipInstall) {
           return npmInstall.run();
         }
       })
@@ -96,6 +100,7 @@ export default Task.extend({
           return linkCli.run();
         }
       })
+      .then(checkYarnOrCNPM)
       .then(() => {
         this.ui.writeLine(chalk.green(`Project '${packageName}' successfully created.`));
       });

packages/@angular/cli/tasks/npm-install.ts

@@ -6,17 +6,21 @@ import {exec} from 'child_process';
 export default Task.extend({
   run: function() {
     const ui = this.ui;
+    let packageManager = this.packageManager;
+    if (packageManager === 'default') {
+      packageManager = 'npm';
+    }
 
     return new Promise(function(resolve, reject) {
-      ui.writeLine(chalk.green('Installing packages for tooling via npm.'));
-      exec('npm install',
+      ui.writeLine(chalk.green(`Installing packages for tooling via ${packageManager}.`));
+      exec(`${packageManager} install`,
         (err: NodeJS.ErrnoException, stdout: string, stderr: string) => {
         if (err) {
           ui.writeLine(stderr);
           ui.writeLine(chalk.red('Package install failed, see above.'));
           reject();
         } else {
-          ui.writeLine(chalk.green('Installed packages for tooling via npm.'));
+          ui.writeLine(chalk.green(`Installed packages for tooling via ${packageManager}.`));
           resolve();
         }
       });

packages/@angular/cli/utilities/check-package-manager.ts

@@ -0,0 +1,38 @@
+import * as chalk from 'chalk';
+import {exec} from 'child_process';
+import {CliConfig} from '../models/config';
+
+const Promise = require('../ember-cli/lib/ext/promise');
+const execPromise = Promise.denodeify(exec);
+const packageManager = CliConfig.fromGlobal().get('packageManager');
+
+
+export function checkYarnOrCNPM() {
+  if (packageManager !== 'default') {
+    return Promise.resolve();
+  }
+
+  return Promise
+      .all([checkYarn(), checkCNPM()])
+      .then((data: Array<boolean>) => {
+        const [isYarnInstalled, isCNPMInstalled] = data;
+        if (isYarnInstalled && isCNPMInstalled) {
+          console.log(chalk.yellow('You can `ng set --global packageManager=yarn` '
+            + 'or `ng set --global packageManager=cnpm`.'));
+        } else if (isYarnInstalled) {
+          console.log(chalk.yellow('You can `ng set --global packageManager=yarn`.'));
+        } else if (isCNPMInstalled) {
+          console.log(chalk.yellow('You can `ng set --global packageManager=cnpm`.'));
+        }
+      });
+}
+
+function checkYarn() {
+  return execPromise('yarn --version')
+    .then(() => true, () => false);
+}
+
+function checkCNPM() {
+  return execPromise('cnpm --version')
+    .then(() => true, () => false);
+}

packages/@ngtools/json-schema/src/schema-tree.ts

@@ -495,7 +495,9 @@ class EnumSchemaTreeNode extends LeafSchemaTreeNode<any> {
     return v;
   }
 
-  get type() { return 'any'; }
+  get type() {
+    return this._schema['type'] || 'any';
+  }
   get tsType(): null { return null; }
   serialize(serializer: Serializer) { serializer.outputEnum(this); }
 }

tests/acceptance/destroy.spec.js

@@ -11,7 +11,7 @@ describe('Acceptance: ng destroy', function () {
     return tmp.setup('./tmp').then(function () {
       process.chdir('./tmp');
     }).then(function () {
-      return ng(['new', 'foo', '--skip-npm']);
+      return ng(['new', 'foo', '--skip-install']);
     });
   });
 

tests/acceptance/generate-class.spec.js

@@ -16,7 +16,7 @@ describe('Acceptance: ng generate class', function () {
     return tmp.setup('./tmp').then(function () {
       process.chdir('./tmp');
     }).then(function () {
-      return ng(['new', 'foo', '--skip-npm']);
+      return ng(['new', 'foo', '--skip-install']);
     });
   });
 

tests/acceptance/generate-component.spec.js

@@ -20,7 +20,7 @@ describe('Acceptance: ng generate component', function () {
     return tmp.setup('./tmp').then(function () {
       process.chdir('./tmp');
     }).then(function () {
-      return ng(['new', 'foo', '--skip-npm']);
+      return ng(['new', 'foo', '--skip-install']);
     });
   });
 

tests/acceptance/generate-directive.spec.js

@@ -19,7 +19,7 @@ describe('Acceptance: ng generate directive', function () {
     return tmp.setup('./tmp').then(function () {
       process.chdir('./tmp');
     }).then(function () {
-      return ng(['new', 'foo', '--skip-npm']);
+      return ng(['new', 'foo', '--skip-install']);
     });
   });
 

tests/acceptance/generate-module.spec.js

@@ -16,7 +16,7 @@ describe('Acceptance: ng generate module', function () {
     return tmp.setup('./tmp').then(function () {
       process.chdir('./tmp');
     }).then(function () {
-      return ng(['new', 'foo', '--skip-npm']);
+      return ng(['new', 'foo', '--skip-install']);
     });
   });
 

tests/acceptance/generate-pipe.spec.js

@@ -20,7 +20,7 @@ describe('Acceptance: ng generate pipe', function () {
     return tmp.setup('./tmp').then(function () {
       process.chdir('./tmp');
     }).then(function () {
-      return ng(['new', 'foo', '--skip-npm']);
+      return ng(['new', 'foo', '--skip-install']);
     });
   });
 

tests/acceptance/generate-route.spec.js

@@ -21,7 +21,7 @@ xdescribe('Acceptance: ng generate route', function () {
     return tmp.setup('./tmp').then(function () {
       process.chdir('./tmp');
     }).then(function () {
-      return ng(['new', 'foo', '--skip-npm']);
+      return ng(['new', 'foo', '--skip-install']);
     });
   });
 

tests/acceptance/generate-service.spec.js

@@ -19,7 +19,7 @@ describe('Acceptance: ng generate service', function () {
     return tmp.setup('./tmp').then(function () {
       process.chdir('./tmp');
     }).then(function () {
-      return ng(['new', 'foo', '--skip-npm']);
+      return ng(['new', 'foo', '--skip-install']);
     });
   });
 

tests/acceptance/init.spec.js

@@ -97,7 +97,7 @@ describe('Acceptance: ng update', function () {
   it('ng init does the same as ng update', function () {
     return ng([
       'init',
-      '--skip-npm'
+      '--skip-install'
     ]).then(confirmBlueprinted);
   });
 
@@ -109,7 +109,7 @@ describe('Acceptance: ng update', function () {
       .then(function () {
         return ng([
           'init',
-          '--skip-npm',
+          '--skip-install',
           '--name',
           'tmp'
         ]);
@@ -121,79 +121,79 @@ describe('Acceptance: ng update', function () {
   });
 
   it('init an already init\'d folder', function () {
-    return ng(['init', '--skip-npm'])
+    return ng(['init', '--skip-install'])
       .then(function () {
-        return ng(['init', '--skip-npm']);
+        return ng(['init', '--skip-install']);
       })
       .then(confirmBlueprinted);
   });
 
   it('init a single file', function () {
-    return ng(['init', 'package.json', '--skip-npm'])
+    return ng(['init', 'package.json', '--skip-install'])
       .then(function () {
         return 'package.json';
       })
       .then(confirmGlobBlueprinted);
   });
 
   it('init a single file on already init\'d folder', function () {
-    return ng(['init', '--skip-npm'])
+    return ng(['init', '--skip-install'])
       .then(function () {
-        return ng(['init', 'package.json', '--skip-npm']);
+        return ng(['init', 'package.json', '--skip-install']);
       })
       .then(confirmBlueprinted);
   });
 
   it('init multiple files by glob pattern', function () {
-    return ng(['init', 'src/**', '--skip-npm'])
+    return ng(['init', 'src/**', '--skip-install'])
       .then(function () {
         return 'src/**';
       })
       .then(confirmGlobBlueprinted);
   });
 
   it('init multiple files by glob pattern on already init\'d folder', function () {
-    return ng(['init', '--skip-npm'])
+    return ng(['init', '--skip-install'])
       .then(function () {
-        return ng(['init', 'src/**', '--skip-npm']);
+        return ng(['init', 'src/**', '--skip-install']);
       })
       .then(confirmBlueprinted);
   });
 
   it('init multiple files by glob patterns', function () {
-    return ng(['init', 'src/**', 'package.json', '--skip-npm'])
+    return ng(['init', 'src/**', 'package.json', '--skip-install'])
       .then(function () {
         return '{src/**,package.json}';
       })
       .then(confirmGlobBlueprinted);
   });
 
   it('init multiple files by glob patterns on already init\'d folder', function () {
-    return ng(['init', '--skip-npm'])
+    return ng(['init', '--skip-install'])
       .then(function () {
-        return ng(['init', 'src/**', 'package.json', '--skip-npm']);
+        return ng(['init', 'src/**', 'package.json', '--skip-install']);
       })
       .then(confirmBlueprinted);
   });
 
   it('ng update --inline-template does not generate a template file', () => {
-    return ng(['init', '--skip-npm', '--skip-git', '--inline-template'])
+    return ng(['init', '--skip-install', '--skip-git', '--inline-template'])
       .then(() => {
         const templateFile = path.join('src', 'app', 'app.component.html');
         expect(existsSync(templateFile)).to.equal(false);
       });
   });
 
   it('ng update --inline-style does not gener a style file', () => {
-    return ng(['init', '--skip-npm', '--skip-git', '--inline-style'])
+    return ng(['init', '--skip-install', '--skip-git', '--inline-style'])
       .then(() => {
         const styleFile = path.join('src', 'app', 'app.component.css');
         expect(existsSync(styleFile)).to.equal(false);
       });
   });
 
   it('should skip spec files when passed --skip-tests', () => {
-    return ng(['init', '--skip-npm', '--skip-git', '--skip-tests'])
+    return ng(['init', '--skip-install', '--skip-git', '--skip-tests'])
       .then(() => {
         const specFile = path.join('src', 'app', 'app.component.spec.ts');
         expect(existsSync(specFile)).to.equal(false);