amphora-html 5.0.0-0 → 5.1.0

package/.eslintrc

@@ -58,7 +58,7 @@
     "no-trailing-spaces": 2,
     "no-underscore-dangle": 0,
     "no-unneeded-ternary": 1,
-    "one-var": 2,
+    "one-var": 0,
     "quotes": [2, "single", "avoid-escape"],
     "semi": [2, "always"],
     "keyword-spacing": 2,

package/lib/media.js

@@ -6,6 +6,7 @@ const _ = require('lodash'),
   bluebird = require('bluebird'),
   setup = require('./setup'),
   styleguide = require('./styleguide'),
+  url = require('url'),
   STYLE_TAG = 'style',
   SCRIPT_TAG = 'scripts',
   MEDIA_DIRECTORY = path.join(process.cwd(), 'public');
@@ -166,7 +167,7 @@ function injectTags(fileArray, site, tag) {
 function getMediaMap(state) {
   return {
     styles: module.exports.getStyleFiles(state),
-    scripts: module.exports.getScriptFiles(state)
+    scripts: module.exports.getScriptFiles(state),
   };
 }
 
@@ -238,6 +239,14 @@ function getStyleFiles(state) {
     }
   }
 
+  // check for clay compile linked? clay compile font files?
+  const defaultFontPath = path.join(assetDir, 'css', '_linked-fonts._default.css');
+  const siteFontPath = path.join(assetDir, 'css', `_linked-fonts.${siteStyleguide}.css`);
+
+  // add any default and site font css
+  cssFilePaths.push(defaultFontPath);
+  cssFilePaths.push(siteFontPath);
+
   return cssFilePaths
     .filter(files.fileExists)
     .map(pathJoin(assetHost, assetPath, assetDir));

package/lib/media.test.js

@@ -10,7 +10,8 @@ const _ = require('lodash'),
 
 jest.mock('nymag-fs', () => ({
   fileExists: () => false,
-  readFilePromise: () => Promise.resolve('')
+  readFilePromise: () => Promise.resolve(''),
+  tryRequire: () => ({})
 }));
 
 describe(_.startCase(filename), () => {

package/lib/render.js

@@ -40,7 +40,7 @@ function applyRenderHooks(ref, data, locals) {
  * @param {Object} locals
  * @returns {Function}
  */
-function applyPostRenderHooks(ref, locals) {
+function applyPostRenderHooks(ref, locals, res, self) {
   return (html) => {
 
     // skip postRender hooks in edit mode
@@ -50,7 +50,7 @@ function applyPostRenderHooks(ref, locals) {
 
     return setup.plugins.filter((plugin) => plugin.postRender)
       .reduce((val, plugin) => {
-        return plugin.postRender(ref, html, locals);
+        return plugin.postRender(ref, html, locals, res, self);
       }, html);
   };
 }
@@ -148,7 +148,7 @@ function render(data, meta, res) {
   return applyRenderHooks(state._layoutRef || state.self, data, state.locals)
     .then(makeHtml(state))
     .then(mediaService.injectScriptsAndStyles(state))
-    .then(applyPostRenderHooks(state._layoutRef || state.self, state.locals))
+    .then(applyPostRenderHooks(state._layoutRef || state.self, state.locals, res, meta._ref))
     .then(result => {
       res.type('text/html');
       res.send(result);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amphora-html",
-  "version": "5.0.0-0",
+  "version": "5.1.0",
   "description": "An HTML renderer for component data",
   "main": "index.js",
   "scripts": {
@@ -9,10 +9,10 @@
     "jest": "jest"
   },
   "dependencies": {
-    "amphora-fs": "^2.0.0-0",
+    "amphora-fs": "^2.0.0",
     "bluebird": "^3.5.0",
     "clay-log": "^1.2.0",
-    "clayutils": "^3.0.0-0",
+    "clayutils": "^3.0.0",
     "glob": "^7.1.1",
     "js-yaml": "^3.8.2",
     "lodash": "^4.17.5",
@@ -20,6 +20,7 @@
     "traverse": "^0.6.6"
   },
   "devDependencies": {
+    "clayhandlebars": "^5.0.1",
     "coveralls": "^3.0.2",
     "eslint": "^3.19.0",
     "jest": "23.6.0"