@adobe/helix-html-pipeline 3.11.10 → 3.11.12

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [3.11.12](https://github.com/adobe/helix-html-pipeline/compare/v3.11.11...v3.11.12) (2023-06-05)
+
+
+### Bug Fixes
+
+* return multisheet for any multisheet query ([65d6e21](https://github.com/adobe/helix-html-pipeline/commit/65d6e21ab40611689ef59af949917805c941f116))
+
+## [3.11.11](https://github.com/adobe/helix-html-pipeline/compare/v3.11.10...v3.11.11) (2023-06-03)
+
+
+### Bug Fixes
+
+* ignore invalid urls in link rewriter ([#329](https://github.com/adobe/helix-html-pipeline/issues/329)) ([03a8e35](https://github.com/adobe/helix-html-pipeline/commit/03a8e354af1f88d0d7dc1b9ad4537c7fbf8382f3)), closes [#328](https://github.com/adobe/helix-html-pipeline/issues/328)
+
 ## [3.11.10](https://github.com/adobe/helix-html-pipeline/compare/v3.11.9...v3.11.10) (2023-06-01)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "3.11.10",
+  "version": "3.11.12",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -57,12 +57,12 @@
     "mdast-util-gfm-task-list-item": "1.0.2",
     "mdast-util-to-hast": "12.3.0",
     "mdast-util-to-string": "3.2.0",
-    "micromark-extension-gfm-footnote": "1.1.0",
-    "micromark-extension-gfm-strikethrough": "1.0.5",
-    "micromark-extension-gfm-table": "1.0.6",
+    "micromark-extension-gfm-footnote": "1.1.2",
+    "micromark-extension-gfm-strikethrough": "1.0.7",
+    "micromark-extension-gfm-table": "1.0.7",
     "micromark-extension-gfm-tagfilter": "1.0.2",
-    "micromark-extension-gfm-task-list-item": "1.0.4",
-    "micromark-util-combine-extensions": "1.0.0",
+    "micromark-extension-gfm-task-list-item": "1.0.5",
+    "micromark-util-combine-extensions": "1.1.0",
     "mime": "3.0.0",
     "rehype-format": "4.0.1",
     "rehype-parse": "8.0.4",
@@ -82,12 +82,12 @@
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "10.0.3",
-    "c8": "7.13.0",
-    "eslint": "8.41.0",
+    "c8": "7.14.0",
+    "eslint": "8.42.0",
     "eslint-import-resolver-exports": "1.0.0-beta.5",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.27.5",
-    "esmock": "2.2.3",
+    "esmock": "2.3.1",
     "husky": "8.0.3",
     "js-yaml": "4.1.0",
     "jsdom": "22.1.0",
@@ -96,7 +96,7 @@
     "mocha": "10.2.0",
     "mocha-multi-reporters": "1.5.1",
     "remark-gfm": "3.0.1",
-    "semantic-release": "21.0.2"
+    "semantic-release": "21.0.3"
   },
   "lint-staged": {
     "*.js": "eslint",

package/src/json-pipe.js

@@ -131,7 +131,7 @@ export async function jsonPipe(state, req) {
     state.timer?.update('json-fetch');
     let contentPromise = await fetchJsonContent(state, req, res);
     if (res.status === 404) {
-      await folderMapping(state);
+      folderMapping(state);
       if (state.info.unmappedPath) {
         contentPromise = fetchJsonContent(state, req, res);
       }

package/src/steps/utils.js

@@ -185,25 +185,29 @@ export function rewriteUrl(state, url) {
   if (!url || !url.startsWith('https://')) {
     return url;
   }
-  const { pathname, search, hash } = new URL(url);
-
-  if (AZURE_BLOB_REGEXP.test(url)) {
-    const filename = pathname.split('/').pop();
-    const [name, props] = hash.split('?');
-    const extension = name.split('.').pop() || 'jpg';
-    const newHash = props ? `#${props}` : '';
-    return `./media_${filename}.${extension}${newHash}`;
-  }
+  try {
+    const { pathname, search, hash } = new URL(url);
+
+    if (AZURE_BLOB_REGEXP.test(url)) {
+      const filename = pathname.split('/').pop();
+      const [name, props] = hash.split('?');
+      const extension = name.split('.').pop() || 'jpg';
+      const newHash = props ? `#${props}` : '';
+      return `./media_${filename}.${extension}${newHash}`;
+    }
 
-  if (MEDIA_BLOB_REGEXP.test(url)) {
-    return `.${pathname}${hash}`;
-  }
+    if (MEDIA_BLOB_REGEXP.test(url)) {
+      return `.${pathname}${hash}`;
+    }
 
-  if (HELIX_URL_REGEXP.test(url)) {
-    if (hash && pathname === state.info?.path) {
-      return hash;
+    if (HELIX_URL_REGEXP.test(url)) {
+      if (hash && pathname === state.info?.path) {
+        return hash;
+      }
+      return `${pathname}${search}${hash}`;
     }
-    return `${pathname}${search}${hash}`;
+  } catch {
+    // ignore
   }
 
   return url;

package/src/utils/json-filter.js

@@ -96,7 +96,7 @@ export default function jsonFilter(state, res, query) {
 
   let body;
   let type = 'sheet';
-  if (sheetNames.length === 1) {
+  if (sheetNames.length === 1 && requestedSheets.length < 2) {
     body = sheets[sheetNames[0]];
   } else {
     type = 'multi-sheet';