Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

imprv: Add GitHub Markdown alerts #9127

Open
wants to merge 6 commits into
base: imprv/148445-upgrade-remark-growi-directive
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,11 @@
"rehype-slug": "^6.0.0",
"rehype-toc": "^3.0.2",
"remark-breaks": "^4.0.0",
"remark-directive": "^3.0.0",
"remark-emoji": "^5.0.0",
"remark-frontmatter": "^5.0.0",
"remark-gfm": "^4.0.0",
"remark-github-admonitions-to-directives": "^2.0.0",
"remark-math": "^6.0.0",
"remark-toc": "^9.0.0",
"remark-wiki-link": "^2.0.1",
Expand Down
18 changes: 18 additions & 0 deletions apps/app/src/client/services/renderer/renderer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import sanitize from 'rehype-sanitize';
import slug from 'rehype-slug';
import type { HtmlElementNode } from 'rehype-toc';
import breaks from 'remark-breaks';
import remarkDirective from 'remark-directive';
import remarkGithubAdmonitionsToDirectives from 'remark-github-admonitions-to-directives';
import math from 'remark-math';
import deepmerge from 'ts-deepmerge';
import type { Pluggable } from 'unified';
Expand All @@ -19,6 +21,7 @@ import { Header } from '~/client/components/ReactMarkdownComponents/Header';
import { LightBox } from '~/client/components/ReactMarkdownComponents/LightBox';
import { RichAttachment } from '~/client/components/ReactMarkdownComponents/RichAttachment';
import { TableWithEditButton } from '~/client/components/ReactMarkdownComponents/TableWithEditButton';
import * as callout from '~/features/callout';
import * as mermaid from '~/features/mermaid';
import type { RendererOptions } from '~/interfaces/renderer-options';
import type { RendererConfig } from '~/interfaces/services/renderer';
Expand Down Expand Up @@ -65,6 +68,9 @@ export const generateViewOptions = (
mermaid.remarkPlugin,
xsvToTable.remarkPlugin,
attachment.remarkPlugin,
remarkGithubAdmonitionsToDirectives,
remarkDirective,
callout.remarkPlugin,
lsxGrowiDirective.remarkPlugin,
refsGrowiDirective.remarkPlugin,
);
Expand All @@ -78,6 +84,7 @@ export const generateViewOptions = (
presentation.sanitizeOption,
drawio.sanitizeOption,
mermaid.sanitizeOption,
callout.sanitizeOption,
attachment.sanitizeOption,
lsxGrowiDirective.sanitizeOption,
refsGrowiDirective.sanitizeOption,
Expand Down Expand Up @@ -112,6 +119,7 @@ export const generateViewOptions = (
components.drawio = DrawioViewerWithEditButton;
components.table = TableWithEditButton;
components.mermaid = mermaid.MermaidViewer;
components.callout = callout.CalloutViewer;
components.attachment = RichAttachment;
components.img = LightBox;
}
Expand Down Expand Up @@ -169,6 +177,9 @@ export const generateSimpleViewOptions = (
mermaid.remarkPlugin,
xsvToTable.remarkPlugin,
attachment.remarkPlugin,
remarkGithubAdmonitionsToDirectives,
remarkDirective,
callout.remarkPlugin,
lsxGrowiDirective.remarkPlugin,
refsGrowiDirective.remarkPlugin,
);
Expand All @@ -185,6 +196,7 @@ export const generateSimpleViewOptions = (
presentation.sanitizeOption,
drawio.sanitizeOption,
mermaid.sanitizeOption,
callout.sanitizeOption,
attachment.sanitizeOption,
lsxGrowiDirective.sanitizeOption,
refsGrowiDirective.sanitizeOption,
Expand All @@ -211,6 +223,7 @@ export const generateSimpleViewOptions = (
components.gallery = refsGrowiDirective.GalleryImmutable;
components.drawio = drawio.DrawioViewer;
components.mermaid = mermaid.MermaidViewer;
components.callout = callout.CalloutViewer;
components.attachment = RichAttachment;
components.img = LightBox;
}
Expand Down Expand Up @@ -262,6 +275,9 @@ export const generatePreviewOptions = (config: RendererConfig, pagePath: string)
mermaid.remarkPlugin,
xsvToTable.remarkPlugin,
attachment.remarkPlugin,
remarkGithubAdmonitionsToDirectives,
remarkDirective,
callout.remarkPlugin,
lsxGrowiDirective.remarkPlugin,
refsGrowiDirective.remarkPlugin,
);
Expand All @@ -274,6 +290,7 @@ export const generatePreviewOptions = (config: RendererConfig, pagePath: string)
getCommonSanitizeOption(config),
drawio.sanitizeOption,
mermaid.sanitizeOption,
callout.sanitizeOption,
attachment.sanitizeOption,
lsxGrowiDirective.sanitizeOption,
refsGrowiDirective.sanitizeOption,
Expand Down Expand Up @@ -301,6 +318,7 @@ export const generatePreviewOptions = (config: RendererConfig, pagePath: string)
components.gallery = refsGrowiDirective.GalleryImmutable;
components.drawio = drawio.DrawioViewer;
components.mermaid = mermaid.MermaidViewer;
components.callout = callout.CalloutViewer;
components.attachment = RichAttachment;
components.img = LightBox;
}
Expand Down
75 changes: 75 additions & 0 deletions apps/app/src/features/callout/components/CalloutViewer.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
@use '@growi/core-styles/scss/bootstrap/init' as bs;

