Don't use <script> tag to pass fingerprinted assets file name

adopted-ember-addons · Oct 9, 2017 · 3104e3b · 3104e3b
1 parent e121efb
commit 3104e3b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/addon/initializers/asset-map.js b/addon/initializers/asset-map.js
@@ -14,6 +14,10 @@ export function initialize(app) {
 
   let assetMapFile = window && window.__assetMapPlaceholder__;
 
+  if (!assetMapFile) {
+    assetMapFile = decodeURIComponent(document.querySelector('[property="ifa:placeholder"]').getAttribute('content'));
+  }
+
   if (!assetMapFile) {
     app.register('service:asset-map', AssetMap);
     return;

diff --git a/index.js b/index.js
@@ -54,10 +54,9 @@ module.exports = {
 
     if (ifaConfig.inline && fs.existsSync(assetFileNamePath)) {
       assetMapPlaceholder = fs.readFileSync(assetFileNamePath, {encoding: 'utf-8'});
-
     } else {
       if (assetFileName) {
-        assetMapPlaceholder = `"${fingerprintPrepend}assets/${assetFileName}"`;
+        assetMapPlaceholder = encodeURIComponent(`${fingerprintPrepend}assets/${assetFileName}`);
       }
     }
 
@@ -69,7 +68,9 @@ module.exports = {
   },
 
   contentFor(type, config) {
-    if (type === 'head-footer' && config.ifa && config.ifa.enabled) {
+    if (type === 'head' && config.ifa && config.ifa.enabled && !config.ifa.inline) {
+      return '<meta property="ifa:placeholder" content="__asset_map_placeholder__">';
+    } else if (type === 'head-footer' && config.ifa && config.ifa.enabled && config.ifa.inline) {
       return '<script>var __assetMapPlaceholder__ = __asset_map_placeholder__;</script>';
     }
   }