Merge branch 'chore/update-deps' into 'master'

Update some dependencies

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!60

.nvmrc

@@ -1 +1 @@
-14.16.0
+14

next.config.js

@@ -14,4 +14,7 @@ module.exports = withBundleAnalyzer({
       "placehold.it",
     ],
   },
+  future: {
+    webpack5: true
+  },
 });

package.json

@@ -37,10 +37,10 @@
   },
   "devDependencies": {
     "@types/js-cookie": "2.2.6",
-    "@types/react": "17.0.2",
+    "@types/react": "^17.0.2",
     "@types/react-beautiful-dnd": "13.0.0",
     "@types/react-csv": "1.1.1",
-    "@types/react-dom": "17.0.1",
+    "@types/react-dom": "^17.0.1",
     "@types/react-jsonschema-form": "1.7.4",
     "@types/shortid": "0.0.29",
     "@types/styled-components": "5.1.7",
@@ -54,7 +54,7 @@
     "eslint-plugin-react": "7.22.0",
     "eslint-plugin-react-hooks": "4.2.0",
     "husky": "5.1.3",
-    "next-sitemap": "^1.6.9",
+    "next-sitemap": "^1.6.25",
     "npm-run-all": "4.1.5",
     "stylelint": "13.11.0",
     "stylelint-config-recommended": "3.0.0",
@@ -64,23 +64,25 @@
     "typescript": "4.2.2"
   },
   "dependencies": {
-    "@next/bundle-analyzer": "10.0.7",
+    "@next/bundle-analyzer": "^10.1.3",
     "axios": "0.21.1",
     "date-fns": "2.18.0",
     "fast-deep-equal": "^3.1.3",
     "js-cookie": "2.2.1",
     "lodash": "4.17.21",
-    "next": "10.1.2",
+    "next": "^10.1.3",
     "normalize.css": "8.0.1",
-    "react": "17.0.1",
+    "react": "^17.0.2",
     "react-beautiful-dnd": "13.1.0",
     "react-csv": "2.0.3",
-    "react-dom": "17.0.1",
+    "react-dom": "^17.0.2",
-    "react-is": "17.0.2",
+    "react-is": "^17.0.2",
     "react-jsonschema-form": "1.8.1",
-    "react-markdown": "5.0.3",
+    "react-markdown": "^6.0.0",
-    "react-mde": "11.0.6",
+    "react-mde": "^11.1.0",
     "react-toastify": "^7.0.3",
+    "rehype-raw": "^5.1.0",
+    "rehype-sanitize": "^4.0.0",
     "shortid": "2.2.16",
     "styled-components": "5.2.3",
     "swr": "0.4.2"

src/components/Widgets/MarkdownEditorWidget.tsx

@@ -32,7 +32,9 @@ const MarkdownEditorWidget: React.FC<MarkdownEditorWidgetProps> = ({ value, onCh
         onChange={onChange}
         selectedTab={selectedTab}
         onTabChange={setSelectedTab}
-        generateMarkdownPreview={(markdown) => Promise.resolve(<MarkdownStyles source={markdown} />)}
+        generateMarkdownPreview={(markdown) => Promise.resolve(
+          <MarkdownStyles>{markdown}</MarkdownStyles>,
+        )}
       />
     </Container>
   );

src/views/CorporatePage/JobAdList.tsx

@@ -3,6 +3,8 @@ import styled from "styled-components";
 import JobAd from "@models/JobAd";
 import { Accordion } from "@components/index";
 import ReactMarkdown from "react-markdown";
+import rehypeRaw from "rehype-raw";
+import rehypeSanitize from "rehype-sanitize";
 
 interface JobAdListProps {
   jobAds: JobAd[];
@@ -25,7 +27,9 @@ const JobAdList: React.FC<JobAdListProps> = ({ jobAds }) => (
             <p>
               {ad.description_fi}
             </p>
-            <ReactMarkdown source={ad.content_fi} escapeHtml={false} />
+            <ReactMarkdown rehypePlugins={[rehypeRaw, rehypeSanitize]}>
+              {ad.content_fi}
+            </ReactMarkdown>
           </div>
         </Accordion>
       </li>

src/views/EventPage/EventPageView.tsx

@@ -1,6 +1,8 @@
 import React from "react";
 import Image from "next/image";
 import styled from "styled-components";
+import rehypeRaw from "rehype-raw";
+import rehypeSanitize from "rehype-sanitize";
 import colors from "@theme/colors";
 import Event from "@models/Event";
 import {
@@ -85,7 +87,7 @@ const EventPageView: React.FC<EventPageViewProps> = ({ event }) => {
           />
         </h1>
         <div>
-          <Content source={content} escapeHtml={false} />
+          <Content rehypePlugins={[rehypeRaw, rehypeSanitize]}>{content}</Content>
           <p>
             {`${t("Paikka")}: ${location}`}
           </p>

src/views/FeedPage/FeedPageView.tsx

@@ -1,6 +1,8 @@
 import React from "react";
 import Image from "next/image";
 import styled from "styled-components";
+import rehypeRaw from "rehype-raw";
+import rehypeSanitize from "rehype-sanitize";
 import colors from "@theme/colors";
 import Post from "@models/Feed";
 import { TextSection, ChangeLanguageButton } from "@components/index";
@@ -70,7 +72,7 @@ const FeedPageView: React.FC<FeedPageViewProps> = ({ post }) => {
           )}
         </h1>
         <div>
-          <Content source={content} escapeHtml={false} />
+          <Content rehypePlugins={[rehypeRaw, rehypeSanitize]}>{content}</Content>
         </div>
       </StyledTextSection>
     </>