// == Colors
@include bs.color-mode(light) {
.callout-viewer {
--callout-accent-note: hsl(212, 92%, 45%);
--callout-accent-tip: hsl(137, 66%, 30%);
--callout-accent-important: hsl(261, 69%, 59%);
--callout-accent-warning: hsl(40, 100%, 30%);
--callout-accent-caution: hsl(356, 71%, 48%);
}
}

@include bs.color-mode(dark) {
.callout-viewer {
--callout-accent-note: hsl(215, 93%, 58%);
--callout-accent-tip: hsl(128, 49%, 49%);
--callout-accent-important: hsl(262, 89%, 71%);
--callout-accent-warning: hsl(41, 72%, 48%);
--callout-accent-caution: hsl(3, 93%, 63%);
}
}

.callout-viewer :global{

.callout {
--calloutAccent: var(--callout-accent, var(--callout-accent-note));
--calloutHeaderFontWeight: var(--callout-header-font-weight, 500);
padding: 0.5rem 1rem;
margin: 1rem 0rem;
color: inherit;
border-left: .25em solid var(--calloutAccent);
}

.callout-indicator {
display: flex;
margin-bottom: 16px;
line-height: 1;
color: var(--calloutAccent);
}

.callout-hint > svg {
display: inline-block;
margin-right: 0.5rem;
vertical-align: text-bottom;
fill: currentColor;
}

.callout-content:first-child,
.callout-content:only-child {
margin-block-start: 0;
}

.callout-content:last-child,
.callout-content:only-child {
margin-block-end: 0;
}

.callout-tip {
--callout-accent: var(--callout-accent-tip);
}

.callout-warning {
--callout-accent: var(--callout-accent-warning);
}

.callout-caution {
--callout-accent: var(--callout-accent-caution);
}

.callout-important {
--callout-accent: var(--callout-accent-important);
}

}
44 changes: 44 additions & 0 deletions apps/app/src/features/callout/components/CalloutViewer.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
// Ref: https://github.com/Microflash/remark-callout-directives/blob/fabe4d8adc7738469f253836f0da346591ea2a2b/README.md

import type { ReactNode } from 'react';
import React from 'react';

import { githubCallout } from '../services/consts';

import styles from './CalloutViewer.module.scss';

const moduleClass = styles['callout-viewer'];

type CalloutViewerProps = {
children: ReactNode,
node: Element,
name: string
}

export const CalloutViewer = React.memo((props: CalloutViewerProps): JSX.Element => {

const { node, name, children } = props;

if (node == null) {
return <></>;
}

return (
<div className={`${moduleClass} callout-viewer`}>
<div className={`callout callout-${githubCallout[name].title.toLowerCase()}`}>
<div className="callout-indicator">
{/* eslint-disable-next-line react/no-danger */}
<div className="callout-hint" dangerouslySetInnerHTML={{ __html: githubCallout[name].hint ?? '' }}>
</div>
<div className="callout-title">
{githubCallout[name].title}
</div>
</div>
<div className="callout-content">
{children}
</div>
</div>
</div>
);
});
CalloutViewer.displayName = 'CalloutViewer';
1 change: 1 addition & 0 deletions apps/app/src/features/callout/components/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { CalloutViewer } from './CalloutViewer';
2 changes: 2 additions & 0 deletions apps/app/src/features/callout/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from './components';
export * from './services';
23 changes: 23 additions & 0 deletions apps/app/src/features/callout/services/callout.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import type { ContainerDirective } from 'mdast-util-directive';
import type { Plugin } from 'unified';
import { visit } from 'unist-util-visit';

import { githubCallout } from './consts';

