Skip to content
This repository was archived by the owner on Feb 23, 2020. It is now read-only.

pin ember data version to ^3.10.0 #107

Merged
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@ember/octane-app-blueprint/files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"ember-cli-sri": "^2.1.1",
"ember-cli-template-lint": "^1.0.0-beta.1",
"ember-cli-uglify": "^2.1.0",
"ember-data": "<%= emberData %>",
"ember-data": "^3.10.0",
Copy link
Collaborator

Choose a reason for hiding this comment

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

Instead of hard coding this to ^3.10.0, can it be the latest release? So that way as ember-data continues to release new versions, we don't need to keep updating the blueprint?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's actually the behavior we get from the ^ in ^3.10.0, since ^ will resolve to the latest available 3.x version (but not less than 3.10)

Copy link
Collaborator

Choose a reason for hiding this comment

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

oh cool.

"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^2.0.0",
"ember-maybe-import-regenerator": "^0.1.6",
Expand Down
7 changes: 1 addition & 6 deletions packages/@ember/octane-app-blueprint/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,13 @@ module.exports = {
locals(options) {
return Promise.all([
getRepoVersion('ember-cli', 'ember-cli'),
getRepoVersion('emberjs', 'data'),
getURLFor('canary')
]).then(([emberCLIURL, emberDataURL, emberURL]) => {
]).then(([emberCLIURL, emberURL]) => {
let name = stringUtil.dasherize(options.entity.name);
let entity = options.entity;
let rawName = entity.name;
let namespace = stringUtil.classify(rawName);

// temporarily pinning ember-data see tracking issue for details:
// https://github.com/ember-cli/ember-octane-blueprint/issues/95 to
emberDataURL = 'github:emberjs/data#1df833396855d956b817540923dd89338463fec2';

return {
name,
Expand All @@ -33,7 +29,6 @@ module.exports = {
yarn: options.yarn,
welcome: options.welcome,
emberCanaryVersion: emberURL,
emberData: emberDataURL,
emberCLI: emberCLIURL
};
});
Expand Down