@adobe/helix-html-pipeline 6.14.3 → 6.14.5

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [6.14.5](https://github.com/adobe/helix-html-pipeline/compare/v6.14.4...v6.14.5) (2024-09-17)
+
+
+### Bug Fixes
+
+* only rewrite url for proper helix hosts ([#691](https://github.com/adobe/helix-html-pipeline/issues/691)) ([6e6bc37](https://github.com/adobe/helix-html-pipeline/commit/6e6bc375aea9fbb11b38a13da796543dede492ef))
+
+## [6.14.4](https://github.com/adobe/helix-html-pipeline/compare/v6.14.3...v6.14.4) (2024-09-04)
+
+
+### Bug Fixes
+
+* ignore mapped metadata sheet with not default ([#678](https://github.com/adobe/helix-html-pipeline/issues/678)) ([c50a910](https://github.com/adobe/helix-html-pipeline/commit/c50a9104697796a4a2bdbf8add50f737cf950eaf)), closes [#677](https://github.com/adobe/helix-html-pipeline/issues/677)
+
 ## [6.14.3](https://github.com/adobe/helix-html-pipeline/compare/v6.14.2...v6.14.3) (2024-08-31)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "6.14.3",
+  "version": "6.14.5",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -70,8 +70,8 @@
     "unist-util-visit-parents": "6.0.1"
   },
   "devDependencies": {
-    "@adobe/eslint-config-helix": "2.0.6",
-    "@markedjs/html-differ": "4.0.2",
+    "@adobe/eslint-config-helix": "2.0.7",
+    "@markedjs/html-differ": "5.0.1",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "12.0.1",
@@ -79,17 +79,17 @@
     "eslint": "8.57.0",
     "eslint-import-resolver-exports": "1.0.0-beta.5",
     "eslint-plugin-header": "3.1.1",
-    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-import": "2.30.0",
     "esmock": "2.6.7",
-    "husky": "9.1.5",
+    "husky": "9.1.6",
     "js-yaml": "4.1.0",
     "jsdom": "25.0.0",
     "junit-report-builder": "5.0.0",
-    "lint-staged": "15.2.9",
+    "lint-staged": "15.2.10",
     "mocha": "10.7.3",
     "mocha-multi-reporters": "1.5.1",
     "mocha-suppress-logs": "0.5.1",
-    "semantic-release": "24.1.0"
+    "semantic-release": "24.1.1"
   },
   "lint-staged": {
     "*.js": "eslint",

package/src/steps/fetch-mapped-metadata.js

@@ -38,8 +38,12 @@ export default async function fetchMappedMetadata(state) {
     } catch (e) {
       throw new PipelineStatusError(500, `failed parsing of ${metadataPath}: ${e.message}`);
     }
-
     const { data } = json.default ?? json;
+    if (!data) {
+      state.log.info(`default sheet missing in ${metadataPath}`);
+      return;
+    }
+
     if (!Array.isArray(data)) {
       throw new PipelineStatusError(500, `failed loading of ${metadataPath}: data must be an array`);
     }

package/src/steps/utils.js

@@ -14,7 +14,7 @@ const AZURE_BLOB_REGEXP = /^https:\/\/hlx\.blob\.core\.windows\.net\/external\//
 
 const MEDIA_BLOB_REGEXP = /^https:\/\/.*\.(aem|hlx3?)\.(live|page)\/media_.*/;
 
-const HELIX_URL_REGEXP = /^https:\/\/(?!admin\.|www\.)[^.]+\.(aem|hlx3?)\.(live|page)\/?.*/;
+const HELIX_URL_REGEXP = /^https:\/\/.*\.(aem|hlx3?)\.(live|page)\/?.*/;
 
 /**
  * Returns the original host name from the request to the outer CDN.
@@ -208,7 +208,7 @@ export function rewriteUrl(state, url) {
       return `.${pathname}${hash}`;
     }
 
-    if (HELIX_URL_REGEXP.test(url)
+    if ((host.includes('--') && HELIX_URL_REGEXP.test(url))
       || host === state.previewHost
       || host === state.liveHost) {
       if (hash && pathname === state.info?.path) {