Skip to content

Update project #210

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

Merged
merged 3 commits into from
May 21, 2018
Merged

Update project #210

merged 3 commits into from
May 21, 2018

Conversation

dfreeman
Copy link
Member

This ember-cli-updates the project to Ember + CLI ~3.1.0 as a preliminary step toward reworking our test matrix as discussed in #190

'index.js',
'testem.js',
'ember-cli-build.js',
'blueprints/*/index.js',
Copy link
Contributor

Choose a reason for hiding this comment

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

maybe change this to "blueprings/**/*.js"?

Then we don't need /* eslint-env node */ in the other node files inside the "blueprints/" dir.

Copy link
Member Author

Choose a reason for hiding this comment

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

The tricky bit with those directories is that they're a mix of node and Emberland files. This entry is from the default addon blueprint, and our -addon-import and test-framework-detector are sort of oddballs, so it seemed simpler to leave it as-is rather than having to keep dealing with merge conflicts each time we update.

@dfreeman
Copy link
Member Author

@chriskrycho @dwickern @jamescdavis any objections to this? It's the first in a chain that looks something like:

  1. Update project #210 (update to 3.1)
  2. Update build matrix to cover TS + Ember CLI versions #211 (more useful test matrix)
  3. Node acceptance tests, round 2 #202 (basic end-to-end testing)
  4. #??? (implement RFC: Type Generation #192)

@chriskrycho
Copy link
Member

I'm 👍 on it; sorry, I meant to say as much a week ago!

Copy link
Contributor

@dwickern dwickern left a comment

Choose a reason for hiding this comment

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

LGTM

@dfreeman dfreeman merged commit 54efd3f into master May 21, 2018
@dfreeman dfreeman deleted the update-project branch May 21, 2018 20:53
dfreeman added a commit that referenced this pull request Aug 21, 2018
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.

4 participants