amphora-html 6.0.0-6 → 6.0.0-8

package/lib/media.js

@@ -274,6 +274,20 @@ function getStyleFiles(state) {
     }
   }
 
+  // check for clay linked font files
+  const defaultFontPath = path.join(assetDir, 'css', '_linked-fonts._default.css');
+  const siteFontPath = path.join(assetDir, 'css', `_linked-fonts.${siteStyleguide}.css`);
+
+  // check for inlined font files
+  const defaultInlinedFontPath = path.join(assetDir, 'css', '_inlined-fonts._default.css');
+  const siteInlinedFontPath = path.join(assetDir, 'css', `_inlined-fonts.${siteStyleguide}.css`);
+
+  // add any default and site font css
+  cssFilePaths.push(defaultFontPath);
+  cssFilePaths.push(siteFontPath);
+  cssFilePaths.push(defaultInlinedFontPath);
+  cssFilePaths.push(siteInlinedFontPath);
+
   return cssFilePaths
     .filter(files.fileExists)
     .map(pathJoin(assetHost, assetPath, assetDir));
@@ -409,7 +423,7 @@ function injectScriptsAndStyles(state) {
     if (!locals.edit) {
       mediaMap.styles = combineFileContents(mediaMap.styles, 'public/css', '/css/', STYLE_TAG);
       mediaMap.scripts = !!mediaMap.manifestAssets && mediaMap.manifestAssets.length > 0
-        ? injectTags(mediaMap.manifestAssets, locals.site, DEFER_SCRIPT_TAG)
+        ? injectTags(mediaMap.manifestAssets, locals.site, SCRIPT_TAG)
         : combineFileContents(mediaMap.scripts, 'public/js', '/js/', SCRIPT_TAG);
     } else {
       mediaMap.styles = module.exports.editStylesTags ? injectTags(mediaMap.styles, locals.site, STYLE_TAG) : combineFileContents(mediaMap.styles, 'public/css', '/css/', STYLE_TAG);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amphora-html",
-  "version": "6.0.0-6",
+  "version": "6.0.0-8",
   "description": "An HTML renderer for component data",
   "main": "index.js",
   "scripts": {

package/.envrc

@@ -1,2 +0,0 @@
-use node 14
-layout node