@adobe/helix-html-pipeline 6.4.1 → 6.6.0

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [6.6.0](https://github.com/adobe/helix-html-pipeline/compare/v6.5.0...v6.6.0) (2024-02-21)
+
+
+### Features
+
+* speed up pageblock generation ([#542](https://github.com/adobe/helix-html-pipeline/issues/542)) ([34aca92](https://github.com/adobe/helix-html-pipeline/commit/34aca92e2a5161ab720ca1da2687de46f0b0dbf0))
+
+# [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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "6.4.1",
+  "version": "6.6.0",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -54,7 +54,7 @@
     "hast-util-to-html": "9.0.0",
     "hast-util-to-string": "3.0.0",
     "hastscript": "9.0.0",
-    "jose": "5.2.1",
+    "jose": "5.2.2",
     "lodash.escape": "4.0.1",
     "mdast-util-to-hast": "13.1.0",
     "mdast-util-to-string": "4.0.0",
@@ -83,14 +83,14 @@
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.29.1",
     "esmock": "2.6.3",
-    "husky": "9.0.10",
+    "husky": "9.0.11",
     "js-yaml": "4.1.0",
     "jsdom": "24.0.0",
     "junit-report-builder": "3.2.1",
-    "lint-staged": "15.2.1",
-    "mocha": "10.2.0",
+    "lint-staged": "15.2.2",
+    "mocha": "10.3.0",
     "mocha-multi-reporters": "1.5.1",
-    "mocha-suppress-logs": "0.4.1",
+    "mocha-suppress-logs": "0.5.1",
     "semantic-release": "22.0.12"
   },
   "lint-staged": {

package/src/steps/create-page-blocks.js

@@ -10,10 +10,11 @@
  * governing permissions and limitations under the License.
  */
 import { h } from 'hastscript';
-import { selectAll, select } from 'hast-util-select';
+import { select } from 'hast-util-select';
 import { toString } from 'hast-util-to-string';
+import { CONTINUE, SKIP, visit } from 'unist-util-visit';
 import { toBlockCSSClassNames } from './utils.js';
-import { replace, childNodes } from '../utils/hast-utils.js';
+import { childNodes } from '../utils/hast-utils.js';
 
 /**
  * Creates a "DIV representation" of a table.
@@ -74,9 +75,11 @@ function tableToDivs($table) {
  */
 export default function createPageBlocks({ content }) {
   const { hast } = content;
-  selectAll('div > table', hast).forEach(($table) => {
-    const $div = tableToDivs($table);
-    // replace child in parent
-    replace(hast, $table, $div);
+  visit(hast, (node, idx, parent) => {
+    if (node.tagName === 'table' && parent.tagName === 'div') {
+      parent.children[idx] = tableToDivs(node);
+      return SKIP;
+    }
+    return CONTINUE;
   });
 }

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/hast-utils.js

@@ -9,16 +9,6 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import { EXIT, visit } from 'unist-util-visit';
-
-export function replace(tree, oldNode, newNode) {
-  // $table.parentNode.replaceChild($div, $table);
-  // replace child in parent
-  visit(tree, oldNode, (node, idx, parent) => {
-    parent.children[idx] = newNode;
-    return EXIT;
-  });
-}
 
 export function childNodes(node) {
   return node.children.filter((n) => n.type === 'element');

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';
 }
 
 /**