@adobe/helix-html-pipeline 6.12.3 → 6.12.5

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [6.12.5](https://github.com/adobe/helix-html-pipeline/compare/v6.12.4...v6.12.5) (2024-06-11)
+
+
+### Bug Fixes
+
+* surrogate key for static html ([#623](https://github.com/adobe/helix-html-pipeline/issues/623)) ([6d04f2d](https://github.com/adobe/helix-html-pipeline/commit/6d04f2d1daa90053dc8565f6136cebd0a80860f9))
+
+## [6.12.4](https://github.com/adobe/helix-html-pipeline/compare/v6.12.3...v6.12.4) (2024-06-10)
+
+
+### Bug Fixes
+
+* rewrite meta image link ([#615](https://github.com/adobe/helix-html-pipeline/issues/615)) ([#620](https://github.com/adobe/helix-html-pipeline/issues/620)) ([132e591](https://github.com/adobe/helix-html-pipeline/commit/132e591844cfe7d27bec2c28a87d83c754dd53c8)), closes [#604](https://github.com/adobe/helix-html-pipeline/issues/604)
+
 ## [6.12.3](https://github.com/adobe/helix-html-pipeline/compare/v6.12.2...v6.12.3) (2024-06-09)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "6.12.3",
+  "version": "6.12.5",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -75,7 +75,7 @@
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "12.0.1",
-    "c8": "9.1.0",
+    "c8": "10.0.0",
     "eslint": "8.57.0",
     "eslint-import-resolver-exports": "1.0.0-beta.5",
     "eslint-plugin-header": "3.1.1",

package/src/steps/extract-metadata.js

@@ -14,7 +14,7 @@ import { toString } from 'hast-util-to-string';
 import { remove } from 'unist-util-remove';
 import { visit, EXIT, CONTINUE } from 'unist-util-visit';
 import {
-  getAbsoluteUrl, makeCanonicalHtmlUrl, optimizeImageURL, resolveUrl,
+  getAbsoluteUrl, makeCanonicalHtmlUrl, optimizeImageURL, resolveUrl, rewriteUrl,
 } from './utils.js';
 import { toMetaName } from '../utils/modifiers.js';
 import { childNodes } from '../utils/hast-utils.js';
@@ -251,7 +251,9 @@ export default function extractMetaData(state, req) {
     meta.image = content.image || '/default-meta-image.png';
   }
   if (meta.image) {
-    meta.image = getAbsoluteUrl(state, optimizeMetaImage(state.info.path, meta.image));
+    meta.image = rewriteUrl(state, meta.image);
+    meta.image = optimizeMetaImage(state.info.path, meta.image);
+    meta.image = getAbsoluteUrl(state, meta.image);
   }
 
   meta.imageAlt = meta['image-alt'] ?? content.imageAlt;

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

@@ -44,14 +44,20 @@ export default async function setXSurrogateKeyHeader(state, req, res) {
   const {
     contentBusId, owner, repo, ref,
   } = state;
-  const hash = await getPathKey(state);
-  const keys = [
-    hash,
-    `${contentBusId}_metadata`,
-    `${ref}--${repo}--${owner}_head`,
-    contentBusId,
-  ];
 
+  const isCode = state.content.sourceBus === 'code';
+
+  const keys = [];
+  const hash = await getPathKey(state);
+  if (isCode) {
+    keys.push(await computeSurrogateKey(`${ref}--${repo}--${owner}${state.info.path}`));
+    keys.push(`${ref}--${repo}--${owner}_code`);
+  } else {
+    keys.push(hash);
+    keys.push(`${contentBusId}_metadata`);
+    keys.push(`${ref}--${repo}--${owner}_head`);
+    keys.push(contentBusId);
+  }
   // for folder-mapped resources, we also need to include the surrogate key of the mapped metadata
   if (state.mapped) {
     keys.push(`${hash}_metadata`);