@adobe/helix-html-pipeline 5.12.4 → 5.12.6

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [5.12.6](https://github.com/adobe/helix-html-pipeline/compare/v5.12.5...v5.12.6) (2024-09-25)
+
+
+### Bug Fixes
+
+* set code and content surrogate keys for json 404 ([#692](https://github.com/adobe/helix-html-pipeline/issues/692)) ([#698](https://github.com/adobe/helix-html-pipeline/issues/698)) ([d334099](https://github.com/adobe/helix-html-pipeline/commit/d334099f806eddcf84181a4c354de0e8b02ced0a)), closes [#688](https://github.com/adobe/helix-html-pipeline/issues/688)
+
+## [5.12.5](https://github.com/adobe/helix-html-pipeline/compare/v5.12.4...v5.12.5) (2024-09-23)
+
+
+### Bug Fixes
+
+* missing config/support should not be treated as 500 ([#694](https://github.com/adobe/helix-html-pipeline/issues/694)) ([#697](https://github.com/adobe/helix-html-pipeline/issues/697)) ([7257e13](https://github.com/adobe/helix-html-pipeline/commit/7257e13f1e7d9f8e73ab8e6c8129fbbe3a91ee34))
+
 ## [5.12.4](https://github.com/adobe/helix-html-pipeline/compare/v5.12.3...v5.12.4) (2024-09-04)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "5.12.4",
+  "version": "5.12.6",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -51,15 +51,15 @@
     "github-slugger": "2.0.0",
     "hast-util-raw": "9.0.4",
     "hast-util-select": "6.0.2",
-    "hast-util-to-html": "9.0.2",
+    "hast-util-to-html": "9.0.3",
     "hast-util-to-string": "3.0.0",
     "hastscript": "9.0.0",
-    "jose": "5.8.0",
+    "jose": "5.9.2",
     "lodash.escape": "4.0.1",
     "mdast-util-to-hast": "13.2.0",
     "mdast-util-to-string": "4.0.0",
     "mime": "4.0.4",
-    "rehype-format": "5.0.0",
+    "rehype-format": "5.0.1",
     "rehype-parse": "9.0.0",
     "remark-parse": "11.0.0",
     "strip-markdown": "6.0.0",
@@ -72,26 +72,26 @@
     "unist-util-visit-parents": "6.0.1"
   },
   "devDependencies": {
-    "@adobe/eslint-config-helix": "2.0.6",
-    "@markedjs/html-differ": "4.0.2",
+    "@adobe/eslint-config-helix": "2.0.7",
+    "@markedjs/html-differ": "5.0.1",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "12.0.1",
     "c8": "10.1.2",
-    "eslint": "8.57.0",
+    "eslint": "8.57.1",
     "eslint-import-resolver-exports": "1.0.0-beta.5",
     "eslint-plugin-header": "3.1.1",
-    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-import": "2.30.0",
     "esmock": "2.6.7",
-    "husky": "9.1.5",
+    "husky": "9.1.6",
     "js-yaml": "4.1.0",
     "jsdom": "25.0.0",
-    "junit-report-builder": "5.0.0",
-    "lint-staged": "15.2.9",
+    "junit-report-builder": "5.1.1",
+    "lint-staged": "15.2.10",
     "mocha": "10.7.3",
     "mocha-multi-reporters": "1.5.1",
     "mocha-suppress-logs": "0.5.1",
-    "semantic-release": "24.1.0"
+    "semantic-release": "24.1.1"
   },
   "lint-staged": {
     "*.js": "eslint",

package/src/json-pipe.js

@@ -87,7 +87,8 @@ async function fetchJsonContent(state, req, res) {
 
     updateLastModified(state, res, extractLastModified(ret.headers));
   } else {
-    state.content.sourceBus = 'content';
+    // also add code surrogate key in case json is later added to code bus (#688)
+    state.content.sourceBus = 'code|content';
     res.status = ret.status === 404 ? 404 : 502;
     res.error = `failed to load ${state.info.resourcePath}: ${ret.status}`;
   }
@@ -95,16 +96,15 @@ async function fetchJsonContent(state, req, res) {
 
 async function computeSurrogateKeys(state) {
   const keys = [];
-  const pathKey = state.content?.sourceBus === 'code'
-    ? `${state.ref}--${state.repo}--${state.owner}${state.info.path}`
-    : `${state.contentBusId}${state.info.path}`;
-
-  keys.push(await computeSurrogateKey(pathKey));
-  if (state.content?.sourceBus === 'content') {
-    keys.push(state.contentBusId);
-  } else {
+  if (state.content.sourceBus.includes('code')) {
+    keys.push(await computeSurrogateKey(`${state.ref}--${state.repo}--${state.owner}${state.info.path}`));
     keys.push(`${state.ref}--${state.repo}--${state.owner}_code`);
   }
+  if (state.content.sourceBus.includes('content')) {
+    keys.push(await computeSurrogateKey(`${state.contentBusId}${state.info.path}`));
+    keys.push(state.contentBusId);
+  }
+
   return keys;
 }
 

package/src/steps/validate-captcha.js

@@ -55,10 +55,10 @@ export default async function validateCaptcha(state, body) {
   // Check captcha type is correctly configured
   const validator = SUPPORTED_CAPTCHA_TYPES[captcha.type];
   if (!validator) {
-    throw new PipelineStatusError(500, `The captcha type ${captcha.type} is not supported.`);
+    throw new PipelineStatusError(400, `The captcha type ${captcha.type} is not supported.`);
   }
   if (!captcha.secret) {
-    throw new PipelineStatusError(500, 'Captcha secret key is not configured.');
+    throw new PipelineStatusError(400, 'Captcha secret key is not configured.');
   }
 
   // Perform validation