Skip to content

Commit c84f19b

Browse files
clydinfilipesilva
authored andcommitted
refactor(@angular/cli): remove unused ember task abstraction
1 parent f6f774a commit c84f19b

File tree

10 files changed

+1
-323
lines changed

10 files changed

+1
-323
lines changed

package-lock.json

Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
"@schematics/update": "0.5.0",
4949
"chalk": "~2.2.0",
5050
"common-tags": "^1.3.1",
51-
"core-object": "^3.1.0",
5251
"ember-cli-string-utils": "^1.0.0",
5352
"fs-extra": "^4.0.0",
5453
"lodash": "^4.11.1",

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

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,23 @@ process.setMaxListeners(1000);
1414

1515
// Options: Array cliArgs, Stream inputStream, Stream outputStream
1616
module.exports = function(options) {
17-
let UI = options.UI || require('../ui');
1817
const CLI = require('./cli');
1918
const Project = require('../models/project');
2019

21-
// TODO: one UI (lib/models/project.js also has one for now...)
22-
let ui = new UI({
23-
inputStream: options.inputStream,
24-
outputStream: options.outputStream,
25-
errorStream: options.errorStream || process.stderr,
26-
errorLog: options.errorLog || [],
27-
ci: process.env.CI || (/^(dumb|emacs)$/).test(process.env.TERM),
28-
writeLevel: (process.argv.indexOf('--silent') !== -1) ? 'ERROR' : undefined,
29-
});
30-
31-
32-
let defaultUpdateCheckerOptions = {
33-
// checkForUpdates: false,
34-
};
35-
3620
let cli = new CLI({
37-
ui,
3821
testing: options.testing,
3922
name: options.cli ? options.cli.name : 'ember',
40-
disableDependencyChecker: options.disableDependencyChecker,
4123
root: options.cli ? options.cli.root : path.resolve(__dirname, '..', '..'),
4224
npmPackage: options.cli ? options.cli.npmPackage : 'ember-cli',
4325
});
4426

45-
let project = Project.projectOrnullProject(ui, cli);
27+
let project = Project.projectOrnullProject(undefined, cli);
4628

4729
let environment = {
4830
tasks: options.tasks || {},
4931
cliArgs: options.cliArgs,
5032
commands: options.commands || {},
5133
project,
52-
settings: defaultUpdateCheckerOptions,
5334
};
5435

5536
return cli.run(environment);

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ class Project {
239239
static closest(pathName, _ui, _cli) {
240240
let ui = ensureUI(_ui);
241241

242-
ui.writeDeprecateLine('`Project.closest` is a private method that will be removed, please use `Project.closestSync` instead.');
243242

244243
return closestPackageJSON(pathName).then(result => {
245244
if (result.pkg && result.pkg.name === 'ember-cli') {
@@ -345,17 +344,6 @@ function ensureInstrumentation(cli, ui) {
345344
function ensureUI(_ui) {
346345
let ui = _ui;
347346

348-
if (!ui) {
349-
// TODO: one UI (lib/cli/index.js also has one for now...)
350-
const UI = require('../ui');
351-
ui = new UI({
352-
inputStream: process.stdin,
353-
outputStream: process.stdout,
354-
ci: process.env.CI || (/^(dumb|emacs)$/).test(process.env.TERM),
355-
writeLevel: (process.argv.indexOf('--silent') !== -1) ? 'ERROR' : undefined,
356-
});
357-
}
358-
359347
return ui;
360348
}
361349

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

Lines changed: 0 additions & 22 deletions
This file was deleted.

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

Lines changed: 0 additions & 196 deletions
This file was deleted.

packages/@angular/cli/ember-cli/lib/ui/write-error.js

Lines changed: 0 additions & 25 deletions
This file was deleted.

packages/@angular/cli/lib/cli/index.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import * as path from 'path';
22

33
const cli = require('../../ember-cli/lib/cli');
4-
const UI = require('../../ember-cli/lib/ui');
54

65

76
function loadCommands() {
@@ -30,10 +29,6 @@ function loadCommands() {
3029
}
3130

3231
export default function(options: any) {
33-
34-
// patch UI to not print Ember-CLI warnings (which don't apply to Angular CLI)
35-
UI.prototype.writeWarnLine = function () { };
36-
3732
options.cli = {
3833
name: 'ng',
3934
root: path.join(__dirname, '..', '..'),

packages/@angular/cli/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"@schematics/update": "0.5.0",
3535
"chalk": "~2.2.0",
3636
"common-tags": "^1.3.1",
37-
"core-object": "^3.1.0",
3837
"ember-cli-string-utils": "^1.0.0",
3938
"fs-extra": "^4.0.0",
4039
"lodash": "^4.11.1",

packages/@angular/cli/tasks/render-universal.ts

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)