refactor(@angular/cli): simplify command registration

Author: Charles Lyding

package.json

@@ -100,11 +100,6 @@
     "webpack-merge": "^2.4.0",
     "zone.js": "^0.8.4"
   },
-  "ember-addon": {
-    "paths": [
-      "./packages/@angular/cli/lib/addon"
-    ]
-  },
   "devDependencies": {
     "@angular/compiler": "^4.0.0",
     "@angular/compiler-cli": "^4.0.0",

packages/@angular/cli/addon/index.js

@@ -38,9 +38,9 @@ module.exports = function(options) {
   var project = Project.projectOrnullProject(ui, cli);
 
   var environment = {
-    tasks:    { },
+    tasks:    options.tasks || {},
     cliArgs:  options.cliArgs,
-    commands: { },
+    commands: options.commands || {},
     project:  project,
     settings: defaultUpdateCheckerOptions
   };

packages/@angular/cli/ember-cli/lib/cli/index.js

@@ -260,17 +260,6 @@ Project.prototype.initializeAddons = function() {
   this._addonsInitialized = true;
 
   debug('initializeAddons for: %s', this.name());
-
-  const cliPkg = require(path.resolve(__dirname, '../../../package.json'));
-  const Addon = require('../models/addon');
-  const Constructor = Addon.lookup({
-    name: '@angular/cli',
-    path: path.join(__dirname, '../../../'),
-    pkg: cliPkg,
-  });
-
-  const addon = new Constructor(this.addonParent, this);
-  this.addons = [addon];
 };
 
 /**
@@ -334,7 +323,7 @@ Project.prototype.eachAddonCommand = function(callback) {
   @return {String} Path to blueprints
  */
 Project.prototype.localBlueprintLookupPath = function() {
-  return path.join(this.root, 'blueprints');
+  return path.join(this.cli.root, 'blueprints');
 };
 
 /**
@@ -345,7 +334,7 @@ Project.prototype.localBlueprintLookupPath = function() {
   @return {Array} List of paths
  */
 Project.prototype.blueprintLookupPaths = function() {
-  return this.addonBlueprintLookupPaths();
+  return [this.localBlueprintLookupPath()];
 };
 
 /**

packages/@angular/cli/ember-cli/lib/models/addon.js

@@ -10,6 +10,31 @@ const cli = require('../../ember-cli/lib/cli');
 const UI = require('../../ember-cli/lib/ui');
 const path = require('path');
 
+function loadCommands() {
+  return {
+    'build': require('../../commands/build').default,
+    'serve': require('../../commands/serve').default,
+    'eject': require('../../commands/eject').default,
+    'new': require('../../commands/new').default,
+    'generate': require('../../commands/generate').default,
+    'destroy': require('../../commands/destroy').default,
+    'test': require('../../commands/test').default,
+    'e2e': require('../../commands/e2e').default,
+    'help': require('../../commands/help').default,
+    'lint': require('../../commands/lint').default,
+    'version': require('../../commands/version').default,
+    'completion': require('../../commands/completion').default,
+    'doc': require('../../commands/doc').default,
+    'xi18n': require('../../commands/xi18n').default,
+
+    // Easter eggs.
+    'make-this-awesome': require('../../commands/easter-egg').default,
+
+    // Configuration.
+    'set': require('../../commands/set').default,
+    'get': require('../../commands/get').default
+  };
+}
 
 module.exports = function(options) {
 
@@ -22,6 +47,8 @@ module.exports = function(options) {
     npmPackage: '@angular/cli'
   };
 
+  options.commands = loadCommands();
+
   // ensure the environemnt variable for dynamic paths
   process.env.PWD = path.normalize(process.env.PWD || process.cwd());
   process.env.CLI_ROOT = process.env.CLI_ROOT || path.resolve(__dirname, '..', '..');

packages/@angular/cli/ember-cli/lib/models/project.js

@@ -87,11 +87,5 @@
   },
   "optionalDependencies": {
     "node-sass": "^4.3.0"
-  },
-  "ember-addon": {
-    "paths": [
-      "./"
-    ],
-    "main": "./addon/index.js"
   }
 }