Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: remove support for '.ember-cli' file #4030

Merged
merged 1 commit into from Jan 15, 2017
Merged

refactor: remove support for '.ember-cli' file #4030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@
"webpack-dev-server": "2.2.0-rc.0",
"webpack-merge": "^0.14.0",
"webpack-sources": "^0.1.3",
"yam": "0.0.18",
"zone.js": "^0.7.2"
},
"ember-addon": {
Expand Down
7 changes: 1 addition & 6 deletions packages/angular-cli/ember-cli/lib/cli/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@ var commands = require('../commands');
var tasks = require('../tasks');
var CLI = require('./cli');
var debug = require('debug')('ember-cli:cli/index');
var merge = require('lodash/merge');


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

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

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

var defaultUpdateCheckerOptions = {
checkForUpdates: false
Expand All @@ -49,7 +44,7 @@ module.exports = function(options) {
cliArgs: options.cliArgs,
commands: commands,
project: project,
settings: merge(defaultUpdateCheckerOptions, config.getAll())
settings: defaultUpdateCheckerOptions
};

return cli.run(environment);
Expand Down
1 change: 0 additions & 1 deletion packages/angular-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@
"webpack-dev-server": "2.2.0-rc.0",
"webpack-merge": "^0.14.0",
"webpack-sources": "^0.1.3",
"yam": "0.0.18",
"zone.js": "^0.7.2"
},
"ember-addon": {
Expand Down