refactor(@angular/cli): remove unused ember-cli internal logging

Author: clydin

package-lock.json

@@ -60,8 +60,6 @@
     "file-loader": "^0.10.0",
     "fs-extra": "^4.0.0",
     "glob": "^7.0.3",
-    "heimdalljs": "^0.2.4",
-    "heimdalljs-logger": "^0.1.9",
     "html-webpack-plugin": "^2.29.0",
     "istanbul-instrumenter-loader": "^2.0.0",
     "karma-source-map-support": "^1.2.0",

package.json

@@ -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.

packages/@angular/cli/ember-cli/lib/cli/cli.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,

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

@@ -8,7 +8,6 @@ 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');
 
@@ -85,8 +84,6 @@ let Command = CoreObject.extend({
      */
     this.name = this.name || '<undefined>';
 
-    logger.info('initialize: name: %s, name: %s', this.name);
-
     /**
      * An array of aliases for the command
      *
@@ -210,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}"`);
@@ -222,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;
       });
@@ -251,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');
       }
 
@@ -429,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. ` +

packages/@angular/cli/ember-cli/lib/models/command.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) {

packages/@angular/cli/ember-cli/lib/models/installation-checker.js

@@ -9,7 +9,6 @@ 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');
 
 let processCwd = process.cwd();
@@ -29,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;
@@ -75,8 +72,6 @@ class Project {
    */
   setupNodeModulesPath() {
     this.nodeModulesPath = nodeModulesPath(this.root);
-
-    logger.info('nodeModulesPath: %s', this.nodeModulesPath);
   }
 
   static nullProject(ui, cli) {
@@ -244,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);
       }
@@ -264,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);
     }
 
@@ -319,19 +307,16 @@ 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();
     }
 
     let directory = path.dirname(packagePath);
     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;
   }
 }

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

@@ -47,8 +47,6 @@
     "file-loader": "^0.10.0",
     "fs-extra": "^4.0.0",
     "glob": "^7.0.3",
-    "heimdalljs": "^0.2.4",
-    "heimdalljs-logger": "^0.1.9",
     "html-webpack-plugin": "^2.29.0",
     "karma-source-map-support": "^1.2.0",
     "less": "^2.7.2",