Skip to content

Commit 5a27fdb

Browse files
clydinhansl
authored andcommitted
refactor: remove support for '.ember-cli' file (#4030)
1 parent 4ee90cd commit 5a27fdb

File tree

3 files changed

+1
-8
lines changed

3 files changed

+1
-8
lines changed

package.json

-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@
118118
"webpack-dev-server": "2.2.0-rc.0",
119119
"webpack-merge": "^0.14.0",
120120
"webpack-sources": "^0.1.3",
121-
"yam": "0.0.18",
122121
"zone.js": "^0.7.2"
123122
},
124123
"ember-addon": {

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

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@ var commands = require('../commands');
77
var tasks = require('../tasks');
88
var CLI = require('./cli');
99
var debug = require('debug')('ember-cli:cli/index');
10-
var merge = require('lodash/merge');
1110

1211

1312
// Options: Array cliArgs, Stream inputStream, Stream outputStream
1413
module.exports = function(options) {
1514
var UI = options.UI || require('../ui');
16-
var Yam = options.Yam || require('yam');
1715

1816
// TODO: one UI (lib/models/project.js also has one for now...)
1917
var ui = new UI({
@@ -25,9 +23,6 @@ module.exports = function(options) {
2523
writeLevel: ~process.argv.indexOf('--silent') ? 'ERROR' : undefined
2624
});
2725

28-
var config = new Yam('ember-cli', {
29-
primary: Project.getProjectRoot()
30-
});
3126

3227
var defaultUpdateCheckerOptions = {
3328
checkForUpdates: false
@@ -49,7 +44,7 @@ module.exports = function(options) {
4944
cliArgs: options.cliArgs,
5045
commands: commands,
5146
project: project,
52-
settings: merge(defaultUpdateCheckerOptions, config.getAll())
47+
settings: defaultUpdateCheckerOptions
5348
};
5449

5550
return cli.run(environment);

packages/angular-cli/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
"webpack-dev-server": "2.2.0-rc.0",
101101
"webpack-merge": "^0.14.0",
102102
"webpack-sources": "^0.1.3",
103-
"yam": "0.0.18",
104103
"zone.js": "^0.7.2"
105104
},
106105
"ember-addon": {

0 commit comments

Comments
 (0)