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

Jump to bottom

Upgrade to Ember v2.13 #760

Merged
merged 6 commits into from
Jun 9, 2017
Merged

Upgrade to Ember v2.13 #760

merged 6 commits into from
Jun 9, 2017

Conversation

locks
Copy link
Contributor

@locks locks commented Jun 7, 2017

Builds on the nice work by @bjornharrtell in #719 and adds some sprinkles.

@locks
Updates codebase through ember init
81478d8 
I noticed that the project still had a bunch of bower.json
dependencies. I moved some of them, but was super conservative as I’d
prefer to get these changes merged before continuing.
Also updated some of the files and dependencies, like jshint->eslint,
which included adding some TODOs to clean up afterwards.
The package.json churn is because `ember init` now generates
package.json with the same ordering as npm, to minimize churn.
@sgrif
Copy link
Contributor

sgrif commented Jun 8, 2017

Looks like this is failing the build

@carols10cents
Copy link
Member

yeah @locks there are a few eslint indentation things and then these errors on the ember tests?

not ok 1 PhantomJS 2.0 - Global error: Error: Could not find module `cargo/tests/helpers/register-select-helper` imported from `cargo/tests/test-helper` at http://localhost:7357/assets/vendor.js, line 229

    ---

        Log: |

            { type: 'error',

              text: 'Error: Could not find module `cargo/tests/helpers/register-select-helper` imported from `cargo/tests/test-helper` at http://localhost:7357/assets/vendor.js, line 229\n' }

    ...

not ok 2 PhantomJS 2.0 - Global error: Error: Assertion Failed: The tests file was not loaded. Make sure your tests index.html includes "assets/tests.js". at http://localhost:7357/assets/vendor.js, line 23064

    ---

        Log: |

            { type: 'error',

              text: 'Error: Assertion Failed: The tests file was not loaded. Make sure your tests index.html includes "assets/tests.js". at http://localhost:7357/assets/vendor.js, line 23064\n' }

    ...

@locks
Copy link
Contributor Author

locks commented Jun 8, 2017

Addressing it!

locks added 2 commits June 8, 2017 22:57
@locks
Use Ember.assign "polyfill"
6915f7d 
This avoids PhantomJS keeling over because we used modern JavaScript APIs.
@locks
Remove function import and call
c3f6983
@locks
Copy link
Contributor Author

locks commented Jun 8, 2017

@carols10cents 👍 ?

locks
locks commented Jun 8, 2017
View reviewed changes
config/targets.js
/* eslint-env node */

module.exports = {
browsers: [
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@carols10cents make sure this matches rust-lang/rfcs#1985

@carols10cents carols10cents merged commit c3f6983 into rust-lang:master Jun 9, 2017
@carols10cents
Copy link
Member

Merged this in before it gets too stale, and so we can do this all again next week when the next version of ember is out ;)

Thank you for all your help @bjornharrtell and @locks!!! ❤️

@carols10cents carols10cents mentioned this pull request Jun 9, 2017
Closed
@locks locks deleted the ember-upgrade-plus branch June 13, 2017 21:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@locks @sgrif @carols10cents @bjornharrtell