Skip to content
This repository has been archived by the owner on May 19, 2021. It is now read-only.

Commit

Permalink
Fix rootURL asset compilation 🔨
Browse files Browse the repository at this point in the history
Fixes #57 . Vulcanized.html was not being imported properly.
  • Loading branch information
dunnkers committed Jun 3, 2017
1 parent b13f75b commit 0d9691d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ember-polymer",
"dependencies": {
"polymer": "Polymer/polymer#~1.8.1",
"polymer": "Polymer/polymer#~1.9.1",
"paper-elements": "PolymerElements/paper-elements#^1.0.7",
"iron-icons": "PolymerElements/iron-icons#^1.2.0",
"webcomponentsjs": "0.7.24"
Expand Down
6 changes: 4 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,15 @@ module.exports = {
},

// insert polymer and vulcanized elements
contentFor(type) {
contentFor(type, config) {
if (type === 'head') {
let href = config.rootURL + this.options.vulcanizeOutput;

return `<script>
window.Polymer = window.Polymer || {};
window.Polymer.dom = "shadow";
</script>
<link rel="import" href="${this.options.vulcanizeOutput}">`;
<link rel="import" href="${href}">`;
}
},

Expand Down
6 changes: 1 addition & 5 deletions tests/dummy/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ import Resolver from './resolver';
import loadInitializers from 'ember-load-initializers';
import config from './config/environment';

let App;

Ember.MODEL_FACTORY_INJECTIONS = true;

App = Ember.Application.extend({
let App = Ember.Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
Resolver
Expand Down

0 comments on commit 0d9691d

Please sign in to comment.