Skip to content

load template-compiler from ember-source#68

Merged
stefanpenner merged 4 commits intomasterfrom
ember-source
May 22, 2016
Merged

load template-compiler from ember-source#68
stefanpenner merged 4 commits intomasterfrom
ember-source

Conversation

@stefanpenner
Copy link
Contributor

@stefanpenner stefanpenner commented Feb 27, 2016

  • fallback to old
  • don’t append ‘.js’ as require already does this

htmlbarsOptions: function() {
var projectConfig = this.projectConfig() || {};
var EmberENV = projectConfig.EmberENV || {};
var templateCompilerPath = this.templateCompilerPath() + '.js';
Copy link
Member

Choose a reason for hiding this comment

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

this is required to properly clear the cache below (because the path is stored with its extension in the cache)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

hmm this.templateCompilerPath() now returns (sometimes with '.js')

I can add a ensureEndsInJs() or something

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor Author

@stefanpenner stefanpenner May 22, 2016

Choose a reason for hiding this comment

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

ah, we already had this conversation :P #68 (comment)

@rwjblue
Copy link
Member

rwjblue commented Feb 29, 2016

This looks good except for that one nit-pick/correction RE: extension.

@stefanpenner
Copy link
Contributor Author

@rwjblue one possible solution: 9f7bf84

@rwjblue
Copy link
Member

rwjblue commented Feb 29, 2016

Ya, that looks good.

* fallback to old
* don’t append ‘.js’ as require already does this
@stefanpenner
Copy link
Contributor Author

got r+ from @chadhietala

@stefanpenner
Copy link
Contributor Author

@homu r+

@stefanpenner stefanpenner merged commit 93a4385 into master May 22, 2016
@stefanpenner stefanpenner deleted the ember-source branch May 22, 2016 22:04
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