From 2c878b60ceb7b7b536330a900b7abe0b5df81e94 Mon Sep 17 00:00:00 2001
From: Rafe Goldberg <rafegoldberg@gmail.com>
Date: Mon, 9 Sep 2024 10:38:45 -0400
Subject: [PATCH 1/3] chore(rdmd to rmdx): wrap scripts + styles in an
 <HTMLBlock> (#954)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## 🧰 Changes

- [x] wrap scripts + styles in an <HTMLBlock>
- [x] add test cases
- [x] ~implement `compatabilityMode` option~
  *discussed with @kellyjosephprice and we're gonna deprecate compat mode for RMDX* (8ad57ac)

## 🧬 QA & Testing

Pull this branch down and try running the test suite for the RDMD→MDX conversion:

```
npm run test -- compatability.test
```

If these new tests pass, this worked! :tada:

[demo]: https://markdown-pr-PR_NUMBER.herokuapp.com
[prod]: https://SUBDOMAIN.readme.io
[icn]: https://user-images.githubusercontent.com/886627/160426047-1bee9488-305a-4145-bb2b-09d8b757d38a.svg
[guidance]: https://readmeio.slack.com/archives/C04R9PADCS3/p1724778026094309 "View in Slack→"
---
 ...ability.test.ts => compatability.test.tsx} | 70 ++++++++++++++++++-
 processor/transform/readme-to-mdx.ts          | 15 ++++
 2 files changed, 84 insertions(+), 1 deletion(-)
 rename __tests__/compilers/{compatability.test.ts => compatability.test.tsx} (72%)

diff --git a/__tests__/compilers/compatability.test.ts b/__tests__/compilers/compatability.test.tsx
similarity index 72%
rename from __tests__/compilers/compatability.test.ts
rename to __tests__/compilers/compatability.test.tsx
index 659afc007..7ce595f3b 100644
--- a/__tests__/compilers/compatability.test.ts
+++ b/__tests__/compilers/compatability.test.tsx
@@ -1,5 +1,9 @@
-import { mdx } from '../../index';
+import React from 'react';
 import fs from 'node:fs';
+import { vi } from 'vitest';
+import { render, screen, prettyDOM, configure } from '@testing-library/react';
+
+import { mdx, compile, run } from '../../index';
 import * as rdmd from '@readme/markdown-legacy';
 
 describe('compatability with RDMD', () => {
@@ -199,4 +203,68 @@ This is an image: <img src="http://example.com/#\\>" >
 
     expect(mdx(rdmd.mdast(md))).toBe(`Contact me at {user.email}\n`);
   });
+
+  describe('<HTMLBlock> wrapping', () => {
+  // configure({ defaultIgnore: undefined });
+
+    const rawStyle = `<style data-testid="style-tag">
+    p {
+      color: red;
+    }
+    </style>
+    `;
+    const rawScript = `<script data-testid="script-tag">
+    console.log('hello raw')
+    </script>
+    `;
+    const magicScript = `[block:html]
+    {
+      "html": "<script data-testid='script-block'>console.log('hello magic')</script>"
+    }
+    [/block]
+    `;
+
+    it('should wrap raw <style> tags in an <HTMLBlock>', async () => {
+      const legacyAST = rdmd.mdast(rawStyle);
+      const converted = mdx(legacyAST);
+      const compiled = compile(converted);
+      const Component = (await run(compiled)).default;
+      render(
+        <div className="markdown-body">
+          <Component />
+        </div>,
+      );
+      expect(screen.getByTestId('style-tag').tagName).toMatch('STYLE');
+    });
+
+    it('should wrap raw <script> tags in an <HTMLBlock>', async () => {
+      const legacyAST = rdmd.mdast(rawScript);
+      const converted = mdx(legacyAST);
+      const compiled = compile(converted);
+      const Component = (await run(compiled)).default;
+      render(
+        <div className="markdown-body">
+          <Component />
+        </div>,
+      );
+      expect(screen.queryByTestId('script-tag')).toBe(null);
+    });
+
+    it('should never execute <script> tags', async () => {
+      /**
+       * @note compatability mode has been deprecated for RMDX
+       */
+      const spy = vi.spyOn(console, 'log');
+      const legacyAST = rdmd.mdast(magicScript);
+      const converted = mdx(legacyAST);
+      const compiled = compile(converted);
+      const Component = await run(compiled);
+      render(
+        <div className="markdown-body">
+          <Component.default />
+        </div>,
+      );
+      expect(spy).toHaveBeenCalledTimes(0);
+    });
+  });
 });
diff --git a/processor/transform/readme-to-mdx.ts b/processor/transform/readme-to-mdx.ts
index ab081a1f2..31c098227 100644
--- a/processor/transform/readme-to-mdx.ts
+++ b/processor/transform/readme-to-mdx.ts
@@ -5,6 +5,7 @@ import { MdxJsxAttribute } from 'mdast-util-mdx-jsx';
 
 import { visit } from 'unist-util-visit';
 import { toAttributes } from '../utils';
+import { type HTMLBlock } from 'types';
 
 const imageAttrs = ['align', 'alt', 'caption', 'border', 'src', 'title', 'width', 'lazy', 'className'];
 
@@ -75,6 +76,20 @@ const readmeToMdx = (): Transform => tree => {
     }
   });
 
