Skip to content
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

Jump to bottom

Implement optional page templates #14

Merged
merged 2 commits into from Jun 2, 2022
Merged

Implement optional page templates #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f21f861
Make the inclusion of a _template.js file in pages directories optional
hawkticehurst Jun 2, 2022
b6e2259
Fix bug where an empty style tag would still be added to final page o…
hawkticehurst Jun 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
89 changes: 54 additions & 35 deletions src/index.js
View file
Open in desktop
Expand Up @@ -25,7 +25,6 @@ async function main() {
}

async function buildPages(buildDirectory, pagesDirectory) {
// TODO: Make template optional
const [template, templateStyles] = await getPageTemplate(pagesDirectory);
const files = fs.readdirSync(pagesDirectory);
for (const file of files) {
Expand All @@ -51,31 +50,45 @@ async function buildPages(buildDirectory, pagesDirectory) {
} = await import(`${pagesDirectory}/${file}`);

let pageOutput = '';
switch (metadata.useTemplate) {
case false:
pageOutput = page();
pageOutput = addStyles(
pageOutput,
styles,
'',
metadata.inlineCSS,
buildDirectory,
pageName
);
break;
default:
// When metadata.useTemplate is undefined or set to true,
// the template will be used
pageOutput = template(page(), metadata);
pageOutput = addStyles(
pageOutput,
styles,
templateStyles,
metadata.inlineCSS,
buildDirectory,
pageName
);
break;
if (template) {
switch (metadata.useTemplate) {
case false:
pageOutput = page();
pageOutput = addStyles(
pageOutput,
styles,
'',
metadata.inlineCSS,
buildDirectory,
pageName
);
break;
default:
// When metadata.useTemplate is undefined or set to true,
// the template will be used
pageOutput = template(page(), metadata);
pageOutput = addStyles(
pageOutput,
styles,
templateStyles,
metadata.inlineCSS,
buildDirectory,
pageName
);
break;
}
} else {
// If a _template.js file does not exist in the given
// directory, build page output without it
pageOutput = page();
pageOutput = addStyles(
pageOutput,
styles,
'',
metadata.inlineCSS,
buildDirectory,
pageName
);
}
pageOutput = addWebComponentScriptTags(pageOutput);
writeToBuildDirectory(pageOutput, buildDirectory, `${pageName}.html`);
Expand All @@ -84,8 +97,12 @@ async function buildPages(buildDirectory, pagesDirectory) {
}

async function getPageTemplate(pagesDirectory) {
const templatePath = `${pagesDirectory}/_template.js`;
if (!fs.existsSync(templatePath)) {
return [undefined, ''];
}

try {
const templatePath = `${pagesDirectory}/_template.js`;
const { template, styles = '' } = await import(templatePath);
return [template, styles];
} catch (err) {
Expand All @@ -102,14 +119,16 @@ function addStyles(
pageName
) {
const styles = `${pageStyles}${templateStyles}`;
if (isInlineCSS) {
output = output.replace('</head>', `<style>${styles}</style>\n</head>`);
} else {
writeToBuildDirectory(styles, buildDirectory, `${pageName}.css`);
output = output.replace(
'</head>',
`<link rel="stylesheet" href="./${pageName}.css" />\n</head>`
);
if (styles.length > 0) {
if (isInlineCSS) {
output = output.replace('</head>', `<style>${styles}</style>\n</head>`);
} else {
writeToBuildDirectory(styles, buildDirectory, `${pageName}.css`);
output = output.replace(
'</head>',
`<link rel="stylesheet" href="./${pageName}.css" />\n</head>`
);
}
}
return output;
}
Expand Down