@adobe/helix-html-pipeline 2.0.0 → 2.0.3

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [2.0.3](https://github.com/adobe/helix-html-pipeline/compare/v2.0.2...v2.0.3) (2022-05-30)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-markdown-support to v3.1.6 ([1dd999a](https://github.com/adobe/helix-html-pipeline/commit/1dd999a2c4ef3caf06a6b66dd7ff3e091166ea72))
+
+## [2.0.2](https://github.com/adobe/helix-html-pipeline/compare/v2.0.1...v2.0.2) (2022-05-28)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([#65](https://github.com/adobe/helix-html-pipeline/issues/65)) ([0994581](https://github.com/adobe/helix-html-pipeline/commit/09945810ee3969350b6053d49d1614c1e9051eba))
+
+## [2.0.1](https://github.com/adobe/helix-html-pipeline/compare/v2.0.0...v2.0.1) (2022-05-25)
+
+
+### Bug Fixes
+
+* querystring is deprecated ([d693319](https://github.com/adobe/helix-html-pipeline/commit/d6933197e928da452712bcfb2c8a42cdefe2bf2c))
+* respect fragments and querystring during link-rewrite ([44e00d4](https://github.com/adobe/helix-html-pipeline/commit/44e00d49293df392f4dec7eafee1abc60743ff79))
+
 # [2.0.0](https://github.com/adobe/helix-html-pipeline/compare/v1.5.8...v2.0.0) (2022-05-25)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "2.0.0",
+  "version": "2.0.3",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -30,11 +30,11 @@
     "loader": "esmock"
   },
   "dependencies": {
-    "@adobe/helix-markdown-support": "3.1.5",
+    "@adobe/helix-markdown-support": "3.1.6",
     "@adobe/helix-shared-utils": "2.0.10",
     "github-slugger": "1.4.0",
     "hast-util-raw": "7.2.1",
-    "hast-util-select": "5.0.1",
+    "hast-util-select": "5.0.2",
     "hast-util-to-html": "8.0.3",
     "hast-util-to-string": "2.0.0",
     "hastscript": "7.0.2",
@@ -79,7 +79,7 @@
     "jsdoc-to-markdown": "7.1.1",
     "jsdom": "19.0.0",
     "junit-report-builder": "3.0.0",
-    "lint-staged": "12.4.1",
+    "lint-staged": "12.4.2",
     "mocha": "10.0.0",
     "mocha-multi-reporters": "1.5.1",
     "remark-gfm": "3.0.1",

package/src/steps/create-pictures.js

@@ -10,7 +10,6 @@
  * governing permissions and limitations under the License.
  */
 import mime from 'mime';
-import { parse } from 'querystring';
 import { h } from 'hastscript';
 import { visitParents } from 'unist-util-visit-parents';
 
@@ -22,10 +21,12 @@ const BREAK_POINTS = [
 export function createOptimizedPicture(src, alt = '', eager = false) {
   const url = new URL(src, 'https://localhost/');
   const { pathname, hash = '' } = url;
-  let { width, height } = parse(hash.substring(1)); // intrinsic dimensions
+  const props = new URLSearchParams(hash.substring(1));
   // detect bug in media handler that created fragments like `width=800&width=600`
-  if (Array.isArray(width)) {
-    [width, height] = width;
+  // eslint-disable-next-line prefer-const
+  let [width, height] = props.getAll('width');
+  if (props.has('height')) {
+    height = props.get('height');
   }
   const ext = pathname.substring(pathname.lastIndexOf('.') + 1);
   const type = mime.getType(pathname);

package/src/steps/utils.js

@@ -201,15 +201,23 @@ export function rewriteUrl(state, url) {
   }
 
   if (HELIX_URL_REGEXP.test(url)) {
-    const { pathname } = new URL(url);
-    return pathname;
+    const { pathname, hash, search } = new URL(url);
+    if (hash && pathname === state.info?.path) {
+      return hash;
+    }
+    return `${pathname}${search}${hash}`;
   }
 
   // todo: read host from contentbus config
   if (state.config?.host) {
-    const external = `https://${state.config.host}/`;
-    if (url.startsWith(external)) {
-      return url.substring(external.length - 1);
+    const {
+      host, pathname, search, hash,
+    } = new URL(url);
+    if (host === state.config.host) {
+      if (hash && pathname === state.info?.path) {
+        return hash;
+      }
+      return `${pathname}${search}${hash}`;
     }
   }