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.

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

[2.X] Deprecate vendor-prefix and vendor-suffix. #5309

Merged
merged 2 commits into from
Jan 26, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion blueprints/addon/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ module.exports = {
}

// add `ember-disable-prototype-extensions` to addons by default
contents.devDependencies['ember-disable-prototype-extensions'] = '^1.0.0';
contents.devDependencies['ember-disable-prototype-extensions'] = '^1.1.0';

// add `ember-try` to addons by default
contents.devDependencies['ember-try'] = '~0.0.8';
Expand Down
2 changes: 1 addition & 1 deletion lib/broccoli/ember-app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1542,7 +1542,7 @@ EmberApp.prototype.toTree = function(additionalTrees) {
*/
EmberApp.prototype.contentFor = function(config, match, type) {
var content = [];
var deprecatedHooks = ['app-prefix', 'app-suffix'];
var deprecatedHooks = ['app-prefix', 'app-suffix', 'vendor-prefix', 'vendor-suffix'];
var deprecate = this.project.ui.writeDeprecateLine.bind(this.project.ui);

switch (type) {
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/blueprints/addon-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ describe('blueprint - addon', function() {
],\n\
"dependencies": {},\n\
"devDependencies": {\n\
"ember-disable-prototype-extensions": "^1.0.0",\n\
"ember-disable-prototype-extensions": "^1.1.0",\n\
"ember-try": "~0.0.8"\n\
},\n\
"ember-addon": {\n\
Expand Down Expand Up @@ -224,7 +224,7 @@ describe('blueprint - addon', function() {
expect(writeFileSyncWasCalled).to.be.true;

var json = JSON.parse(writeFileSyncArguments[1]);
expect(json.devDependencies['ember-disable-prototype-extensions']).to.equal('^1.0.0');
expect(json.devDependencies['ember-disable-prototype-extensions']).to.equal('^1.1.0');
});

it('overwrites any version of `ember-try`', function() {
Expand Down