feat!(deps): Bump marked from v3.0.3 to v4.0.4

mlaursen · mlaursen · commit 70fa53b5086b · 2021-11-22T11:09:49.000-07:00
diff --git a/package.json b/package.json
@@ -28,8 +28,8 @@
     "build": "next build"
   },
   "dependencies": {
-    "@types/marked": "^3.0.1",
-    "marked": "^3.0.3"
+    "@types/marked": "^4.0.1",
+    "marked": "^4.0.4"
   },
   "devDependencies": {
     "@babel/core": "^7.16.0",
diff --git a/src/Markdown.tsx b/src/Markdown.tsx
@@ -1,4 +1,4 @@
-import marked from "marked";
+import { marked } from "marked";
 import type { ReactElement } from "react";
 
 import {
diff --git a/src/index.ts b/src/index.ts
@@ -1,12 +1,4 @@
-export type {
-  MarkedExtension,
-  RendererExtension,
-  RendererObject,
-  SluggerOptions,
-  Token,
-  Tokens,
-  TokensList,
-} from "marked";
+export type { marked } from "marked";
 export * from "./Markdown";
 export * from "./renderers";
 export * from "./useSluggedId";
diff --git a/src/renderers/code.tsx b/src/renderers/code.tsx
@@ -1,5 +1,4 @@
-import type { Tokens } from "marked";
-import marked from "marked";
+import type { marked } from "marked";
 import {
   ComponentType,
   createContext,
@@ -171,7 +170,7 @@ export function MarkdownCodeProvider({
   return <Provider value={value}>{children}</Provider>;
 }
 
-export interface CodeSpanRendererProps extends Tokens.Codespan {
+export interface CodeSpanRendererProps extends marked.Tokens.Codespan {
   children: ReactNode;
 }
 
@@ -189,7 +188,7 @@ export function CodeSpanRenderer({
   return <code>{children}</code>;
 }
 
-export interface CodeBlockRendererProps extends Tokens.Code {
+export interface CodeBlockRendererProps extends marked.Tokens.Code {
   lang: string;
   children: ReactNode;
 }
diff --git a/src/renderers/html.tsx b/src/renderers/html.tsx
@@ -1,7 +1,7 @@
-import type { Tokens } from "marked";
+import type { marked } from "marked";
 import type { ComponentType, ReactElement, ReactNode } from "react";
 
-export interface TagRendererProps extends Tokens.Tag {
+export interface TagRendererProps extends marked.Tokens.Tag {
   children: ReactNode;
 }
 
@@ -13,7 +13,7 @@ export function TagRenderer(_props: TagRendererProps): null {
   return null;
 }
 
-export interface HtmlRendererProps extends Tokens.HTML {
+export interface HtmlRendererProps extends marked.Tokens.HTML {
   children: ReactNode;
 }
 
@@ -25,7 +25,7 @@ export function HtmlRenderer(_props: HtmlRendererProps): null {
   return null;
 }
 
-export type EscapeRendererProps = Tokens.Escape;
+export type EscapeRendererProps = marked.Tokens.Escape;
 
 /**
  * The default implementation for rendering the {@link Tokens.Escape} by
diff --git a/src/renderers/list.tsx b/src/renderers/list.tsx
@@ -1,9 +1,9 @@
-import type { Tokens } from "marked";
+import type { marked } from "marked";
 import type { ComponentType, ReactElement, ReactNode } from "react";
 
 import { getTokensText, useSluggedId } from "../useSluggedId";
 
-export interface ListRendererProps extends Tokens.List {
+export interface ListRendererProps extends marked.Tokens.List {
   children: ReactNode;
 }
 
@@ -26,7 +26,7 @@ export function ListRenderer({
 }
 
 export interface ListItemRendererProps
-  extends Omit<Tokens.ListItem, "checked" | "task"> {
+  extends Omit<marked.Tokens.ListItem, "checked" | "task"> {
   children: ReactNode;
 }
 
diff --git a/src/renderers/media.tsx b/src/renderers/media.tsx
@@ -1,7 +1,7 @@
-import type { Tokens } from "marked";
+import type { marked } from "marked";
 import type { ComponentType, ReactElement } from "react";
 
-export type ImageRendererProps = Tokens.Image;
+export type ImageRendererProps = marked.Tokens.Image;
 
 /**
  * The default implementation for rendering the {@link Tokens.Image} by
diff --git a/src/renderers/presentational.tsx b/src/renderers/presentational.tsx
@@ -1,7 +1,7 @@
+import type { marked } from "marked";
 import type { ComponentType, ReactElement } from "react";
-import type { Tokens } from "marked";
 
-export type SpaceRendererProps = Tokens.Space;
+export type SpaceRendererProps = marked.Tokens.Space;
 
 /**
  * The default implementation for rendering the {@link Tokens.Hr} by rendering:
@@ -14,7 +14,7 @@ export function HrRenderer(): ReactElement {
   return <hr />;
 }
 
-export type BrRendererProps = Tokens.Br;
+export type BrRendererProps = marked.Tokens.Br;
 
 /**
  * The default implementation for rendering the {@link Tokens.Space} by
@@ -28,7 +28,7 @@ export function SpaceRenderer(): ReactElement {
   return <> </>;
 }
 
-export type HrRendererProps = Tokens.Hr;
+export type HrRendererProps = marked.Tokens.Hr;
 
 /**
  * The default implementation for rendering the {@link Tokens.Br} by rendering:
diff --git a/src/renderers/table.tsx b/src/renderers/table.tsx
@@ -1,7 +1,7 @@
-import type { Tokens } from "marked";
+import type { marked } from "marked";
 import type { ComponentType, ReactElement, ReactNode } from "react";
 
-export interface TableRendererProps extends Tokens.Table {
+export interface TableRendererProps extends marked.Tokens.Table {
   children: ReactNode;
 }
 
@@ -17,7 +17,7 @@ export function TableRenderer({ children }: TableRendererProps): ReactElement {
   return <table>{children}</table>;
 }
 
-export interface TheadRendererProps extends Tokens.Table {
+export interface TheadRendererProps extends marked.Tokens.Table {
   children: ReactNode;
 }
 
@@ -33,7 +33,7 @@ export function TheadRenderer({ children }: TheadRendererProps): ReactElement {
   return <thead>{children}</thead>;
 }
 
-export interface TbodyRendererProps extends Tokens.Table {
+export interface TbodyRendererProps extends marked.Tokens.Table {
   children: ReactNode;
 }
 
@@ -49,7 +49,7 @@ export function TbodyRenderer({ children }: TbodyRendererProps): ReactElement {
   return <tbody>{children}</tbody>;
 }
 
-export interface TrRendererProps extends Tokens.Table {
+export interface TrRendererProps extends marked.Tokens.Table {
   children: ReactNode;
 }
 
@@ -66,8 +66,8 @@ export function TrRenderer({ children }: TrRendererProps): ReactElement {
 
 export interface ThRendererProps {
   align: "left" | "center" | "right" | undefined;
-  cell: Tokens.TableCell;
-  table: Tokens.Table;
+  cell: marked.Tokens.TableCell;
+  table: marked.Tokens.Table;
   children: ReactNode;
 }
 
diff --git a/src/renderers/text.tsx b/src/renderers/text.tsx
@@ -1,10 +1,10 @@
-import type { Tokens } from "marked";
+import type { marked } from "marked";
 import type { ComponentType, ReactElement, ReactNode } from "react";
 
 import { useSluggedId } from "../useSluggedId";
 import { useMarkdownConfig } from "./code";
 
-export interface TextRendererProps extends Tokens.Text {
+export interface TextRendererProps extends marked.Tokens.Text {
   children: ReactNode;
 }
 
@@ -27,7 +27,7 @@ export function TextRenderer({
   return <>{children || raw}</>;
 }
 
-export interface EmRendererProps extends Tokens.Em {
+export interface EmRendererProps extends marked.Tokens.Em {
   children: ReactNode;
 }
 
@@ -42,7 +42,7 @@ export function EmRenderer({ children }: EmRendererProps): ReactElement {
   return <em>{children}</em>;
 }
 
-export interface DelRendererProps extends Tokens.Del {
+export interface DelRendererProps extends marked.Tokens.Del {
   children: ReactNode;
 }
 
@@ -57,7 +57,7 @@ export function DelRenderer({ children }: DelRendererProps): ReactElement {
   return <del>{children}</del>;
 }
 
-export interface StrongRendererProps extends Tokens.Strong {
+export interface StrongRendererProps extends marked.Tokens.Strong {
   children: ReactNode;
 }
 
@@ -75,7 +75,7 @@ export function StrongRenderer({
   return <strong>{children}</strong>;
 }
 
-export interface HeadingRendererProps extends Tokens.Heading {
+export interface HeadingRendererProps extends marked.Tokens.Heading {
   depth: 1 | 2 | 3 | 4 | 5 | 6;
   children: ReactNode;
 }
@@ -104,7 +104,7 @@ export function HeadingRenderer({
   return <Component id={headerIds ? id : undefined}>{children}</Component>;
 }
 
-export interface ParagraphRendererProps extends Tokens.Paragraph {
+export interface ParagraphRendererProps extends marked.Tokens.Paragraph {
   children: ReactNode;
 }
 
@@ -122,7 +122,7 @@ export function ParagraphRenderer({
   return <p>{children}</p>;
 }
 
-export interface BlockquoteRendererProps extends Tokens.Blockquote {
+export interface BlockquoteRendererProps extends marked.Tokens.Blockquote {
   children: ReactNode;
 }
 
@@ -140,7 +140,7 @@ export function BlockquoteRenderer({
   return <blockquote>{children}</blockquote>;
 }
 
-export interface LinkRendererProps extends Tokens.Link {
+export interface LinkRendererProps extends marked.Tokens.Link {
   children: ReactNode;
 }
 
diff --git a/src/renderers/tokens.tsx b/src/renderers/tokens.tsx
@@ -1,11 +1,11 @@
-import type { Token } from "marked";
+import type { marked } from "marked";
 import type { ReactElement } from "react";
 
 import { useMarkdownConfig } from "./code";
 import { useMarkdownRenderers } from "./useMarkdownRenderers";
 
 export interface TokensRendererProps {
-  tokens: readonly Token[];
+  tokens: readonly marked.Token[];
 }
 
 /**
@@ -38,7 +38,7 @@ function getDepth(depth: number): 1 | 2 | 3 | 4 | 5 | 6 {
 }
 
 export interface TokenRendererProps {
-  token: Token;
+  token: marked.Token;
 }
 
 /**
diff --git a/src/useSluggedId.tsx b/src/useSluggedId.tsx
@@ -1,5 +1,4 @@
-import type { Slugger, Token } from "marked";
-import marked from "marked";
+import { marked, Slugger } from "marked";
 import { createContext, ReactElement, ReactNode, useContext } from "react";
 
 export interface TokensTextOptions {
@@ -27,7 +26,7 @@ export interface TokensTextOptions {
  * @returns the text content for the list of tokens
  */
 export function getTokensText(
-  tokens: readonly Token[],
+  tokens: readonly marked.Token[],
   { depth = 0, maxDepth = -1 }: TokensTextOptions = {}
 ): string {
   return tokens.reduce((s, token) => {
@@ -102,8 +101,8 @@ export function useMarkdownSlugger(): Slugger {
  * // "some-content-link-text"
  * ```
  *
- * @param textOrTokens - The text or list of {@link Token} to convert to a
- * unique id
+ * @param textOrTokens - The text or list of {@link marked.Token} to convert to
+ * a unique id
  * @returns a unique id that can be applied to a component
  */
 export function useSluggedId(
diff --git a/yarn.lock b/yarn.lock
@@ -2169,10 +2169,10 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
 
-"@types/marked@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@types/marked/-/marked-3.0.1.tgz#748645ecde30d8cf7861c3e1c360c6f694172f92"
-  integrity sha512-jry/WUAC511P2NBCeiCkfTRCN2VXobeeQa8p8gImOYsRfnuIVfeEsqOJ1pk+CzCwfMCdv3dkTQRCYaNkkFGtxw==
+"@types/marked@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.1.tgz#d588a7bbc4d6551c5e75249bc106ffda96ae33c5"
+  integrity sha512-ZigEmCWdNUU7IjZEuQ/iaimYdDHWHfTe3kg8ORfKjyGYd9RWumPoOJRQXB0bO+XLkNwzCthW3wUIQtANaEZ1ag==
 
 "@types/minimist@^1.2.0":
   version "1.2.2"
@@ -5809,11 +5809,16 @@ map-obj@^4.0.0:
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.2.1.tgz#e4ea399dbc979ae735c83c863dd31bdf364277b7"
   integrity sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==
 
-marked@^3.0.3, marked@^3.0.8:
+marked@^3.0.8:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/marked/-/marked-3.0.8.tgz#2785f0dc79cbdc6034be4bb4f0f0a396bd3f8aeb"
   integrity sha512-0gVrAjo5m0VZSJb4rpL59K1unJAMb/hm8HRXqasD8VeC8m91ytDPMritgFSlKonfdt+rRYYpP/JfLxgIX8yoSw==
 
+marked@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.4.tgz#d7cb16adaa474291307c521824c5716d32b95c36"
+  integrity sha512-d8v7SensuOj+gxi0TGbqb2WtS60ycZfZuqtmAB9yz0JLotKerTob/47Qk9oLCDmn5G1dcdn3d5ydR+ih9dvS0A==
+
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import marked from "marked";`
	`1`	`+import { marked } from "marked";`
`2`	`2`	`import type { ReactElement } from "react";`
`3`	`3`
`4`	`4`	`import {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-import type { Tokens } from "marked";`
`2`		`-import marked from "marked";`
	`1`	`+import type { marked } from "marked";`
`3`	`2`	`import {`
`4`	`3`	`ComponentType,`
`5`	`4`	`createContext,`
`@@ -171,7 +170,7 @@ export function MarkdownCodeProvider({`
`171`	`170`	`return <Provider value={value}>{children}</Provider>;`
`172`	`171`	`}`
`173`	`172`
`174`		`-export interface CodeSpanRendererProps extends Tokens.Codespan {`
	`173`	`+export interface CodeSpanRendererProps extends marked.Tokens.Codespan {`
`175`	`174`	`children: ReactNode;`
`176`	`175`	`}`
`177`	`176`
`@@ -189,7 +188,7 @@ export function CodeSpanRenderer({`
`189`	`188`	`return <code>{children}</code>;`
`190`	`189`	`}`
`191`	`190`
`192`		`-export interface CodeBlockRendererProps extends Tokens.Code {`
	`191`	`+export interface CodeBlockRendererProps extends marked.Tokens.Code {`
`193`	`192`	`lang: string;`
`194`	`193`	`children: ReactNode;`
`195`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-import type { Tokens } from "marked";`
	`1`	`+import type { marked } from "marked";`
`2`	`2`	`import type { ComponentType, ReactElement, ReactNode } from "react";`
`3`	`3`
`4`		`-export interface TagRendererProps extends Tokens.Tag {`
	`4`	`+export interface TagRendererProps extends marked.Tokens.Tag {`
`5`	`5`	`children: ReactNode;`
`6`	`6`	`}`
`7`	`7`
`@@ -13,7 +13,7 @@ export function TagRenderer(_props: TagRendererProps): null {`
`13`	`13`	`return null;`
`14`	`14`	`}`
`15`	`15`
`16`		`-export interface HtmlRendererProps extends Tokens.HTML {`
	`16`	`+export interface HtmlRendererProps extends marked.Tokens.HTML {`
`17`	`17`	`children: ReactNode;`
`18`	`18`	`}`
`19`	`19`
`@@ -25,7 +25,7 @@ export function HtmlRenderer(_props: HtmlRendererProps): null {`
`25`	`25`	`return null;`
`26`	`26`	`}`
`27`	`27`
`28`		`-export type EscapeRendererProps = Tokens.Escape;`
	`28`	`+export type EscapeRendererProps = marked.Tokens.Escape;`
`29`	`29`
`30`	`30`	`/**`
`31`	`31`	`* The default implementation for rendering the {@link Tokens.Escape} by`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`		`-import type { Tokens } from "marked";`
	`1`	`+import type { marked } from "marked";`
`2`	`2`	`import type { ComponentType, ReactElement, ReactNode } from "react";`
`3`	`3`
`4`	`4`	`import { getTokensText, useSluggedId } from "../useSluggedId";`
`5`	`5`
`6`		`-export interface ListRendererProps extends Tokens.List {`
	`6`	`+export interface ListRendererProps extends marked.Tokens.List {`
`7`	`7`	`children: ReactNode;`
`8`	`8`	`}`
`9`	`9`
`@@ -26,7 +26,7 @@ export function ListRenderer({`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`export interface ListItemRendererProps`
`29`		`- extends Omit<Tokens.ListItem, "checked" \| "task"> {`
	`29`	`+ extends Omit<marked.Tokens.ListItem, "checked" \| "task"> {`
`30`	`30`	`children: ReactNode;`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`		`-import type { Tokens } from "marked";`
	`1`	`+import type { marked } from "marked";`
`2`	`2`	`import type { ComponentType, ReactElement, ReactNode } from "react";`
`3`	`3`
`4`	`4`	`import { useSluggedId } from "../useSluggedId";`
`5`	`5`	`import { useMarkdownConfig } from "./code";`
`6`	`6`
`7`		`-export interface TextRendererProps extends Tokens.Text {`
	`7`	`+export interface TextRendererProps extends marked.Tokens.Text {`
`8`	`8`	`children: ReactNode;`
`9`	`9`	`}`
`10`	`10`
`@@ -27,7 +27,7 @@ export function TextRenderer({`
`27`	`27`	`return <>{children \|\| raw}</>;`
`28`	`28`	`}`
`29`	`29`
`30`		`-export interface EmRendererProps extends Tokens.Em {`
	`30`	`+export interface EmRendererProps extends marked.Tokens.Em {`
`31`	`31`	`children: ReactNode;`
`32`	`32`	`}`
`33`	`33`
`@@ -42,7 +42,7 @@ export function EmRenderer({ children }: EmRendererProps): ReactElement {`
`42`	`42`	`return <em>{children}</em>;`
`43`	`43`	`}`
`44`	`44`
`45`		`-export interface DelRendererProps extends Tokens.Del {`
	`45`	`+export interface DelRendererProps extends marked.Tokens.Del {`
`46`	`46`	`children: ReactNode;`
`47`	`47`	`}`
`48`	`48`
`@@ -57,7 +57,7 @@ export function DelRenderer({ children }: DelRendererProps): ReactElement {`
`57`	`57`	`return <del>{children}</del>;`
`58`	`58`	`}`
`59`	`59`
`60`		`-export interface StrongRendererProps extends Tokens.Strong {`
	`60`	`+export interface StrongRendererProps extends marked.Tokens.Strong {`
`61`	`61`	`children: ReactNode;`
`62`	`62`	`}`
`63`	`63`
`@@ -75,7 +75,7 @@ export function StrongRenderer({`
`75`	`75`	`return <strong>{children}</strong>;`
`76`	`76`	`}`
`77`	`77`
`78`		`-export interface HeadingRendererProps extends Tokens.Heading {`
	`78`	`+export interface HeadingRendererProps extends marked.Tokens.Heading {`
`79`	`79`	`depth: 1 \| 2 \| 3 \| 4 \| 5 \| 6;`
`80`	`80`	`children: ReactNode;`
`81`	`81`	`}`
`@@ -104,7 +104,7 @@ export function HeadingRenderer({`
`104`	`104`	`return <Component id={headerIds ? id : undefined}>{children}</Component>;`
`105`	`105`	`}`
`106`	`106`
`107`		`-export interface ParagraphRendererProps extends Tokens.Paragraph {`
	`107`	`+export interface ParagraphRendererProps extends marked.Tokens.Paragraph {`
`108`	`108`	`children: ReactNode;`
`109`	`109`	`}`
`110`	`110`
`@@ -122,7 +122,7 @@ export function ParagraphRenderer({`
`122`	`122`	`return <p>{children}</p>;`
`123`	`123`	`}`
`124`	`124`
`125`		`-export interface BlockquoteRendererProps extends Tokens.Blockquote {`
	`125`	`+export interface BlockquoteRendererProps extends marked.Tokens.Blockquote {`
`126`	`126`	`children: ReactNode;`
`127`	`127`	`}`
`128`	`128`
`@@ -140,7 +140,7 @@ export function BlockquoteRenderer({`
`140`	`140`	`return <blockquote>{children}</blockquote>;`
`141`	`141`	`}`
`142`	`142`
`143`		`-export interface LinkRendererProps extends Tokens.Link {`
	`143`	`+export interface LinkRendererProps extends marked.Tokens.Link {`
`144`	`144`	`children: ReactNode;`
`145`	`145`	`}`
`146`	`146`