Nothing Special   »   [go: up one dir, main page]

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

Apply clean-base-url to config.rootURL #6600

Merged
merged 1 commit into from
Dec 23, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Apply clean-base-url to config.rootURL
  • Loading branch information
nathanhammond committed Dec 22, 2016
commit 502a523873d57b7c1c257a67b026cce143c797b8
6 changes: 6 additions & 0 deletions lib/broccoli/ember-app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1714,6 +1714,12 @@ EmberApp.prototype.contentFor = function(config, match, type) {
var deprecatedHooks = ['app-prefix', 'app-suffix', 'vendor-prefix', 'vendor-suffix'];
var deprecate = this.project.ui.writeDeprecateLine.bind(this.project.ui);

// This normalizes `rootURL` to the value which we use everywhere inside of Ember CLI.
// This makes sure that the user doesn't have to account for it in application code.
if ('rootURL' in config) {
config.rootURL = calculateRootURL(config);
}

switch (type) {
case 'head': this._contentForHead(content, config); break;
case 'config-module': this._contentForConfigModule(content, config); break;
Expand Down