@astrojs/markdown-remark 2.0.0-beta.1 → 2.0.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
-@astrojs/markdown-remark:build: cache hit, replaying output 9c178a3ea0572c76
+@astrojs/markdown-remark:build: cache hit, replaying output 6cabe659bf0ade09
 @astrojs/markdown-remark:build: 
-@astrojs/markdown-remark:build: > @astrojs/markdown-remark@2.0.0-beta.1 build /home/runner/work/astro/astro/packages/markdown/remark
+@astrojs/markdown-remark:build: > @astrojs/markdown-remark@2.0.0 build /home/runner/work/astro/astro/packages/markdown/remark
 @astrojs/markdown-remark:build: > astro-scripts build "src/**/*.ts" && tsc -p tsconfig.json
 @astrojs/markdown-remark:build: 

package/CHANGELOG.md

@@ -1,7 +1,151 @@
 # @astrojs/markdown-remark
 
+## 2.0.0
+
+### Major Changes
+
+- [#5687](https://github.com/withastro/astro/pull/5687) [`e2019be6f`](https://github.com/withastro/astro/commit/e2019be6ffa46fa33d92cfd346f9ecbe51bb7144) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Give remark and rehype plugins access to user frontmatter via frontmatter injection. This means `data.astro.frontmatter` is now the _complete_ Markdown or MDX document's frontmatter, rather than an empty object.
+
+  This allows plugin authors to modify existing frontmatter, or compute new properties based on other properties. For example, say you want to compute a full image URL based on an `imageSrc` slug in your document frontmatter:
+
+  ```ts
+  export function remarkInjectSocialImagePlugin() {
+    return function (tree, file) {
+      const { frontmatter } = file.data.astro;
+      frontmatter.socialImageSrc = new URL(frontmatter.imageSrc, 'https://my-blog.com/').pathname;
+    };
+  }
+  ```
+
+  When using Content Collections, you can access this modified frontmatter using the `remarkPluginFrontmatter` property returned when rendering an entry.
+
+  **Migration instructions**
+
+  Plugin authors should now **check for user frontmatter when applying defaults.**
+
+  For example, say a remark plugin wants to apply a default `title` if none is present. Add a conditional to check if the property is present, and update if none exists:
+
+  ```diff
+  export function remarkInjectTitlePlugin() {
+    return function (tree, file) {
+      const { frontmatter } = file.data.astro;
+  +    if (!frontmatter.title) {
+        frontmatter.title = 'Default title';
+  +    }
+    }
+  }
+  ```
+
+  This differs from previous behavior, where a Markdown file's frontmatter would _always_ override frontmatter injected via remark or reype.
+
+- [#5785](https://github.com/withastro/astro/pull/5785) [`16107b6a1`](https://github.com/withastro/astro/commit/16107b6a10514ef1b563e585ec9add4b14f42b94) Thanks [@delucis](https://github.com/delucis)! - Drop support for legacy Astro-flavored Markdown
+
+- [#5684](https://github.com/withastro/astro/pull/5684) [`a9c292026`](https://github.com/withastro/astro/commit/a9c2920264e36cc5dc05f4adc1912187979edb0d) & [#5769](https://github.com/withastro/astro/pull/5769) [`93e633922`](https://github.com/withastro/astro/commit/93e633922c2e449df3bb2357b3683af1d3c0e07b) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Refine Markdown and MDX configuration options for ease-of-use.
+  
+  - **Markdown**
+
+      - **Replace the `extendDefaultPlugins` option** with a `gfm` boolean and a `smartypants` boolean. These are enabled by default, and can be disabled to remove GitHub-Flavored Markdown and SmartyPants.
+  
+      - Ensure GitHub-Flavored Markdown and SmartyPants are applied whether or not custom `remarkPlugins` or `rehypePlugins` are configured. If you want to apply custom plugins _and_ remove Astro's default plugins, manually set `gfm: false` and `smartypants: false` in your config.
+
+  - **Migrate `extendDefaultPlugins` to `gfm` and `smartypants`**
+
+      You may have disabled Astro's built-in plugins (GitHub-Flavored Markdown and Smartypants) with the `extendDefaultPlugins` option. This has now been split into 2 flags to disable each plugin individually:
+
+      - `markdown.gfm` to disable GitHub-Flavored Markdown
+      - `markdown.smartypants` to disable SmartyPants
+
+      ```diff
+      // astro.config.mjs
+      import { defineConfig } from 'astro/config';
+
+      export default defineConfig({
+        markdown: {
+      -   extendDefaultPlugins: false,
+      +   smartypants: false,
+      +   gfm: false,
+        }
+      });
+      ```
+
+      Additionally, applying remark and rehype plugins **no longer disables** `gfm` and `smartypants`. You will need to opt-out manually by setting `gfm` and `smartypants` to `false`.
+
+  - **MDX**
+
+      - Support _all_ Markdown configuration options (except `drafts`) from your MDX integration config. This includes `syntaxHighlighting` and `shikiConfig` options to further customize the MDX renderer.
+
+      - Simplify `extendPlugins` to an `extendMarkdownConfig` option. MDX options will default to their equivalent in your Markdown config. By setting `extendMarkdownConfig` to false, you can "eject" to set your own syntax highlighting, plugins, and more.
+
+  - **Migrate MDX's `extendPlugins` to `extendMarkdownConfig`**
+
+      You may have used the `extendPlugins` option to manage plugin defaults in MDX. This has been replaced by 3 flags:
+
+      - `extendMarkdownConfig` (`true` by default) to toggle Markdown config inheritance. This replaces the `extendPlugins: 'markdown'` option.
+      - `gfm` (`true` by default) and `smartypants` (`true` by default) to toggle GitHub-Flavored Markdown and SmartyPants in MDX. This replaces the `extendPlugins: 'defaults'` option.
+
+- [#5825](https://github.com/withastro/astro/pull/5825) [`52209ca2a`](https://github.com/withastro/astro/commit/52209ca2ad72a30854947dcb3a90ab4db0ac0a6f) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Baseline the experimental `contentCollections` flag. You're free to remove this from your astro config!
+
+  ```diff
+  import { defineConfig } from 'astro/config';
+
+  export default defineConfig({
+  - experimental: { contentCollections: true }
+  })
+
+  ```
+
+- [#5806](https://github.com/withastro/astro/pull/5806) [`7572f7402`](https://github.com/withastro/astro/commit/7572f7402238da37de748be58d678fedaf863b53) Thanks [@matthewp](https://github.com/matthewp)! - Make astro a `peerDependency` of integrations
+
+  This marks `astro` as a `peerDependency` of several packages that are already getting `major` version bumps. This is so we can more properly track the dependency between them and what version of Astro they are being used with.
+
+
+**Patch Changes**
+
+- [#5837](https://github.com/withastro/astro/pull/5837) [`12f65a4d5`](https://github.com/withastro/astro/commit/12f65a4d55e3fd2993c2f67b18794dd536280c69) Thanks [@giuseppelt](https://github.com/giuseppelt)! - fix shiki css class replace logic
+
+- Updated dependencies [[`93e633922`](https://github.com/withastro/astro/commit/93e633922c2e449df3bb2357b3683af1d3c0e07b), [`16dc36a87`](https://github.com/withastro/astro/commit/16dc36a870df47a4151a8ed2d91d0bd1bb812458), [`01f3f463b`](https://github.com/withastro/astro/commit/01f3f463bf2918b310d130a9fabbf3ee21d14029), [`e2019be6f`](https://github.com/withastro/astro/commit/e2019be6ffa46fa33d92cfd346f9ecbe51bb7144), [`05caf445d`](https://github.com/withastro/astro/commit/05caf445d4d2728f1010aeb2179a9e756c2fd17d), [`49ab4f231`](https://github.com/withastro/astro/commit/49ab4f231c23b34891c3ee86f4b92bf8d6d267a3), [`a342a486c`](https://github.com/withastro/astro/commit/a342a486c2831461e24e6c2f1ca8a9d3e15477b6), [`8fb28648f`](https://github.com/withastro/astro/commit/8fb28648f66629741cb976bfe34ccd9d8f55661e), [`1f92d64ea`](https://github.com/withastro/astro/commit/1f92d64ea35c03fec43aff64eaf704dc5a9eb30a), [`c2180746b`](https://github.com/withastro/astro/commit/c2180746b4f6d9ef1b6f86924f21f52cc6ab4e63), [`ae8a012a7`](https://github.com/withastro/astro/commit/ae8a012a7b6884a03c50494332ee37b4505c2c3b), [`cf2de5422`](https://github.com/withastro/astro/commit/cf2de5422c26bfdea4c75f76e57b57299ded3e3a), [`ce5c5dbd4`](https://github.com/withastro/astro/commit/ce5c5dbd46afbe738b03600758bf5c35113de522), [`ec09bb664`](https://github.com/withastro/astro/commit/ec09bb6642064dbd7d2f3369afb090363ae18de2), [`665a2c222`](https://github.com/withastro/astro/commit/665a2c2225e42881f5a9550599e8f3fc1deea0b4), [`259a539d7`](https://github.com/withastro/astro/commit/259a539d7d70c783330c797794b15716921629cf), [`f7aa1ec25`](https://github.com/withastro/astro/commit/f7aa1ec25d1584f7abd421903fbef66b1c050e2a), [`4987d6f44`](https://github.com/withastro/astro/commit/4987d6f44cfd0d81d88f21f5c380503403dc1e6a), [`304823811`](https://github.com/withastro/astro/commit/304823811eddd8e72aa1d8e2d39b40ab5cda3565), [`302e0ef8f`](https://github.com/withastro/astro/commit/302e0ef8f5d5232e3348afe680e599f3e537b5c5), [`55cea0a9d`](https://github.com/withastro/astro/commit/55cea0a9d8c8df91a46590fc04a9ac28089b3432), [`dd56c1941`](https://github.com/withastro/astro/commit/dd56c19411b126439b8bc42d681b6fa8c06e8c61), [`9963c6e4d`](https://github.com/withastro/astro/commit/9963c6e4d50c392c3d1ac4492237020f15ccb1de), [`be901dc98`](https://github.com/withastro/astro/commit/be901dc98c4a7f6b5536540aa8f7ba5108e939a0), [`f6cf92b48`](https://github.com/withastro/astro/commit/f6cf92b48317a19a3840ad781b77d6d3cae143bb), [`e818cc046`](https://github.com/withastro/astro/commit/e818cc0466a942919ea3c41585e231c8c80cb3d0), [`8c100a6fe`](https://github.com/withastro/astro/commit/8c100a6fe6cc652c3799d1622e12c2c969f30510), [`116d8835c`](https://github.com/withastro/astro/commit/116d8835ca9e78f8b5e477ee5a3d737b69f80706), [`840412128`](https://github.com/withastro/astro/commit/840412128b00a04515156e92c314a929d6b94f6d), [`1f49cddf9`](https://github.com/withastro/astro/commit/1f49cddf9e9ffc651efc171b2cbde9fbe9e8709d), [`7325df412`](https://github.com/withastro/astro/commit/7325df412107fc0e65cd45c1b568fb686708f723), [`16c7d0bfd`](https://github.com/withastro/astro/commit/16c7d0bfd49d2b9bfae45385f506bcd642f9444a), [`a9c292026`](https://github.com/withastro/astro/commit/a9c2920264e36cc5dc05f4adc1912187979edb0d), [`2a5786419`](https://github.com/withastro/astro/commit/2a5786419599b8674473c699300172b9aacbae2e), [`4a1cabfe6`](https://github.com/withastro/astro/commit/4a1cabfe6b9ef8a6fbbcc0727a0dc6fa300cedaa), [`a8d3e7924`](https://github.com/withastro/astro/commit/a8d3e79246605d252dcddad159e358e2d79bd624), [`fa8c131f8`](https://github.com/withastro/astro/commit/fa8c131f88ef67d14c62f1c00c97ed74d43a80ac), [`64b8082e7`](https://github.com/withastro/astro/commit/64b8082e776b832f1433ed288e6f7888adb626d0), [`c4b0cb8bf`](https://github.com/withastro/astro/commit/c4b0cb8bf2b41887d9106440bb2e70d421a5f481), [`23dc9ea96`](https://github.com/withastro/astro/commit/23dc9ea96a10343852d965efd41fe6665294f1fb), [`63a6ceb38`](https://github.com/withastro/astro/commit/63a6ceb38d88331451dca64d0034c7c58e3d26f1), [`a3a7fc929`](https://github.com/withastro/astro/commit/a3a7fc9298e6d88abb4b7bee1e58f05fa9558cf1), [`52209ca2a`](https://github.com/withastro/astro/commit/52209ca2ad72a30854947dcb3a90ab4db0ac0a6f), [`5fd9208d4`](https://github.com/withastro/astro/commit/5fd9208d447f5ab8909a2188b6c2491a0debd49d), [`5eba34fcc`](https://github.com/withastro/astro/commit/5eba34fcc663def20bdf6e0daad02a6a5472776b), [`899214298`](https://github.com/withastro/astro/commit/899214298cee5f0c975c7245e623c649e1842d73), [`3a00ecb3e`](https://github.com/withastro/astro/commit/3a00ecb3eb4bc44be758c064f2bde6e247e8a593), [`5eba34fcc`](https://github.com/withastro/astro/commit/5eba34fcc663def20bdf6e0daad02a6a5472776b), [`2303f9514`](https://github.com/withastro/astro/commit/2303f95142aa740c99213a098f82b99dd37d74a0), [`1ca81c16b`](https://github.com/withastro/astro/commit/1ca81c16b8b66236e092e6eb6ec3f73f5668421c), [`b66d7195c`](https://github.com/withastro/astro/commit/b66d7195c17a55ea0931bc3744888bd4f5f01ce6)]:
+  - astro@2.0.0
+  - @astrojs/prism@2.0.0
+
+## 2.0.0-beta.2
+
+<details>
+<summary>See changes in 2.0.0-beta.2</summary>
+
+### Major Changes
+
+- [#5785](https://github.com/withastro/astro/pull/5785) [`16107b6a1`](https://github.com/withastro/astro/commit/16107b6a10514ef1b563e585ec9add4b14f42b94) Thanks [@delucis](https://github.com/delucis)! - Drop support for legacy Astro-flavored Markdown
+
+- [#5825](https://github.com/withastro/astro/pull/5825) [`52209ca2a`](https://github.com/withastro/astro/commit/52209ca2ad72a30854947dcb3a90ab4db0ac0a6f) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Baseline the experimental `contentCollections` flag. You're free to remove this from your astro config!
+
+  ```diff
+  import { defineConfig } from 'astro/config';
+
+  export default defineConfig({
+  - experimental: { contentCollections: true }
+  })
+
+  ```
+
+- [#5806](https://github.com/withastro/astro/pull/5806) [`7572f7402`](https://github.com/withastro/astro/commit/7572f7402238da37de748be58d678fedaf863b53) Thanks [@matthewp](https://github.com/matthewp)! - Make astro a peerDependency of integrations
+
+  This marks `astro` as a peerDependency of several packages that are already getting `major` version bumps. This is so we can more properly track the dependency between them and what version of Astro they are being used with.
+
+### Patch Changes
+
+- [#5837](https://github.com/withastro/astro/pull/5837) [`12f65a4d5`](https://github.com/withastro/astro/commit/12f65a4d55e3fd2993c2f67b18794dd536280c69) Thanks [@giuseppelt](https://github.com/giuseppelt)! - fix shiki css class replace logic
+
+- Updated dependencies [[`01f3f463b`](https://github.com/withastro/astro/commit/01f3f463bf2918b310d130a9fabbf3ee21d14029), [`1f92d64ea`](https://github.com/withastro/astro/commit/1f92d64ea35c03fec43aff64eaf704dc5a9eb30a), [`c2180746b`](https://github.com/withastro/astro/commit/c2180746b4f6d9ef1b6f86924f21f52cc6ab4e63), [`ae8a012a7`](https://github.com/withastro/astro/commit/ae8a012a7b6884a03c50494332ee37b4505c2c3b), [`cf2de5422`](https://github.com/withastro/astro/commit/cf2de5422c26bfdea4c75f76e57b57299ded3e3a), [`ec09bb664`](https://github.com/withastro/astro/commit/ec09bb6642064dbd7d2f3369afb090363ae18de2), [`665a2c222`](https://github.com/withastro/astro/commit/665a2c2225e42881f5a9550599e8f3fc1deea0b4), [`f7aa1ec25`](https://github.com/withastro/astro/commit/f7aa1ec25d1584f7abd421903fbef66b1c050e2a), [`302e0ef8f`](https://github.com/withastro/astro/commit/302e0ef8f5d5232e3348afe680e599f3e537b5c5), [`840412128`](https://github.com/withastro/astro/commit/840412128b00a04515156e92c314a929d6b94f6d), [`1f49cddf9`](https://github.com/withastro/astro/commit/1f49cddf9e9ffc651efc171b2cbde9fbe9e8709d), [`4a1cabfe6`](https://github.com/withastro/astro/commit/4a1cabfe6b9ef8a6fbbcc0727a0dc6fa300cedaa), [`c4b0cb8bf`](https://github.com/withastro/astro/commit/c4b0cb8bf2b41887d9106440bb2e70d421a5f481), [`23dc9ea96`](https://github.com/withastro/astro/commit/23dc9ea96a10343852d965efd41fe6665294f1fb), [`63a6ceb38`](https://github.com/withastro/astro/commit/63a6ceb38d88331451dca64d0034c7c58e3d26f1), [`52209ca2a`](https://github.com/withastro/astro/commit/52209ca2ad72a30854947dcb3a90ab4db0ac0a6f), [`2303f9514`](https://github.com/withastro/astro/commit/2303f95142aa740c99213a098f82b99dd37d74a0)]:
+  - astro@2.0.0-beta.2
+  - @astrojs/prism@2.0.0-beta.0
+
+</details>
+
 ## 2.0.0-beta.1
 
+<details>
+<summary>See changes in 2.0.0-beta.1</summary>
+
 ### Minor Changes
 
 - [#5769](https://github.com/withastro/astro/pull/5769) [`93e633922`](https://github.com/withastro/astro/commit/93e633922c2e449df3bb2357b3683af1d3c0e07b) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Introduce a `smartypants` flag to opt-out of Astro's default SmartyPants plugin.
@@ -34,8 +178,13 @@
   });
   ```
 
+</details>
+
 ## 2.0.0-beta.0
 
+<details>
+<summary>See changes in 2.0.0-beta.0</summary>
+
 ### Major Changes
 
 - [#5687](https://github.com/withastro/astro/pull/5687) [`e2019be6f`](https://github.com/withastro/astro/commit/e2019be6ffa46fa33d92cfd346f9ecbe51bb7144) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Give remark and rehype plugins access to user frontmatter via frontmatter injection. This means `data.astro.frontmatter` is now the _complete_ Markdown or MDX document's frontmatter, rather than an empty object.
@@ -134,6 +283,8 @@
   - `extendMarkdownConfig` (`true` by default) to toggle Markdown config inheritance. This replaces the `extendPlugins: 'markdown'` option.
   - `gfm` (`true` by default) to toggle GitHub-Flavored Markdown in MDX. This replaces the `extendPlugins: 'defaults'` option.
 
+</details>
+
 ## 1.2.0
 
 ### Minor Changes

package/dist/index.js

@@ -1,18 +1,10 @@
 import { toRemarkInitializeAstroData } from "./frontmatter-injection.js";
 import { loadPlugins } from "./load-plugins.js";
 import { rehypeHeadingIds } from "./rehype-collect-headings.js";
-import rehypeEscape from "./rehype-escape.js";
-import rehypeExpressions from "./rehype-expressions.js";
-import rehypeIslands from "./rehype-islands.js";
-import rehypeJsx from "./rehype-jsx.js";
 import toRemarkContentRelImageError from "./remark-content-rel-image-error.js";
-import remarkEscape from "./remark-escape.js";
-import remarkMarkAndUnravel from "./remark-mark-and-unravel.js";
-import remarkMdxish from "./remark-mdxish.js";
 import remarkPrism from "./remark-prism.js";
 import scopedStyles from "./remark-scoped-styles.js";
 import remarkShiki from "./remark-shiki.js";
-import remarkUnwrap from "./remark-unwrap.js";
 import rehypeRaw from "rehype-raw";
 import rehypeStringify from "rehype-stringify";
 import remarkGfm from "remark-gfm";
@@ -47,14 +39,12 @@ async function renderMarkdown(content, opts) {
     remarkRehype = markdownConfigDefaults.remarkRehype,
     gfm = markdownConfigDefaults.gfm,
     smartypants = markdownConfigDefaults.smartypants,
-    isAstroFlavoredMd = false,
-    isExperimentalContentCollections = false,
     contentDir,
     frontmatter: userFrontmatter = {}
   } = opts;
   const input = new VFile({ value: content, path: fileURL });
   const scopedClassName = (_a = opts.$) == null ? void 0 : _a.scopedClassName;
-  let parser = unified().use(markdown).use(toRemarkInitializeAstroData({ userFrontmatter })).use(isAstroFlavoredMd ? [remarkMdxish, remarkMarkAndUnravel, remarkUnwrap, remarkEscape] : []);
+  let parser = unified().use(markdown).use(toRemarkInitializeAstroData({ userFrontmatter })).use([]);
   if (gfm) {
     parser.use(remarkGfm);
   }
@@ -74,21 +64,13 @@ async function renderMarkdown(content, opts) {
   } else if (syntaxHighlight === "prism") {
     parser.use([remarkPrism(scopedClassName)]);
   }
-  if (isExperimentalContentCollections) {
-    parser.use([toRemarkContentRelImageError({ contentDir })]);
-  }
+  parser.use([toRemarkContentRelImageError({ contentDir })]);
   parser.use([
     [
       markdownToHtml,
       {
         allowDangerousHtml: true,
-        passThrough: isAstroFlavoredMd ? [
-          "raw",
-          "mdxFlowExpression",
-          "mdxJsxFlowElement",
-          "mdxJsxTextElement",
-          "mdxTextExpression"
-        ] : [],
+        passThrough: [],
         ...remarkRehype
       }
     ]
@@ -96,9 +78,7 @@ async function renderMarkdown(content, opts) {
   loadedRehypePlugins.forEach(([plugin, pluginOpts]) => {
     parser.use([[plugin, pluginOpts]]);
   });
-  parser.use(
-    isAstroFlavoredMd ? [rehypeJsx, rehypeExpressions, rehypeEscape, rehypeIslands, rehypeHeadingIds] : [rehypeHeadingIds, rehypeRaw]
-  ).use(rehypeStringify, { allowDangerousHtml: true });
+  parser.use([rehypeHeadingIds, rehypeRaw]).use(rehypeStringify, { allowDangerousHtml: true });
   let vfile;
   try {
     vfile = await parser.process(input);

package/dist/rehype-collect-headings.js

@@ -1,5 +1,4 @@
 import Slugger from "github-slugger";
-import { toHtml } from "hast-util-to-html";
 import { visit } from "unist-util-visit";
 const rawNodeTypes = /* @__PURE__ */ new Set(["text", "raw", "mdxTextExpression"]);
 const codeTagNames = /* @__PURE__ */ new Set(["code", "pre"]);
@@ -19,7 +18,6 @@ function rehypeHeadingIds() {
         return;
       const depth = Number.parseInt(level);
       let text = "";
-      let isJSX = false;
       visit(node, (child, __, parent) => {
         if (child.type === "element" || parent == null) {
           return;
@@ -34,23 +32,15 @@ function rehypeHeadingIds() {
             text += child.value;
           } else {
             text += child.value.replace(/\{/g, "${");
-            isJSX = isJSX || child.value.includes("{");
           }
         }
       });
       node.properties = node.properties || {};
       if (typeof node.properties.id !== "string") {
-        if (isJSX) {
-          const raw = toHtml(node.children, { allowDangerousHtml: true }).replace(/\n(<)/g, "<").replace(/(>)\n/g, ">");
-          node.properties.id = `$$slug(\`${text}\`)`;
-          node.type = "raw";
-          node.value = `<${node.tagName} id={${node.properties.id}}>${raw}</${node.tagName}>`;
-        } else {
-          let slug = slugger.slug(text);
-          if (slug.endsWith("-"))
-            slug = slug.slice(0, -1);
-          node.properties.id = slug;
-        }
+        let slug = slugger.slug(text);
+        if (slug.endsWith("-"))
+          slug = slug.slice(0, -1);
+        node.properties.id = slug;
       }
       headings.push({ depth, slug: node.properties.id, text });
     });

package/dist/remark-content-rel-image-error.js

@@ -3,6 +3,8 @@ import { pathToFileURL } from "url";
 function toRemarkContentRelImageError({ contentDir }) {
   return function remarkContentRelImageError() {
     return (tree, vfile) => {
+      if (typeof (vfile == null ? void 0 : vfile.path) !== "string")
+        return;
       const isContentFile = pathToFileURL(vfile.path).href.startsWith(contentDir.href);
       if (!isContentFile)
         return;

package/dist/remark-shiki.js

@@ -43,8 +43,8 @@ const remarkShiki = async ({ langs = [], theme = "github-dark", wrap = false },
       }
       let html = highlighter.codeToHtml(node.value, { lang });
       html = html.replace(
-        '<pre class="shiki"',
-        `<pre is:raw class="astro-code${scopedClassName ? " " + scopedClassName : ""}"`
+        /<pre class="(.*?)shiki(.*?)"/,
+        `<pre is:raw class="$1astro-code$2${scopedClassName ? " " + scopedClassName : ""}"`
       );
       if (node.lang === "diff") {
         html = html.replace(

package/dist/types.d.ts

@@ -38,9 +38,6 @@ export interface MarkdownRenderingOptions extends AstroMarkdownOptions {
     $?: {
         scopedClassName: string | null;
     };
-    isAstroFlavoredMd?: boolean;
-    /** Used to prevent relative image imports from `src/content/` */
-    isExperimentalContentCollections?: boolean;
     /** Used to prevent relative image imports from `src/content/` */
     contentDir: URL;
     /** Used for frontmatter injection plugins */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -16,20 +16,13 @@
     ".": "./dist/index.js",
     "./dist/internal.js": "./dist/internal.js"
   },
+  "peerDependencies": {
+    "astro": "^2.0.0"
+  },
   "dependencies": {
-    "@astrojs/micromark-extension-mdx-jsx": "^1.0.3",
-    "@astrojs/prism": "^1.0.0",
-    "acorn": "^8.7.1",
-    "acorn-jsx": "^5.3.2",
+    "@astrojs/prism": "^2.0.0",
     "github-slugger": "^1.4.0",
-    "hast-util-to-html": "^8.0.3",
     "import-meta-resolve": "^2.1.0",
-    "mdast-util-from-markdown": "^1.2.0",
-    "mdast-util-mdx-expression": "^1.2.1",
-    "mdast-util-mdx-jsx": "^1.2.0",
-    "micromark-extension-mdx-expression": "^1.0.3",
-    "micromark-extension-mdx-md": "^1.0.0",
-    "micromark-util-combine-extensions": "^1.0.0",
     "rehype-raw": "^6.1.1",
     "rehype-stringify": "^9.0.3",
     "remark-gfm": "^3.0.1",
@@ -38,7 +31,6 @@
     "remark-smartypants": "^2.0.0",
     "shiki": "^0.11.1",
     "unified": "^10.1.2",
-    "unist-util-map": "^3.1.1",
     "unist-util-visit": "^4.1.0",
     "vfile": "^5.3.2"
   },
@@ -49,9 +41,8 @@
     "@types/mdast": "^3.0.10",
     "@types/mocha": "^9.1.1",
     "@types/unist": "^2.0.6",
-    "astro-scripts": "0.0.9",
+    "astro-scripts": "0.0.10",
     "chai": "^4.3.6",
-    "micromark-util-types": "^1.0.2",
     "mocha": "^9.2.2"
   },
   "scripts": {

package/src/index.ts

@@ -8,18 +8,10 @@ import type {
 import { toRemarkInitializeAstroData } from './frontmatter-injection.js';
 import { loadPlugins } from './load-plugins.js';
 import { rehypeHeadingIds } from './rehype-collect-headings.js';
-import rehypeEscape from './rehype-escape.js';
-import rehypeExpressions from './rehype-expressions.js';
-import rehypeIslands from './rehype-islands.js';
-import rehypeJsx from './rehype-jsx.js';
 import toRemarkContentRelImageError from './remark-content-rel-image-error.js';
-import remarkEscape from './remark-escape.js';
-import remarkMarkAndUnravel from './remark-mark-and-unravel.js';
-import remarkMdxish from './remark-mdxish.js';
 import remarkPrism from './remark-prism.js';
 import scopedStyles from './remark-scoped-styles.js';
 import remarkShiki from './remark-shiki.js';
-import remarkUnwrap from './remark-unwrap.js';
 
 import rehypeRaw from 'rehype-raw';
 import rehypeStringify from 'rehype-stringify';
@@ -61,8 +53,6 @@ export async function renderMarkdown(
 		remarkRehype = markdownConfigDefaults.remarkRehype,
 		gfm = markdownConfigDefaults.gfm,
 		smartypants = markdownConfigDefaults.smartypants,
-		isAstroFlavoredMd = false,
-		isExperimentalContentCollections = false,
 		contentDir,
 		frontmatter: userFrontmatter = {},
 	} = opts;
@@ -72,7 +62,7 @@ export async function renderMarkdown(
 	let parser = unified()
 		.use(markdown)
 		.use(toRemarkInitializeAstroData({ userFrontmatter }))
-		.use(isAstroFlavoredMd ? [remarkMdxish, remarkMarkAndUnravel, remarkUnwrap, remarkEscape] : []);
+		.use([]);
 
 	if (gfm) {
 		parser.use(remarkGfm);
@@ -100,24 +90,14 @@ export async function renderMarkdown(
 	}
 
 	// Apply later in case user plugins resolve relative image paths
-	if (isExperimentalContentCollections) {
-		parser.use([toRemarkContentRelImageError({ contentDir })]);
-	}
+	parser.use([toRemarkContentRelImageError({ contentDir })]);
 
 	parser.use([
 		[
 			markdownToHtml as any,
 			{
 				allowDangerousHtml: true,
-				passThrough: isAstroFlavoredMd
-					? [
-							'raw',
-							'mdxFlowExpression',
-							'mdxJsxFlowElement',
-							'mdxJsxTextElement',
-							'mdxTextExpression',
-					  ]
-					: [],
+				passThrough: [],
 				...remarkRehype,
 			},
 		],
@@ -127,13 +107,7 @@ export async function renderMarkdown(
 		parser.use([[plugin, pluginOpts]]);
 	});
 
-	parser
-		.use(
-			isAstroFlavoredMd
-				? [rehypeJsx, rehypeExpressions, rehypeEscape, rehypeIslands, rehypeHeadingIds]
-				: [rehypeHeadingIds, rehypeRaw]
-		)
-		.use(rehypeStringify, { allowDangerousHtml: true });
+	parser.use([rehypeHeadingIds, rehypeRaw]).use(rehypeStringify, { allowDangerousHtml: true });
 
 	let vfile: MarkdownVFile;
 	try {

package/src/rehype-collect-headings.ts

@@ -1,5 +1,4 @@
 import Slugger from 'github-slugger';
-import { toHtml } from 'hast-util-to-html';
 import { visit } from 'unist-util-visit';
 
 import type { MarkdownHeading, MarkdownVFile, RehypePlugin } from './types.js';
@@ -21,7 +20,6 @@ export function rehypeHeadingIds(): ReturnType<RehypePlugin> {
 			const depth = Number.parseInt(level);
 
 			let text = '';
-			let isJSX = false;
 			visit(node, (child, __, parent) => {
 				if (child.type === 'element' || parent == null) {
 					return;
@@ -36,31 +34,17 @@ export function rehypeHeadingIds(): ReturnType<RehypePlugin> {
 						text += child.value;
 					} else {
 						text += child.value.replace(/\{/g, '${');
-						isJSX = isJSX || child.value.includes('{');
 					}
 				}
 			});
 
 			node.properties = node.properties || {};
 			if (typeof node.properties.id !== 'string') {
-				if (isJSX) {
-					// HACK: serialized JSX from internal plugins, ignore these for slug
-					const raw = toHtml(node.children, { allowDangerousHtml: true })
-						.replace(/\n(<)/g, '<')
-						.replace(/(>)\n/g, '>');
-					// HACK: for ids that have JSX content, use $$slug helper to generate slug at runtime
-					node.properties.id = `$$slug(\`${text}\`)`;
-					(node as any).type = 'raw';
-					(
-						node as any
-					).value = `<${node.tagName} id={${node.properties.id}}>${raw}</${node.tagName}>`;
-				} else {
-					let slug = slugger.slug(text);
+				let slug = slugger.slug(text);
 
-					if (slug.endsWith('-')) slug = slug.slice(0, -1);
+				if (slug.endsWith('-')) slug = slug.slice(0, -1);
 
-					node.properties.id = slug;
-				}
+				node.properties.id = slug;
 			}
 
 			headings.push({ depth, slug: node.properties.id, text });

package/src/remark-content-rel-image-error.ts

@@ -10,6 +10,8 @@ import type { VFile } from 'vfile';
 export default function toRemarkContentRelImageError({ contentDir }: { contentDir: URL }) {
 	return function remarkContentRelImageError() {
 		return (tree: any, vfile: VFile) => {
+			if (typeof vfile?.path !== 'string') return;
+
 			const isContentFile = pathToFileURL(vfile.path).href.startsWith(contentDir.href);
 			if (!isContentFile) return;
 

package/src/remark-shiki.ts

@@ -70,8 +70,8 @@ const remarkShiki = async (
 
 			// Replace "shiki" class naming with "astro" and add "is:raw".
 			html = html.replace(
-				'<pre class="shiki"',
-				`<pre is:raw class="astro-code${scopedClassName ? ' ' + scopedClassName : ''}"`
+				/<pre class="(.*?)shiki(.*?)"/,
+				`<pre is:raw class="$1astro-code$2${scopedClassName ? ' ' + scopedClassName : ''}"`
 			);
 			// Add "user-select: none;" for "+"/"-" diff symbols
 			if (node.lang === 'diff') {

package/src/types.ts

@@ -58,9 +58,6 @@ export interface MarkdownRenderingOptions extends AstroMarkdownOptions {
 	$?: {
 		scopedClassName: string | null;
 	};
-	isAstroFlavoredMd?: boolean;
-	/** Used to prevent relative image imports from `src/content/` */
-	isExperimentalContentCollections?: boolean;
 	/** Used to prevent relative image imports from `src/content/` */
 	contentDir: URL;
 	/** Used for frontmatter injection plugins */