export const remarkPlugin: Plugin = () => {
return (tree) => {
visit(tree, 'containerDirective', (node: ContainerDirective) => {
if (githubCallout[node.name] != null) {
const data = node.data ?? (node.data = {});
data.hName = 'callout';
data.hProperties = {
name: node.name,
};
}
});
};
};

export const sanitizeOption = {
tagNames: ['callout'],
};
41 changes: 41 additions & 0 deletions apps/app/src/features/callout/services/consts.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/* eslint-disable max-len */
// Ref: https://github.com/Microflash/remark-callout-directives/blob/fabe4d8adc7738469f253836f0da346591ea2a2b/themes/github/index.js

const calloutHints = {
note: '<svg viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.5 7.75A.75.75 0 0 1 7.25 7h1a.75.75 0 0 1 .75.75v2.75h.25a.75.75 0 0 1 0 1.5h-2a.75.75 0 0 1 0-1.5h.25v-2h-.25a.75.75 0 0 1-.75-.75ZM8 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"></path></svg>',
tip: '<svg viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path d="M8 1.5c-2.363 0-4 1.69-4 3.75 0 .984.424 1.625.984 2.304l.214.253c.223.264.47.556.673.848.284.411.537.896.621 1.49a.75.75 0 0 1-1.484.211c-.04-.282-.163-.547-.37-.847a8.456 8.456 0 0 0-.542-.68c-.084-.1-.173-.205-.268-.32C3.201 7.75 2.5 6.766 2.5 5.25 2.5 2.31 4.863 0 8 0s5.5 2.31 5.5 5.25c0 1.516-.701 2.5-1.328 3.259-.095.115-.184.22-.268.319-.207.245-.383.453-.541.681-.208.3-.33.565-.37.847a.751.751 0 0 1-1.485-.212c.084-.593.337-1.078.621-1.489.203-.292.45-.584.673-.848.075-.088.147-.173.213-.253.561-.679.985-1.32.985-2.304 0-2.06-1.637-3.75-4-3.75ZM5.75 12h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1 0-1.5ZM6 15.25a.75.75 0 0 1 .75-.75h2.5a.75.75 0 0 1 0 1.5h-2.5a.75.75 0 0 1-.75-.75Z"></path></svg>',
info: '<svg viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path d="M0 1.75C0 .784.784 0 1.75 0h12.5C15.216 0 16 .784 16 1.75v9.5A1.75 1.75 0 0 1 14.25 13H8.06l-2.573 2.573A1.458 1.458 0 0 1 3 14.543V13H1.75A1.75 1.75 0 0 1 0 11.25Zm1.75-.25a.25.25 0 0 0-.25.25v9.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h6.5a.25.25 0 0 0 .25-.25v-9.5a.25.25 0 0 0-.25-.25Zm7 2.25v2.5a.75.75 0 0 1-1.5 0v-2.5a.75.75 0 0 1 1.5 0ZM9 9a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"></path></svg>',
warn: '<svg viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path d="M6.457 1.047c.659-1.234 2.427-1.234 3.086 0l6.082 11.378A1.75 1.75 0 0 1 14.082 15H1.918a1.75 1.75 0 0 1-1.543-2.575Zm1.763.707a.25.25 0 0 0-.44 0L1.698 13.132a.25.25 0 0 0 .22.368h12.164a.25.25 0 0 0 .22-.368Zm.53 3.996v2.5a.75.75 0 0 1-1.5 0v-2.5a.75.75 0 0 1 1.5 0ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"></path></svg>',
danger: '<svg viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path d="M4.47.22A.749.749 0 0 1 5 0h6c.199 0 .389.079.53.22l4.25 4.25c.141.14.22.331.22.53v6a.749.749 0 0 1-.22.53l-4.25 4.25A.749.749 0 0 1 11 16H5a.749.749 0 0 1-.53-.22L.22 11.53A.749.749 0 0 1 0 11V5c0-.199.079-.389.22-.53Zm.84 1.28L1.5 5.31v5.38l3.81 3.81h5.38l3.81-3.81V5.31L10.69 1.5ZM8 4a.75.75 0 0 1 .75.75v3.5a.75.75 0 0 1-1.5 0v-3.5A.75.75 0 0 1 8 4Zm0 8a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"></path></svg>',
};

export const githubCallout = {
note: {
title: 'Note',
hint: calloutHints.note,
},
tip: {
title: 'Tip',
hint: calloutHints.tip,
},
info: {
title: 'Important',
hint: calloutHints.info,
},
important: {
title: 'Important',
hint: calloutHints.info,
},
warning: {
title: 'Warning',
hint: calloutHints.warn,
},
danger: {
title: 'Caution',
hint: calloutHints.danger,
},
caution: {
title: 'Caution',
hint: calloutHints.danger,
},
};
1 change: 1 addition & 0 deletions apps/app/src/features/callout/services/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { sanitizeOption, remarkPlugin } from './callout';
3 changes: 2 additions & 1 deletion apps/app/src/features/mermaid/components/MermaidViewer.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { useRef, useEffect, ReactNode } from 'react';
import type { ReactNode } from 'react';
import React, { useRef, useEffect } from 'react';

