@adobe/helix-html-pipeline 1.3.4 → 1.4.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [1.4.0](https://github.com/adobe/helix-html-pipeline/compare/v1.3.4...v1.4.0) (2022-04-12)
+
+
+### Features
+
+* adjust for upcoming helix-config changes ([#37](https://github.com/adobe/helix-html-pipeline/issues/37)) ([e6d4f90](https://github.com/adobe/helix-html-pipeline/commit/e6d4f90d4bf8c9a0642e921395e5ac48aa3e53c7)), closes [#36](https://github.com/adobe/helix-html-pipeline/issues/36)
+
 ## [1.3.4](https://github.com/adobe/helix-html-pipeline/compare/v1.3.3...v1.3.4) (2022-04-11)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "1.3.4",
+  "version": "1.4.0",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/src/steps/fetch-config.js

@@ -30,13 +30,33 @@ export default async function fetchConfig(state, req, res) {
   if (ret.status !== 200) {
     throw new PipelineStatusError(ret.status === 404 ? 404 : 502, `unable to load /helix-config.json: ${ret.status}`);
   }
+  let config;
   try {
-    state.helixConfig = JSON.parse(ret.body);
+    config = JSON.parse(ret.body);
   } catch (e) {
     log.info('failed to parse helix-config.json', e);
     throw new PipelineStatusError(400, `Failed parsing of /helix-config.json: ${e.message}`);
   }
 
+  // upgrade to version 2 if needed
+  if (config.version !== 2) {
+    Object.keys(config).forEach((name) => {
+      config[name] = {
+        data: config[name],
+      };
+    });
+  }
+
   // also update last-modified
-  updateLastModified(state, res, extractLastModified(ret.headers));
+  const configLastModified = extractLastModified(ret.headers);
+
+  // update last modified of fstab
+  updateLastModified(state, res, config.fstab?.lastModified || configLastModified);
+
+  // for html requests, also consider the HEAD config
+  if (state.type === 'html' && state.info.selector !== 'plain' && config.head?.lastModified) {
+    updateLastModified(state, res, config.head.lastModified);
+  }
+
+  state.helixConfig = config;
 }

package/src/steps/folder-mapping.js

@@ -40,7 +40,7 @@ export function mapPath(folders, path) {
  * @param {PipelineState} state
  */
 export default function folderMapping(state) {
-  const folders = state.helixConfig?.fstab?.folders;
+  const folders = state.helixConfig?.fstab?.data.folders;
   if (!folders) {
     return;
   }

package/src/steps/render.js

@@ -81,7 +81,7 @@ export default async function render(state, req, res) {
   appendElement($head, createElement('link', 'rel', 'alternate', 'type', 'application/xml+atom', 'href', meta.feed, 'title', `${meta.title} feed`));
 
   // inject head.html
-  const headHtml = state.helixConfig?.head?.html;
+  const headHtml = state.helixConfig?.head?.data.html;
   if (headHtml) {
     const $headHtml = await unified()
       .use(rehypeParse, { fragment: true })