Merge pull request #761 from Samfundet/760-upgrade-react-markdown

Upgrade react-markdown.
Samfundet · Oct 13, 2023 · bfbc40d · bfbc40d
2 parents aa60074 + dd72442
commit bfbc40d
Show file tree

Hide file tree

Showing 6 changed files with 329 additions and 322 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -42,7 +42,7 @@
     "react-dom": "^18",
     "react-helmet-async": "^1",
     "react-loading-skeleton": "^3",
-    "react-markdown": "^8",
+    "react-markdown": "^9",
     "react-modal": "^3",
     "react-refresh": "^0",
     "react-router-dom": "^6",

diff --git a/frontend/src/Components/Dropdown/Dropdown.tsx b/frontend/src/Components/Dropdown/Dropdown.tsx
@@ -1,7 +1,6 @@
 import { Icon } from '@iconify/react';
 import { default as classNames, default as classnames } from 'classnames';
-import { ChangeEvent } from 'react';
-import { ReactElement } from 'react-markdown/lib/react-markdown';
+import { ChangeEvent, ReactElement } from 'react';
 import styles from './Dropdown.module.scss';
 
 export type DropDownOption<T> = {

diff --git a/frontend/src/Components/SamfMarkdown/SamfMarkdown.tsx b/frontend/src/Components/SamfMarkdown/SamfMarkdown.tsx
@@ -1,4 +1,4 @@
-import { ReactMarkdown } from 'react-markdown/lib/react-markdown';
+import Markdown from 'react-markdown';
 import styles from './SamfMarkdown.module.scss';
 
 type SamfMarkdownProps = {
@@ -9,7 +9,7 @@ type SamfMarkdownProps = {
 export function SamfMarkdown({ children = '' }: SamfMarkdownProps) {
   return (
     <div className={styles.samf_markdown}>
-      <ReactMarkdown>{children}</ReactMarkdown>
+      <Markdown>{children}</Markdown>
     </div>
   );
 }
diff --git a/frontend/src/Forms/SamfFormFieldTypes.tsx b/frontend/src/Forms/SamfFormFieldTypes.tsx
@@ -1,4 +1,4 @@
-import { ReactElement } from 'react-markdown/lib/react-markdown';
+import { ReactElement } from 'react';
 import { Checkbox, Dropdown, InputField, TextAreaField } from '~/Components';
 import { DropDownOption } from '~/Components/Dropdown/Dropdown';
 import { ImagePicker } from '~/Components/ImagePicker/ImagePicker';

diff --git a/frontend/src/PagesAdmin/EventCreatorAdminPage/EventCreatorAdminPage.tsx b/frontend/src/PagesAdmin/EventCreatorAdminPage/EventCreatorAdminPage.tsx
@@ -3,8 +3,7 @@ import { Button, ImageCard } from '~/Components';
 import { Icon } from '@iconify/react';
 import classNames from 'classnames';
 import { t } from 'i18next';
-import { useState } from 'react';
-import { ReactElement } from 'react-markdown/lib/react-markdown';
+import { ReactElement, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { toast } from 'react-toastify';
 import { DropDownOption } from '~/Components/Dropdown/Dropdown';