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

upgrade ember-cli/ember/ember-data to 2.3 #310

Merged
merged 12 commits into from
Jan 29, 2016

Conversation

piotrpalek
Copy link
Contributor

Hey, so I wanted to do a quick upgrade of ember twiddles dependencies to the newest versions. Turned out a bit more complicated than anticipated, but I think I'm on the right path here.

I've backported the ember data shims from the previous ember-cli-shims version and include it by default in the twiddle app. Doesn't seem to cause any problems when using ember-data 2.3.0 and up, but I'm not sure about this so input is appreciated. If this could lead to potential problems I would add the shims conditionally when building the twiddle based on the ember-data version specified in twiddle.json.

This is currently still a WIP since I'm planning to remove container related deprecations as well, but as mentioned earlier wanted someone to take a look and check if my changes till now are fine.

@Gaurav0
Copy link
Contributor

Gaurav0 commented Jan 29, 2016

Hi, @piotrpalek, yes your changes look basically fine.

Two questions:

  1. Why was it necessary to abstract the resolver?
  2. Can you conditionally include shims in the build only if ember data is less than 2.3?

@piotrpalek
Copy link
Contributor Author

Hey @Gaurav0, so:

  1. I just followed the upgrade path for ember-cli 2.3.0-beta.1. Or do you mean something else?
  2. Yup as said in the PR description it's possible to provide them as a module. So I could import them in the ember-cli service, check for ED version and include them if necessary. Though as said they don't seem to cause any problems.

@piotrpalek
Copy link
Contributor Author

I still have 2 issues I would like to resolve:

  1. Two tests are failing in Chrome (for eg. this one) because the tests fire an additional action, which isn't fired when running in phantomjs. Any suggestions for this?
  2. I've removed our own container related deprecation, but there are still a few left from addons. I'd like to check if there are newer versions that fix this issue and upgrade them as well if there are.

@Gaurav0
Copy link
Contributor

Gaurav0 commented Jan 29, 2016

@piotrpalek Ah, didn't realize you had upgraded ember-cli as well.

I think the remaining issues can be done in a separate PR.

👍

@piotrpalek
Copy link
Contributor Author

@Gaurav0 fine with me to do that in another PR 😄

Gaurav0 added a commit that referenced this pull request Jan 29, 2016
upgrade ember-cli/ember/ember-data to 2.3
@Gaurav0 Gaurav0 merged commit ffe5d01 into ember-cli:master Jan 29, 2016
@piotrpalek piotrpalek deleted the cli-2.3.0-beta.1 branch January 29, 2016 01:10
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.

2 participants