`
-
-module.exports = function (source: any) {
- console.log('✅✅✅✅✅source')
- const {
- body,
- attributes: { imports: importMap },
- } = frontMatter(source)
- const imports = `import * as React from 'react';${importMap}`
-
- /* 处理 :::demo 开头的 markdown 内容 */
- mdLoader.use(mdContainer, 'demo', {
- validate: (params: string) => params.trim().match(/^demo\s*(.*)$/),
- render: (tokens: any[], idx: number) => {
- // container 从开头到结尾把之间的token跑一遍，其中idx定位到具体的位置
- // 有此标记代表 ::: 开始
- if (tokens[idx].nesting === 1) {
- let i = 1
- // 从 ::: 下一个token开始
- let token = tokens[idx + i]
-
- // 如果没有到结尾
- while (token.markup !== ':::') {
- i++
- token = tokens[idx + i]
- }
- // 描述也执行md
- return formatOpening()
- }
- return formatClosing()
- },
- })
-
- // md 处理过后的字符串含有 class 和 style ，需要再次处理给到 react
- let content = mdLoader.render(body)
-
- content = content
- .replace(/
/g, '
')
- .replace(/
/g, '
')
- .replace(/class=/g, 'className=')
- .replace(/style="text-align:center"/g, 'style={{ textAlign: "center"}}')
- .replace(/style="text-align:left"/g, 'style={{ textAlign: "left"}}')
- .replace(/style="text-align:right"/g, 'style={{ textAlign: "right"}}')
- .replace(/
\(_blank\)/g, ` target="_blank">`)
-
- return `module.exports = ${formatModule(imports, content)}`
-}
diff --git a/packages/crd-markdown-loader/package.json b/packages/crd-markdown-loader/package.json
deleted file mode 100644
index 12532f36b..000000000
--- a/packages/crd-markdown-loader/package.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "name": "crd-markdown-loader",
- "version": "1.1.3",
- "description": "markdown-loader with webpack for create react doc",
- "main": "index.js",
- "dependencies": {
- "front-matter": "^4.0.2",
- "highlight.js": "^11.0.1",
- "markdown-it": "^12.0.6",
- "markdown-it-container": "^3.0.0"
- },
- "repository": {
- "type": "git",
- "url": "https://github.com/MuYunyun/create-react-doc",
- "directory": "packages/utils"
- },
- "keywords": [],
- "publishConfig": {
- "access": "public"
- },
- "author": "muyunyun",
- "license": "MIT",
- "gitHead": "ffc5e4cbc94a7356da558c2dbf46e2f39bb8b199"
-}
diff --git a/packages/create-react-doc/index.js b/packages/create-react-doc/index.js
index e8da6f216..935a90c8f 100755
--- a/packages/create-react-doc/index.js
+++ b/packages/create-react-doc/index.js
@@ -39,6 +39,7 @@ program
const { start, build, deploy, theme } = program
+console.log('start', start)
if (!start && !build && !deploy && !theme) return initProject(program)
if (theme) {
diff --git a/packages/scripts/src/conf/webpack.config.dev.js b/packages/scripts/src/conf/webpack.config.dev.js
index c72d4e8f8..e83ae437d 100644
--- a/packages/scripts/src/conf/webpack.config.dev.js
+++ b/packages/scripts/src/conf/webpack.config.dev.js
@@ -121,16 +121,16 @@ module.exports = function (cmd) {
template: defaultHTMLPath,
title: docsConfig && docsConfig.title ? docsConfig.title : 'Create React Doc',
}),
- new CreateSpareWebpackPlugin({
- // 备用文件目录，比对是否存在，不存在生成，根据 sep 目录规则生成
- path: path.join(cacheDirPath, './md'),
- sep: '___', // 检查目标目录文件，文件名存储，文件夹+下划线间隔+文件名
- directoryTrees: { // 索引目录
- dir: cmd.markdownPaths,
- mdconf: true,
- extensions: /\.md$/,
- },
- }),
+ // new CreateSpareWebpackPlugin({
+ // // 备用文件目录，比对是否存在，不存在生成，根据 sep 目录规则生成
+ // path: path.join(cacheDirPath, './md'),
+ // sep: '___', // 检查目标目录文件，文件名存储，文件夹+下划线间隔+文件名
+ // directoryTrees: { // 索引目录
+ // dir: cmd.markdownPaths,
+ // mdconf: true,
+ // extensions: /\.md$/,
+ // },
+ // }),
new FriendlyErrorsWebpackPlugin({
clearConsole: true,
}),
diff --git a/packages/scripts/src/conf/webpack.config.js b/packages/scripts/src/conf/webpack.config.js
index 5f2adc009..864e4e24a 100644
--- a/packages/scripts/src/conf/webpack.config.js
+++ b/packages/scripts/src/conf/webpack.config.js
@@ -74,15 +74,16 @@ module.exports = {
},
'@mdx-js/loader',
// 'crd-markdown-loader',
- {
- loader: `${path.join(__dirname, './modifyMarkdownLoader.js')}`,
- options: {
- path: path.join(cacheDirPath, './md'), // dir need to replace
- replace: paths.projectPath, // the dir to replace
- sep: /___/g, // name saved, folder + __ + file
- },
- },
+ // {
+ // loader: `${path.join(__dirname, './modifyMarkdownLoader.js')}`,
+ // options: {
+ // path: path.join(cacheDirPath, './md'), // dir need to replace
+ // replace: paths.projectPath, // the dir to replace
+ // sep: /___/g, // name saved, folder + __ + file
+ // },
+ // },
],
+ exclude: /(node_modules)/,
},
// {
// test: /\.md$/,
diff --git a/packages/scripts/src/conf/webpack.config.prod.js b/packages/scripts/src/conf/webpack.config.prod.js
index e16a888aa..c1fc15317 100755
--- a/packages/scripts/src/conf/webpack.config.prod.js
+++ b/packages/scripts/src/conf/webpack.config.prod.js
@@ -147,17 +147,17 @@ module.exports = function (cmd) {
dir: cmd.markdownPaths,
toDir: config.output.path,
}),
- new CreateSpareWebpackPlugin({
- // 备用文件目录，比对是否存在，不存在生成，根据 sep 目录规则生成
- path: path.join(cacheDirPath, './md'),
- sep: '___', // 检查目标目录文件，文件名存储，文件夹+下划线间隔+文件名
- directoryTrees: {
- // 索引目录
- dir: cmd.markdownPaths,
- mdconf: true,
- extensions: /\.md$/,
- },
- }),
+ // new CreateSpareWebpackPlugin({
+ // // 备用文件目录，比对是否存在，不存在生成，根据 sep 目录规则生成
+ // path: path.join(cacheDirPath, './md'),
+ // sep: '___', // 检查目标目录文件，文件名存储，文件夹+下划线间隔+文件名
+ // directoryTrees: {
+ // // 索引目录
+ // dir: cmd.markdownPaths,
+ // mdconf: true,
+ // extensions: /\.md$/,
+ // },
+ // }),
// new webpack.optimize.DedupePlugin(),
new MiniCssExtractPlugin({
// Options similar to the same options in webpackOptions.output
diff --git a/packages/scripts/src/utils/initCache.js b/packages/scripts/src/utils/initCache.js
index ce265b079..7e2ffd08d 100644
--- a/packages/scripts/src/utils/initCache.js
+++ b/packages/scripts/src/utils/initCache.js
@@ -38,6 +38,7 @@ module.exports = function (program, cb) {
)
// generate file cache only it isn't in .gitignore
if (!ifInGitIgnore(mdfilePath)) {
+ // todo: remove ___
const underlineFileName = mdfilePath.split(path.sep).join('___')
const writeMarkdownPath = path.resolve(
process.cwd(),
diff --git a/packages/theme/markdown/index.js b/packages/theme/markdown/index.js
index 06cf77ad7..00c92d946 100644
--- a/packages/theme/markdown/index.js
+++ b/packages/theme/markdown/index.js
@@ -1,18 +1,18 @@
import { useState, useEffect, useRef } from 'react'
import cx from 'classnames'
-import ReactMarkdown from 'react-markdown'
-import hljs from 'highlight.js'
+// import ReactMarkdown from 'react-markdown'
+// import hljs from 'highlight.js'
import { MDXProvider } from '@mdx-js/react'
import CodeBlock from './codeBlock'
-import InlineCode from './InlineCode'
+// import InlineCode from './InlineCode'
import Link from './Link'
import Loading from '../component/Loading'
import styles from './style/index.less'
-hljs.configure({
- tabReplace: ' ', // 2 spaces
- classPrefix: '', // don't append class prefix
-})
+// hljs.configure({
+// tabReplace: ' ', // 2 spaces
+// classPrefix: '', // don't append class prefix
+// })
const formatPath = path =>
path.replace(/^(\/|\\)/, '')
@@ -26,19 +26,30 @@ const components = {
link: Link,
}
-function Markdown({ props }) {
- const { type, relative } = props
+function Markdown(markdownProps) {
+ // const { props } = markdownProps
+ const { props } = markdownProps
+ const { relative } = props
const [MarkdownCP, setMarkdownCP] = useState(null)
const markdownWrapperRef = useRef(null)
const renderMarkdown = () => {
const relativeMd = relative
if (!relativeMd) return null
- let filename = formatPath(relativeMd)
- if (type === 'directory') {
- filename = formatPath(relativeMd)
- }
- import(`__project_root__/.cache/md/${filename}.md`).then((data) => {
+ // let filename = formatPath(relativeMd)
+ // if (type === 'directory') {
+ // filename = formatPath(relativeMd)
+ // }
+ // import(`__project_root__/.cache/md/${filename}.md`).then((data) => {
+ // import(`__project_root__${relative}`).then((data) => {
+ // console.log('data', data)
+ // // data.default is a function, so we should write () => data.default in setState here.
+ // // setMarkdownCP(() => (data.default || data))
+ // })
+
+ const rmFirstSlash = relative.slice(1, relative.length - 3)
+ // it must be writen with / & .md in dynamic import
+ import(`__project_root__/${rmFirstSlash}.md`).then((data) => {
// data.default is a function, so we should write () => data.default in setState here.
setMarkdownCP(() => (data.default || data))
})
From 73a082f4b9fb4fea78578a6f56af59b5b0bb5040 Mon Sep 17 00:00:00 2001
From: MuYunyun <328375795@qq.com>
Date: Wed, 9 Jun 2021 10:44:50 +0800
Subject: [PATCH 7/9] feat: support math in markdown
---
config.yml | 7 +-
...60\345\255\246\345\205\254\345\274\217.md" | 35 +++++++++
...32\344\271\211\344\270\273\351\242\230.md" | 2 +-
packages/scripts/package.json | 2 +
packages/scripts/src/conf/webpack.config.js | 54 ++++++-------
packages/theme/index.html | 4 +-
yarn.lock | 77 ++++++++++++++++++-
7 files changed, 145 insertions(+), 36 deletions(-)
create mode 100644 "docs/\346\225\260\345\255\246\345\205\254\345\274\217.md"
diff --git a/config.yml b/config.yml
index 848d04df2..d74d598b5 100644
--- a/config.yml
+++ b/config.yml
@@ -8,13 +8,14 @@ title: Create React Doc
## todo: auto menu
menu: [
docs/快速上手.md,
+ docs/更新日志.md,
docs/默认主题.md,
docs/站点发布.md,
- docs/高阶用法.md,
docs/自定义主题.md,
docs/其它工具.md,
- docs/更新日志.md,
- docs/书写组件.md
+ docs/书写组件.md,
+ docs/数学公式.md,
+ docs/高阶用法.md,
]
## set init open menu keys
# menuOpenKeys:
diff --git "a/docs/\346\225\260\345\255\246\345\205\254\345\274\217.md" "b/docs/\346\225\260\345\255\246\345\205\254\345\274\217.md"
new file mode 100644
index 000000000..ddd0a9dfa
--- /dev/null
+++ "b/docs/\346\225\260\345\255\246\345\205\254\345\274\217.md"
@@ -0,0 +1,35 @@
+## 数学公式
+
+在 `$$` 与 `$$` 之间书写 latex 数学公式即能显示在网页上。
+
+```js
+$$
+z = \frac{x}{y}
+$$
+
+$$
+C_1 \quad= \quad c_2 + c_4^3
+$$
+
+$$
+y = \sqrt {x_1^2 + x_2^2 + x_3^2 + x_4^2}
+$$
+```
+
+被转化为
+
+$$
+z = \frac{x}{y}
+$$
+
+$$
+C_1 \quad= \quad c_2 + c_4^3
+$$
+
+$$
+y = \sqrt {x_1^2 + x_2^2 + x_3^2 + x_4^2}
+$$
+
+## 参考链接
+
+* [latex 数学公式示例汇总](https://zhuanlan.zhihu.com/p/34799800)
diff --git "a/docs/\350\207\252\345\256\232\344\271\211\344\270\273\351\242\230.md" "b/docs/\350\207\252\345\256\232\344\271\211\344\270\273\351\242\230.md"
index 5c136bcb9..04f911900 100644
--- "a/docs/\350\207\252\345\256\232\344\271\211\344\270\273\351\242\230.md"
+++ "b/docs/\350\207\252\345\256\232\344\271\211\344\270\273\351\242\230.md"
@@ -1,4 +1,4 @@
-### 使用自定义主题
+## 使用自定义主题
切换主题非常简单, 只需要将根目录文件 `config.yml` 中的 `theme` 更改为您想使用的主题即可。
diff --git a/packages/scripts/package.json b/packages/scripts/package.json
index 786bd5ca2..5f5bfca15 100644
--- a/packages/scripts/package.json
+++ b/packages/scripts/package.json
@@ -50,6 +50,8 @@
"postcss-flexbugs-fixes": "^3.3.1",
"postcss-loader": "^2.0.9",
"process": "^0.11.10",
+ "rehype-katex": "^5.0.0",
+ "remark-math": "^3.0.1",
"rimraf": "^2.6.2",
"string-replace-loader": "^3.0.1",
"style-loader": "^0.19.1",
diff --git a/packages/scripts/src/conf/webpack.config.js b/packages/scripts/src/conf/webpack.config.js
index 864e4e24a..61f84104c 100644
--- a/packages/scripts/src/conf/webpack.config.js
+++ b/packages/scripts/src/conf/webpack.config.js
@@ -7,6 +7,8 @@ const fs = require('fs')
const { resolveApp, docsConfig, cacheDirPath, docsBuildDist } = require('crd-utils')
const { getDocsConfig } = require('crd-utils')
// const { getSearchContent } = require('../utils');
+const remarkMath = require('remark-math')
+const rehypeKatex = require('rehype-katex')
const paths = require('./path')
const pkg = require('../../package.json')
@@ -63,43 +65,35 @@ module.exports = {
{
test: /\.md$/,
use: [
- // {
- // loader: require.resolve('crd-markdown-loader'),
- // },
- // 'crd-markdown-loader',
- // 'babel-loader'
{
loader: require.resolve('babel-loader'),
options: require('../../.babelrc'), // eslint-disable-line
},
- '@mdx-js/loader',
- // 'crd-markdown-loader',
- // {
- // loader: `${path.join(__dirname, './modifyMarkdownLoader.js')}`,
- // options: {
- // path: path.join(cacheDirPath, './md'), // dir need to replace
- // replace: paths.projectPath, // the dir to replace
- // sep: /___/g, // name saved, folder + __ + file
- // },
- // },
+ // '@mdx-js/loader',
+ {
+ loader: require.resolve('@mdx-js/loader'),
+ options: {
+ remarkPlugins: [
+ [
+ remarkMath,
+ {
+ /* options */
+ },
+ ],
+ ],
+ rehypePlugins: [
+ [
+ rehypeKatex,
+ {
+ /* options */
+ },
+ ],
+ ],
+ },
+ },
],
exclude: /(node_modules)/,
},
- // {
- // test: /\.md$/,
- // use: [
- // // {
- // // loader: `babel-loader!${path.join(__dirname, './mdloader.js')}`,
- // // },
- // {
- // loader: require.resolve('crd-markdown-loader'),
- // },
- // {
- // loader: require.resolve('babel-loader'),
- // options: require('../../.babelrc'), // eslint-disable-line
- // },
- // ],
- // },
// “file-loader”确保这些资源由WebpackDevServer服务。
// 当您导入资源时，您将获得（虚拟）文件名。
// 在生产中，它们将被复制到`build`文件夹。
diff --git a/packages/theme/index.html b/packages/theme/index.html
index ad901f2b2..1471b8b92 100644
--- a/packages/theme/index.html
+++ b/packages/theme/index.html
@@ -9,7 +9,9 @@
-
+
+
diff --git a/yarn.lock b/yarn.lock
index 82d82c2f9..dfe869cd1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2223,6 +2223,11 @@
resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+"@types/katex@^0.11.0":
+ version "0.11.0"
+ resolved "https://registry.npmjs.org/@types/katex/-/katex-0.11.0.tgz#b16c54ee670925ffef0616beae9e90c557e17334"
+ integrity sha512-27BfE8zASRLYfSBNMk5/+KIjr2CBBrH0i5lhsO04fca4TGirIIMay73v3zNkzqmsaeIa/Mi5kejWDcxPLAmkvA==
+
"@types/mdast@^3.0.0":
version "3.0.3"
resolved "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz#2d7d671b1cd1ea3deb306ea75036c2a0407d2deb"
@@ -3807,6 +3812,11 @@ commander@^4.0.1, commander@^4.1.1:
resolved "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
+commander@^6.0.0:
+ version "6.2.1"
+ resolved "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
+ integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
+
commondir@^1.0.1:
version "1.0.1"
resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -6194,6 +6204,11 @@ hast-util-from-parse5@^6.0.0:
vfile-location "^3.2.0"
web-namespaces "^1.0.0"
+hast-util-is-element@^1.0.0:
+ version "1.1.0"
+ resolved "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.1.0.tgz#3b3ed5159a2707c6137b48637fbfe068e175a425"
+ integrity sha512-oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ==
+
hast-util-parse-selector@^2.0.0:
version "2.2.5"
resolved "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz#d57c23f4da16ae3c63b3b6ca4616683313499c3a"
@@ -6226,6 +6241,15 @@ hast-util-to-parse5@^6.0.0:
xtend "^4.0.0"
zwitch "^1.0.0"
+hast-util-to-text@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.npmjs.org/hast-util-to-text/-/hast-util-to-text-2.0.1.tgz#04f2e065642a0edb08341976084aa217624a0f8b"
+ integrity sha512-8nsgCARfs6VkwH2jJU9b8LNTuR4700na+0h3PqCaEk4MAnMDeu5P0tP8mjk9LLNGxIeQRLbiDbZVw6rku+pYsQ==
+ dependencies:
+ hast-util-is-element "^1.0.0"
+ repeat-string "^1.0.0"
+ unist-util-find-after "^3.0.0"
+
hastscript@^6.0.0:
version "6.0.0"
resolved "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640"
@@ -7327,6 +7351,13 @@ jsprim@^1.2.2:
array-includes "^3.1.1"
object.assign "^4.1.1"
+katex@^0.13.0:
+ version "0.13.11"
+ resolved "https://registry.npmjs.org/katex/-/katex-0.13.11.tgz#66138ebf173f25ef130cd3a3ea3ea1d12a3f1362"
+ integrity sha512-yJBHVIgwlAaapzlbvTpVF/ZOs8UkTj/sd46Fl8+qAf2/UiituPYVeapVD8ADZtqyRg/qNWUKt7gJoyYVWLrcXw==
+ dependencies:
+ commander "^6.0.0"
+
killable@^1.0.1:
version "1.0.1"
resolved "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
@@ -10462,6 +10493,26 @@ regjsparser@^0.6.4:
dependencies:
jsesc "~0.5.0"
+rehype-katex@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.npmjs.org/rehype-katex/-/rehype-katex-5.0.0.tgz#b556f24fde918f28ba1cb642ea71c7e82f3373d7"
+ integrity sha512-ksSuEKCql/IiIadOHiKRMjypva9BLhuwQNascMqaoGLDVd0k2NlE2wMvgZ3rpItzRKCd6vs8s7MFbb8pcR0AEg==
+ dependencies:
+ "@types/katex" "^0.11.0"
+ hast-util-to-text "^2.0.0"
+ katex "^0.13.0"
+ rehype-parse "^7.0.0"
+ unified "^9.0.0"
+ unist-util-visit "^2.0.0"
+
+rehype-parse@^7.0.0:
+ version "7.0.1"
+ resolved "https://registry.npmjs.org/rehype-parse/-/rehype-parse-7.0.1.tgz#58900f6702b56767814afc2a9efa2d42b1c90c57"
+ integrity sha512-fOiR9a9xH+Le19i4fGzIEowAbwG7idy2Jzs4mOrFWBSJ0sNUgy0ev871dwWnbOo371SjgjG4pwzrbgSVrKxecw==
+ dependencies:
+ hast-util-from-parse5 "^6.0.0"
+ parse5 "^6.0.0"
+
relateurl@^0.2.7:
version "0.2.7"
resolved "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
@@ -10472,6 +10523,11 @@ remark-footnotes@2.0.0:
resolved "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-2.0.0.tgz#9001c4c2ffebba55695d2dd80ffb8b82f7e6303f"
integrity sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ==
+remark-math@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.npmjs.org/remark-math/-/remark-math-3.0.1.tgz#85a02a15b15cad34b89a27244d4887b3a95185bb"
+ integrity sha512-epT77R/HK0x7NqrWHdSV75uNLwn8g9qTyMqCRCDujL0vj/6T6+yhdrR7mjELWtkse+Fw02kijAaBuVcHBor1+Q==
+
remark-mdx@1.6.22:
version "1.6.22"
resolved "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd"
@@ -10557,7 +10613,7 @@ repeat-element@^1.1.2:
resolved "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
-repeat-string@^1.5.4, repeat-string@^1.6.1:
+repeat-string@^1.0.0, repeat-string@^1.5.4, repeat-string@^1.6.1:
version "1.6.1"
resolved "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
@@ -12110,6 +12166,18 @@ unified@^6.1.5:
vfile "^2.0.0"
x-is-string "^0.1.0"
+unified@^9.0.0:
+ version "9.2.1"
+ resolved "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz#ae18d5674c114021bfdbdf73865ca60f410215a3"
+ integrity sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA==
+ dependencies:
+ bail "^1.0.0"
+ extend "^3.0.0"
+ is-buffer "^2.0.0"
+ is-plain-obj "^2.0.0"
+ trough "^1.0.0"
+ vfile "^4.0.0"
+
union-value@^1.0.0:
version "1.0.1"
resolved "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
@@ -12149,6 +12217,13 @@ unist-builder@2.0.3, unist-builder@^2.0.0:
resolved "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436"
integrity sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==
+unist-util-find-after@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.npmjs.org/unist-util-find-after/-/unist-util-find-after-3.0.0.tgz#5c65fcebf64d4f8f496db46fa8fd0fbf354b43e6"
+ integrity sha512-ojlBqfsBftYXExNu3+hHLfJQ/X1jYY/9vdm4yZWjIbf0VuWF6CRufci1ZyoD/wV2TYMKxXUoNuoqwy+CkgzAiQ==
+ dependencies:
+ unist-util-is "^4.0.0"
+
unist-util-generated@^1.0.0:
version "1.1.6"
resolved "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b"
From f7e57bb9259e34b0142bf6b04f407bc0eb6669a6 Mon Sep 17 00:00:00 2001
From: MuYunyun <328375795@qq.com>
Date: Wed, 9 Jun 2021 13:40:29 +0800
Subject: [PATCH 8/9] =?UTF-8?q?feat:=20create-react-doc=20=E9=9B=86?=
=?UTF-8?q?=E6=88=90=20MDX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 2 +
config.yml | 1 +
...64\346\226\260\346\227\245\345\277\227.md" | 9 +++++
...30\351\230\266\347\224\250\346\263\225.md" | 37 ++---------------
injectLogic/index.js | 27 +------------
.../scripts/src/conf/modifyMarkdownLoader.js | 40 +++++++++----------
.../scripts/src/conf/webpack.config.dev.js | 4 +-
packages/scripts/src/conf/webpack.config.js | 2 -
packages/scripts/src/utils/initCache.js | 36 ++++++++---------
9 files changed, 57 insertions(+), 101 deletions(-)
diff --git a/.gitignore b/.gitignore
index 51554dd20..1de26e584 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ package-lock.json
#.swp
*.*~
~*.*
+
+docs/忽略文件.md
\ No newline at end of file
diff --git a/config.yml b/config.yml
index d74d598b5..b4c90064f 100644
--- a/config.yml
+++ b/config.yml
@@ -16,6 +16,7 @@ menu: [
docs/书写组件.md,
docs/数学公式.md,
docs/高阶用法.md,
+ docs/忽略文件.md
]
## set init open menu keys
# menuOpenKeys:
diff --git "a/docs/\346\233\264\346\226\260\346\227\245\345\277\227.md" "b/docs/\346\233\264\346\226\260\346\227\245\345\277\227.md"
index 9fc49fd05..f30f7c77c 100644
--- "a/docs/\346\233\264\346\226\260\346\227\245\345\277\227.md"
+++ "b/docs/\346\233\264\346\226\260\346\227\245\345\277\227.md"
@@ -2,6 +2,15 @@
`create-react-doc` 严格遵循 [Semantic Versioning 2.0.0](http://semver.org/lang/zh-CN/) 语义化版本规范。
+### 1.4.0
+
+`2020-06-09`
+
+- **Feature**
+
+ - 🚀 create-react-doc 集成 MDX。[issue](https://github.com/MuYunyun/create-react-doc/issues/138)、[mr](https://github.com/MuYunyun/create-react-doc/pull/143)
+ - 🚀 支持在 .md 文件中`书写 React 组件`。
+ - 🚀 支持在 .md 文件中`书写数学公式`。
### 1.2.0
diff --git "a/docs/\351\253\230\351\230\266\347\224\250\346\263\225.md" "b/docs/\351\253\230\351\230\266\347\224\250\346\263\225.md"
index 5c172ec53..975f03252 100644
--- "a/docs/\351\253\230\351\230\266\347\224\250\346\263\225.md"
+++ "b/docs/\351\253\230\351\230\266\347\224\250\346\263\225.md"
@@ -2,11 +2,7 @@
与 git 文件结构类似, 如果在展示的文件夹中有私有文件不方便展示在文档站点, 可以在 `.gitignore` 文件中设置过滤文件, 这样它们就不会展示在文档站点中了。eg: [.gitignore](https://github.com/MuYunyun/blog/blob/main/.gitignore)
-## 数学公式
-
-Todo:
-
-### 使用方式
+### 插入自定义脚本
在 `config.yml` 文件中加入 `inject` 字段。
@@ -14,36 +10,11 @@ Todo:
+ inject: injectLogic/index.js
```
-然后在根目录新建与 `inject` 字段相对应的文件, 声明 `injectWithPathname` 函数, 写入[自定义逻辑](https://github.com/MuYunyun/create-react-doc/injectLogic/index.js), 完成 MathJax 的使用。
+然后在根目录新建与 `inject` 字段相对应的文件, 声明 `injectWithPathname` 函数, 写入[自定义逻辑](https://github.com/MuYunyun/create-react-doc/injectLogic/index.js)。
```js
// perf injectWithPathname logic every pathname changes
-const injectWithPathname = (pathname) => {
- // demo for using mathjax. see https://github.com/MuYunyun/create-react-doc/issues/63
- if (pathname !== '/高阶用法') return;
- window.MathJax = {
- tex: {
- inlineMath: [['$', '$'], ['\\(', '\\)']],
- },
- svg: {
- fontCache: 'global',
- },
- };
- const script = document.createElement('script');
- script.src = 'https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-svg.js';
- const tag = 'mathjax';
- script.id = tag;
- script.async = true;
- const scriptNode = document.getElementById(tag);
- try {
- if (!scriptNode) {
- document.head.appendChild(script);
- } else {
- scriptNode.remove();
- document.head.appendChild(script);
- }
- } catch (error) {}
-};
+const injectWithPathname = (pathname) => {}
-module.exports = { injectWithPathname };
+module.exports = { injectWithPathname }
```
\ No newline at end of file
diff --git a/injectLogic/index.js b/injectLogic/index.js
index 44ffdd691..a1a94c89d 100644
--- a/injectLogic/index.js
+++ b/injectLogic/index.js
@@ -9,31 +9,6 @@ const inject = () => {
}
// perf injectWithPathname logic every pathname changes
-const injectWithPathname = (pathname) => {
- // demo for using mathjax. see https://github.com/MuYunyun/create-react-doc/issues/63
- if (pathname !== '/高阶用法') return
- window.MathJax = {
- tex: {
- inlineMath: [['$', '$'], ['\\(', '\\)']],
- },
- svg: {
- fontCache: 'global',
- },
- }
- const script = document.createElement('script')
- script.src = 'https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-svg.js'
- const tag = 'mathjax'
- script.id = tag
- script.async = true
- const scriptNode = document.getElementById(tag)
- try {
- if (!scriptNode) {
- document.head.appendChild(script)
- } else {
- scriptNode.remove()
- document.head.appendChild(script)
- }
- } catch (error) {}
-}
+const injectWithPathname = (pathname) => {}
module.exports = { inject, injectWithPathname }
diff --git a/packages/scripts/src/conf/modifyMarkdownLoader.js b/packages/scripts/src/conf/modifyMarkdownLoader.js
index 9497693a7..0fd6eeffe 100644
--- a/packages/scripts/src/conf/modifyMarkdownLoader.js
+++ b/packages/scripts/src/conf/modifyMarkdownLoader.js
@@ -1,23 +1,23 @@
-/**
- * this webpack plugin is to modify markdown position.
- */
-const loaderUtils = require('loader-utils')
-const PATH = require('path')
-const FS = require('fs')
+// /**
+// * this webpack plugin is to modify markdown position.
+// */
+// const loaderUtils = require('loader-utils')
+// const PATH = require('path')
+// const FS = require('fs')
-module.exports = function (source) {
- const options = loaderUtils.getOptions(this) || {}
- const { replace, sep, path, include, extensions } = options
- let content = ''
+// module.exports = function (source) {
+// const options = loaderUtils.getOptions(this) || {}
+// const { replace, sep, path, include, extensions } = options
+// let content = ''
- let fpath = this.resourcePath.replace(sep || /___/g, PATH.sep)
- if (path && replace && (!include || include.test(fpath))) {
- fpath = fpath.replace(path, replace)
- this.addDependency(fpath)
- }
+// let fpath = this.resourcePath.replace(sep || /___/g, PATH.sep)
+// if (path && replace && (!include || include.test(fpath))) {
+// fpath = fpath.replace(path, replace)
+// this.addDependency(fpath)
+// }
- if (FS.existsSync(fpath)) {
- content = FS.readFileSync(fpath)
- }
- return content
-}
+// if (FS.existsSync(fpath)) {
+// content = FS.readFileSync(fpath)
+// }
+// return content
+// }
diff --git a/packages/scripts/src/conf/webpack.config.dev.js b/packages/scripts/src/conf/webpack.config.dev.js
index e83ae437d..dbddb072e 100644
--- a/packages/scripts/src/conf/webpack.config.dev.js
+++ b/packages/scripts/src/conf/webpack.config.dev.js
@@ -3,10 +3,10 @@ const webpack = require('webpack')
const path = require('path')
const upath = require('upath')
const HtmlWebpackPlugin = require('html-webpack-plugin')
-const { defaultHTMLPath, cacheDirPath } = require('crd-utils')
+const { defaultHTMLPath } = require('crd-utils')
const FriendlyErrorsWebpackPlugin = require('@nuxtjs/friendly-errors-webpack-plugin')
const { getDocsConfig } = require('crd-utils')
-const CreateSpareWebpackPlugin = require('./createSpareWebpackPlugin')
+// const CreateSpareWebpackPlugin = require('./createSpareWebpackPlugin')
const config = require('./webpack.config')
const paths = require('./path')
diff --git a/packages/scripts/src/conf/webpack.config.js b/packages/scripts/src/conf/webpack.config.js
index 61f84104c..92bffd03b 100644
--- a/packages/scripts/src/conf/webpack.config.js
+++ b/packages/scripts/src/conf/webpack.config.js
@@ -1,6 +1,5 @@
/* eslint-disable global-require */
/* eslint-disable import/no-dynamic-require */
-const path = require('path')
const webpack = require('webpack')
const webpackbar = require('webpackbar')
const fs = require('fs')
@@ -69,7 +68,6 @@ module.exports = {
loader: require.resolve('babel-loader'),
options: require('../../.babelrc'), // eslint-disable-line
},
- // '@mdx-js/loader',
{
loader: require.resolve('@mdx-js/loader'),
options: {
diff --git a/packages/scripts/src/utils/initCache.js b/packages/scripts/src/utils/initCache.js
index 7e2ffd08d..4b87aeba6 100644
--- a/packages/scripts/src/utils/initCache.js
+++ b/packages/scripts/src/utils/initCache.js
@@ -32,25 +32,25 @@ module.exports = function (program, cb) {
// eslint-disable-next-line no-plusplus
for (let i = 0; i < flatTreeData.length; i++) {
const mdfile = flatTreeData[i]
- const mdfilePath = mdfile.replace(
- process.cwd() + path.sep,
- '',
- )
+ // const mdfilePath = mdfile.replace(
+ // process.cwd() + path.sep,
+ // '',
+ // )
// generate file cache only it isn't in .gitignore
- if (!ifInGitIgnore(mdfilePath)) {
- // todo: remove ___
- const underlineFileName = mdfilePath.split(path.sep).join('___')
- const writeMarkdownPath = path.resolve(
- process.cwd(),
- cacheDirPath,
- 'md',
- underlineFileName,
- )
- if (fs.existsSync(mdfile)) {
- const content = fs.readFileSync(mdfile)
- write.sync(writeMarkdownPath, content)
- }
- }
+ // if (!ifInGitIgnore(mdfilePath)) {
+ // // todo: remove ___
+ // const underlineFileName = mdfilePath.split(path.sep).join('___')
+ // const writeMarkdownPath = path.resolve(
+ // process.cwd(),
+ // cacheDirPath,
+ // 'md',
+ // underlineFileName,
+ // )
+ // if (fs.existsSync(mdfile)) {
+ // const content = fs.readFileSync(mdfile)
+ // write.sync(writeMarkdownPath, content)
+ // }
+ // }
}
function dfsMap(data) {
From 291eebba6f0c081bfde3ef8322278555d1a8549d Mon Sep 17 00:00:00 2001
From: MuYunyun <328375795@qq.com>
Date: Wed, 9 Jun 2021 18:55:50 +0800
Subject: [PATCH 9/9] feat: create-react-doc support MDX
---
.babelrc.js | 36 ---------
config.yml | 3 +-
...32\344\271\211\344\270\273\351\242\230.md" | 0
...30\350\256\244\344\270\273\351\242\230.md" | 0
...46\345\206\231\347\273\204\344\273\266.md" | 2 +-
...60\345\255\246\345\205\254\345\274\217.md" | 20 +++--
...64\346\226\260\346\227\245\345\277\227.md" | 12 ++-
packages/create-react-doc/index.js | 1 -
packages/scripts/package.json | 4 -
.../scripts/src/conf/modifyMarkdownLoader.js | 23 ------
.../scripts/src/conf/webpack.config.dev.js | 11 ---
.../scripts/src/conf/webpack.config.prod.js | 14 +---
packages/scripts/src/utils/initCache.js | 40 +---------
packages/theme/index.html | 1 -
packages/theme/markdown/InlineCode.js | 74 -------------------
packages/theme/markdown/InlineCode.less | 33 ---------
packages/theme/markdown/index.js | 35 ---------
packages/theme/markdown/style/default.less | 31 ++++----
yarn.lock | 49 +-----------
19 files changed, 43 insertions(+), 346 deletions(-)
delete mode 100644 .babelrc.js
rename "docs/\350\207\252\345\256\232\344\271\211\344\270\273\351\242\230.md" => "docs/\344\270\273\351\242\230/\350\207\252\345\256\232\344\271\211\344\270\273\351\242\230.md" (100%)
rename "docs/\351\273\230\350\256\244\344\270\273\351\242\230.md" => "docs/\344\270\273\351\242\230/\351\273\230\350\256\244\344\270\273\351\242\230.md" (100%)
delete mode 100644 packages/scripts/src/conf/modifyMarkdownLoader.js
delete mode 100644 packages/theme/markdown/InlineCode.js
delete mode 100644 packages/theme/markdown/InlineCode.less
diff --git a/.babelrc.js b/.babelrc.js
deleted file mode 100644
index 806a2b7fe..000000000
--- a/.babelrc.js
+++ /dev/null
@@ -1,36 +0,0 @@
-const babelrc = {
- presets: [
- [
- "@babel/preset-env",
- {
- targets: {
- browsers: ["last 2 versions", "ie >= 10"],
- },
- },
- ],
- ["@babel/preset-react", {
- "runtime": "automatic"
- }]
- ],
- plugins: [
- "@babel/plugin-syntax-object-rest-spread",
- "@babel/plugin-syntax-dynamic-import",
- "@babel/plugin-transform-async-to-generator",
- "@babel/plugin-proposal-class-properties",
- "@babel/plugin-transform-runtime"
- ],
- env: {
- production: {},
- },
-};
-
-if (process.env.NODE_ENV === 'development') {
- // 不要包含多余的空格字符和行结束符。
- // 设置为“auto”时，对于大于500KB的输入大小，设置为"true"。
- // https://babeljs.io/docs/usage/api/#options
- babelrc.cacheDirectory = true;
-} else {
- babelrc.compact = true;
-}
-
-module.exports = babelrc
diff --git a/config.yml b/config.yml
index b4c90064f..c4ea33148 100644
--- a/config.yml
+++ b/config.yml
@@ -9,9 +9,8 @@ title: Create React Doc
menu: [
docs/快速上手.md,
docs/更新日志.md,
- docs/默认主题.md,
+ docs/主题,
docs/站点发布.md,
- docs/自定义主题.md,
docs/其它工具.md,
docs/书写组件.md,
docs/数学公式.md,
diff --git "a/docs/\350\207\252\345\256\232\344\271\211\344\270\273\351\242\230.md" "b/docs/\344\270\273\351\242\230/\350\207\252\345\256\232\344\271\211\344\270\273\351\242\230.md"
similarity index 100%
rename from "docs/\350\207\252\345\256\232\344\271\211\344\270\273\351\242\230.md"
rename to "docs/\344\270\273\351\242\230/\350\207\252\345\256\232\344\271\211\344\270\273\351\242\230.md"
diff --git "a/docs/\351\273\230\350\256\244\344\270\273\351\242\230.md" "b/docs/\344\270\273\351\242\230/\351\273\230\350\256\244\344\270\273\351\242\230.md"
similarity index 100%
rename from "docs/\351\273\230\350\256\244\344\270\273\351\242\230.md"
rename to "docs/\344\270\273\351\242\230/\351\273\230\350\256\244\344\270\273\351\242\230.md"
diff --git "a/docs/\344\271\246\345\206\231\347\273\204\344\273\266.md" "b/docs/\344\271\246\345\206\231\347\273\204\344\273\266.md"
index 21b3a89d6..0e82c45a4 100644
--- "a/docs/\344\271\246\345\206\231\347\273\204\344\273\266.md"
+++ "b/docs/\344\271\246\345\206\231\347\273\204\344\273\266.md"
@@ -2,7 +2,7 @@ import { Button } from '../components/index.jsx'
## 书写组件
-[create-react-doc](https://github.com/MuYunyun/create-react-doc) 内置了 [mdx](https://github.com/mdx-js/mdx), 你可以在 .md 文件中书写 React 组件, 因此你可以选择 create-react-doc 来快速搭建组件站点开发环境。
+[create-react-doc](https://github.com/MuYunyun/create-react-doc) 内置了 [mdx](https://github.com/mdx-js/mdx), 你可以在 .md 文件中书写 React 组件, 因此你可以选择 create-react-doc 来快速搭建组件站点。
## 例子
### Button 组件
diff --git "a/docs/\346\225\260\345\255\246\345\205\254\345\274\217.md" "b/docs/\346\225\260\345\255\246\345\205\254\345\274\217.md"
index ddd0a9dfa..5cebe3e23 100644
--- "a/docs/\346\225\260\345\255\246\345\205\254\345\274\217.md"
+++ "b/docs/\346\225\260\345\255\246\345\205\254\345\274\217.md"
@@ -1,30 +1,38 @@
## 数学公式
-在 `$$` 与 `$$` 之间书写 latex 数学公式即能显示在网页上。
+支持在 `$$` 与 `$$` 之间书写 latex 数学公式即能显示在网页上。
```js
$$
z = \frac{x}{y}
$$
+```
+
+被转化为:
$$
-C_1 \quad= \quad c_2 + c_4^3
+z = \frac{x}{y}
$$
+```js
$$
-y = \sqrt {x_1^2 + x_2^2 + x_3^2 + x_4^2}
+C_1 \quad= \quad c_2 + c_4^3
$$
```
-被转化为
+被转化为:
$$
-z = \frac{x}{y}
+C_1 \quad= \quad c_2 + c_4^3
$$
+```js
$$
-C_1 \quad= \quad c_2 + c_4^3
+y = \sqrt {x_1^2 + x_2^2 + x_3^2 + x_4^2}
$$
+```
+
+被转化为:
$$
y = \sqrt {x_1^2 + x_2^2 + x_3^2 + x_4^2}
diff --git "a/docs/\346\233\264\346\226\260\346\227\245\345\277\227.md" "b/docs/\346\233\264\346\226\260\346\227\245\345\277\227.md"
index f30f7c77c..fecc3e11a 100644
--- "a/docs/\346\233\264\346\226\260\346\227\245\345\277\227.md"
+++ "b/docs/\346\233\264\346\226\260\346\227\245\345\277\227.md"
@@ -2,15 +2,19 @@
`create-react-doc` 严格遵循 [Semantic Versioning 2.0.0](http://semver.org/lang/zh-CN/) 语义化版本规范。
-### 1.4.0
+### 1.3.0
`2020-06-09`
- **Feature**
- 🚀 create-react-doc 集成 MDX。[issue](https://github.com/MuYunyun/create-react-doc/issues/138)、[mr](https://github.com/MuYunyun/create-react-doc/pull/143)
- - 🚀 支持在 .md 文件中`书写 React 组件`。
- - 🚀 支持在 .md 文件中`书写数学公式`。
+ - 🚀 支持在 markdown 文件中`书写 React 组件`。
+ - 🚀 支持在 markdown 文件中`书写数学公式`。
+
+- **Enhancement**
+
+ - 🎈 支持 yarn up、yarn up:dev 在 lerna 项目中快速安装包。[mr](https://github.com/MuYunyun/create-react-doc/pull/143/files?file-filters%5B%5D=.html&file-filters%5B%5D=.js&file-filters%5B%5D=.json&file-filters%5B%5D=.less&file-filters%5B%5D=.lock&file-filters%5B%5D=.sh)
### 1.2.0
@@ -114,7 +118,7 @@
- **Enhancement**
- - 🎈项目结构重构为 monorepo。[pr](https://github.com/MuYunyun/create-react-doc/pull/16)
+ - 🎈 项目结构重构为 monorepo。[pr](https://github.com/MuYunyun/create-react-doc/pull/16)
### 0.1.0
diff --git a/packages/create-react-doc/index.js b/packages/create-react-doc/index.js
index 935a90c8f..e8da6f216 100755
--- a/packages/create-react-doc/index.js
+++ b/packages/create-react-doc/index.js
@@ -39,7 +39,6 @@ program
const { start, build, deploy, theme } = program
-console.log('start', start)
if (!start && !build && !deploy && !theme) return initProject(program)
if (theme) {
diff --git a/packages/scripts/package.json b/packages/scripts/package.json
index 5f5bfca15..207d2ba40 100644
--- a/packages/scripts/package.json
+++ b/packages/scripts/package.json
@@ -33,17 +33,13 @@
"eslint": "^7.11.0",
"eslint-loader": "^4.0.2",
"file-loader": "^1.1.11",
- "front-matter": "^4.0.2",
"fs-extra": "^5.0.0",
"gh-pages": "^1.2.0",
- "highlight.js": "^11.0.1",
"html-webpack-plugin": "^4.5.1",
"less-loader": "^7.2.1",
"loader-utils": "^2.0.0",
"loading-cli": "^1.0.6",
"local-ip-url": "^1.0.1",
- "markdown-it": "^12.0.6",
- "markdown-it-container": "^3.0.0",
"mini-css-extract-plugin": "^0.4.0",
"open-browsers": "^1.1.1",
"path-browserify": "^1.0.1",
diff --git a/packages/scripts/src/conf/modifyMarkdownLoader.js b/packages/scripts/src/conf/modifyMarkdownLoader.js
deleted file mode 100644
index 0fd6eeffe..000000000
--- a/packages/scripts/src/conf/modifyMarkdownLoader.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// /**
-// * this webpack plugin is to modify markdown position.
-// */
-// const loaderUtils = require('loader-utils')
-// const PATH = require('path')
-// const FS = require('fs')
-
-// module.exports = function (source) {
-// const options = loaderUtils.getOptions(this) || {}
-// const { replace, sep, path, include, extensions } = options
-// let content = ''
-
-// let fpath = this.resourcePath.replace(sep || /___/g, PATH.sep)
-// if (path && replace && (!include || include.test(fpath))) {
-// fpath = fpath.replace(path, replace)
-// this.addDependency(fpath)
-// }
-
-// if (FS.existsSync(fpath)) {
-// content = FS.readFileSync(fpath)
-// }
-// return content
-// }
diff --git a/packages/scripts/src/conf/webpack.config.dev.js b/packages/scripts/src/conf/webpack.config.dev.js
index dbddb072e..227108fd0 100644
--- a/packages/scripts/src/conf/webpack.config.dev.js
+++ b/packages/scripts/src/conf/webpack.config.dev.js
@@ -6,7 +6,6 @@ const HtmlWebpackPlugin = require('html-webpack-plugin')
const { defaultHTMLPath } = require('crd-utils')
const FriendlyErrorsWebpackPlugin = require('@nuxtjs/friendly-errors-webpack-plugin')
const { getDocsConfig } = require('crd-utils')
-// const CreateSpareWebpackPlugin = require('./createSpareWebpackPlugin')
const config = require('./webpack.config')
const paths = require('./path')
@@ -121,16 +120,6 @@ module.exports = function (cmd) {
template: defaultHTMLPath,
title: docsConfig && docsConfig.title ? docsConfig.title : 'Create React Doc',
}),
- // new CreateSpareWebpackPlugin({
- // // 备用文件目录，比对是否存在，不存在生成，根据 sep 目录规则生成
- // path: path.join(cacheDirPath, './md'),
- // sep: '___', // 检查目标目录文件，文件名存储，文件夹+下划线间隔+文件名
- // directoryTrees: { // 索引目录
- // dir: cmd.markdownPaths,
- // mdconf: true,
- // extensions: /\.md$/,
- // },
- // }),
new FriendlyErrorsWebpackPlugin({
clearConsole: true,
}),
diff --git a/packages/scripts/src/conf/webpack.config.prod.js b/packages/scripts/src/conf/webpack.config.prod.js
index c1fc15317..631397b4d 100755
--- a/packages/scripts/src/conf/webpack.config.prod.js
+++ b/packages/scripts/src/conf/webpack.config.prod.js
@@ -10,9 +10,8 @@ const { generateSiteMap } = require('crd-generator-sitemap')
// const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
// const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
const fs = require('fs-extra')
-const { defaultHTMLPath, cacheDirPath, docsBuildDist } = require('crd-utils')
+const { defaultHTMLPath, docsBuildDist } = require('crd-utils')
const { getDocsConfig } = require('crd-utils')
-const CreateSpareWebpackPlugin = require('./createSpareWebpackPlugin')
const config = require('./webpack.config')
const paths = require('./path')
const getPrerenderRoutes = require('./getPrerenderRoutes')
@@ -147,17 +146,6 @@ module.exports = function (cmd) {
dir: cmd.markdownPaths,
toDir: config.output.path,
}),
- // new CreateSpareWebpackPlugin({
- // // 备用文件目录，比对是否存在，不存在生成，根据 sep 目录规则生成
- // path: path.join(cacheDirPath, './md'),
- // sep: '___', // 检查目标目录文件，文件名存储，文件夹+下划线间隔+文件名
- // directoryTrees: {
- // // 索引目录
- // dir: cmd.markdownPaths,
- // mdconf: true,
- // extensions: /\.md$/,
- // },
- // }),
// new webpack.optimize.DedupePlugin(),
new MiniCssExtractPlugin({
// Options similar to the same options in webpackOptions.output
diff --git a/packages/scripts/src/utils/initCache.js b/packages/scripts/src/utils/initCache.js
index 4b87aeba6..de31ed6ca 100644
--- a/packages/scripts/src/utils/initCache.js
+++ b/packages/scripts/src/utils/initCache.js
@@ -1,57 +1,19 @@
const write = require('write')
const path = require('path')
-const fs = require('fs')
const { cacheDirPath, getDocsConfig } = require('crd-utils')
const DirectoryTree = require('../conf/node-directory-tree')
-const { ifInGitIgnore } = require('./index')
-
-function restRuctureMarkdown(items, arr = []) {
- items.forEach((item) => {
- if (item.type === 'directory') {
- restRuctureMarkdown(item.children, arr)
- } else if (/\.md$/.test(item.path)) {
- arr.push(item.path)
- }
- })
- return arr
-}
module.exports = function (program, cb) {
const treeData = program.markdownPaths.map((markdownPath) => {
return DirectoryTree(markdownPath, {
- mdconf: true, // 存在 Markdown 设置
+ mdconf: true, // Markdown config for exsiting file.
extensions: /\.md/,
})
})
- // cache Markdown, Markdown file name rule: `folder__folder__Markdown name.md`
- const flatTreeData = restRuctureMarkdown(treeData)
// to collect search data
const searchData = []
const docsConfig = getDocsConfig()
const useSearchPlugin = docsConfig.search && docsConfig.host
- // eslint-disable-next-line no-plusplus
- for (let i = 0; i < flatTreeData.length; i++) {
- const mdfile = flatTreeData[i]
- // const mdfilePath = mdfile.replace(
- // process.cwd() + path.sep,
- // '',
- // )
- // generate file cache only it isn't in .gitignore
- // if (!ifInGitIgnore(mdfilePath)) {
- // // todo: remove ___
- // const underlineFileName = mdfilePath.split(path.sep).join('___')
- // const writeMarkdownPath = path.resolve(
- // process.cwd(),
- // cacheDirPath,
- // 'md',
- // underlineFileName,
- // )
- // if (fs.existsSync(mdfile)) {
- // const content = fs.readFileSync(mdfile)
- // write.sync(writeMarkdownPath, content)
- // }
- // }
- }
function dfsMap(data) {
// eslint-disable-next-line no-plusplus
diff --git a/packages/theme/index.html b/packages/theme/index.html
index 1471b8b92..02b7a91c4 100644
--- a/packages/theme/index.html
+++ b/packages/theme/index.html
@@ -9,7 +9,6 @@
-
diff --git a/packages/theme/markdown/InlineCode.js b/packages/theme/markdown/InlineCode.js
deleted file mode 100644
index f84e21f4c..000000000
--- a/packages/theme/markdown/InlineCode.js
+++ /dev/null
@@ -1,74 +0,0 @@
-// import classNames from 'classnames'
-import React from 'react'
-import Highlight, { defaultProps } from 'prism-react-renderer'
-import styles from './InlineCode.less'
-
-// export default class Canvas extends PureComponent {
-// constructor() {
-// super()
-// this.state = {
-// height: 0,
-// }
-// this.playerId = `${parseInt(Math.random() * 1e9, 10).toString(36)}`
-// }
-// onClick() {
-// this.setState({
-// height: this.state.height === 0 ? this.codeDom.clientHeight : 0,
-// })
-// }
-// render() {
-// const sourceCode = this.props.value || ''
-// // const code = sourceCode.replace(/^__dome__/, '').replace(/\\`/g, '`')
-// const code = sourceCode.replace(/\\`/g, '`')
-// const PreCode = height => (
-//
-// this.codeDom = node} className={classNames('hljs', { [`language-${this.props.language}`]: this.props.language })}>
-// {code}
-//
-//
-// )
-// // const isPreview = /^(html|htm)$/.test(this.props.language)
-
-// // if (/^__dome__/.test(sourceCode)) {
-// // return (
-// //
-// // {isPreview && (
-// //
-// // )}
-// // {PreCode(this.state.height)}
-// //
-// // {this.state.height === 0 ? '显示' : '隐藏'}代码
-// // {this.props.language &&
{this.props.language}
}
-// //
-// //
-// // )
-// // }
-// return PreCode()
-// }
-// }
-
-export default ({ children, className }) => {
- const language = className.replace(/language-/, '')
- return (
-
- {({ className, style, tokens, getLineProps, getTokenProps }) => (
-
- {tokens.map((line, i) => (
-
- {line.map((token, key) => (
-
- ))}
-
- ))}
-
- )}
-
- )
-}
diff --git a/packages/theme/markdown/InlineCode.less b/packages/theme/markdown/InlineCode.less
deleted file mode 100644
index 0398827f8..000000000
--- a/packages/theme/markdown/InlineCode.less
+++ /dev/null
@@ -1,33 +0,0 @@
-.demo {
- border: 1px solid #d5d5d5;
- border-radius: 4px;
- margin-bottom: 15px;
- .demoBody {
- padding: 10px;
- }
- pre.highlight {
- margin-bottom: 0;
- margin-top: 0;
- transition: all .3s;
- :global(.hljs) {
- padding: 10px;
- }
- }
- .demoBody + pre.highlight + .demoControl {
- border-top: 1px solid #d5d5d5;
- }
- .isPreview {
- border-top: 1px solid #d5d5d5;
- }
- .demoControl {
- padding: 3px 8px;
- line-height: 20px;
- background-color: rgba(0,0,0,.03);
- cursor: pointer;
- .language {
- float: right;
- text-shadow: 0 1px white;
- color: #b1b1b1;
- }
- }
-}
diff --git a/packages/theme/markdown/index.js b/packages/theme/markdown/index.js
index 00c92d946..391022a2c 100644
--- a/packages/theme/markdown/index.js
+++ b/packages/theme/markdown/index.js
@@ -1,33 +1,17 @@
import { useState, useEffect, useRef } from 'react'
import cx from 'classnames'
-// import ReactMarkdown from 'react-markdown'
-// import hljs from 'highlight.js'
import { MDXProvider } from '@mdx-js/react'
import CodeBlock from './codeBlock'
-// import InlineCode from './InlineCode'
import Link from './Link'
import Loading from '../component/Loading'
import styles from './style/index.less'
-// hljs.configure({
-// tabReplace: ' ', // 2 spaces
-// classPrefix: '', // don't append class prefix
-// })
-
-const formatPath = path =>
- path.replace(/^(\/|\\)/, '')
- .replace(/\.md$/, '')
- .replace(/\\/g, '/')
- .split('/')
- .join('___')
-
const components = {
code: CodeBlock,
link: Link,
}
function Markdown(markdownProps) {
- // const { props } = markdownProps
const { props } = markdownProps
const { relative } = props
const [MarkdownCP, setMarkdownCP] = useState(null)
@@ -36,16 +20,6 @@ function Markdown(markdownProps) {
const renderMarkdown = () => {
const relativeMd = relative
if (!relativeMd) return null
- // let filename = formatPath(relativeMd)
- // if (type === 'directory') {
- // filename = formatPath(relativeMd)
- // }
- // import(`__project_root__/.cache/md/${filename}.md`).then((data) => {
- // import(`__project_root__${relative}`).then((data) => {
- // console.log('data', data)
- // // data.default is a function, so we should write () => data.default in setState here.
- // // setMarkdownCP(() => (data.default || data))
- // })
const rmFirstSlash = relative.slice(1, relative.length - 3)
// it must be writen with / & .md in dynamic import
@@ -59,15 +33,6 @@ function Markdown(markdownProps) {
renderMarkdown()
}, [])
- // useEffect(() => {
- // const code = markdownWrapperRef.current.getElementsByTagName('code')
- // for (let i = 0; i < code.length; i += 1) {
- // if (code[i].parentNode && code[i].parentNode.tagName === 'PRE') {
- // hljs.highlightBlock(code[i])
- // }
- // }
- // }, [markdownStr])
-
return (
{
diff --git a/packages/theme/markdown/style/default.less b/packages/theme/markdown/style/default.less
index 4e36f86bc..4f945c55c 100644
--- a/packages/theme/markdown/style/default.less
+++ b/packages/theme/markdown/style/default.less
@@ -3,27 +3,26 @@ code {
word-wrap: normal;
}
-code:not(.hljs) {
- padding: 0.2em 0.4em;
- margin: 0;
- font-size: 85%;
- background-color: rgba(27, 31, 35, 0.07);
- border-radius: 3px;
-}
-
-code.hljs {
- padding: 16px;
- font-size: 95%;
- line-height: 1.5;
- display: block;
- text-shadow: 0 1px #fff;
-}
+// code:not(.hljs) {
+// padding: 0.2em 0.4em;
+// margin: 0;
+// font-size: 85%;
+// background-color: rgba(27, 31, 35, 0.07);
+// border-radius: 3px;
+// }
+
+// code.hljs {
+// padding: 16px;
+// font-size: 95%;
+// line-height: 1.5;
+// display: block;
+// text-shadow: 0 1px #fff;
+// }
pre {
max-height: 35em;
position: relative;
overflow: auto;
- // background-color: #F0F0F0;
background-color: rgb(251, 251, 251);
border-radius: 3px;
}
diff --git a/yarn.lock b/yarn.lock
index dfe869cd1..1d9f577cb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2730,11 +2730,6 @@ argparse@^1.0.7:
dependencies:
sprintf-js "~1.0.2"
-argparse@^2.0.1:
- version "2.0.1"
- resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
- integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
-
aria-query@^4.2.2:
version "4.2.2"
resolved "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"
@@ -4850,7 +4845,7 @@ entities@^1.1.1:
resolved "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
-entities@^2.0.0, entities@~2.1.0:
+entities@^2.0.0:
version "2.1.0"
resolved "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
@@ -5728,13 +5723,6 @@ from2@^2.1.0:
inherits "^2.0.1"
readable-stream "^2.0.0"
-front-matter@^4.0.2:
- version "4.0.2"
- resolved "https://registry.npmjs.org/front-matter/-/front-matter-4.0.2.tgz#b14e54dc745cfd7293484f3210d15ea4edd7f4d5"
- integrity sha512-I8ZuJ/qG92NWX8i5x1Y8qyj3vizhXS31OxjKDu3LKP+7/qBgfIKValiZIEwoVoJKUHlhWtYrktkxV1XsX+pPlg==
- dependencies:
- js-yaml "^3.13.1"
-
fs-constants@^1.0.0:
version "1.0.0"
resolved "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
@@ -6271,11 +6259,6 @@ hex-color-regex@^1.1.0:
resolved "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
-highlight.js@^11.0.1:
- version "11.0.1"
- resolved "https://registry.npmjs.org/highlight.js/-/highlight.js-11.0.1.tgz#a78bafccd9aa297978799fe5eed9beb7ee1ef887"
- integrity sha512-EqYpWyTF2s8nMfttfBA2yLKPNoZCO33pLS4MnbXQ4hECf1TKujCt1Kq7QAdrio7roL4+CqsfjqwYj4tYgq0pJQ==
-
history@^4.7.2:
version "4.10.1"
resolved "https://registry.npmjs.org/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"
@@ -7490,13 +7473,6 @@ lines-and-columns@^1.1.6:
resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
-linkify-it@^3.0.1:
- version "3.0.2"
- resolved "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.2.tgz#f55eeb8bc1d3ae754049e124ab3bb56d97797fb8"
- integrity sha512-gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ==
- dependencies:
- uc.micro "^1.0.1"
-
load-json-file@^1.0.0:
version "1.1.0"
resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -7806,22 +7782,6 @@ markdown-escapes@^1.0.0:
resolved "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
-markdown-it-container@^3.0.0:
- version "3.0.0"
- resolved "https://registry.npmjs.org/markdown-it-container/-/markdown-it-container-3.0.0.tgz#1d19b06040a020f9a827577bb7dbf67aa5de9a5b"
- integrity sha512-y6oKTq4BB9OQuY/KLfk/O3ysFhB3IMYoIWhGJEidXt1NQFocFK2sA2t0NYZAMyMShAGL6x5OPIbrmXPIqaN9rw==
-
-markdown-it@^12.0.6:
- version "12.0.6"
- resolved "https://registry.npmjs.org/markdown-it/-/markdown-it-12.0.6.tgz#adcc8e5fe020af292ccbdf161fe84f1961516138"
- integrity sha512-qv3sVLl4lMT96LLtR7xeRJX11OUFjsaD5oVat2/SNBIb21bJXwal2+SklcRbTwGwqWpWH/HRtYavOoJE+seL8w==
- dependencies:
- argparse "^2.0.1"
- entities "~2.1.0"
- linkify-it "^3.0.1"
- mdurl "^1.0.1"
- uc.micro "^1.0.5"
-
math-expression-evaluator@^1.2.14:
version "1.2.22"
resolved "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.22.tgz#c14dcb3d8b4d150e5dcea9c68c8dad80309b0d5e"
@@ -7887,7 +7847,7 @@ mdn-data@2.0.4:
resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==
-mdurl@^1.0.0, mdurl@^1.0.1:
+mdurl@^1.0.0:
version "1.0.1"
resolved "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
@@ -12078,11 +12038,6 @@ typedarray@^0.0.6:
resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-uc.micro@^1.0.1, uc.micro@^1.0.5:
- version "1.0.6"
- resolved "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
- integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
-
uglify-js@^3.1.4:
version "3.11.5"
resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.5.tgz#d6788bc83cf35ff18ea78a65763e480803409bc6"