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

[BUGFIX beta] Implement public module API. #3995

Merged
merged 6 commits into from
Dec 14, 2015
Merged

Conversation

rwjblue
Copy link
Member

@rwjblue rwjblue commented Dec 14, 2015

  • This replaces the public module API from ember-cli-shims. These shims have been removed from ember-cli-shims in Remove ember-data shims. ember-cli/ember-cli-shims#38.
  • Adds shims when define && define.petal (which is set by loader.js) is present.
  • Remove old addon + blueprint.
  • If bower.json includes ember-data a warning will be issued, and that
    version will be used.

This replaces the public module API from ember-cli-shims.
@rwjblue rwjblue changed the title [BUGFIX beta] Implement public module API. [WIP] [BUGFIX beta] Implement public module API. Dec 14, 2015
@bmac
Copy link
Member

bmac commented Dec 14, 2015

LGTM 👍

@rwjblue
Copy link
Member Author

rwjblue commented Dec 14, 2015

Updated again, added the following:

  • Remove old addon + blueprint.
  • Use bower version of ember-data if present.

In order to keep backwards compat, we must honor the version of ember-data that is present in bower.json (even though it is not needed). This is due to the fact that many people update the package.json and bower.json versions of Ember Data completely independently.

If bower.json includes ember-data a warning will be issued, and that version will be used.

@rwjblue rwjblue changed the title [WIP] [BUGFIX beta] Implement public module API. [BUGFIX beta] Implement public module API. Dec 14, 2015
In order to keep backwards compat, we must honor the version of
ember-data that is present in `bower.json` (even though it is not
needed). This is due to the fact that many people update the
`package.json` and `bower.json` versions of Ember Data completely
independently.

If `bower.json` includes `ember-data` a warning will be issued, and that
version will be used.
`config/environment.js` is used by ember-cli to allow the addon to
provide default configuration to the consuming app.  In this case, the
configuration here is for the addon's internal development so it belongs
in `tests/dummy/config/environment.js` instead.
When using ember-cli-shims prior to 0.1.0, the `ember-data` module that
we provide in this addon is overridden by the one provided by the shims
repo. This warning should help folks understand what to do *before* they
notice an issue.
@rwjblue
Copy link
Member Author

rwjblue commented Dec 14, 2015

Added two more changes:

bmac added a commit that referenced this pull request Dec 14, 2015
[BUGFIX beta] Implement public module API.
@bmac bmac merged commit de6f7be into emberjs:master Dec 14, 2015
@bmac
Copy link
Member

bmac commented Dec 14, 2015

Thanks @rwjblue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants