Skip to content

Another fonts update #41

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.

Sign up for GitHub

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

Open
Jess2896 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Another fonts update #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
46899a3
feat: handle font files
james-owen Nov 7, 2022
5536dcd
2.0.2-dev.0
james-owen Nov 7, 2022
e90d715
feat: adds plugins setup
james-owen Nov 23, 2022
9f14814
2.0.2-dev.1
james-owen Nov 23, 2022
01ec5bd
Updated the version
Mar 15, 2023
c4588aa
Rebased and fixed the errors
Apr 17, 2023
1136b4e
Updated the version
Apr 17, 2023
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
1 change: 1 addition & 0 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ const setup = require('./lib/setup'),
module.exports.render = render;
module.exports.addResolveMedia = setup.addResolveMedia;
module.exports.addHelpers = setup.addHelpers;
module.exports.addPlugins = setup.addPlugins;
module.exports.configureRender = setup.configureRender;
14 changes: 13 additions & 1 deletion lib/media.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,13 @@ function getMediaMap({ _components: componentList, _layoutData, locals }) {
{site} = locals || {},
assetDir = site && site.assetDir || MEDIA_DIRECTORY,
assetPath = site && site.assetPath || '',
assetHost = site && site.assetHost || '';
assetHost = site && site.assetHost || '',
siteStyleguide = site && site.styleguide,
defaultLinkedFontPath = path.join(assetDir, 'css', '_linked-fonts._default.css'),
siteLinkedFontPath = path.join(assetDir, 'css', `_linked-fonts.${siteStyleguide}.css`),
defaultInlinedFontPath = path.join(assetDir, 'css', '_inlined-fonts._default.css'),
siteInlinedFontPath = path.join(assetDir, 'css', `_inlined-fonts.${siteStyleguide}.css`);

let componentStyles = flatMap(componentList, (componentName) => module.exports.getStyles(componentName, locals.site));

if (layoutName) {
Expand All @@ -135,6 +141,12 @@ function getMediaMap({ _components: componentList, _layoutData, locals }) {
componentStyles = _.concat(componentStyles, layoutStyles);
}

// add any default and site font css
componentStyles.push(defaultLinkedFontPath);
componentStyles.push(siteLinkedFontPath);
componentStyles.push(defaultInlinedFontPath);
componentStyles.push(siteInlinedFontPath);

return {
styles: _.map(_.filter(componentStyles, util.fileExists), pathJoin(assetHost, assetPath, assetDir))
};
Expand Down
49 changes: 48 additions & 1 deletion lib/render.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

const _ = require('lodash'),
clayUtils = require('clayutils'),
mediaService = require('./media');
mediaService = require('./media'),
setup = require('./setup');

let log = require('./log').setup({ file: __filename }),
amphoraFs = require('amphora-fs'),
Expand Down Expand Up @@ -79,13 +80,59 @@ function makeHtml(state) {
};
}

/**
* Applies `render` hooks.
* Render hooks each return `data` or a Promise for `data`.
*
* @param {String} ref
* @param {Object} data
* @param {Object} locals
* @returns {Object} data
*/
function applyRenderHooks(ref, data, locals) {
// skip render hooks in edit mode
if (locals.edit) {
return bluebird.resolve(data);
}

return bluebird
.filter(setup.plugins, (plugin) => plugin.render)
.reduce((val, plugin) => {
return plugin.render(ref, val, locals);
}, data);
}

/**
* Applies `postRender` hooks.
* Post Render hooks each returns `html`.
*
* @param {String} ref
* @param {Object} locals
* @returns {Function}
*/
function applyPostRenderHooks(ref, locals) {
return (html) => {
// skip postRender hooks in edit mode
if (locals.edit) {
return html;
}

return setup.plugins
.filter((plugin) => plugin.postRender)
.reduce((val, plugin) => {
return plugin.postRender(ref, html, locals);
}, html);
};
}

function render(data, meta, res) {
const hrStart = process.hrtime(),
state = makeState(data, meta);

return Promise.resolve(data)
.then(makeHtml(state))
.then(mediaService.injectStyles(state))
.then(applyPostRenderHooks(state._layoutRef || state.self, state.locals))
.then(result => {
res.type('text/html');
res.send(result);
Expand Down
18 changes: 18 additions & 0 deletions lib/setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,23 @@ function addHelpers(payload) {
});
}

/**
*
* @param {Plugin[]} pluginsArr
*/
function addPlugins(pluginsArr) {
pluginsArr.forEach((plugin, index) => {
if (plugin.render || plugin.postRender) {
module.exports.plugins.push(plugin);
} else {
log(
"error",
`Error in amphora-html addPlugins: No \`render\` or \`postRender\` func found for plugin at index ${index}`
);
}
});
}

/**
* Pass settings to the renderer
*
Expand Down Expand Up @@ -150,6 +167,7 @@ module.exports.plugins = [];
// Setup functions
module.exports.init = init;
module.exports.addHelpers = addHelpers;
module.exports.addPlugins = addPlugins;
module.exports.configureRender = configureRender;
module.exports.addResolveMedia = addResolveMedia;

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "amphora-amp",
"version": "2.0.1",
"version": "2.0.2-beta.1",
"description": "An AMPHTML renderer for component data",
"main": "index.js",
"scripts": {
Expand Down