From c4037005ddd7da9a4767995cce97c19de642ac12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?kiner-tang=28=E6=96=87=E8=BE=89=29?= <1127031143@qq.com>
Date: Fri, 20 Jan 2023 11:19:23 +0800
Subject: [PATCH] feat: dumi 1.x -> 2.x (#178)
* feat: dumi 1.x -> 2.x
* feat: update snapshots
* feat: update config
---
.dumirc.ts | 14 ++++++++++++++
.gitignore | 5 +++++
.umirc.ts | 19 -------------------
docs/demo/basic.md | 9 +++++++--
docs/demo/controlled.md | 9 +++++++--
docs/demo/controlledWithGroup.md | 9 +++++++--
docs/demo/fallback.md | 9 +++++++--
docs/demo/placeholder.md | 9 +++++++--
docs/demo/previewgroup.md | 9 +++++++--
docs/demo/thumbnail.md | 9 +++++++--
docs/index.md | 4 +++-
now.json | 2 +-
package.json | 2 +-
tests/__snapshots__/controlled.test.tsx.snap | 1 +
.../__snapshots__/previewGroup.test.tsx.snap | 1 +
tsconfig.json | 2 +-
16 files changed, 76 insertions(+), 37 deletions(-)
create mode 100644 .dumirc.ts
delete mode 100644 .umirc.ts
diff --git a/.dumirc.ts b/.dumirc.ts
new file mode 100644
index 00000000..756c2777
--- /dev/null
+++ b/.dumirc.ts
@@ -0,0 +1,14 @@
+import { defineConfig } from 'dumi';
+import path from 'path';
+
+export default defineConfig({
+ alias: {
+ 'rc-image$': path.resolve('src'),
+ 'rc-image/es': path.resolve('src'),
+ },
+ favicons: ['https://avatars0.githubusercontent.com/u/9441414?s=200&v=4'],
+ themeConfig: {
+ name: 'Image',
+ logo: 'https://avatars0.githubusercontent.com/u/9441414?s=200&v=4',
+ },
+});
diff --git a/.gitignore b/.gitignore
index 4d743592..512f9835 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,8 @@ es/
.umi
.umi-production
.umi-test
+
+
+# dumi
+.dumi/tmp
+.dumi/tmp-production
\ No newline at end of file
diff --git a/.umirc.ts b/.umirc.ts
deleted file mode 100644
index 234e8c2f..00000000
--- a/.umirc.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// more config: https://d.umijs.org/config
-import { defineConfig } from 'dumi';
-
-export default defineConfig({
- title: 'rc-image',
- favicon:
- 'https://avatars0.githubusercontent.com/u/9441414?s=200&v=4',
- logo:
- 'https://avatars0.githubusercontent.com/u/9441414?s=200&v=4',
- outputPath: '.doc',
- exportStatic: {},
- styles: [
- `
- .markdown table {
- width: auto !important;
- }
- `,
- ]
-});
diff --git a/docs/demo/basic.md b/docs/demo/basic.md
index 301e8c6d..0f224404 100644
--- a/docs/demo/basic.md
+++ b/docs/demo/basic.md
@@ -1,3 +1,8 @@
-## basic
+---
+title: basic
+nav:
+ title: Demo
+ path: /demo
+---
-<code src="../examples/basic.tsx">
+<code src="../examples/basic.tsx"></code>
diff --git a/docs/demo/controlled.md b/docs/demo/controlled.md
index c475a581..93806bdc 100644
--- a/docs/demo/controlled.md
+++ b/docs/demo/controlled.md
@@ -1,3 +1,8 @@
-## controlled
+---
+title: controlled
+nav:
+ title: Demo
+ path: /demo
+---
-<code src="../examples/controlled.tsx">
+<code src="../examples/controlled.tsx"></code>
diff --git a/docs/demo/controlledWithGroup.md b/docs/demo/controlledWithGroup.md
index 1c95dba6..ebbc1d28 100644
--- a/docs/demo/controlledWithGroup.md
+++ b/docs/demo/controlledWithGroup.md
@@ -1,3 +1,8 @@
-## controlledWithGroup
+---
+title: controlledWithGroup
+nav:
+ title: Demo
+ path: /demo
+---
-<code src="../examples/controlledWithGroup.tsx">
+<code src="../examples/controlledWithGroup.tsx"></code>
diff --git a/docs/demo/fallback.md b/docs/demo/fallback.md
index 0c0ff023..888d723d 100644
--- a/docs/demo/fallback.md
+++ b/docs/demo/fallback.md
@@ -1,3 +1,8 @@
-## fallback
+---
+title: fallback
+nav:
+ title: Demo
+ path: /demo
+---
-<code src="../examples/fallback.tsx">
+<code src="../examples/fallback.tsx"></code>
diff --git a/docs/demo/placeholder.md b/docs/demo/placeholder.md
index dcce7b6a..3cc46796 100644
--- a/docs/demo/placeholder.md
+++ b/docs/demo/placeholder.md
@@ -1,3 +1,8 @@
-## placeholder
+---
+title: placeholder
+nav:
+ title: Demo
+ path: /demo
+---
-<code src="../examples/placeholder.tsx">
+<code src="../examples/placeholder.tsx"></code>
diff --git a/docs/demo/previewgroup.md b/docs/demo/previewgroup.md
index 440bb325..ff2e8153 100644
--- a/docs/demo/previewgroup.md
+++ b/docs/demo/previewgroup.md
@@ -1,3 +1,8 @@
-## previewgroup
+---
+title: previewgroup
+nav:
+ title: Demo
+ path: /demo
+---
-<code src="../examples/previewgroup.tsx">
+<code src="../examples/previewgroup.tsx"></code>
diff --git a/docs/demo/thumbnail.md b/docs/demo/thumbnail.md
index c8acfa3d..9e781d3b 100644
--- a/docs/demo/thumbnail.md
+++ b/docs/demo/thumbnail.md
@@ -1,3 +1,8 @@
-## thumbnail
+---
+title: thumbnail
+nav:
+ title: Demo
+ path: /demo
+---
-<code src="../examples/thumbnail.tsx">
+<code src="../examples/thumbnail.tsx"></code>
diff --git a/docs/index.md b/docs/index.md
index db78acdb..f8129123 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,5 +1,7 @@
---
-title: rc-image
+hero:
+ title: rc-image
+ description: React Image.
---
<embed src="../README.md"></embed>
diff --git a/now.json b/now.json
index 36bb9d63..70106d20 100644
--- a/now.json
+++ b/now.json
@@ -5,7 +5,7 @@
{
"src": "package.json",
"use": "@now/static-build",
- "config": { "distDir": ".doc" }
+ "config": { "distDir": "dist" }
}
],
"routes": [
diff --git a/package.json b/package.json
index 15a5a59e..84347e12 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
"@types/react-dom": "^18.0.0",
"@umijs/fabric": "^2.2.2",
"cross-env": "^7.0.2",
- "dumi": "^1.1.4",
+ "dumi": "^2.1.4",
"eslint": "^7.6.0",
"father": "^4.0.0",
"glob": "^7.1.6",
diff --git a/tests/__snapshots__/controlled.test.tsx.snap b/tests/__snapshots__/controlled.test.tsx.snap
index 80235349..2e03b331 100644
--- a/tests/__snapshots__/controlled.test.tsx.snap
+++ b/tests/__snapshots__/controlled.test.tsx.snap
@@ -5,6 +5,7 @@ exports[`Controlled With previewVisible 1`] = `
aria-modal="true"
class="rc-image-preview"
role="dialog"
+ style="display: none;"
>
<div
aria-hidden="true"
diff --git a/tests/__snapshots__/previewGroup.test.tsx.snap b/tests/__snapshots__/previewGroup.test.tsx.snap
index cf811b73..9fc138fe 100644
--- a/tests/__snapshots__/previewGroup.test.tsx.snap
+++ b/tests/__snapshots__/previewGroup.test.tsx.snap
@@ -5,6 +5,7 @@ exports[`PreviewGroup With Controlled 1`] = `
aria-modal="true"
class="rc-image-preview"
role="dialog"
+ style="display: none;"
>
<div
aria-hidden="true"
diff --git a/tsconfig.json b/tsconfig.json
index ec8d7779..02ccd13d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,7 +9,7 @@
"esModuleInterop": true,
"paths": {
"@/*": ["src/*"],
- "@@/*": ["src/.umi/*"],
+ "@@/*": [".dumi/tmp/*"],
"rc-image": ["src/index.ts"]
}
}