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

Update ember-try #145

Closed
wants to merge 2 commits into from
Closed

Update ember-try #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bda958
Update ember-try
pangratz Jan 27, 2016
b11573b
Update ember-data-2.3 scenario to use npm dependencies
pangratz Jan 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions config/ember-try.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,28 @@ module.exports = {
},
{
name: 'ember-data-2.3',
dependencies: {
"ember": "components/ember#release",
},
devDependencies: {
"ember-data": "~2.3"
bower: {
dependencies: {
"ember": "components/ember#release",
},
devDependencies: {
// Note that the bower dependency for ember-data is set here to ~2.3,
// altough since 2.3 ember-data is a proper addon which is installed
// via npm; we are setting the version for the bower dependency here
// so we make sure that ember-data 2.3 is used. This can be removed
// once there is support for removing dependencies in an ember-try
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's remove ember-data from the default bower.json and add it to each scenario. That way we do not need ember-try to support removing...

// scenario
"ember-data": "~2.3",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.1.0"
},
resolutions: {
"ember": "release"
}
},
resolutions: {
"ember": "release"
npm: {
devDependencies: {
"ember-data": "~2.3"
}
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"broccoli-sourcemap-concat": "^0.4.3",
"ember-cli": "1.13.13",
"ember-cli-release": "^1.0.0-beta.1",
"ember-try": "0.0.8"
"ember-try": "https://github.com/kategengler/ember-try#npm-support"
},
"dependencies": {
"klassy": "^0.1.3"
Expand Down