@adobe/helix-html-pipeline 3.11.6 → 3.11.7

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [3.11.7](https://github.com/adobe/helix-html-pipeline/compare/v3.11.6...v3.11.7) (2023-05-22)
+
+
+### Bug Fixes
+
+* folder mapping should only be applied if direct addressed resource is missing ([#307](https://github.com/adobe/helix-html-pipeline/issues/307)) ([cf9cfc0](https://github.com/adobe/helix-html-pipeline/commit/cf9cfc0f00aed7a8fd7a502d0b2c77e9aa6e710d))
+
 ## [3.11.6](https://github.com/adobe/helix-html-pipeline/compare/v3.11.5...v3.11.6) (2023-05-13)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "3.11.6",
+  "version": "3.11.7",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -66,8 +66,8 @@
     "mime": "3.0.0",
     "rehype-format": "4.0.1",
     "rehype-parse": "8.0.4",
-    "remark-parse": "10.0.1",
-    "strip-markdown": "5.0.0",
+    "remark-parse": "10.0.2",
+    "strip-markdown": "5.0.1",
     "unified": "10.1.2",
     "unist-util-map": "3.1.3",
     "unist-util-remove": "3.1.1",
@@ -83,11 +83,11 @@
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "10.0.3",
     "c8": "7.13.0",
-    "eslint": "8.40.0",
+    "eslint": "8.41.0",
     "eslint-import-resolver-exports": "1.0.0-beta.5",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.27.5",
-    "esmock": "2.2.2",
+    "esmock": "2.2.3",
     "husky": "8.0.3",
     "js-yaml": "4.1.0",
     "jsdom": "22.0.0",

package/src/html-pipe.js

@@ -82,13 +82,21 @@ export async function htmlPipe(state, req) {
     }
 
     // ...and apply the folder mapping
-    await folderMapping(state);
+    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 = fetchContent(state, req, res);
+      }
+    }
 
     // load metadata and content in parallel
-    state.timer?.update('content-fetch');
+    state.timer?.update('metadata-fetch');
     await Promise.all([
       fetchConfigAll(state, req, res),
-      fetchContent(state, req, res),
+      contentPromise,
       fetchMappedMetadata(state),
     ]);
 

package/src/json-pipe.js

@@ -54,6 +54,8 @@ async function fetchJsonContent(state, req, res) {
     ret = await s3Loader.getObject('helix-code-bus', `${owner}/${repo}/${ref}${path}`);
   }
   if (ret.status === 200) {
+    res.status = 200;
+    delete res.error;
     state.content.data = ret.body;
 
     // store extra source location if present
@@ -117,7 +119,6 @@ export async function jsonPipe(state, req) {
         },
       });
     }
-    await folderMapping(state);
 
     /** @type PipelineResponse */
     const res = new PipelineResponse('', {
@@ -126,10 +127,20 @@ export async function jsonPipe(state, req) {
       },
     });
 
+    // apply the folder mapping if the current resource doesn't exist
     state.timer?.update('json-fetch');
+    let contentPromise = await fetchJsonContent(state, req, res);
+    if (res.status === 404) {
+      await folderMapping(state);
+      if (state.info.unmappedPath) {
+        contentPromise = fetchJsonContent(state, req, res);
+      }
+    }
+
+    state.timer?.update('json-metadata-fetch');
     await Promise.all([
       fetchConfigAll(state, req, res),
-      fetchJsonContent(state, req, res),
+      contentPromise,
     ]);
 
     await authenticate(state, req, res);

package/src/steps/fetch-content.js

@@ -48,6 +48,8 @@ export default async function fetchContent(state, req, res) {
   }
 
   if (ret.status === 200) {
+    res.status = 200;
+    delete res.error;
     state.content.data = ret.body;
 
     // store extra source location if present