From ca9ecbdd03813722fda1fc097676d051329c8539 Mon Sep 17 00:00:00 2001 From: Mikkel Laursen Date: Sun, 5 Sep 2021 12:48:03 -0600 Subject: [PATCH] chore(website): Updated fonts for latest nextjs build optimizations --- .../src/components/Code/InternalCode.tsx | 14 ---------- .../src/components/Code/InternalCodeBlock.tsx | 16 ------------ .../src/components/Code/index.ts | 4 +-- .../src/components/Demos/DemoPage.tsx | 19 +++++++++++--- .../src/components/Demos/DemoPageFont.tsx | 26 ------------------- .../src/components/GoogleFont.tsx | 22 ---------------- .../src/components/Markdown/Markdown.tsx | 3 --- packages/documentation/src/pages/_app.tsx | 3 --- .../documentation/src/pages/_document.tsx | 11 +++++++- 9 files changed, 27 insertions(+), 91 deletions(-) delete mode 100644 packages/documentation/src/components/Code/InternalCode.tsx delete mode 100644 packages/documentation/src/components/Code/InternalCodeBlock.tsx delete mode 100644 packages/documentation/src/components/Demos/DemoPageFont.tsx delete mode 100644 packages/documentation/src/components/GoogleFont.tsx diff --git a/packages/documentation/src/components/Code/InternalCode.tsx b/packages/documentation/src/components/Code/InternalCode.tsx deleted file mode 100644 index 9ab9668911..0000000000 --- a/packages/documentation/src/components/Code/InternalCode.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import React, { ReactElement } from "react"; - -import GoogleFont from "components/GoogleFont"; - -import Code, { CodeProps } from "./Code"; - -export default function InternalCode(props: CodeProps): ReactElement { - return ( - <> - - - - ); -} diff --git a/packages/documentation/src/components/Code/InternalCodeBlock.tsx b/packages/documentation/src/components/Code/InternalCodeBlock.tsx deleted file mode 100644 index 7a212bead2..0000000000 --- a/packages/documentation/src/components/Code/InternalCodeBlock.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import React, { forwardRef } from "react"; - -import GoogleFont from "components/GoogleFont"; - -import CodeBlock, { CodeBlockProps } from "./CodeBlock"; - -export default forwardRef( - function InternalCodeBlock(props, ref) { - return ( - <> - - - - ); - } -); diff --git a/packages/documentation/src/components/Code/index.ts b/packages/documentation/src/components/Code/index.ts index 1015e16450..c703387719 100644 --- a/packages/documentation/src/components/Code/index.ts +++ b/packages/documentation/src/components/Code/index.ts @@ -1,2 +1,2 @@ -export { default as Code } from "./InternalCode"; -export { default as CodeBlock } from "./InternalCodeBlock"; +export { default as Code } from "./Code"; +export { default as CodeBlock } from "./CodeBlock"; diff --git a/packages/documentation/src/components/Demos/DemoPage.tsx b/packages/documentation/src/components/Demos/DemoPage.tsx index cea1289f70..248dea03c3 100644 --- a/packages/documentation/src/components/Demos/DemoPage.tsx +++ b/packages/documentation/src/components/Demos/DemoPage.tsx @@ -1,12 +1,12 @@ import React, { ReactElement } from "react"; import cn from "classnames"; import { defaults } from "lodash"; +import Head from "next/head"; import { toId } from "utils/toTitle"; import Demo from "./Demo"; import DemoPageHeader from "./DemoPageHeader"; -import DemoPageFont from "./DemoPageFont"; import { DemoPageConfig, DemoProps, DemoConfig } from "./types"; import styles from "./DemoPage.module.scss"; @@ -47,9 +47,20 @@ export default function DemoPage(props: DemoPageProps): ReactElement { } = props; return (
- {fonts.map((font) => ( - - ))} + + {fonts.map((font) => { + let href: string; + if (font === "Font Awesome") { + href = + "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css"; + } else { + const name = font.replace(/\s+/g, "+"); + href = `https://fonts.googleapis.com/css2?family=${name}&display=swap`; + } + + return ; + })} + {description} {demos.map((demo, index) => ( // eslint-disable-next-line react/jsx-key diff --git a/packages/documentation/src/components/Demos/DemoPageFont.tsx b/packages/documentation/src/components/Demos/DemoPageFont.tsx deleted file mode 100644 index 5c96543421..0000000000 --- a/packages/documentation/src/components/Demos/DemoPageFont.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import React, { ReactElement } from "react"; -import Head from "next/head"; - -import GoogleFont from "components/GoogleFont"; - -export interface DemoPageFontProps { - font: string; -} - -export default function DemoPageFont({ - font, -}: DemoPageFontProps): ReactElement { - if (font === "Font Awesome") { - return ( - - - - ); - } - - return ; -} diff --git a/packages/documentation/src/components/GoogleFont.tsx b/packages/documentation/src/components/GoogleFont.tsx deleted file mode 100644 index c4fe85a0eb..0000000000 --- a/packages/documentation/src/components/GoogleFont.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import React, { memo, ReactElement } from "react"; -import Head from "next/head"; - -export interface GoogleFontProps { - font: string; -} - -export default memo(function GoogleFont({ - font, -}: GoogleFontProps): ReactElement { - const name = font.split(" ").join("+"); - - return ( - - - - ); -}); diff --git a/packages/documentation/src/components/Markdown/Markdown.tsx b/packages/documentation/src/components/Markdown/Markdown.tsx index bedffa6b79..45bb30cc97 100644 --- a/packages/documentation/src/components/Markdown/Markdown.tsx +++ b/packages/documentation/src/components/Markdown/Markdown.tsx @@ -11,8 +11,6 @@ import React, { import cn from "classnames"; import { useRouter } from "next/router"; -import GoogleFont from "components/GoogleFont"; - import styles from "./Markdown.module.scss"; import { markdownToHTML } from "./utils"; @@ -116,7 +114,6 @@ export default function Markdown({ return ( <> -
{ return ( <> - - { const { theme } = this.props; return ( - + + + +