@adobe/helix-html-pipeline 5.4.0 → 5.4.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [5.4.2](https://github.com/adobe/helix-html-pipeline/compare/v5.4.1...v5.4.2) (2023-12-20)
+
+
+### Bug Fixes
+
+* handle redirects correctly for static .html ([#476](https://github.com/adobe/helix-html-pipeline/issues/476)) ([5fd99d7](https://github.com/adobe/helix-html-pipeline/commit/5fd99d798076ba6d693fbf70a24ce5d1290fc9de))
+
+## [5.4.1](https://github.com/adobe/helix-html-pipeline/compare/v5.4.0...v5.4.1) (2023-12-19)
+
+
+### Bug Fixes
+
+* do not include empty canonical ([#273](https://github.com/adobe/helix-html-pipeline/issues/273)) ([66e5d9c](https://github.com/adobe/helix-html-pipeline/commit/66e5d9c1e42ac5844bbd20ec68d7cb31b30d83af))
+
 # [5.4.0](https://github.com/adobe/helix-html-pipeline/compare/v5.3.0...v5.4.0) (2023-12-15)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "5.4.0",
+  "version": "5.4.2",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -76,10 +76,10 @@
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "11.0.2",
     "c8": "8.0.1",
-    "eslint": "8.55.0",
+    "eslint": "8.56.0",
     "eslint-import-resolver-exports": "1.0.0-beta.5",
     "eslint-plugin-header": "3.1.1",
-    "eslint-plugin-import": "2.29.0",
+    "eslint-plugin-import": "2.29.1",
     "esmock": "2.6.0",
     "husky": "8.0.3",
     "js-yaml": "4.1.0",
@@ -89,7 +89,7 @@
     "mocha": "10.2.0",
     "mocha-multi-reporters": "1.5.1",
     "mocha-suppress-logs": "0.4.1",
-    "semantic-release": "22.0.10"
+    "semantic-release": "22.0.12"
   },
   "lint-staged": {
     "*.js": "eslint",

package/src/html-pipe.js

@@ -54,6 +54,31 @@ async function fetchContentWith404Fallback(state, req, res) {
   }
 }
 
+/**
+ * Loads the resource from the content bus but only handles the redirect; otherwise applies
+ * a 404 fallback.
+ * @param state
+ * @param req
+ * @param res
+ * @returns {Promise<void>}
+ */
+async function fetchContentRedirectWith404Fallback(state, req, res) {
+  // force load from content bus again
+  state.content.sourceBus = 'content';
+  const prevError = res.error;
+  try {
+    await fetchContent(state, req, res);
+  } finally {
+    state.content.sourceBus = 'code';
+  }
+  if (res.status !== 301) {
+    // force 404
+    res.status = 404;
+    res.error = prevError;
+    await fetch404(state, req, res);
+  }
+}
+
 /**
  * Runs the default pipeline and returns the response.
  * @param {PipelineState} state
@@ -104,13 +129,18 @@ export async function htmlPipe(state, req) {
     // ...and apply the folder mapping
     state.timer?.update('content-fetch');
     let contentPromise = await fetchContent(state, req, res);
-    // ...but only if the current resource doesn't exist
     if (res.status === 404) {
-      await folderMapping(state);
-      if (state.info.unmappedPath) {
-        contentPromise = fetchContentWith404Fallback(state, req, res);
+      // special handling for code-bus 404
+      if (state.content.sourceBus === 'code') {
+        contentPromise = fetchContentRedirectWith404Fallback(state, req, res);
       } else {
-        contentPromise = fetch404(state, req, res);
+        // ...apply folder mapping if the current resource doesn't exist
+        await folderMapping(state);
+        if (state.info.unmappedPath) {
+          contentPromise = fetchContentWith404Fallback(state, req, res);
+        } else {
+          contentPromise = fetch404(state, req, res);
+        }
       }
     }
 

package/src/steps/render.js

@@ -55,7 +55,9 @@ export default async function render(state, req, res) {
     $head.children.push(h('title', meta.title));
   }
 
-  appendElement($head, createElement('link', 'rel', 'canonical', 'href', meta.canonical));
+  if (meta.canonical) {
+    appendElement($head, createElement('link', 'rel', 'canonical', 'href', meta.canonical));
+  }
 
   for (const [name, value] of Object.entries(meta.page)) {
     const attr = name.includes(':') && !name.startsWith('twitter:') ? 'property' : 'name';