Skip to content

Commit cd93d80

Browse files
DBSDsliangjun.chen
DBSDs
and
liangjun.chen
authored
chore: bump dumi@2.x.x (#42)
* chore: bump dumi@2.x.x * chore: fix father 4.x compile * chore: use rc-test * chore: vercel deploy --------- Co-authored-by: liangjun.chen <liangjun.chen@yunqutech.com>
1 parent 0553047 commit cd93d80

20 files changed

+128
-74
lines changed

‎.dumirc.ts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import { defineConfig } from 'dumi';
2+
const isGitPagesSite = process.env.GITHUB_ACTIONS;
3+
4+
export default defineConfig({
5+
favicons: ['https://avatars0.githubusercontent.com/u/9441414?s=200&v=4'],
6+
themeConfig: {
7+
name: 'rc-overflow',
8+
logo: 'https://avatars0.githubusercontent.com/u/9441414?s=200&v=4',
9+
},
10+
exportStatic: {},
11+
outputPath: 'docs-dist',
12+
base: isGitPagesSite ? `/rc-overflow/` : ``,
13+
publicPath: isGitPagesSite ? `/rc-overflow/` : ``,
14+
styles: [
15+
`
16+
.markdown table {
17+
width: auto !important;
18+
}
19+
`,
20+
],
21+
});

‎.fatherrc.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎.fatherrc.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { defineConfig } from 'father';
2+
3+
export default defineConfig({
4+
plugins: ['@rc-component/father-plugin'],
5+
});

‎.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
- uses: actions/setup-node@v1
1717
with:
18-
node-version: '12'
18+
node-version: '18'
1919

2020
- name: cache package-lock.json
2121
uses: actions/cache@v2
@@ -24,7 +24,7 @@ jobs:
2424
key: lock-${{ github.sha }}
2525

2626
- name: create package-lock.json
27-
run: npm i --package-lock-only
27+
run: npm i --package-lock-only --ignore-scripts
2828

2929
- name: hack for singe file
3030
run: |

‎.gitignore

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
.storybook
21
*.iml
32
*.log
43
.idea/
@@ -29,5 +28,10 @@ yarn.lock
2928
package-lock.json
3029
coverage/
3130
.doc
32-
.umi
33-
dist/
31+
dist/
32+
33+
# dumi
34+
.dumi/tmp
35+
.dumi/tmp-test
36+
.dumi/tmp-production
37+
.env.local

‎.umirc.ts

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎docs/demo/base.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎docs/demo/basic.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
title: basic
3+
nav:
4+
title: Demo
5+
path: /demo
6+
---
7+
8+
<code src="../../examples/basic.tsx"></code>

‎docs/demo/blink.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1-
## blink
1+
---
2+
title: blink
3+
nav:
4+
title: Demo
5+
path: /demo
6+
---
27

3-
<code src="../../examples/blink.tsx">
8+
<code src="../../examples/blink.tsx"></code>

‎docs/demo/fill-width.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1-
## fill-width
1+
---
2+
title: fill-width
3+
nav:
4+
title: Demo
5+
path: /demo
6+
---
27

3-
<code src="../../examples/fill-width.tsx">
8+
<code src="../../examples/fill-width.tsx"></code>

‎docs/demo/raw-render.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1-
## Raw Render
1+
---
2+
title: raw-render
3+
nav:
4+
title: Demo
5+
path: /demo
6+
---
27

3-
<code src="../../examples/raw-render.tsx">
8+
<code src="../../examples/raw-render.tsx"></code>

‎docs/index.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
---
2-
title: rc-overflow
2+
hero:
3+
title: rc-overflow
4+
description: React Overflow Component
35
---
46

5-
<embed src="../README.md" />
7+
<embed src="../README.md" ></embed>

‎jest.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
module.exports = {
22
setupFiles: ['./tests/setup.js'],
33
snapshotSerializers: [require.resolve('enzyme-to-json/serializer')],
4-
setupFilesAfterEnv: ['<rootDir>/tests/setupFilesAfterEnv.ts']
54
};

‎now.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@
44
"builds": [
55
{
66
"src": "package.json",
7-
"use": "@now/static-build",
7+
"use": "@vercel/static-build",
88
"config": { "distDir": "docs-dist" }
99
}
10-
],
11-
"routes": [
12-
{ "src": "/(.*)", "dest": "/dist/$1" }
1310
]
1411
}

