@adobe/helix-html-pipeline 6.6.0 → 6.7.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [6.7.0](https://github.com/adobe/helix-html-pipeline/compare/v6.6.1...v6.7.0) (2024-03-01)
+
+
+### Features
+
+* remove front- and mid-matter support ([#546](https://github.com/adobe/helix-html-pipeline/issues/546)) ([a1ad474](https://github.com/adobe/helix-html-pipeline/commit/a1ad4744b32acf64b23ca5b08a2a4ba3a7e0b672)), closes [#396](https://github.com/adobe/helix-html-pipeline/issues/396)
+
+## [6.6.1](https://github.com/adobe/helix-html-pipeline/compare/v6.6.0...v6.6.1) (2024-02-28)
+
+
+### Bug Fixes
+
+* **deps:** update adobe fixes ([#549](https://github.com/adobe/helix-html-pipeline/issues/549)) ([bae49e1](https://github.com/adobe/helix-html-pipeline/commit/bae49e12802176d386fd12453ebd84b7a443b0e0))
+
 # [6.6.0](https://github.com/adobe/helix-html-pipeline/compare/v6.5.0...v6.6.0) (2024-02-21)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "6.6.0",
+  "version": "6.7.0",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -45,8 +45,8 @@
   "dependencies": {
     "@adobe/helix-markdown-support": "7.1.0",
     "@adobe/helix-shared-utils": "3.0.1",
-    "@adobe/mdast-util-gridtables": "4.0.0",
-    "@adobe/remark-gridtables": "3.0.0",
+    "@adobe/mdast-util-gridtables": "4.0.1",
+    "@adobe/remark-gridtables": "3.0.1",
     "cookie": "0.6.0",
     "github-slugger": "2.0.0",
     "hast-util-raw": "9.0.2",
@@ -78,7 +78,7 @@
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "11.0.2",
     "c8": "9.1.0",
-    "eslint": "8.56.0",
+    "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",

package/src/html-pipe.js

@@ -23,7 +23,6 @@ import folderMapping from './steps/folder-mapping.js';
 import getMetadata from './steps/get-metadata.js';
 import html from './steps/make-html.js';
 import parseMarkdown from './steps/parse-markdown.js';
-import removeHlxProps from './steps/removeHlxProps.js';
 import render from './steps/render.js';
 import renderCode from './steps/render-code.js';
 import rewriteUrls from './steps/rewrite-urls.js';
@@ -171,7 +170,6 @@ export async function htmlPipe(state, req) {
       await extractMetaData(state, req);
       await addHeadingIds(state);
       await render(state, req, res);
-      await removeHlxProps(state, req, res);
       state.timer?.update('serialize');
       await tohtml(state, req, res);
     }

package/src/steps/fix-sections.js

@@ -25,11 +25,6 @@ export default async function fixSections({ content }) {
   // if there are no sections wrap everything in a div with appropriate class names from meta
   if ($sections.length === 0) {
     const $outerDiv = h('div');
-    if (content.meta && content.meta.class) {
-      $outerDiv.properties.className = content.meta.class.split(/[ ,]/)
-        .map((c) => c.trim())
-        .filter((c) => !!c);
-    }
     wrapContent($outerDiv, hast);
   }
 }

package/src/steps/get-metadata.js

@@ -13,9 +13,8 @@ import { select, selectAll } from 'unist-util-select';
 import { toString as plain } from 'mdast-util-to-string';
 import { rewriteUrl } from './utils.js';
 
-function yaml(section) {
-  section.meta = selectAll('yaml', section)
-    .reduce((prev, { payload }) => Object.assign(prev, payload), Object.create(null));
+function init(section) {
+  section.meta = {};
   return section;
 }
 
@@ -83,10 +82,6 @@ function sectiontype(section) {
 
     node.meta = { types: [], ...node.meta };
 
-    if (type === 'yaml') {
-      return counter;
-    }
-
     const mycounter = {};
 
     if (type === 'paragraph' && pChildren && pChildren.length > 0) {
@@ -156,7 +151,7 @@ export default function getMetadata(state) {
     sections = [content.mdast];
   }
 
-  [yaml, title, intro, image, sectiontype, fallback].forEach((fn) => {
+  [init, title, intro, image, sectiontype, fallback].forEach((fn) => {
     sections.forEach((section) => fn(section, state));
   });
 

package/src/steps/parse-markdown.js

@@ -13,30 +13,21 @@ import { unified } from 'unified';
 import remarkParse from 'remark-parse';
 import { removePosition } from 'unist-util-remove-position';
 import { dereference, remarkGfmNoLink } from '@adobe/helix-markdown-support';
-import { remarkMatter } from '@adobe/helix-markdown-support/matter';
 import remarkGridTable from '@adobe/remark-gridtables';
 
-export class FrontmatterParsingError extends Error {
-}
-
 /**
  * Parses the markdown body
  * @type PipelineStep
  * @param {PipelineState} state
  */
 export default function parseMarkdown(state) {
-  const { log, content } = state;
+  const { content } = state;
 
   // convert linebreaks
   const converted = content.data.replace(/(\r\n|\n|\r)/gm, '\n');
   content.mdast = unified()
     .use(remarkParse)
     .use(remarkGfmNoLink)
-    .use(remarkMatter, {
-      errorHandler: (e) => {
-        log.warn(new FrontmatterParsingError(e));
-      },
-    })
     .use(remarkGridTable)
     .parse(converted);
 

package/src/steps/split-sections.js

@@ -9,12 +9,6 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import { selectAll } from 'unist-util-select';
-
-// Compute the meta information for the section
-function computeMeta(section) {
-  return selectAll('yaml', section).reduce((prev, { payload }) => Object.assign(prev, payload), Object.create(null));
-}
 
 /**
  * Splits the sections in the mdast tree
@@ -24,8 +18,8 @@ function computeMeta(section) {
 export default function split(state) {
   const { content: { mdast } } = state;
 
-  // filter all children that are either yaml or break blocks
-  const dividers = mdast.children.filter((node) => node.type === 'yaml' || node.type === 'thematicBreak')
+  // filter all children that are break blocks
+  const dividers = mdast.children.filter((node) => node.type === 'thematicBreak')
     // then get their index in the list of children
     .map((node) => mdast.children.indexOf(node));
 
@@ -42,12 +36,10 @@ export default function split(state) {
     .map(([start, end]) => {
       // skip 'thematicBreak' nodes
       const index = mdast.children[start].type === 'thematicBreak' ? start + 1 : start;
-      const section = {
+      return {
         type: 'section',
         children: mdast.children.slice(index, end),
       };
-      section.meta = computeMeta(section);
-      return section;
     });
 
   // unwrap sole section directly on the root

package/src/utils/section-handler.js

@@ -9,65 +9,14 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const HELIX_NAMESPACE = 'hlx-';
-const DEFAULT_SECTION_TAG = 'div';
-const DEFAULT_SECTION_CLASS = `${HELIX_NAMESPACE}section`;
-const SYSTEM_META_PROPERTIES = ['tagname'];
-const SYSTEM_HTML_ATTRIBUTES = ['types'];
-const GLOBAL_HTML_ATTRIBUTES = [
-  'accesskey', 'autocapitalize', 'class', 'contenteditable', 'contextmenu', 'dir', 'draggable', 'dropzone', 'hidden',
-  'id', 'inputmode', 'is', 'itemid', 'itemprop', 'itemref', 'itemscope', 'itemtype', 'lang', 'slot', 'spellcheck',
-  'style', 'tabindex', 'title', 'translate',
-];
-
-/**
- * Get the tag name for the specified section.
- *
- * @param {Node} section The MDAST section to get the tag name for
- * @returns {string} The tag name for the section. Defaults to {@code div}.
- */
-function getTagName(section) {
-  return (section.meta && section.meta.tagname) || DEFAULT_SECTION_TAG;
-}
-
-function toHtmlAttribute(value) {
-  return Array.isArray(value) ? value.join(' ') : value;
-}
-
-function getAttributes(section) {
-  const attributeKeys = Object.keys(section.meta);
-  // Add system properties as data-hlx-*
-  const attributes = attributeKeys
-    .filter((k) => SYSTEM_HTML_ATTRIBUTES.indexOf(k) > -1)
-    .reduce((result, attr) => Object.assign(result, { [`data-${HELIX_NAMESPACE}${attr}`]: toHtmlAttribute(section.meta[attr]) }), Object.create(null));
-  return attributeKeys
-    .filter((k) => [...SYSTEM_HTML_ATTRIBUTES, ...SYSTEM_META_PROPERTIES].indexOf(k) === -1)
-    .reduce((result, attr) => {
-      // Add invalid HTML attributes as data-*
-      if (GLOBAL_HTML_ATTRIBUTES.indexOf(attr) === -1 && !attr.startsWith('data-')) {
-        return Object.assign(result, { [`data-${attr}`]: toHtmlAttribute(section.meta[attr]) });
-      }
-      // Add valid HTML attributes
-      return Object.assign(result, { [attr]: toHtmlAttribute(section.meta[attr]) });
-    }, attributes);
-}
-
 export default function sectionHandler() {
   return function handler(state, node) {
     const n = { ...node };
 
-    const tagName = getTagName(n);
-    const properties = getAttributes(n);
-    properties.className = [DEFAULT_SECTION_CLASS];
-    if (properties.class) {
-      properties.className.push(...properties.class.split(/\s+/));
-    }
-    delete properties.class;
     const children = state.all(n);
     return {
       type: 'element',
-      tagName,
-      properties,
+      tagName: 'div',
       children,
     };
   };

package/src/steps/removeHlxProps.js

@@ -1,33 +0,0 @@
-/*
- * Copyright 2019 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-import { selectAll } from 'hast-util-select';
-
-/**
- * Cleans the response document by removing `hlx-` stuff
- * @param {PipelineState} state
- * @param {PipelineRequest} req
- * @param {PipelineResponse} res
- */
-export default function clean(state, req, res) {
-  const { document } = res;
-  selectAll('[class]', document).forEach(({ properties }) => {
-    properties.className = properties.className.filter((name) => !name.startsWith('hlx-'));
-    if (properties.className.length === 0) {
-      delete properties.className;
-    }
-
-    // Remove all `data-hlx-*` attributes on these elements
-    Object.keys(properties)
-      .filter((key) => key.match(/^dataHlx[A-Z].*/))
-      .forEach((key) => delete properties[key]);
-  });
-}