+  visit(tree, 'html', (node, index, parent) => {
+    const html = node.value;
+    const isScriptOrStyleTag = [!!html.match(/^<(?:style|script)/i), !!html.match(/<\/(?:style|script)>$/i)];
+    if (!isScriptOrStyleTag.includes(true)) return;
+    parent.children.splice(index, 1, {
+      type: 'html-block',
+      children: [{ type: 'text', value: html }],
+      data: {
+        hName: 'html-block',
+        hProperties: { html },
+      },
+    } as HTMLBlock);
+  });
+
   return tree;
 };
 

From 746d83edc88b5adacc164f66da6bf00209291caa Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Fri, 6 Sep 2024 20:59:21 +0000
Subject: [PATCH 2/3] =?UTF-8?q?build(release):=20=F0=9F=9A=80=20v7.4.3=20?=
 =?UTF-8?q?=F0=9F=A6=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Version 7.4.3

### 🛠 Fixes & Updates

* undefined check ([#962](https://github.com/readmeio/markdown/issues/962)) ([cc4a53f](https://github.com/readmeio/markdown/commit/cc4a53ff2153ddffdd84aa4bbd1a9dda3ac75157))
* update tabs & accordions ui ([#961](https://github.com/readmeio/markdown/issues/961)) ([88636cd](https://github.com/readmeio/markdown/commit/88636cdd17d676408721cf7d1781f65b25aff248))

<!--SKIP CI-->
---
 CHANGELOG.md      | 7 +++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf374a2c5..7ad377459 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Changelog
 ===
 
+## Version 7.4.3
+
+### 🛠 Fixes & Updates
+
+* undefined check ([#962](https://github.com/readmeio/markdown/issues/962)) ([cc4a53f](https://github.com/readmeio/markdown/commit/cc4a53ff2153ddffdd84aa4bbd1a9dda3ac75157))
+* update tabs & accordions ui ([#961](https://github.com/readmeio/markdown/issues/961)) ([88636cd](https://github.com/readmeio/markdown/commit/88636cdd17d676408721cf7d1781f65b25aff248))
+
 ## Version 7.4.2
 
 ### ✨ New & Improved
diff --git a/package-lock.json b/package-lock.json
index 9679d7a46..4371eae6d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@readme/markdown",
-  "version": "7.4.2",
+  "version": "7.4.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@readme/markdown",
-      "version": "7.4.2",
+      "version": "7.4.3",
       "license": "MIT",
       "dependencies": {
         "@mdx-js/mdx": "^3.0.0",
diff --git a/package.json b/package.json
index 6bb175c60..89b2ad1c3 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "@readme/markdown",
   "description": "ReadMe's React-based Markdown parser",
   "author": "Rafe Goldberg <rafe@readme.io>",
-  "version": "7.4.2",
+  "version": "7.4.3",
   "main": "dist/main.node.js",
   "types": "dist/index.d.ts",
   "browser": "dist/main.js",

From fb4fb7db1998463c9cf43764d533c14383e63a9f Mon Sep 17 00:00:00 2001
From: Kelly Joseph Price <kellyjosephprice@gmail.com>
Date: Tue, 10 Sep 2024 10:35:03 -0700
Subject: [PATCH 3/3] feat: pass through stringify options (#963)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![PR App][icn]][demo] | RM-10779
:-------------------:|:----------:

## 🧰 Changes

Allows passing through options to `remark-stringify`.

There are places in the main app where we'd like to be able control the
formatting of mdx.

## 🧬 QA & Testing

- [Broken on production][prod].
- [Working in this PR app][demo].


[demo]: https://markdown-pr-PR_NUMBER.herokuapp.com
[prod]: https://SUBDOMAIN.readme.io
[icn]:
https://user-images.githubusercontent.com/886627/160426047-1bee9488-305a-4145-bb2b-09d8b757d38a.svg
---
 README.md  | 8 ++++++++
 lib/mdx.ts | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 42b25d269..234612387 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,14 @@ A module ([`RMDXModule`](#rmdxmodule)) of renderable components
 
 Compiles an ast to mdx.
 
+###### Parameters
+
+Extends [`remark-stringify` options](https://github.com/remarkjs/remark/tree/main/packages/remark-stringify#options).
+
+###### Returns
+
+An mdx string.
+
 #### `mdast`
 
 Parses mdx to an mdast.
diff --git a/lib/mdx.ts b/lib/mdx.ts
index e1935d707..9732dc143 100644
--- a/lib/mdx.ts
+++ b/lib/mdx.ts
@@ -7,7 +7,7 @@ import remarkStringify from 'remark-stringify';
 import compilers from '../processor/compile';
 import { divTransformer, readmeToMdx, tablesToJsx } from '../processor/transform';
 
-export const mdx = (tree: any, { hast = false } = {}) => {
+export const mdx = (tree: any, { hast = false, ...opts } = {}) => {
   const processor = unified()
     .use(hast ? rehypeRemark : undefined)
     .use(remarkMdx)
@@ -16,7 +16,7 @@ export const mdx = (tree: any, { hast = false } = {}) => {
     .use(readmeToMdx)
     .use(tablesToJsx)
     .use(compilers)
-    .use(remarkStringify);
+    .use(remarkStringify, opts);
 
   return processor.stringify(processor.runSync(tree));
 };