@adobe/helix-html-pipeline 1.3.0 → 1.3.1

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.3.1](https://github.com/adobe/helix-html-pipeline/compare/v1.3.0...v1.3.1) (2022-03-18)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-shared-utils to v2.0.6 ([#26](https://github.com/adobe/helix-html-pipeline/issues/26)) ([186c376](https://github.com/adobe/helix-html-pipeline/commit/186c376d0252b0c96ee461670cf45a711aa93f4f))
+* preserve formatting of script tags ([#25](https://github.com/adobe/helix-html-pipeline/issues/25)) ([7009f20](https://github.com/adobe/helix-html-pipeline/commit/7009f20d37190f5704b7f9363c59912b4272c0bf)), closes [#23](https://github.com/adobe/helix-html-pipeline/issues/23)
+
 # [1.3.0](https://github.com/adobe/helix-html-pipeline/compare/v1.2.1...v1.3.0) (2022-03-17)
 
 

package/README.md

@@ -3,8 +3,8 @@
 This package contains the common code for `helix-pipeline-service` and `helix-cloudflare-pipeline` for rendering the html response for helix3. it has the following design goals:
 
 - be platform neutral, i.e. not using node or browser specific modules or dependencies.
-- +/-0 runtime dependencies
-- offer extension interfaces where platform abstraction is required (e.g. reading from s3)
+- +/-0 runtime dependencies (eg. node [crypto](https://nodejs.org/api/crypto.html))
+- offer extension interfaces where platform abstraction is required (e.g. reading from S3, sending to SQS)
 
 ## Status
 [![codecov](https://img.shields.io/codecov/c/github/adobe/helix-html-pipeline.svg)](https://codecov.io/gh/adobe/helix-html-pipeline)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@adobe/helix-markdown-support": "3.1.2",
-    "@adobe/helix-shared-utils": "2.0.5",
+    "@adobe/helix-shared-utils": "2.0.6",
     "github-slugger": "1.4.0",
     "hast-util-raw": "7.2.1",
     "hast-util-select": "5.0.1",

package/src/steps/stringify-response.js

@@ -12,6 +12,8 @@
 import { toHtml } from 'hast-util-to-html';
 // import rehypeFormat from 'rehype-format';
 import rehypeMinifyWhitespace from 'rehype-minify-whitespace';
+import { visit } from 'unist-util-visit';
+
 /**
  * Serializes the response document to HTML
  * @param {PipelineState} state
@@ -32,7 +34,25 @@ export default function stringify(state, req, res) {
   // TODO: for the next breaking release, pretty print the HTML with rehypeFormat.
   // TODO: but for backward compatibility, output all on 1 line.
   // rehypeFormat()(doc);
+
+  // due to a bug in rehype-minify-whitespace, script content is also minified to 1 line, which
+  // can result in errors https://github.com/rehypejs/rehype-minify/issues/44
+  // so we 'save' all text first and revert it afterwards
+  visit(doc, (node) => {
+    if (node.tagName === 'script' && node.children[0]?.type === 'text') {
+      node.children[0].savedValue = node.children[0].value;
+    }
+  });
+
   rehypeMinifyWhitespace()(doc);
+
+  visit(doc, (node) => {
+    if (node.tagName === 'script' && node.children[0]?.type === 'text') {
+      node.children[0].value = node.children[0].savedValue;
+      delete node.children[0].savedValue;
+    }
+  });
+
   res.body = toHtml(doc, {
     upperDoctype: true,
   });