Merge pull request #140 from hocgin/develop

Develop

.dumirc.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from 'dumi';
-import { join, resolve } from 'path';
+import { resolve } from 'path';
 
 export const useLogger = () => {
   let result: any = [];
@@ -16,15 +16,16 @@ export const useLogger = () => {
 
 export default defineConfig({
   outputPath: 'docs-dist',
-  // more config: https://d.umijs.org/config
-  locales: [
-    { id: 'zh-CN', name: '中文' },
-    { id: 'en-US', name: 'EN' },
-  ],
+  footer: false,
+  favicons: ['https://cdn.hocgin.top/uPic/mp_logo.png'],
   themeConfig: {
     name: 'HUI',
     logo: 'https://cdn.hocgin.top/uPic/mp_logo.png',
   },
+  locales: [
+    { id: 'zh-CN', name: '中文' },
+    { id: 'en-US', name: 'EN' },
+  ],
   exportStatic: {},
   ignoreMomentLocale: true,
   alias: {

.fatherrc.ts

@@ -35,4 +35,4 @@ export default defineConfig({
       'antd',
     ],
   ],
-});
+} as IFatherConfig);

.npmrc

@@ -0,0 +1,2 @@
+auto-install-peers=true
+shamefully-hoist=true

package.json

@@ -14,8 +14,8 @@
     "docs:build": "dumi build",
     "docs:deploy": "gh-pages -d docs-dist",
     "build": "cross-env NODE_OPTIONS=\"--max_old_space_size=8192\" father build",
-    "link": "npm link",
-    "unlink": "npm unlink",
+    "link": "pnpm link --global",
+    "unlink": "pnpm unlink --global",
     "patchpackage": "patch-package",
     "deploy": "npm run docs:build && npm run docs:deploy",
     "release": "npm run build && npm publish --access public",
@@ -40,13 +40,9 @@
     ]
   },
   "dependencies": {
+    "@ant-design/compatible": "^5.1.1",
     "@ant-design/icons": "^4.6.3",
-    "@ant-design/pro-descriptions": "^1.9.13",
-    "@ant-design/pro-field": "^1.34.8",
-    "@ant-design/pro-form": "^1.43.2",
-    "@ant-design/pro-layout": "^6.25.4",
-    "@ant-design/pro-provider": "^2.1.1",
-    "@ant-design/pro-table": "^2.53.1",
+    "@ant-design/pro-components": "^2.3.37",
     "@babel/runtime": "^7.17.9",
     "@tiptap/core": "^2.0.0-beta.204",
     "@tiptap/extension-blockquote": "^2.0.0-beta.204",
@@ -94,31 +90,31 @@
     "@uiw/react-amap": "^4.0.2",
     "@uiw/react-amap-require-script": "^4.0.2",
     "ahooks": "^3.3.8",
+    "antd": "5.0.3",
     "classnames": "^2.3.1",
     "codemirror": "^5.65.5",
     "memoize-one": "^5.2.1",
-    "mockjs": "^1.1.0",
-    "moment": "^2.29.4",
     "prismjs": "^1.28.0",
-    "prosemirror-commands": "^1.4.0",
-    "prosemirror-history": "^1.3.0",
-    "prosemirror-model": "^1.18.1",
-    "prosemirror-state": "^1.4.1",
-    "prosemirror-view": "^1.28.2",
     "query-string": "^7.0.1",
     "randexp": "^0.5.3",
     "rc-tween-one": "^3.0.6",
     "react-color": "^2.19.3",
     "react-copy-to-clipboard": "^5.0.4",
     "react-countup": "^5.2.0",
     "react-truncate": "^2.4.0",
-    "tippy.js": "^6.3.7"
+    "tippy.js": "^6.3.7",
+    "zeed-dom": "0.9.19"
+  },
+  "resolutions": {
+    "zeed-dom": "0.9.19"
   },
   "peerDependencies": {
-    "antd": "4.22.5"
+    "antd": "5.0.3",
+    "react": "17.x",
+    "react-dom": "17.x"
   },
   "optionalDependencies": {
-    "@hocgin/hkit": "^1.0.83",
+    "@hocgin/hkit": "^2.0.12",
     "aplayer": "^1.10.1",
     "artplayer": "^4.4.7",
     "console-feed": "^3.3.0",
@@ -134,19 +130,16 @@
     "@types/react-color": "^3.0.6",
     "@types/react-copy-to-clipboard": "^5.0.1",
     "@uiw/react-amap-types": "^4.0.2",
-    "antd": "4.22.5",
     "babel-plugin-import": "^1.13.5",
-    "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "cross-env": "^7.0.3",
     "dumi": "^2.0.10",
-    "father": "^4.0.0",
+    "father": "^4.1.0",
     "gh-pages": "^3.0.0",
     "lint-staged": "^10.0.7",
+    "mockjs": "^1.1.0",
     "patch-package": "^6.4.7",
     "prettier": "^2.2.1",
-    "react": "^18.0.0",
-    "rollup-plugin-typescript-paths": "^1.3.1",
     "yorkie": "^2.0.0"
   },
   "author": {