@astrojs/markdown-remark 2.2.1 → 3.0.0-rc.1

package/dist/frontmatter-injection.d.ts

@@ -1,4 +1,4 @@
-import type { VFile, VFileData as Data } from 'vfile';
+import type { VFileData as Data, VFile } from 'vfile';
 import type { MarkdownAstroData } from './types.js';
 export declare class InvalidAstroDataError extends TypeError {
 }

package/dist/index.js

@@ -32,7 +32,6 @@ const markdownConfigDefaults = {
 };
 const isPerformanceBenchmark = Boolean(process.env.ASTRO_PERFORMANCE_BENCHMARK);
 async function renderMarkdown(content, opts) {
-  var _a;
   let {
     fileURL,
     syntaxHighlight = markdownConfigDefaults.syntaxHighlight,
@@ -45,7 +44,7 @@ async function renderMarkdown(content, opts) {
     frontmatter: userFrontmatter = {}
   } = opts;
   const input = new VFile({ value: content, path: fileURL });
-  const scopedClassName = (_a = opts.$) == null ? void 0 : _a.scopedClassName;
+  const scopedClassName = opts.$?.scopedClassName;
   let parser = unified().use(markdown).use(toRemarkInitializeAstroData({ userFrontmatter })).use([]);
   if (!isPerformanceBenchmark && gfm) {
     if (gfm) {
@@ -69,9 +68,7 @@ async function renderMarkdown(content, opts) {
     } else if (syntaxHighlight === "prism") {
       parser.use([remarkPrism(scopedClassName)]);
     }
-    if (opts.experimentalAssets) {
-      parser.use([remarkCollectImages]);
-    }
+    parser.use([remarkCollectImages]);
   }
   parser.use([
     [
@@ -86,9 +83,7 @@ async function renderMarkdown(content, opts) {
   loadedRehypePlugins.forEach(([plugin, pluginOpts]) => {
     parser.use([[plugin, pluginOpts]]);
   });
-  if (opts.experimentalAssets) {
-    parser.use(rehypeImages());
-  }
+  parser.use(rehypeImages());
   if (!isPerformanceBenchmark) {
     parser.use([rehypeHeadingIds]);
   }
@@ -101,7 +96,7 @@ async function renderMarkdown(content, opts) {
     console.error(err);
     throw err;
   }
-  const headings = (vfile == null ? void 0 : vfile.data.__astroHeadings) || [];
+  const headings = vfile?.data.__astroHeadings || [];
   return {
     metadata: { headings, source: content, html: String(vfile.value) },
     code: String(vfile.value),
@@ -109,7 +104,7 @@ async function renderMarkdown(content, opts) {
   };
 }
 function prefixError(err, prefix) {
-  if (err && err.message) {
+  if (err?.message) {
     try {
       err.message = `${prefix}:
 ${err.message}`;
@@ -121,7 +116,7 @@ ${err.message}`;
   try {
     wrappedError.stack = err.stack;
     wrappedError.cause = err;
-  } catch (error) {
+  } catch {
   }
   return wrappedError;
 }

package/dist/load-plugins.js

@@ -1,6 +1,6 @@
 import { resolve as importMetaResolve } from "import-meta-resolve";
-import path from "path";
-import { pathToFileURL } from "url";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
 const cwdUrlStr = pathToFileURL(path.join(process.cwd(), "package.json")).toString();
 async function importPlugin(p) {
   if (typeof p === "string") {

package/dist/rehype-collect-headings.js

@@ -15,7 +15,7 @@ function rehypeHeadingIds() {
       const { tagName } = node;
       if (tagName[0] !== "h")
         return;
-      const [_, level] = tagName.match(/h([0-6])/) ?? [];
+      const [, level] = tagName.match(/h([0-6])/) ?? [];
       if (!level)
         return;
       const depth = Number.parseInt(level);
@@ -60,15 +60,13 @@ function rehypeHeadingIds() {
   };
 }
 function isMDXFile(file) {
-  var _a;
-  return Boolean((_a = file.history[0]) == null ? void 0 : _a.endsWith(".mdx"));
+  return Boolean(file.history[0]?.endsWith(".mdx"));
 }
 function getMdxFrontmatterVariablePath(node) {
-  var _a;
-  if (!((_a = node.data) == null ? void 0 : _a.estree) || node.data.estree.body.length !== 1)
+  if (!node.data?.estree || node.data.estree.body.length !== 1)
     return new Error();
   const statement = node.data.estree.body[0];
-  if ((statement == null ? void 0 : statement.type) !== "ExpressionStatement" || statement.expression.type !== "MemberExpression")
+  if (statement?.type !== "ExpressionStatement" || statement.expression.type !== "MemberExpression")
     return new Error();
   let expression = statement.expression;
   const expressionPath = [];

package/dist/rehype-images.js

@@ -2,13 +2,12 @@ import { visit } from "unist-util-visit";
 function rehypeImages() {
   return () => function(tree, file) {
     visit(tree, (node) => {
-      var _a, _b;
       if (node.type !== "element")
         return;
       if (node.tagName !== "img")
         return;
-      if ((_a = node.properties) == null ? void 0 : _a.src) {
-        if ((_b = file.data.imagePaths) == null ? void 0 : _b.has(node.properties.src)) {
+      if (node.properties?.src) {
+        if (file.data.imagePaths?.has(node.properties.src)) {
           node.properties["__ASTRO_IMAGE_"] = node.properties.src;
           delete node.properties.src;
         }

package/dist/remark-collect-images.js

@@ -1,7 +1,7 @@
 import { visit } from "unist-util-visit";
 function remarkCollectImages() {
   return function(tree, vfile) {
-    if (typeof (vfile == null ? void 0 : vfile.path) !== "string")
+    if (typeof vfile?.path !== "string")
       return;
     const imagePaths = /* @__PURE__ */ new Set();
     visit(tree, "image", (node) => {

package/dist/remark-prism.js

@@ -1,6 +1,5 @@
 import { runHighlighterWithAstro } from "@astrojs/prism/dist/highlighter";
 import { visit } from "unist-util-visit";
-const noVisit = /* @__PURE__ */ new Set(["root", "html", "text"]);
 function transformer(className) {
   return function(tree) {
     const visitor = (node) => {

package/dist/remark-scoped-styles.js

@@ -2,11 +2,10 @@ import { visit } from "unist-util-visit";
 const noVisit = /* @__PURE__ */ new Set(["root", "html", "text"]);
 function scopedStyles(className) {
   const visitor = (node) => {
-    var _a;
     if (noVisit.has(node.type))
       return;
     const { data } = node;
-    let currentClassName = ((_a = data == null ? void 0 : data.hProperties) == null ? void 0 : _a.class) ?? "";
+    let currentClassName = data?.hProperties?.class ?? "";
     node.data = node.data || {};
     node.data.hProperties = node.data.hProperties || {};
     node.data.hProperties.class = `${className} ${currentClassName}`.trim();

package/dist/remark-shiki.js

@@ -1,24 +1,7 @@
 import { getHighlighter } from "shiki";
 import { visit } from "unist-util-visit";
 const highlighterCacheAsync = /* @__PURE__ */ new Map();
-const compatThemes = {
-  "material-darker": "material-theme-darker",
-  "material-default": "material-theme",
-  "material-lighter": "material-theme-lighter",
-  "material-ocean": "material-theme-ocean",
-  "material-palenight": "material-theme-palenight"
-};
-const normalizeTheme = (theme) => {
-  if (typeof theme === "string") {
-    return compatThemes[theme] || theme;
-  } else if (compatThemes[theme.name]) {
-    return { ...theme, name: compatThemes[theme.name] };
-  } else {
-    return theme;
-  }
-};
 const remarkShiki = async ({ langs = [], theme = "github-dark", wrap = false }, scopedClassName) => {
-  theme = normalizeTheme(theme);
   const cacheID = typeof theme === "string" ? theme : theme.name;
   let highlighterAsync = highlighterCacheAsync.get(cacheID);
   if (!highlighterAsync) {

package/dist/types.d.ts

@@ -1,6 +1,6 @@
 import type * as hast from 'hast';
 import type * as mdast from 'mdast';
-import type { all as Handlers, one as Handler, Options as RemarkRehypeOptions } from 'remark-rehype';
+import type { one as Handler, all as Handlers, Options as RemarkRehypeOptions } from 'remark-rehype';
 import type { ILanguageRegistration, IThemeRegistration, Theme } from 'shiki';
 import type * as unified from 'unified';
 import type { VFile } from 'vfile';
@@ -46,7 +46,6 @@ export interface MarkdownRenderingOptions extends AstroMarkdownOptions {
     };
     /** Used for frontmatter injection plugins */
     frontmatter?: Record<string, any>;
-    experimentalAssets?: boolean;
 }
 export interface MarkdownHeading {
     depth: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "2.2.1",
+  "version": "3.0.0-rc.1",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -20,33 +20,33 @@
     "dist"
   ],
   "peerDependencies": {
-    "astro": "^2.5.0"
+    "astro": "^3.0.0-rc.5"
   },
   "dependencies": {
-    "@astrojs/prism": "^2.1.2",
-    "github-slugger": "^1.4.0",
-    "import-meta-resolve": "^2.1.0",
+    "@astrojs/prism": "^3.0.0-rc.1",
+    "github-slugger": "^1.5.0",
+    "import-meta-resolve": "^2.2.2",
     "rehype-raw": "^6.1.1",
     "rehype-stringify": "^9.0.3",
     "remark-gfm": "^3.0.1",
-    "remark-parse": "^10.0.1",
+    "remark-parse": "^10.0.2",
     "remark-rehype": "^10.1.0",
     "remark-smartypants": "^2.0.0",
     "shiki": "^0.14.1",
     "unified": "^10.1.2",
-    "unist-util-visit": "^4.1.0",
-    "vfile": "^5.3.2"
+    "unist-util-visit": "^4.1.2",
+    "vfile": "^5.3.7"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.1",
-    "@types/estree": "^1.0.0",
+    "@types/chai": "^4.3.5",
+    "@types/estree": "^1.0.1",
     "@types/github-slugger": "^1.3.0",
     "@types/hast": "^2.3.4",
-    "@types/mdast": "^3.0.10",
+    "@types/mdast": "^3.0.11",
     "@types/mocha": "^9.1.1",
     "@types/unist": "^2.0.6",
-    "chai": "^4.3.6",
-    "mdast-util-mdx-expression": "^1.3.1",
+    "chai": "^4.3.7",
+    "mdast-util-mdx-expression": "^1.3.2",
     "mocha": "^9.2.2",
     "astro-scripts": "0.0.14"
   },