@adobe/helix-html-pipeline 5.7.1 → 5.8.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [5.8.0](https://github.com/adobe/helix-html-pipeline/compare/v5.7.2...v5.8.0) (2024-02-21)
+
+
+### Features
+
+* speed up pageblock generation ([#543](https://github.com/adobe/helix-html-pipeline/issues/543)) ([632da6f](https://github.com/adobe/helix-html-pipeline/commit/632da6f676d47778fd259f2187464369e87e5c57))
+
+## [5.7.2](https://github.com/adobe/helix-html-pipeline/compare/v5.7.1...v5.7.2) (2024-02-08)
+
+
+### Bug Fixes
+
+* handle sitemap auth in hlx.page ([#533](https://github.com/adobe/helix-html-pipeline/issues/533)) ([bc95dae](https://github.com/adobe/helix-html-pipeline/commit/bc95daecbdc0a806b61cd00360e68100beb28ece))
+
 ## [5.7.1](https://github.com/adobe/helix-html-pipeline/compare/v5.7.0...v5.7.1) (2024-02-08)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "5.7.1",
+  "version": "5.8.0",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -53,7 +53,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",
@@ -82,14 +82,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/sitemap-pipe.js

@@ -11,7 +11,7 @@
  */
 import escape from 'lodash.escape';
 import { cleanupHeaderValue } from '@adobe/helix-shared-utils';
-import { authenticate, requireProject } from './steps/authenticate.js';
+import { requireProject } from './steps/authenticate.js';
 import fetchConfig from './steps/fetch-config.js';
 import fetchContent from './steps/fetch-content.js';
 import fetchConfigAll from './steps/fetch-config-all.js';
@@ -21,9 +21,9 @@ import setCustomResponseHeaders from './steps/set-custom-response-headers.js';
 import { PipelineStatusError } from './PipelineStatusError.js';
 import { PipelineResponse } from './PipelineResponse.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, config: { host: prodCDN } = {},
   } = state;
   const ret = await s3Loader.getObject('helix-content-bus', `${contentBusId}/live/sitemap.json`);
@@ -74,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.
@@ -98,8 +95,6 @@ export async function sitemapPipe(state, req) {
     },
   });
 
-  // check if .auth request
-
   try { // fetch config first, since we need to compute the content-bus-id from the fstab ...
     state.timer?.update('config-fetch');
     await fetchConfig(state, req, res);
@@ -118,11 +113,9 @@ export async function sitemapPipe(state, req) {
     ]);
 
     await requireProject(state, req, res);
-    if (res.error !== 401) {
-      await authenticate(state, req, res);
-    }
+    // authentication is handled in hlx.page vcl
     if (res.status === 404) {
-      const ret = await generateSitemap(state, partition);
+      const ret = await generateSitemap(state);
       if (ret.status === 200) {
         res.status = 200;
         delete res.error;

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/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');