@adobe/helix-html-pipeline 1.3.4 → 1.4.2

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [1.4.2](https://github.com/adobe/helix-html-pipeline/compare/v1.4.1...v1.4.2) (2022-05-03)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-shared-utils to v2.0.9 ([2aee8a3](https://github.com/adobe/helix-html-pipeline/commit/2aee8a3c70388a220bacdef1671e6c899b02736f))
+
+## [1.4.1](https://github.com/adobe/helix-html-pipeline/compare/v1.4.0...v1.4.1) (2022-04-16)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-shared-utils to v2.0.8 ([9c7e30d](https://github.com/adobe/helix-html-pipeline/commit/9c7e30daccfab99e0dc5861f7105c0eee6c88ca5))
+
+# [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/README.md

@@ -1,6 +1,6 @@
 # Helix HTML Pipeline
 
-This package contains the common code for `helix-pipeline-service` and `helix-cloudflare-pipeline` for rendering the html response for helix3. it has the following design goals:
+This package contains the common code for `helix-pipeline-service` and `helix-cloudflare-page` for rendering the html response for helix3. it has the following design goals:
 
 - be platform neutral, i.e. not using node or browser specific modules or dependencies.
 - +/-0 runtime dependencies (eg. node [crypto](https://nodejs.org/api/crypto.html))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "1.3.4",
+  "version": "1.4.2",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@adobe/helix-markdown-support": "3.1.2",
-    "@adobe/helix-shared-utils": "2.0.7",
+    "@adobe/helix-shared-utils": "2.0.9",
     "github-slugger": "1.4.0",
     "hast-util-raw": "7.2.1",
     "hast-util-select": "5.0.1",
@@ -67,16 +67,16 @@
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "1.3.2",
-    "@markedjs/html-differ": "4.0.1",
+    "@markedjs/html-differ": "4.0.2",
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "9.0.1",
-    "c8": "7.11.0",
+    "c8": "7.11.2",
     "chalk-template": "0.4.0",
     "codecov": "3.8.3",
     "commitizen": "4.2.4",
     "cz-conventional-changelog": "3.3.0",
-    "eslint": "8.13.0",
+    "eslint": "8.14.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.26.0",
     "esmock": "1.7.5",
@@ -85,8 +85,8 @@
     "jsdoc-to-markdown": "7.1.1",
     "jsdom": "19.0.0",
     "junit-report-builder": "3.0.0",
-    "lint-staged": "12.3.7",
-    "mocha": "9.2.2",
+    "lint-staged": "12.4.1",
+    "mocha": "10.0.0",
     "mocha-multi-reporters": "1.5.1",
     "remark-gfm": "3.0.1",
     "semantic-release": "19.0.2"

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 })