From d25a7d365b951d84d7c031186ada2275943d4f08 Mon Sep 17 00:00:00 2001 From: Aakansha Doshi Date: Wed, 10 Jul 2024 20:57:43 +0530 Subject: [PATCH] feat: upgrade mermaid-to-excalidraw to v1.1.0 (#8226) * feat: upgrade mermaid-to-excalidraw to v1.1.0 * fixes * upgrade and remove config as its redundant * lint * upgrade to v1.1.0 --- packages/excalidraw/components/App.tsx | 5 +---- .../excalidraw/components/TTDDialog/common.ts | 17 ++++------------- packages/excalidraw/package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/packages/excalidraw/components/App.tsx b/packages/excalidraw/components/App.tsx index 093f6bfdfe..d84a9febdf 100644 --- a/packages/excalidraw/components/App.tsx +++ b/packages/excalidraw/components/App.tsx @@ -49,7 +49,6 @@ import { import type { PastedMixedContent } from "../clipboard"; import { copyTextToSystemClipboard, parseClipboard } from "../clipboard"; import type { EXPORT_IMAGE_TYPES } from "../constants"; -import { DEFAULT_FONT_SIZE } from "../constants"; import { APP_NAME, CURSOR_TYPE, @@ -3055,9 +3054,7 @@ class App extends React.Component { try { const { elements: skeletonElements, files } = - await api.parseMermaidToExcalidraw(data.text, { - fontSize: DEFAULT_FONT_SIZE, - }); + await api.parseMermaidToExcalidraw(data.text); const elements = convertToExcalidrawElements(skeletonElements, { regenerateIds: true, diff --git a/packages/excalidraw/components/TTDDialog/common.ts b/packages/excalidraw/components/TTDDialog/common.ts index 07135afcfd..ddaa930457 100644 --- a/packages/excalidraw/components/TTDDialog/common.ts +++ b/packages/excalidraw/components/TTDDialog/common.ts @@ -1,10 +1,6 @@ -import type { MermaidOptions } from "@excalidraw/mermaid-to-excalidraw"; +import type { MermaidConfig } from "@excalidraw/mermaid-to-excalidraw"; import type { MermaidToExcalidrawResult } from "@excalidraw/mermaid-to-excalidraw/dist/interfaces"; -import { - DEFAULT_EXPORT_PADDING, - DEFAULT_FONT_SIZE, - EDITOR_LS_KEYS, -} from "../../constants"; +import { DEFAULT_EXPORT_PADDING, EDITOR_LS_KEYS } from "../../constants"; import { convertToExcalidrawElements, exportToCanvas } from "../../index"; import type { NonDeletedExcalidrawElement } from "../../element/types"; import type { AppClassProperties, BinaryFiles } from "../../types"; @@ -38,7 +34,7 @@ export interface MermaidToExcalidrawLibProps { api: Promise<{ parseMermaidToExcalidraw: ( definition: string, - options: MermaidOptions, + config?: MermaidConfig, ) => Promise; }>; } @@ -78,15 +74,10 @@ export const convertMermaidToExcalidraw = async ({ let ret; try { - ret = await api.parseMermaidToExcalidraw(mermaidDefinition, { - fontSize: DEFAULT_FONT_SIZE, - }); + ret = await api.parseMermaidToExcalidraw(mermaidDefinition); } catch (err: any) { ret = await api.parseMermaidToExcalidraw( mermaidDefinition.replace(/"/g, "'"), - { - fontSize: DEFAULT_FONT_SIZE, - }, ); } const { elements, files } = ret; diff --git a/packages/excalidraw/package.json b/packages/excalidraw/package.json index 30b3b2b395..7279346c87 100644 --- a/packages/excalidraw/package.json +++ b/packages/excalidraw/package.json @@ -58,7 +58,7 @@ "dependencies": { "@braintree/sanitize-url": "6.0.2", "@excalidraw/laser-pointer": "1.3.1", - "@excalidraw/mermaid-to-excalidraw": "1.0.0", + "@excalidraw/mermaid-to-excalidraw": "1.1.0", "@excalidraw/random-username": "1.1.0", "@radix-ui/react-popover": "1.0.3", "@radix-ui/react-tabs": "1.0.2", diff --git a/yarn.lock b/yarn.lock index b9124e6468..dc1c07c76c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1930,10 +1930,10 @@ resolved "https://registry.npmjs.org/@excalidraw/markdown-to-text/-/markdown-to-text-0.1.2.tgz#1703705e7da608cf478f17bfe96fb295f55a23eb" integrity sha512-1nDXBNAojfi3oSFwJswKREkFm5wrSjqay81QlyRv2pkITG/XYB5v+oChENVBQLcxQwX4IUATWvXM5BcaNhPiIg== -"@excalidraw/mermaid-to-excalidraw@1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@excalidraw/mermaid-to-excalidraw/-/mermaid-to-excalidraw-1.0.0.tgz#8c058d2a43230425cba96d01e4a669a2d7c586a2" - integrity sha512-RGSoJBY2gFag6mQOIwa3OakTrvAZYx0bwvnr5ojuCZInih8Fxhje4X1WZfsaQx+GATEH8Ioq3O3b1FPDg4nKjQ== +"@excalidraw/mermaid-to-excalidraw@1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@excalidraw/mermaid-to-excalidraw/-/mermaid-to-excalidraw-1.1.0.tgz#a24a7aa3ad2e4f671054fdb670a8508bab463814" + integrity sha512-YP2roqrImzek1SpUAeToSTNhH5Gfw9ogdI5KHp7c+I/mX7SEW8oNqqX7CP+oHcUgNF6RrYIkqSrnMRN9/3EGLg== dependencies: "@excalidraw/markdown-to-text" "0.1.2" mermaid "10.9.0"