Merge pull request #429 from api-platform/staging

MEP

Author: ginifizz

pwa/api/con/conferences.ts

@@ -1,13 +1,13 @@
 import { unbreakable } from "./../../utils/index";
 import path from "node:path";
 import matter from "gray-matter";
-import { marked } from "marked";
 import { readFile, readdir } from "node:fs/promises";
 import { sortByStartDate } from "utils/con";
 import { extractHeadingsFromMarkdown } from "utils";
 import { getSpeakerById } from "./speakers";
 import { Conference, Day, Speaker, Track } from "types/con";
 import { Locale, i18n } from "i18n/i18n-config";
+import MarkdownIt from "markdown-it";
 
 export const getAllConferences = async (
   edition: string,
@@ -66,12 +66,13 @@ export const getConferenceData = async (
   // Use gray-matter to parse the post metadata section
   const matterResult = matter(fileContents);
 
-  marked.setOptions({ mangle: false, headerIds: false });
+  const md = new MarkdownIt({
+    html: true,
+    linkify: true,
+    typographer: true,
+  });
 
-  const processedContent =
-    withDescription && (await marked(matterResult.content, { async: true }));
-
-  const contentHtml = processedContent?.toString();
+  const contentHtml = withDescription ? md.render(matterResult.content) : "";
 
   const speakers = matterResult.data.speakers
     .split(" ")

pwa/api/con/legal.ts

@@ -1,10 +1,9 @@
 import path from "node:path";
 import { readFile, readdir } from "node:fs/promises";
-
 import matter from "gray-matter";
-import { marked } from "marked";
 import { extractHeadingsFromMarkdown } from "utils";
 import { Locale, i18n } from "i18n/i18n-config";
+import MarkdownIt from "markdown-it";
 
 export const getLegalData = async (
   edition: string,
@@ -17,10 +16,13 @@ export const getLegalData = async (
   );
 
   const matterResult = matter(fileContents);
-  marked.setOptions({ mangle: false, headerIds: false });
-  const processedContent = await marked(matterResult.content, { async: true });
+  const md = new MarkdownIt({
+    html: true,
+    linkify: true,
+    typographer: true,
+  });
 
-  const contentHtml = processedContent?.toString();
+  const contentHtml = md.render(matterResult.content);
   // Combine the data with the id and contentHtml
   return {
     content: contentHtml

pwa/api/con/speakers.ts

@@ -1,11 +1,11 @@
 import { readFile, readdir } from "node:fs/promises";
 import path from "node:path";
 import matter from "gray-matter";
-import { marked } from "marked";
 import { Locale } from "i18n/i18n-config";
 import { getPlaceholder } from "utils/getPlaceholder";
 
 import { Speaker } from "types/con";
+import MarkdownIt from "markdown-it";
 
 export const getAllSpeakers = async (edition: string, locale: Locale) => {
   try {
@@ -57,12 +57,13 @@ export const getSpeakerData = async (
 
   const { id } = matterResult.data;
 
-  marked.setOptions({ mangle: false, headerIds: false });
+  const md = new MarkdownIt({
+    html: true,
+    linkify: true,
+    typographer: true,
+  });
 
-  const processedContent =
-    withDescription && (await marked(matterResult.content, { async: true }));
-
-  const contentHtml = processedContent?.toString();
+  const contentHtml = withDescription ? md.render(matterResult.content) : "";
 
   const placeholder = await getPlaceholder(
     path.join(process.cwd(), `/public/images/con/${edition}/speakers/${id}.png`)

pwa/api/contributors.ts

@@ -32,7 +32,7 @@ export const octokit = new MyOctokit({
     onRateLimit: (
       retryAfter: number,
       options: Options,
-      _octokit,
+      _octokit: any,
       retryCount: number
     ) => {
       console.warn(