@astrojs/markdoc 0.8.3 → 0.9.1

package/dist/content-entry-type.js

@@ -1,9 +1,9 @@
-import Markdoc from "@markdoc/markdoc";
-import { emitESMImage } from "astro/assets/utils";
-import matter from "gray-matter";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import Markdoc from "@markdoc/markdoc";
+import { emitESMImage } from "astro/assets/utils";
+import matter from "gray-matter";
 import { htmlTokenTransform } from "./html/transform/html-token-transform.js";
 import { setupConfig } from "./runtime.js";
 import { getMarkdocTokenizer } from "./tokenizer.js";
@@ -137,21 +137,34 @@ function getEntryInfo({ fileUrl, contents }) {
 }
 async function emitOptimizedImages(nodeChildren, ctx) {
   for (const node of nodeChildren) {
-    if (node.type === "image" && typeof node.attributes.src === "string" && shouldOptimizeImage(node.attributes.src)) {
-      const resolved = await ctx.pluginContext.resolve(node.attributes.src, ctx.filePath);
-      if (resolved?.id && fs.existsSync(new URL(prependForwardSlash(resolved.id), "file://"))) {
-        const src = await emitESMImage(
-          resolved.id,
-          ctx.pluginContext.meta.watchMode,
-          ctx.pluginContext.emitFile
-        );
-        node.attributes.__optimizedSrc = src;
-      } else {
-        throw new MarkdocError({
-          message: `Could not resolve image ${JSON.stringify(
-            node.attributes.src
-          )} from ${JSON.stringify(ctx.filePath)}. Does the file exist?`
-        });
+    let isComponent = node.type === "tag" && node.tag === "image";
+    if ((node.type === "image" || isComponent) && typeof node.attributes.src === "string") {
+      let attributeName = isComponent ? "src" : "__optimizedSrc";
+      if (shouldOptimizeImage(node.attributes.src)) {
+        const resolved = await ctx.pluginContext.resolve(node.attributes.src, ctx.filePath);
+        if (resolved?.id && fs.existsSync(new URL(prependForwardSlash(resolved.id), "file://"))) {
+          const src = await emitESMImage(
+            resolved.id,
+            ctx.pluginContext.meta.watchMode,
+            ctx.pluginContext.emitFile
+          );
+          const fsPath = resolved.id;
+          if (src) {
+            if (ctx.astroConfig.output === "static") {
+              if (globalThis.astroAsset.referencedImages)
+                globalThis.astroAsset.referencedImages.add(fsPath);
+            }
+            node.attributes[attributeName] = { ...src, fsPath };
+          }
+        } else {
+          throw new MarkdocError({
+            message: `Could not resolve image ${JSON.stringify(
+              node.attributes.src
+            )} from ${JSON.stringify(ctx.filePath)}. Does the file exist?`
+          });
+        }
+      } else if (isComponent) {
+        node.attributes[attributeName] = node.attributes.src;
       }
     }
     await emitOptimizedImages(node.children, ctx);

package/dist/html/css/parse-inline-css-to-react.js

@@ -11,7 +11,7 @@ function parseInlineCSSToReactLikeObject(css) {
   return void 0;
 }
 function convertCssDirectiveNameToReactCamelCase(original) {
-  const replaced = original.replace(/-([a-z0-9])/gi, (_match, char) => {
+  const replaced = original.replace(/-([a-z\d])/gi, (_match, char) => {
     return char.toUpperCase();
   });
   return replaced;

package/dist/html/css/parse-inline-styles.js

@@ -14,9 +14,9 @@
 const COMMENT_REGEX = /\/\*[^*]*\*+([^/*][^*]*\*+)*\//g;
 const NEWLINE_REGEX = /\n/g;
 const WHITESPACE_REGEX = /^\s*/;
-const PROPERTY_REGEX = /^(\*?[-#/*\\\w]+(\[[0-9a-z_-]+\])?)\s*/;
+const PROPERTY_REGEX = /^([-#/*\\\w]+(\[[\da-z_-]+\])?)\s*/;
 const COLON_REGEX = /^:\s*/;
-const VALUE_REGEX = /^((?:'(?:\\'|.)*?'|"(?:\\"|.)*?"|\([^)]*?\)|[^};])+)/;
+const VALUE_REGEX = /^((?:'(?:\\'|.)*?'|"(?:\\"|.)*?"|\([^)]*\)|[^};])+)/;
 const SEMICOLON_REGEX = /^[;\s]*/;
 const TRIM_REGEX = /^\s+|\s+$/g;
 const NEWLINE = "\n";

package/dist/load-config.js

@@ -1,6 +1,6 @@
-import { build as esbuild } from "esbuild";
 import * as fs from "node:fs";
 import { fileURLToPath } from "node:url";
+import { build as esbuild } from "esbuild";
 import { MarkdocError } from "./utils.js";
 const SUPPORTED_MARKDOC_CONFIG_FILES = [
   "markdoc.config.js",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/markdoc",
   "description": "Add support for Markdoc in your Astro site",
-  "version": "0.8.3",
+  "version": "0.9.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -70,17 +70,13 @@
     "astro": "^3.0.0 || ^4.0.0"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.10",
     "@types/html-escaper": "^3.0.2",
     "@types/markdown-it": "^13.0.6",
-    "@types/mocha": "^10.0.4",
-    "chai": "^4.3.7",
     "devalue": "^4.3.2",
     "linkedom": "^0.16.4",
-    "mocha": "^10.2.0",
-    "vite": "^5.0.10",
-    "@astrojs/markdown-remark": "4.1.0",
-    "astro": "4.2.0",
+    "vite": "^5.1.4",
+    "@astrojs/markdown-remark": "4.2.1",
+    "astro": "4.4.9",
     "astro-scripts": "0.0.14"
   },
   "engines": {
@@ -93,7 +89,6 @@
     "build": "astro-scripts build \"src/**/*.ts\" && tsc",
     "build:ci": "astro-scripts build \"src/**/*.ts\"",
     "dev": "astro-scripts dev \"src/**/*.ts\"",
-    "test": "mocha --exit --timeout 20000",
-    "test:match": "mocha --timeout 20000 -g"
+    "test": "astro-scripts test --timeout 40000 \"test/**/*.test.js\""
   }
 }