Skip to content

load ember from ember-core if available#5531

Merged
homu merged 7 commits intomasterfrom
ember-source
Mar 20, 2016
Merged

load ember from ember-core if available#5531
homu merged 7 commits intomasterfrom
ember-source

Conversation

@stefanpenner
Copy link
Contributor

cc @rwjblue

  • choose ember module name
  • ship ember-core module

@rwjblue
Copy link
Member

rwjblue commented Mar 1, 2016

We should check how far back findAddonByName goes, this project still supports early 1.13.x versions of Ember CLI. So we would either need to bump majors or detect and fallback (either is fine with me).

@stefanpenner - What do you think?

@rwjblue
Copy link
Member

rwjblue commented Mar 1, 2016

Ugh, that comment was for the ember-cli-htmlbars PR not this one, sorry about the noise :(

@rwjblue
Copy link
Member

rwjblue commented Mar 1, 2016

This looks good to me, not sure why it's failing though (haven't dug into the Travis errors).

@stefanpenner
Copy link
Contributor Author

@rwjblue its been around since ember-cli@v0.2.0 45f93f1 I think we are good

var defaultDevelopmentEmber = this.bowerDirectory + '/ember/ember.debug.js';
if (!existsSync(path.join(this.project.root, defaultDevelopmentEmber))) {
defaultDevelopmentEmber = this.bowerDirectory + '/ember/ember.js';
var ember = this.project.findAddonByName('ember-source');
Copy link
Member

Choose a reason for hiding this comment

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

the discussion in emberjs/ember.js#13022 seemed to have converged on using ember-core instead of ember-source

Copy link
Contributor Author

Choose a reason for hiding this comment

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

update to ember-core

@Turbo87
Copy link
Member

Turbo87 commented Mar 16, 2016

@stefanpenner LGTM r+ :shipit:

I think we can merge this already even though ember-core is not published yet.

@stefanpenner stefanpenner changed the title load ember from ember-source if available load ember from ember-core if available Mar 20, 2016
@stefanpenner
Copy link
Contributor Author

@Turbo87 you are totally correct

@homu r+

@homu
Copy link
Contributor

homu commented Mar 20, 2016

📌 Commit 1a6cc0f has been approved by stefanpenner

homu added a commit that referenced this pull request Mar 20, 2016
load ember from ember-core if available

cc @rwjblue

- [x] choose ember module name
- [ ] ship ember-core module
@homu
Copy link
Contributor

homu commented Mar 20, 2016

⌛ Testing commit 1a6cc0f with merge ef7cd53...

@homu
Copy link
Contributor

homu commented Mar 20, 2016

☀️ Test successful - status

@Turbo87 Turbo87 deleted the ember-source branch March 20, 2016 09:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants