@angular/cli 1.4.3 → 1.4.4

package/commands/new.js

@@ -3,12 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const chalk = require("chalk");
-const init_1 = require("./init");
 const config_1 = require("../models/config");
 const validate_project_name_1 = require("../utilities/validate-project-name");
 const common_tags_1 = require("common-tags");
 const Command = require('../ember-cli/lib/models/command');
-const Project = require('../ember-cli/lib/models/project');
 const SilentError = require('silent-error');
 const NewCommand = Command.extend({
     name: 'new',
@@ -48,13 +46,6 @@ const NewCommand = Command.extend({
             aliases: ['si'],
             description: 'Skip installing packages.'
         },
-        {
-            name: 'skip-git',
-            type: Boolean,
-            default: false,
-            aliases: ['sg'],
-            description: 'Skip initializing a git repository.'
-        },
         {
             name: 'skip-commit',
             type: Boolean,
@@ -131,13 +122,15 @@ const NewCommand = Command.extend({
         else {
             commandOptions.collectionName = this.getCollectionName(rawArgs);
         }
-        const initCommand = new init_1.default({
-            ui: this.ui,
+        const InitTask = require('../tasks/init').default;
+        const initTask = new InitTask({
+            project: this.project,
             tasks: this.tasks,
-            project: Project.nullProject(this.ui, this.cli)
+            ui: this.ui,
         });
-        return Promise.resolve()
-            .then(initCommand.run.bind(initCommand, commandOptions, rawArgs));
+        // Ensure skipGit has a boolean value.
+        commandOptions.skipGit = commandOptions.skipGit === undefined ? false : commandOptions.skipGit;
+        return initTask.run(commandOptions, rawArgs);
     }
 });
 NewCommand.overrideCore = true;

package/commands/new.js.map

@@ -1 +1 @@
-{"version":3,"file":"new.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["commands/new.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"new.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["commands/new.ts"],"names":[],"mappings":"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"}

package/ember-cli/lib/cli/cli.js

@@ -2,9 +2,6 @@
 
 const lookupCommand = require('./lookup-command');
 const getOptionArgs = require('../utilities/get-option-args');
-let logger = require('heimdalljs-logger')('ember-cli:cli');
-let loggerTesting = require('heimdalljs-logger')('ember-cli:testing');
-const heimdall = require('heimdalljs');
 
 // Disabled until e2e and serve command can be evaluated/corrected -- require('../utilities/will-interrupt-process');
 const onProcessInterrupt = { addHandler: (_handler) => { }, removeHandler: (_handler) => { } };
@@ -70,8 +67,6 @@ class CLI {
       stopAndReport: (...args) => { },
       start: (...args) => { },
     };
-
-    logger.info('testing %o', !!this.testing);
   }
 
   /**
@@ -103,8 +98,6 @@ class CLI {
       let commandArgs = args;
       let helpOptions;
 
-      let commandLookupCreationtoken = heimdall.start('lookup-command');
-
       let CurrentCommand = lookupCommand(environment.commands, commandName, commandArgs, {
         project: environment.project,
         ui: this.ui,
@@ -121,14 +114,10 @@ class CLI {
         cli: this,
       });
 
-      commandLookupCreationtoken.stop();
-
       getOptionArgs('--verbose', commandArgs).forEach(arg => {
         process.env[`EMBER_VERBOSE_${arg.toUpperCase()}`] = 'true';
       });
 
-      logger.info('command: %s', commandName);
-
       if (!this.testing) {
         let skipInstallationCheck = commandArgs.indexOf('--skip-installation-check') !== -1;
         if (environment.project.isEmberCLIProject() && !skipInstallationCheck) {
@@ -144,13 +133,10 @@ class CLI {
         instrumentation.stopAndReport('init');
         instrumentation.start('command');
 
-        loggerTesting.info('cli: command.beforeRun');
         onProcessInterrupt.addHandler(onCommandInterrupt);
 
         return command.beforeRun(commandArgs);
       }).then(() => {
-        loggerTesting.info('cli: command.validateAndRun');
-
         return command.validateAndRun(commandArgs);
       }).then(result => {
         instrumentation.stopAndReport('command', commandName, commandArgs);
@@ -172,7 +158,6 @@ class CLI {
 
         return result;
       }).then(exitCode => {
-        loggerTesting.info(`cli: command run complete. exitCode: ${exitCode}`);
         // TODO: fix this
         // Possibly this issue: https://github.com/joyent/node/issues/8329
         // Wait to resolve promise when running on windows.

package/ember-cli/lib/cli/index.js

@@ -1,9 +1,7 @@
 'use strict';
 
 // Main entry point
-let logger = require('heimdalljs-logger')('ember-cli:cli/index');
 const path = require('path');
-const heimdall = require('heimdalljs');
 
 // ember-cli and user apps have many dependencies, many of which require
 // process.addListener('exit', ....) for cleanup, by default this limit for
@@ -14,22 +12,12 @@ const heimdall = require('heimdalljs');
 // https://github.com/babel/ember-cli-babel/issues/76
 process.setMaxListeners(1000);
 
-function configureLogger(env) {
-  let depth = Number(env['DEBUG_DEPTH']);
-  if (depth) {
-    let logConfig = require('heimdalljs').configFor('logging');
-    logConfig.depth = depth;
-  }
-}
-
 // Options: Array cliArgs, Stream inputStream, Stream outputStream
 module.exports = function(options) {
   let UI = options.UI || require('../ui');
   const CLI = require('./cli');
   const Project = require('../models/project');
 
-  configureLogger(process.env);
-
   // TODO: one UI (lib/models/project.js also has one for now...)
   let ui = new UI({
     inputStream: options.inputStream,

package/ember-cli/lib/cli/lookup-command.js

@@ -3,9 +3,6 @@
 const UnknownCommand = require('../commands/unknown');
 
 module.exports = function(commands, commandName, commandArgs, optionHash) {
-  let options = optionHash || {};
-  let project = options.project;
-  let ui = options.ui;
 
   function aliasMatches(alias) {
     return alias === commandName;
@@ -27,36 +24,10 @@ module.exports = function(commands, commandName, commandArgs, optionHash) {
   // Attempt to find command in ember-cli core commands
   let command = findCommand(commands, commandName);
 
-  let addonCommand;
-  // Attempt to find command within addons
-  if (project && project.eachAddonCommand) {
-    project.eachAddonCommand((addonName, commands) => {
-      addonCommand = findCommand(commands, commandName);
-      return !addonCommand;
-    });
-  }
-
-  if (command && addonCommand) {
-    if (addonCommand.overrideCore) {
-      ui.writeWarnLine(`An ember-addon has attempted to override the core command "${command.prototype.name}". ` +
-        `The addon command will be used as the overridding was explicit.`);
-
-      return addonCommand;
-    }
-
-    ui.writeWarnLine(`An ember-addon has attempted to override the core command "${command.prototype.name}". ` +
-      `The core command will be used.`);
-    return command;
-  }
-
   if (command) {
     return command;
   }
 
-  if (addonCommand) {
-    return addonCommand;
-  }
-
   // if we didn't find anything, return an "UnknownCommand"
   return class extends UnknownCommand {
     constructor(options) {

package/ember-cli/lib/models/command.js

@@ -4,12 +4,10 @@ const nopt = require('nopt');
 const chalk = require('chalk');
 const path = require('path');
 const camelize = require('ember-cli-string-utils').camelize;
-const getCallerFile = require('get-caller-file');
 const printCommand = require('../utilities/print-command');
 const _ = require('lodash');
 const EOL = require('os').EOL;
 const CoreObject = require('core-object');
-let logger = require('heimdalljs-logger')('ember-cli:command');
 const SilentError = require('silent-error');
 const fs = require('fs');
 
@@ -84,9 +82,7 @@ let Command = CoreObject.extend({
      * @type String
      * @example `new` or `generate`
      */
-    this.name = this.name || path.basename(getCallerFile(), '.js');
-
-    logger.info('initialize: name: %s, name: %s', this.name);
+    this.name = this.name || '<undefined>';
 
     /**
      * An array of aliases for the command
@@ -211,8 +207,6 @@ let Command = CoreObject.extend({
       throw new Error(`Concurrent tasks are not supported`);
     }
 
-    logger.info(`\`${this.name}\` command running \`${name}\` task`);
-
     let Task = this.tasks[name];
     if (!Task) {
       throw new Error(`Unknown task "${name}"`);
@@ -223,11 +217,6 @@ let Command = CoreObject.extend({
     this._currentTask = task;
 
     return Promise.resolve().then(() => task.run(options))
-      .catch(error => {
-        logger.info(`An error occurred running \`${name}\` from the \`${this.name}\` command.`, error.stack);
-
-        throw error;
-      })
       .finally(() => {
         delete this._currentTask;
       });
@@ -252,7 +241,6 @@ let Command = CoreObject.extend({
       let commandOptions = this.parseArgs(args);
       // if the help option was passed, resolve with 'callHelp' to call help command
       if (commandOptions && (commandOptions.options.help || commandOptions.options.h)) {
-        logger.info(`${this.name} called with help option`);
         return resolve('callHelp');
       }
 
@@ -430,8 +418,6 @@ let Command = CoreObject.extend({
         try {
           aliasValue = JSON.parse(alias);
         } catch (e) {
-          let logger = require('heimdalljs-logger')('@angular/cli/ember-cli/models/command');
-          logger.error(e);
         }
       }
       throw new Error(`The "${aliasValue}" [type:${aliasType}] alias is not an acceptable value. ` +

package/ember-cli/lib/models/installation-checker.js

@@ -1,6 +1,5 @@
 'use strict';
 
-let logger = require('heimdalljs-logger')('ember-cli:installation-checker');
 const fs = require('fs-extra');
 const path = require('path');
 const SilentError = require('silent-error');
@@ -24,11 +23,9 @@ class InstallationChecker {
     let commands = [];
 
     if (this.usingNpm() && this.npmDependenciesNotPresent()) {
-      logger.info('npm dependencies not installed');
       commands.push('`npm install`');
     }
     if (this.usingBower() && this.bowerDependenciesNotPresent()) {
-      logger.info('bower dependencies not installed');
       commands.push('`bower install`');
     }
     if (commands.length) {

package/ember-cli/lib/models/project.js

@@ -9,9 +9,7 @@ const findUp = require('../../../utilities/find-up').findUp;
 let resolve = denodeify(require('resolve'));
 const fs = require('fs-extra');
 const _ = require('lodash');
-let logger = require('heimdalljs-logger')('ember-cli:project');
 const nodeModulesPath = require('node-modules-path');
-const heimdall = require('heimdalljs');
 
 let processCwd = process.cwd();
 // ensure NULL_PROJECT is a singleton
@@ -30,8 +28,6 @@ class Project {
     @param {CLI} cli
   */
   constructor(root, pkg, ui, cli) {
-    logger.info('init root: %s', root);
-
     this.root = root;
     this.pkg = pkg;
     this.ui = ui;
@@ -76,8 +72,6 @@ class Project {
    */
   setupNodeModulesPath() {
     this.nodeModulesPath = nodeModulesPath(this.root);
-
-    logger.info('nodeModulesPath: %s', this.nodeModulesPath);
   }
 
   static nullProject(ui, cli) {
@@ -89,16 +83,10 @@ class Project {
       return false;
     };
 
-    NULL_PROJECT.isEmberCLIAddon = function() {
-      return false;
-    };
-
     NULL_PROJECT.name = function() {
       return path.basename(process.cwd());
     };
 
-    NULL_PROJECT.initializeAddons();
-
     return NULL_PROJECT;
   }
 
@@ -126,15 +114,6 @@ class Project {
         || '@angular/cli' in this.dependencies();
   }
 
-  /**
-    Returns whether or not this is an Ember CLI addon.
-    @method isEmberCLIAddon
-    @return {Boolean} Whether or not this is an Ember CLI Addon.
-   */
-  isEmberCLIAddon() {
-    return !!this.pkg.keywords && this.pkg.keywords.indexOf('ember-addon') > -1;
-  }
-
   /**
     Loads the configuration for this project and its addons.
     @public
@@ -143,8 +122,6 @@ class Project {
     @return {Object}     Merged confiration object
    */
   config(env) {
-    this.initializeAddons();
-
     let initialConfig = {};
 
     return this.addons.reduce((config, addon) => {
@@ -231,139 +208,6 @@ class Project {
     return _.assign({}, devDependencies, pkg['dependencies']);
   }
 
-  /**
-    Provides the list of paths to consult for addons that may be provided
-    internally to this project. Used for middleware addons with built-in support.
-    @private
-    @method supportedInternalAddonPaths
-  */
-  supportedInternalAddonPaths() {
-    if (!this.root) { return []; }
-
-    let internalMiddlewarePath = path.join(__dirname, '../tasks/server/middleware');
-    let legacyBlueprintsPath = require.resolve('ember-cli-legacy-blueprints');
-    let emberTryPath = require.resolve('ember-try');
-    return [
-      path.join(internalMiddlewarePath, 'testem-url-rewriter'),
-      path.join(internalMiddlewarePath, 'tests-server'),
-      path.join(internalMiddlewarePath, 'history-support'),
-      path.join(internalMiddlewarePath, 'broccoli-watcher'),
-      path.join(internalMiddlewarePath, 'broccoli-serve-files'),
-      path.join(internalMiddlewarePath, 'proxy-server'),
-      path.dirname(legacyBlueprintsPath),
-      path.dirname(emberTryPath),
-    ];
-  }
-
-  /**
-    Loads and initializes all addons for this project.
-    @private
-    @method initializeAddons
-   */
-  initializeAddons() {
-    if (this._addonsInitialized) {
-      return;
-    }
-    this._addonsInitialized = true;
-
-    logger.info('initializeAddons for: %s', this.name());
-  }
-
-  /**
-    Returns what commands are made available by addons by inspecting
-    `includedCommands` for every addon.
-    @private
-    @method addonCommands
-    @return {Object} Addon names and command maps as key-value pairs
-   */
-  addonCommands() {
-    const Command = require('../models/command');
-    let commands = {};
-    this.addons.forEach(addon => {
-      if (!addon.includedCommands) { return; }
-
-      let token = heimdall.start({
-        name: `lookup-commands: ${addon.name}`,
-        addonName: addon.name,
-        addonCommandInitialization: true,
-      });
-
-      let includedCommands = addon.includedCommands();
-      let addonCommands = {};
-
-      for (let key in includedCommands) {
-        if (typeof includedCommands[key] === 'function') {
-          addonCommands[key] = includedCommands[key];
-        } else {
-          addonCommands[key] = Command.extend(includedCommands[key]);
-        }
-      }
-      if (Object.keys(addonCommands).length) {
-        commands[addon.name] = addonCommands;
-      }
-
-      token.stop();
-    });
-    return commands;
-  }
-
-  /**
-    Execute a given callback for every addon command.
-    Example:
-    ```
-    project.eachAddonCommand(function(addonName, commands) {
-      console.log('Addon ' + addonName + ' exported the following commands:' + commands.keys().join(', '));
-    });
-    ```
-    @private
-    @method eachAddonCommand
-    @param  {Function} callback [description]
-   */
-  eachAddonCommand(callback) {
-    if (this.initializeAddons && this.addonCommands) {
-      this.initializeAddons();
-      let addonCommands = this.addonCommands();
-
-      _.forOwn(addonCommands, (commands, addonName) => callback(addonName, commands));
-    }
-  }
-
-  /**
-    Path to the blueprints for this project.
-    @private
-    @method localBlueprintLookupPath
-    @return {String} Path to blueprints
-   */
-  localBlueprintLookupPath() {
-    return path.join(this.cli.root, 'blueprints');
-  }
-
-  /**
-    Returns a list of paths (including addon paths) where blueprints will be looked up.
-    @private
-    @method blueprintLookupPaths
-    @return {Array} List of paths
-   */
-  blueprintLookupPaths() {
-    return [this.localBlueprintLookupPath()];
-  }
-
-  /**
-    Returns a list of addon paths where blueprints will be looked up.
-    @private
-    @method addonBlueprintLookupPaths
-    @return {Array} List of paths
-   */
-  addonBlueprintLookupPaths() {
-    let addonPaths = this.addons.map(addon => {
-      if (addon.blueprintsPath) {
-        return addon.blueprintsPath();
-      }
-    }, this);
-
-    return addonPaths.filter(Boolean).reverse();
-  }
-
   /**
     Reloads package.json
     @private
@@ -379,62 +223,6 @@ class Project {
     return this.pkg;
   }
 
-  /**
-    Re-initializes addons.
-    @private
-    @method reloadAddons
-   */
-  reloadAddons() {
-    this.reloadPkg();
-    this._addonsInitialized = false;
-    return this.initializeAddons();
-  }
-
-  /**
-    Find an addon by its name
-    @private
-    @method findAddonByName
-    @param  {String} name Addon name as specified in package.json
-    @return {Addon}       Addon instance
-   */
-  findAddonByName(name) {
-    this.initializeAddons();
-
-    var exactMatch = _.find(this.addons, function(addon) {
-      return name === addon.name || (addon.pkg && name === addon.pkg.name);
-    });
-
-    if (exactMatch) {
-      return exactMatch;
-    }
-
-    return _.find(this.addons, function(addon) {
-      return name.indexOf(addon.name) > -1 || (addon.pkg && name.indexOf(addon.pkg.name) > -1);
-    });
-  }
-
-  /**
-    Generate test file contents.
-    This method is supposed to be overwritten by test framework addons
-    like `ember-cli-qunit` and `ember-cli-mocha`.
-    @public
-    @method generateTestFile
-    @param {String} moduleName Name of the test module (e.g. `JSHint`)
-    @param {Object[]} tests Array of tests with `name`, `passed` and `errorMessage` properties
-    @return {String} The test file content
-   */
-  generateTestFile() {
-    let message = 'Please install an Ember.js test framework addon or update your dependencies.';
-
-    if (this.ui) {
-      this.ui.writeDeprecateLine(message);
-    } else {
-      console.warn(message);
-    }
-
-    return '';
-  }
-
   /**
     Returns a new project based on the first package.json that is found
     in `pathName`.
@@ -451,7 +239,6 @@ class Project {
     ui.writeDeprecateLine('`Project.closest` is a private method that will be removed, please use `Project.closestSync` instead.');
 
     return closestPackageJSON(pathName).then(result => {
-      logger.info('closest %s -> %s', pathName, result);
       if (result.pkg && result.pkg.name === 'ember-cli') {
         return Project.nullProject(_ui, _cli);
       }
@@ -471,24 +258,18 @@ class Project {
     @return {Project}         Project instance
    */
   static closestSync(pathName, _ui, _cli) {
-    logger.info('looking for package.json starting at %s', pathName);
-
     let ui = ensureUI(_ui);
 
     let directory = findupPath(pathName);
-    logger.info('found package.json at %s', directory);
 
     let relative = path.relative(directory, pathName);
     if (relative.indexOf('tmp') === 0) {
-      logger.info('ignoring parent project since we are in the tmp folder of the project');
       return Project.nullProject(_ui, _cli);
     }
 
     let pkg = fs.readJsonSync(path.join(directory, 'package.json'));
-    logger.info('project name: %s', pkg && pkg.name);
 
     if (!isEmberCliProject(pkg)) {
-      logger.info('ignoring parent project since it is not an Angular CLI project');
       return Project.nullProject(_ui, _cli);
     }
 
@@ -526,7 +307,6 @@ class Project {
   static getProjectRoot() {
     let packagePath = findUp(process.cwd(), 'package.json');
     if (!packagePath) {
-      logger.info('getProjectRoot: not found. Will use cwd: %s', process.cwd());
       return process.cwd();
     }
 
@@ -534,11 +314,9 @@ class Project {
     const pkg = require(packagePath);
 
     if (pkg && pkg.name === 'ember-cli') {
-      logger.info('getProjectRoot: named \'ember-cli\'. Will use cwd: %s', process.cwd());
       return process.cwd();
     }
 
-    logger.info('getProjectRoot %s -> %s', process.cwd(), directory);
     return directory;
   }
 }

package/lib/cli/index.d.ts

@@ -0,0 +1 @@
+export default function (options: any): any;