Skip to content

Commit 441d422

Browse files
Charles Lydingdond2clouds
Charles Lyding
authored andcommitted
refactor(@angular/cli): remove unneeded dependency on RSVP
1 parent 2189403 commit 441d422

File tree

3 files changed

+1
-16
lines changed

3 files changed

+1
-16
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
"postcss-url": "^5.1.2",
8181
"raw-loader": "^0.5.1",
8282
"resolve": "^1.1.7",
83-
"rsvp": "^3.0.17",
8483
"rxjs": "^5.4.2",
8584
"sass-loader": "^6.0.3",
8685
"script-loader": "^0.7.0",

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
'use strict';
22

3-
const RSVP = require('rsvp');
4-
53
const lookupCommand = require('./lookup-command');
64
const getOptionArgs = require('../utilities/get-option-args');
75
let logger = require('heimdalljs-logger')('ember-cli:cli');
86
let loggerTesting = require('heimdalljs-logger')('ember-cli:testing');
97
const heimdall = require('heimdalljs');
108

11-
const Promise = RSVP.Promise;
129
// Disabled until e2e and serve command can be evaluated/corrected -- require('../utilities/will-interrupt-process');
1310
const onProcessInterrupt = { addHandler: (_handler) => { }, removeHandler: (_handler) => { } };
1411

@@ -86,7 +83,7 @@ class CLI {
8683
run(environment) {
8784
let shutdownOnExit = null;
8885

89-
return RSVP.hash(environment).then(environment => {
86+
return Promise.resolve().then(() => {
9087
let args = environment.cliArgs.slice();
9188

9289
if (args.length === 0) {
@@ -161,11 +158,6 @@ class CLI {
161158
onProcessInterrupt.removeHandler(onCommandInterrupt);
162159

163160
return result;
164-
}).finally(() => {
165-
instrumentation.start('shutdown');
166-
shutdownOnExit = function() {
167-
instrumentation.stopAndReport('shutdown');
168-
};
169161
}).then(result => {
170162
// if the help option was passed, call the help command
171163
if (result === 'callHelp') {
@@ -201,11 +193,6 @@ class CLI {
201193

202194
return runPromise;
203195
})
204-
.finally(() => {
205-
if (shutdownOnExit) {
206-
shutdownOnExit();
207-
}
208-
})
209196
.catch(this.logError.bind(this));
210197
}
211198

packages/@angular/cli/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
"postcss-url": "^5.1.2",
6666
"raw-loader": "^0.5.1",
6767
"resolve": "^1.1.7",
68-
"rsvp": "^3.0.17",
6968
"rxjs": "^5.4.2",
7069
"sass-loader": "^6.0.3",
7170
"script-loader": "^0.7.0",

0 commit comments

Comments
 (0)