File tree 3 files changed +1
-8
lines changed
3 files changed +1
-8
lines changed Original file line number Diff line number Diff line change 118
118
"webpack-dev-server" : " 2.2.0-rc.0" ,
119
119
"webpack-merge" : " ^0.14.0" ,
120
120
"webpack-sources" : " ^0.1.3" ,
121
- "yam" : " 0.0.18" ,
122
121
"zone.js" : " ^0.7.2"
123
122
},
124
123
"ember-addon" : {
Original file line number Diff line number Diff line change @@ -7,13 +7,11 @@ var commands = require('../commands');
7
7
var tasks = require ( '../tasks' ) ;
8
8
var CLI = require ( './cli' ) ;
9
9
var debug = require ( 'debug' ) ( 'ember-cli:cli/index' ) ;
10
- var merge = require ( 'lodash/merge' ) ;
11
10
12
11
13
12
// Options: Array cliArgs, Stream inputStream, Stream outputStream
14
13
module . exports = function ( options ) {
15
14
var UI = options . UI || require ( '../ui' ) ;
16
- var Yam = options . Yam || require ( 'yam' ) ;
17
15
18
16
// TODO: one UI (lib/models/project.js also has one for now...)
19
17
var ui = new UI ( {
@@ -25,9 +23,6 @@ module.exports = function(options) {
25
23
writeLevel : ~ process . argv . indexOf ( '--silent' ) ? 'ERROR' : undefined
26
24
} ) ;
27
25
28
- var config = new Yam ( 'ember-cli' , {
29
- primary : Project . getProjectRoot ( )
30
- } ) ;
31
26
32
27
var defaultUpdateCheckerOptions = {
33
28
checkForUpdates : false
@@ -49,7 +44,7 @@ module.exports = function(options) {
49
44
cliArgs : options . cliArgs ,
50
45
commands : commands ,
51
46
project : project ,
52
- settings : merge ( defaultUpdateCheckerOptions , config . getAll ( ) )
47
+ settings : defaultUpdateCheckerOptions
53
48
} ;
54
49
55
50
return cli . run ( environment ) ;
Original file line number Diff line number Diff line change 100
100
"webpack-dev-server" : " 2.2.0-rc.0" ,
101
101
"webpack-merge" : " ^0.14.0" ,
102
102
"webpack-sources" : " ^0.1.3" ,
103
- "yam" : " 0.0.18" ,
104
103
"zone.js" : " ^0.7.2"
105
104
},
106
105
"ember-addon" : {
You can’t perform that action at this time.
0 commit comments