diff --git a/package.json b/package.json index d1921c920aca..64e080a6b57e 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,6 @@ "node-sass": "^4.3.0", "nopt": "^3.0.1", "opn": "4.0.1", - "ora": "^0.2.0", "portfinder": "1.0.9", "postcss-loader": "^0.9.1", "raw-loader": "^0.5.1", @@ -100,7 +99,6 @@ "stylus": "^0.54.5", "stylus-loader": "^2.4.0", "temp": "0.8.3", - "through": "^2.3.6", "typescript": "~2.0.3", "url-loader": "^0.5.7", "walk-sync": "^0.2.6", @@ -149,6 +147,7 @@ "resolve-bin": "^0.4.0", "rewire": "^2.5.1", "sinon": "^1.17.3", + "through": "^2.3.6", "tree-kill": "^1.0.0", "ts-node": "^1.3.0", "tslint": "^4.0.2" diff --git a/packages/@angular/cli/ember-cli/lib/ui/index.js b/packages/@angular/cli/ember-cli/lib/ui/index.js index 412f77dc521d..7837f04e0f52 100644 --- a/packages/@angular/cli/ember-cli/lib/ui/index.js +++ b/packages/@angular/cli/ember-cli/lib/ui/index.js @@ -1,6 +1,5 @@ 'use strict'; -var ora = require('ora'); var Promise = require('../ext/promise'); var EOL = require('os').EOL; var chalk = require('chalk'); @@ -32,20 +31,8 @@ module.exports = UI; **/ function UI(options) { - var spinner = this.spinner = ora({ color: 'green' }); - - this.through = require('through'); - // Output stream - this.actualOutputStream = options.outputStream; - this.outputStream = this.through(function(data) { - spinner.stop(); - this.emit('data', data); - }); - - this.outputStream.setMaxListeners(0); - this.outputStream.pipe(this.actualOutputStream); - + this.outputStream = options.outputStream; this.inputStream = options.inputStream; this.errorStream = options.errorStream; @@ -174,19 +161,12 @@ UI.prototype.setWriteLevel = function(level) { UI.prototype.startProgress = function(message/*, stepString*/) { if (this.writeLevelVisible('INFO')) { - if (this.ci) { - this.writeLine(message); - } else { - this.spinner.text = message; - this.spinner.start(); - } + this.writeLine(message); } }; UI.prototype.stopProgress = function() { - if (this.writeLevelVisible('INFO') && !this.ci) { - this.spinner.stop(); - } + }; UI.prototype.prompt = function(questions, callback) { diff --git a/packages/@angular/cli/package.json b/packages/@angular/cli/package.json index bc2acbdcf51e..87c04243e28d 100644 --- a/packages/@angular/cli/package.json +++ b/packages/@angular/cli/package.json @@ -66,7 +66,6 @@ "node-sass": "^4.3.0", "nopt": "^3.0.1", "opn": "4.0.1", - "ora": "^0.2.0", "portfinder": "1.0.9", "postcss-loader": "^0.9.1", "raw-loader": "^0.5.1", @@ -84,7 +83,6 @@ "stylus": "^0.54.5", "stylus-loader": "^2.4.0", "temp": "0.8.3", - "through": "^2.3.6", "typescript": "~2.0.3", "url-loader": "^0.5.7", "walk-sync": "^0.2.6",