@adobe/helix-html-pipeline 5.4.1 → 5.4.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [5.4.3](https://github.com/adobe/helix-html-pipeline/compare/v5.4.2...v5.4.3) (2023-12-23)
+
+
+### Bug Fixes
+
+* **deps:** update dependency mime to v4.0.1 ([54c556d](https://github.com/adobe/helix-html-pipeline/commit/54c556dca14d7860ac774cd8bc9a5bbdc626005f))
+
+## [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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "5.4.1",
+  "version": "5.4.3",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -56,7 +56,7 @@
     "jose": "5.1.3",
     "mdast-util-to-hast": "13.0.2",
     "mdast-util-to-string": "4.0.0",
-    "mime": "4.0.0",
+    "mime": "4.0.1",
     "rehype-format": "5.0.0",
     "rehype-parse": "9.0.0",
     "remark-parse": "11.0.0",

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