@adobe/helix-html-pipeline 6.31.0 → 6.31.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [6.31.2](https://github.com/adobe/helix-html-pipeline/compare/v6.31.1...v6.31.2) (2026-08-18)
+
+
+### Bug Fixes
+
+* **sitemap-index:** try generated first, then fallback to code ([#1129](https://github.com/adobe/helix-html-pipeline/issues/1129)) ([5158d71](https://github.com/adobe/helix-html-pipeline/commit/5158d7191cc9a2f90ad3d4252c186fdeb48514e3))
+
+## [6.31.1](https://github.com/adobe/helix-html-pipeline/compare/v6.31.0...v6.31.1) (2026-08-17)
+
+
+### Bug Fixes
+
+* **sitemap-index:** on a 404, we should also return code-related surrogate keys ([#1127](https://github.com/adobe/helix-html-pipeline/issues/1127)) ([132409c](https://github.com/adobe/helix-html-pipeline/commit/132409c77d334adb115d6bc26557186e7a2ba335))
+
 # [6.31.0](https://github.com/adobe/helix-html-pipeline/compare/v6.30.1...v6.31.0) (2026-08-17)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "6.31.0",
+  "version": "6.31.2",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -77,17 +77,17 @@
     "@semantic-release/git": "11.0.1",
     "@semantic-release/npm": "13.1.5",
     "c8": "12.0.0",
-    "eslint": "9.4.0",
+    "eslint": "9.39.5",
     "eslint-import-resolver-exports": "1.0.0-beta.5",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.32.0",
     "esmock": "2.7.6",
     "husky": "9.1.7",
-    "js-yaml": "5.2.2",
-    "jsdom": "30.0.0",
+    "js-yaml": "5.2.3",
+    "jsdom": "30.0.1",
     "junit-report-builder": "5.1.2",
-    "lint-staged": "17.2.0",
-    "mocha": "11.7.6",
+    "lint-staged": "17.3.0",
+    "mocha": "11.8.0",
     "mocha-multi-reporters": "1.5.1",
     "mocha-suppress-logs": "0.6.0",
     "semantic-release": "25.0.8"

package/src/sitemap-index-pipe.js

@@ -28,7 +28,12 @@ async function generateSitemapIndex(state) {
 
   const { sitemap } = config;
   if (!sitemap?.index) {
-    throw new PipelineStatusError(404, 'No sitemap index defined in configuration');
+    return new PipelineResponse('', {
+      status: 404,
+      headers: {
+        'x-error': 'No sitemap index defined in configuration',
+      },
+    });
   }
   const host = partition === 'preview'
     ? (previewHost || `${ref}--${repo}--${owner}.aem.page`)
@@ -77,19 +82,18 @@ export async function sitemapIndexPipe(state, req) {
   try {
     await initConfig(state, req, res);
 
-    // fetch sitemap-index.xml
+    // generate sitemap-index.xml from config, fallback to sitemap-index.xml from code bus
     state.timer?.update('content-fetch');
-    state.content.sourceBus = 'code';
-    await fetchContent(state, req, res);
-    if (res.status === 404) {
-      state.content.sourceBus = 'content';
-      const ret = await generateSitemapIndex(state);
-      if (ret.status === 200) {
-        res.status = 200;
-        recordLastModified(state, res, 'content', extractLastModified(ret.headers));
-        delete res.error;
-        state.content.data = ret.body;
-      }
+    state.content.sourceBus = 'content';
+
+    const ret = await generateSitemapIndex(state);
+    if (ret.status === 404) {
+      state.content.sourceBus = 'code';
+      await fetchContent(state, req, res);
+    } else {
+      res.status = 200;
+      recordLastModified(state, res, 'content', extractLastModified(ret.headers));
+      state.content.data = ret.body;
     }
     if (res.error) {
       // if content loading produced an error, we're done.

package/src/steps/set-x-surrogate-key-header.js

@@ -61,18 +61,22 @@ export default async function setXSurrogateKeyHeader(state, req, res) {
   } = state;
 
   const isCode = state.content.sourceBus === 'code';
-  const purgeMetadataAndHead = !['/sitemap.xml', '/sitemap-index.xml'].includes(path);
+  const isSitemapRelated = ['/sitemap.xml', '/sitemap-index.xml'].includes(path);
 
   // provide either (prefixed) preview or (unprefixed) live content keys
   const contentKeyPrefix = partition === 'preview' ? 'p_' : '';
   const keys = [];
   const hash = await computeContentPathKey(state);
   if (isCode) {
+    if (path === '/sitemap-index.xml' && res.status === 404) {
+      keys.push(`${contentKeyPrefix}${hash}`);
+      keys.push(`${contentKeyPrefix}${contentBusId}`);
+    }
     keys.push(await computeCodePathKey(state));
     keys.push(`${ref}--${repo}--${owner}_code`);
   } else {
     keys.push(`${contentKeyPrefix}${hash}`);
-    if (purgeMetadataAndHead) {
+    if (!isSitemapRelated) {
       keys.push(`${contentKeyPrefix}${contentBusId}_metadata`);
       keys.push(`${ref}--${repo}--${owner}_head`);
     }