@adobe/helix-html-pipeline 6.4.0 → 6.5.0

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [6.5.0](https://github.com/adobe/helix-html-pipeline/compare/v6.4.1...v6.5.0) (2024-02-09)
+
+
+### Bug Fixes
+
+* allow static html with selectors ([#510](https://github.com/adobe/helix-html-pipeline/issues/510)) ([91e20a1](https://github.com/adobe/helix-html-pipeline/commit/91e20a19ec4bfbdbfe80b6ee78b256a7ebc208d1)), closes [#481](https://github.com/adobe/helix-html-pipeline/issues/481)
+
+
+### Features
+
+* remove source-location surrogate key ([049caf0](https://github.com/adobe/helix-html-pipeline/commit/049caf059530ca11025a3f4b6c9ca50db0e13122))
+
+## [6.4.1](https://github.com/adobe/helix-html-pipeline/compare/v6.4.0...v6.4.1) (2024-02-08)
+
+
+### Bug Fixes
+
+* use correct partition ([#534](https://github.com/adobe/helix-html-pipeline/issues/534)) ([960256e](https://github.com/adobe/helix-html-pipeline/commit/960256eb6dd4045775ccf3203aa6b324558909d0))
+
 # [6.4.0](https://github.com/adobe/helix-html-pipeline/compare/v6.3.4...v6.4.0) (2024-02-06)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "6.4.0",
+  "version": "6.5.0",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/src/sitemap-pipe.js

@@ -11,7 +11,6 @@
  */
 import escape from 'lodash.escape';
 import { cleanupHeaderValue } from '@adobe/helix-shared-utils';
-import { authenticate } from './steps/authenticate.js';
 import fetchContent from './steps/fetch-content.js';
 import renderCode from './steps/render-code.js';
 import setXSurrogateKeyHeader from './steps/set-x-surrogate-key-header.js';
@@ -21,9 +20,9 @@ import { PipelineResponse } from './PipelineResponse.js';
 import initConfig from './steps/init-config.js';
 import { extractLastModified, updateLastModified } from './utils/last-modified.js';
 
-async function generateSitemap(state, partition) {
+async function generateSitemap(state) {
   const {
-    owner, repo, ref, contentBusId, s3Loader, log,
+    owner, repo, ref, contentBusId, s3Loader, log, partition,
     previewHost, liveHost, prodHost,
   } = state;
   const ret = await s3Loader.getObject('helix-content-bus', `${contentBusId}/live/sitemap.json`);
@@ -75,12 +74,9 @@ async function generateSitemap(state, partition) {
  * @returns {PipelineResponse}
  */
 export async function sitemapPipe(state, req) {
-  const { partition, log } = state;
+  const { log } = state;
   state.type = 'sitemap';
 
-  // force loading from preview
-  state.partition = 'preview';
-
   if (state.info?.path !== '/sitemap.xml') {
     // this should not happen as it would mean that the caller used the wrong route. so we respond
     // with a 500 to indicate that something is wrong.
@@ -102,18 +98,11 @@ export async function sitemapPipe(state, req) {
   try {
     await initConfig(state, req, res);
 
-    // await requireProject(state, req, res);
-    if (res.error !== 401) {
-      await authenticate(state, req, res);
-    }
-
-    // ...and apply the folder mapping
-    state.timer?.update('content-fetch');
-
     // fetch sitemap.xml
+    state.timer?.update('content-fetch');
     await fetchContent(state, req, res);
     if (res.status === 404) {
-      const ret = await generateSitemap(state, partition);
+      const ret = await generateSitemap(state);
       if (ret.status === 200) {
         res.status = 200;
         updateLastModified(state, res, extractLastModified(ret.headers));

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

@@ -42,19 +42,16 @@ export async function getPathKey(state) {
  */
 export default async function setXSurrogateKeyHeader(state, req, res) {
   const {
-    content, contentBusId, owner, repo, ref,
+    contentBusId, owner, repo, ref,
   } = state;
-
-  const keys = [];
-  if (content.sourceLocation) {
-    keys.push(await computeSurrogateKey(content.sourceLocation));
-  }
-
   const hash = await getPathKey(state);
-  keys.push(hash);
-  keys.push(`${contentBusId}_metadata`);
-  keys.push(`${ref}--${repo}--${owner}_head`);
+  const keys = [
+    hash,
+    `${contentBusId}_metadata`,
+    `${ref}--${repo}--${owner}_head`,
+  ];
 
+  // for folder-mapped resources, we also need to include the surrogate key of the mapped metadata
   if (state.mapped) {
     keys.push(`${hash}_metadata`);
   }

package/src/utils/path.js

@@ -67,15 +67,18 @@ export function getPathInfo(path) {
     }
     let resExt = info.extension;
     if (info.selector) {
-      if (resExt === '.html') {
-        // force .plain.html as markdown resources
+      if (info.selector === 'plain' && resExt === '.html') {
+        // force .plain.html as markdown resources and remove selector from path
         resExt = '.md';
+        fileName = `${baseName}${resExt}`;
+      } else {
+        fileName = `${baseName}.${info.selector}${resExt}`;
       }
       segs.push(`${baseName}.${info.selector}${info.extension}`);
     } else {
       segs.push(`${baseName}${resExt}`);
+      fileName = `${baseName}${resExt}`;
     }
-    fileName = `${baseName}${resExt}`;
   }
 
   info.path = `/${segs.join('/')}`;
@@ -94,14 +97,8 @@ export function validatePathInfo(info) {
     return false;
   }
 
-  // only support empty selector or plain with html
-  if (info.selector) {
-    if (info.selector !== 'plain') {
-      return false;
-    }
-    return info.extension === '.html';
-  }
-  return true;
+  // only support selector for html
+  return info.selector === '' || info.extension === '.html';
 }
 
 /**