‎package.json

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,12 @@
3232
"start": "dumi dev",
3333
"docs:build": "dumi build",
3434
"docs:deploy": "gh-pages -d docs-dist",
35-
"compile": "father-build",
35+
"compile": "father build",
36+
"prepare": "dumi setup",
3637
"deploy": "npm run docs:build && npm run docs:deploy",
3738
"prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
38-
"test": "father test",
39-
"test:coverage": "umi-test --coverage",
39+
"test": "rc-test",
40+
"test:coverage": "rc-test --coverage",
4041
"prepublishOnly": "npm run compile && np --no-cleanup --yolo --no-publish",
4142
"lint": "eslint src/ --ext .tsx,.ts",
4243
"lint:tsc": "tsc -p tsconfig.json --noEmit",
@@ -49,28 +50,31 @@
4950
"rc-util": "^5.37.0"
5051
},
5152
"devDependencies": {
53+
"@rc-component/father-plugin": "^1.0.0",
5254
"@testing-library/jest-dom": "^5.16.4",
5355
"@testing-library/react": "^12.0.0",
5456
"@types/classnames": "^2.2.9",
5557
"@types/enzyme": "^3.10.8",
5658
"@types/jest": "^26.0.23",
5759
"@types/react": "^16.14.2",
5860
"@types/react-dom": "^16.9.10",
59-
"@umijs/fabric": "^2.0.8",
61+
"@umijs/fabric": "^3.0.0",
62+
"glob": "^10.0.0",
6063
"cross-env": "^7.0.2",
61-
"dumi": "^1.1.10",
64+
"dumi": "^2.0.0",
6265
"enzyme": "^3.0.0",
6366
"enzyme-adapter-react-16": "^1.0.1",
6467
"enzyme-to-json": "^3.4.0",
6568
"eslint": "^7.0.0",
66-
"father": "^2.13.4",
67-
"father-build": "^1.19.1",
69+
"father": "^4.0.0",
6870
"less": "^3.10.3",
6971
"np": "^7.0.0",
7072
"prettier": "^2.0.5",
73+
"rc-test": "^7.0",
7174
"react": "^16.0.0",
7275
"react-dom": "^16.0.0",
73-
"regenerator-runtime": "^0.13.7"
76+
"regenerator-runtime": "^0.13.7",
77+
"typescript": "^5.0.0"
7478
},
7579
"peerDependencies": {
7680
"react": ">=16.9.0",
@@ -82,4 +86,4 @@
8286
"tnpm": {
8387
"mode": "npm"
8488
}
85-
}
89+
}

‎script/update-content.js

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*
2+
用于 dumi 改造使用，
3+
可用于将 examples 的文件批量修改为 demo 引入形式，
4+
其他项目根据具体情况使用。
5+
*/
6+
7+
const fs = require('fs');
8+
const glob = require('glob');
9+
10+
const paths = glob.sync('./examples/*.tsx');
11+
12+
paths.forEach(path => {
13+
const name = path.split('/').pop().split('.')[0];
14+
fs.writeFile(
15+
`./docs/demo/${name}.md`,
16+
`---
17+
title: ${name}
18+
nav:
19+
title: Demo
20+
path: /demo
21+
---
22+
23+
<code src="../../examples/${name}.tsx"></code>
24+
`,
25+
'utf8',
26+
function(error) {
27+
if(error){
28+
console.log(error);
29+
return false;
30+
}
31+
console.log(`${name} 更新成功~`);
32+
}
33+
)
34+
});

‎tests/setup.js

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,20 @@ Enzyme.configure({ adapter: new Adapter() });
1111

1212
Object.assign(Enzyme.ReactWrapper.prototype, {
1313
triggerResize(clientWidth) {
14+
const target = this.find('ResizeObserver').first()
15+
target.invoke('onResize')({}, { clientWidth })
1416
act(() => {
15-
this.find('ResizeObserver').first().props().onResize({}, { clientWidth });
1617
jest.runAllTimers();
17-
this.update();
18-
});
18+
})
19+
this.update()
1920
},
2021
triggerItemResize(index, offsetWidth) {
22+
const target = this.find('Item').at(index).find('ResizeObserver')
23+
target.invoke('onResize')({ offsetWidth });
2124
act(() => {
22-
this.find('Item')
23-
.at(index)
24-
.find('ResizeObserver')
25-
.props()
26-
.onResize({ offsetWidth });
2725
jest.runAllTimers();
28-
this.update();
29-
});
26+
})
27+
this.update()
3028
},
3129
initSize(width, itemWidth) {
3230
this.triggerResize(width);

‎tests/setupFilesAfterEnv.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎tests/wrapper.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { mount as enzymeMount, ReactWrapper } from 'enzyme';
1+
import type { ReactWrapper } from 'enzyme';
2+
import { mount as enzymeMount } from 'enzyme';
23

34
export type MountParam = Parameters<typeof enzymeMount>;
45

‎tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"target": "esnext",
44
"moduleResolution": "node",
55
"baseUrl": "./",
6-
"jsx": "preserve",
6+
"jsx": "react",
77
"declaration": true,
88
"skipLibCheck": true,
99
"esModuleInterop": true,
1010
"paths": {
1111
"@/*": ["src/*"],
12-
"@@/*": ["src/.umi/*"],
12+
"@@/*": [".dumi/tmp/*"],
1313
"rc-overflow": ["src/index.tsx"]
1414
}
1515
}

0 commit comments

Comments
 (0)