chore: bump dumi@2.x.x && father 4.x.x (#334)

react-component · Nov 17, 2023 · b65fd88 · b65fd88
1 parent 1df83b4
commit b65fd88
Show file tree

Hide file tree

Showing 23 changed files with 185 additions and 44 deletions.
diff --git a/.umirc.ts → .dumirc.ts b/.umirc.ts → .dumirc.ts
@@ -2,9 +2,11 @@
 import { defineConfig } from 'dumi';
 
 export default defineConfig({
-  title: 'rc-steps',
-  favicon: 'https://avatars0.githubusercontent.com/u/9441414?s=200&v=4',
-  logo: 'https://avatars0.githubusercontent.com/u/9441414?s=200&v=4',
+  favicons: ['https://avatars0.githubusercontent.com/u/9441414?s=200&v=4'],
+  themeConfig: {
+    name: 'rc-steps',
+    logo: 'https://avatars0.githubusercontent.com/u/9441414?s=200&v=4',
+  },
   outputPath: '.doc',
   exportStatic: {},
   base: '/rc-steps',

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   setup:
@@ -15,7 +15,7 @@ jobs:
 
       - uses: actions/setup-node@v1
         with:
-          node-version: '12'
+          node-version: '18'
 
       - name: cache package-lock.json
         uses: actions/cache@v2
@@ -24,7 +24,7 @@ jobs:
           key: lock-${{ github.sha }}
 
       - name: create package-lock.json
-        run: npm i --package-lock-only
+        run: npm i --package-lock-only --ignore-scripts
 
       - name: hack for singe file
         run: |

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-.storybook
 .iml
 *.log
 .idea/
@@ -32,3 +31,9 @@ yarn.lock
 .doc
 .umi
 .npmrc
+
+# dumi
+.dumi/tmp
+.dumi/tmp-test
+.dumi/tmp-production
+.env.local
diff --git a/README.md b/README.md
@@ -27,6 +27,8 @@ React steps component.
 npm install rc-steps
 ```
 
+<br>
+
 ```jsx | pure
 <Steps current={1}>
   <Steps.Step title="first" />
@@ -179,7 +181,7 @@ https://react-component.github.io/steps/
 
 ## Development
 
-```
+```bash
 npm install
 npm start
 ```

diff --git a/docs/demo/alternativeLabel.md b/docs/demo/alternativeLabel.md
@@ -1,2 +1,8 @@
-## alternativeLabel
-<code src="../examples/alternativeLabel.jsx">
+---
+title: alternativeLabel
+nav:
+  title: Demo
+  path: /demo
+---
+
+<code src="../examples/alternativeLabel.jsx"></code>
diff --git a/docs/demo/composable.md b/docs/demo/composable.md
@@ -1,2 +1,8 @@
-## composable
-<code src="../examples/composable.jsx">
+---
+title: composable
+nav:
+  title: Demo
+  path: /demo
+---
+
+<code src="../examples/composable.jsx"></code>
diff --git a/docs/demo/custom-svg-icon.md b/docs/demo/custom-svg-icon.md
@@ -1,2 +1,8 @@
-## custom-svg-icon
-<code src="../examples/custom-svg-icon.jsx">
+---
+title: custom-svg-icon
+nav:
+  title: Demo
+  path: /demo
+---
+
+<code src="../examples/custom-svg-icon.jsx"></code>
diff --git a/docs/demo/customIcon.md b/docs/demo/customIcon.md
@@ -1,2 +1,8 @@
-## customIcon
-<code src="../examples/customIcon.jsx">
+---
+title: customIcon
+nav:
+  title: Demo
+  path: /demo
+---
+
+<code src="../examples/customIcon.jsx"></code>
diff --git a/docs/demo/dynamic.md b/docs/demo/dynamic.md
@@ -1,2 +1,8 @@
-## dynamic
-<code src="../examples/dynamic.jsx">
+---
+title: dynamic
+nav:
+  title: Demo
+  path: /demo
+---
+
+<code src="../examples/dynamic.jsx"></code>
diff --git a/docs/demo/errorStep.md b/docs/demo/errorStep.md
@@ -1,2 +1,8 @@
-## errorStep
-<code src="../examples/errorStep.jsx">
+---
+title: errorStep
+nav:
+  title: Demo
+  path: /demo
+---
+
+<code src="../examples/errorStep.jsx"></code>
diff --git a/docs/demo/inline.md b/docs/demo/inline.md
@@ -1,2 +1,8 @@
-## inline
-<code src="../examples/inline.jsx">
+---
+title: inline
+nav:
+  title: Demo
+  path: /demo
+---
+
+<code src="../examples/inline.jsx"></code>
diff --git a/docs/demo/nav-base.md b/docs/demo/nav-base.md
@@ -1,2 +1,8 @@
-## nav-base
-<code src="../examples/nav-base.jsx">
+---
+title: nav-base
+nav:
+  title: Demo
+  path: /demo
+---
+
+<code src="../examples/nav-base.jsx"></code>
diff --git a/docs/demo/nextStep.md b/docs/demo/nextStep.md
@@ -1,2 +1,8 @@
-## nextStep
-<code src="../examples/nextStep.jsx">
+---
+title: nextStep
+nav:
+  title: Demo
+  path: /demo
+---
+
+<code src="../examples/nextStep.jsx"></code>
diff --git a/docs/demo/progressDot.md b/docs/demo/progressDot.md
@@ -1,2 +1,8 @@
-## progressDot
-<code src="../examples/progressDot.jsx">
+---
+title: progressDot
+nav:
+  title: Demo
+  path: /demo
+---
+
+<code src="../examples/progressDot.jsx"></code>
diff --git a/docs/demo/simple.md b/docs/demo/simple.md
@@ -1,2 +1,8 @@
-## simple
-<code src="../examples/simple.jsx">
+---
+title: simple
+nav:
+  title: Demo
+  path: /demo
+---
+
+<code src="../examples/simple.jsx"></code>
diff --git a/docs/demo/smallSize.md b/docs/demo/smallSize.md
@@ -1,2 +1,8 @@
-## smallSize
-<code src="../examples/smallSize.jsx">
+---
+title: smallSize
+nav:
+  title: Demo
+  path: /demo
+---
+
+<code src="../examples/smallSize.jsx"></code>
diff --git a/docs/demo/stepIcon.md b/docs/demo/stepIcon.md
@@ -1,2 +1,8 @@
-## stepIcon
-<code src="../examples/stepIcon.jsx">
+---
+title: stepIcon
+nav:
+  title: Demo
+  path: /demo
+---
+
+<code src="../examples/stepIcon.jsx"></code>
diff --git a/docs/demo/vertical.md b/docs/demo/vertical.md
@@ -1,2 +1,8 @@
-## vertical
-<code src="../examples/vertical.jsx">
+---
+title: vertical
+nav:
+  title: Demo
+  path: /demo
+---
+
+<code src="../examples/vertical.jsx"></code>
diff --git a/docs/demo/verticalSmall.md b/docs/demo/verticalSmall.md
@@ -1,2 +1,8 @@
-## verticalSmall
-<code src="../examples/verticalSmall.jsx">
+---
+title: verticalSmall
+nav:
+  title: Demo
+  path: /demo
+---
+
+<code src="../examples/verticalSmall.jsx"></code>
diff --git a/docs/index.md b/docs/index.md
@@ -0,0 +1,7 @@
+---
+hero:
+  title: rc-steps
+  description: React Steps Component
+---
+
+<embed src="../README.md"></embed>
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "docs:deploy": "gh-pages -d .doc",
     "gh-pages": "npm run docs:build && npm run docs:deploy",
     "lint": "eslint src/ --ext .ts,.tsx,.jsx,.js,.md",
-    "prepare": "husky install",
+    "prepare": "husky install && dumi setup",
     "prepublishOnly": "npm run compile && np --yolo --no-publish",
     "prettier": "prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\"",
     "postpublish": "npm run gh-pages",
@@ -62,15 +62,16 @@
     "@types/jest": "^26.0.5",
     "@types/react": "^16.9.2",
     "@types/react-dom": "^16.9.0",
-    "@umijs/fabric": "^2.10.0",
+    "@umijs/fabric": "^3.0.0",
     "cross-env": "^7.0.0",
-    "dumi": "^1.1.38",
+    "dumi": "^2.0.0",
     "enzyme": "^3.1.0",
     "enzyme-adapter-react-16": "^1.0.1",
     "enzyme-to-json": "^3.1.2",
     "eslint": "^7.1.0",
     "father": "^4",
     "gh-pages": "^4.0.0",
+    "glob": "^10.0.0",
     "husky": "^8.0.1",
     "less": "^3.11.2",
     "lint-staged": "^13.0.3",
@@ -81,7 +82,7 @@
     "rc-tools": "^9.6.1",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
-    "typescript": "^4.5.4",
+    "typescript": "^5.0.0",
     "umi-test": "^1.9.7"
   },
   "peerDependencies": {

diff --git a/script/update-content.js b/script/update-content.js
@@ -0,0 +1,34 @@
+/*
+  用于 dumi 改造使用，
+  可用于将 examples 的文件批量修改为 demo 引入形式，
+  其他项目根据具体情况使用。
+*/
+
+const fs = require('fs');
+const glob = require('glob');
+
+const paths = glob.sync('./docs/examples/*.jsx');
+
+paths.forEach(path => {
+  const name = path.split('/').pop().split('.')[0];
+  fs.writeFile(
+    `./docs/demo/${name}.md`,
+    `---
+title: ${name}
+nav:
+  title: Demo
+  path: /demo
+---
+
+<code src="../examples/${name}.jsx"></code>
+`,
+    'utf8',
+    function(error) {
+      if(error){
+        console.log(error);
+        return false;
+      }
+      console.log(`${name} 更新成功~`);
+    }
+  )
+});
diff --git a/tsconfig.json b/tsconfig.json
@@ -9,7 +9,7 @@
     "esModuleInterop": true,
     "paths": {
       "@/*": ["src/*"],
-      "@@/*": ["src/.umi/*"],
+      "@@/*": ["dumi/tmp/*"],
       "rc-steps": ["src/index.ts"]
     }
   }