import mermaid from 'mermaid';

Expand Down
47 changes: 47 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12532,6 +12532,20 @@ md5@^2.2.1:
crypt "~0.0.1"
is-buffer "~1.1.1"

mdast-util-directive@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/mdast-util-directive/-/mdast-util-directive-3.0.0.tgz#3fb1764e705bbdf0afb0d3f889e4404c3e82561f"
integrity sha512-JUpYOqKI4mM3sZcNxmF/ox04XYFFkNwr0CFlrQIkCwbvH0xzMCqkMqAde9wRd80VAhaUrwFwKm2nxretdT1h7Q==
dependencies:
"@types/mdast" "^4.0.0"
"@types/unist" "^3.0.0"
devlop "^1.0.0"
mdast-util-from-markdown "^2.0.0"
mdast-util-to-markdown "^2.0.0"
parse-entities "^4.0.0"
stringify-entities "^4.0.0"
unist-util-visit-parents "^6.0.0"

mdast-util-find-and-replace@^3.0.0, mdast-util-find-and-replace@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/mdast-util-find-and-replace/-/mdast-util-find-and-replace-3.0.1.tgz#a6fc7b62f0994e973490e45262e4bc07607b04e0"
Expand Down Expand Up @@ -12931,6 +12945,19 @@ micromark-core-commonmark@^2.0.0:
micromark-util-symbol "^2.0.0"
micromark-util-types "^2.0.0"

micromark-extension-directive@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/micromark-extension-directive/-/micromark-extension-directive-3.0.1.tgz#67b3985bb991a69dbcae52664c57ee54b22f635a"
integrity sha512-VGV2uxUzhEZmaP7NSFo2vtq7M2nUD+WfmYQD+d8i/1nHbzE+rMy9uzTvUybBbNiVbrhOZibg3gbyoARGqgDWyg==
dependencies:
devlop "^1.0.0"
micromark-factory-space "^2.0.0"
micromark-factory-whitespace "^2.0.0"
micromark-util-character "^2.0.0"
micromark-util-symbol "^2.0.0"
micromark-util-types "^2.0.0"
parse-entities "^4.0.0"

micromark-extension-frontmatter@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/micromark-extension-frontmatter/-/micromark-extension-frontmatter-2.0.0.tgz#651c52ffa5d7a8eeed687c513cd869885882d67a"
Expand Down Expand Up @@ -15892,6 +15919,16 @@ remark-breaks@^4.0.0:
mdast-util-newline-to-break "^2.0.0"
unified "^11.0.0"

remark-directive@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/remark-directive/-/remark-directive-3.0.0.tgz#34452d951b37e6207d2e2a4f830dc33442923268"
integrity sha512-l1UyWJ6Eg1VPU7Hm/9tt0zKtReJQNOA4+iDMAxTyZNWnJnFlbS/7zhiel/rogTLQ2vMYwDzSJa4BiVNqGlqIMA==
dependencies:
"@types/mdast" "^4.0.0"
mdast-util-directive "^3.0.0"
micromark-extension-directive "^3.0.0"
unified "^11.0.0"

remark-emoji@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/remark-emoji/-/remark-emoji-5.0.0.tgz#14bd520b765cea3f00228258926ed59ad8125729"
Expand Down Expand Up @@ -15925,6 +15962,16 @@ remark-gfm@^4.0.0:
remark-stringify "^11.0.0"
unified "^11.0.0"

remark-github-admonitions-to-directives@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/remark-github-admonitions-to-directives/-/remark-github-admonitions-to-directives-2.0.0.tgz#88a9a1dde87e65890f0eb5b48502cd798ca12543"
integrity sha512-/fXZWZrU+mr5VeRShPPnzUbWPmOktBAN1vqSwzktVdchhhsL1CqfdBwiQH7mkh8yaxOo/RtXysxlVLXwD2a/Dw==
dependencies:
"@types/mdast" "^4.0.0"
mdast-util-directive "^3.0.0"
unified "^11.0.0"
unist-util-visit "^5.0.0"

remark-math@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/remark-math/-/remark-math-6.0.0.tgz#0acdf74675f1c195fea6efffa78582f7ed7fc0d7"
Expand Down
Loading