From 8bc9b3adaff4377427e3eec72b3d56cdc3945b39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Fri, 19 Jul 2024 17:53:36 +0800
Subject: [PATCH 1/7] chore: bump vitest 2.x
---
package.json | 13 +-
.../__snapshots__/button.test.tsx.snap | 1542 +----------------
src/button/__tests__/button.test.tsx | 5 +-
test/snap/__snapshots__/csr.test.jsx.snap | 4 +-
test/snap/__snapshots__/ssr.test.jsx.snap | 4 +-
test/snap/csr.test.jsx | 2 +-
test/snap/ssr.test.jsx | 2 +-
7 files changed, 26 insertions(+), 1546 deletions(-)
diff --git a/package.json b/package.json
index 0c57cea1..9dcdef4f 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
"esm/**/style/**"
],
"scripts": {
+ "init": "git submodule init && git submodule update",
"prepare": "husky install",
"start": "cd site && vite",
"dev": "cd site && vite",
@@ -95,9 +96,9 @@
"@typescript-eslint/eslint-plugin": "^5.6.0",
"@typescript-eslint/parser": "^5.6.0",
"@vitejs/plugin-react": "^1.1.1",
- "@vitest/coverage-c8": "^0.24.1",
- "@vitest/coverage-istanbul": "^0.24.1",
- "@vitest/ui": "^0.24.1",
+ "@vitest/coverage-istanbul": "^2.0.3",
+ "@vitest/coverage-v8": "^2.0.3",
+ "@vitest/ui": "^2.0.3",
"autoprefixer": "^10.4.0",
"babel-jest": "^27.5.1",
"babel-polyfill": "^6.26.0",
@@ -119,6 +120,7 @@
"eslint-plugin-react": "^7.27.1",
"eslint-plugin-react-hooks": "^4.3.0",
"find-node-modules": "^2.1.2",
+ "glob": "^11.0.0",
"gray-matter": "^4.0.3",
"husky": "^7.0.4",
"inquirer": "^8.2.0",
@@ -149,10 +151,11 @@
"vite": "^2.7.0",
"vite-plugin-pwa": "^0.11.11",
"vite-plugin-tdoc": "^2.0.0",
- "vitest": "^0.24.1",
+ "vitest": "^2.0.3",
"workbox-precaching": "^6.3.0"
},
"dependencies": {
+ "@react-spring/web": "^9.7.3",
"@use-gesture/react": "^10.2.10",
"ahooks": "^3.1.9",
"classnames": "^2.3.1",
@@ -168,4 +171,4 @@
"path": "./node_modules/cz-conventional-changelog"
}
}
-}
+}
\ No newline at end of file
diff --git a/src/button/__tests__/__snapshots__/button.test.tsx.snap b/src/button/__tests__/__snapshots__/button.test.tsx.snap
index 265add7c..9634eee3 100644
--- a/src/button/__tests__/__snapshots__/button.test.tsx.snap
+++ b/src/button/__tests__/__snapshots__/button.test.tsx.snap
@@ -1,1534 +1,10 @@
-// Vitest Snapshot v1
-
-exports[`base.jsx 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
-
-exports[`index.jsx 1`] = `
-
-
-
-
-
- 01 基础按钮
-
-
- 基础类型分为主按钮、次按钮、文字按钮。
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 02 状态
-
-
- 按钮禁用态
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 03 规格
-
-
- 按钮尺寸
-
-
-
-
-
-`;
-
-exports[`size.jsx 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
-
-exports[`status.jsx 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
-
-exports[`test.jsx 1`] = `
-
-
-
-
-
-
-
-
-
-
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`Button 组件测试 > content 1`] = `
+
+
+ 按钮组件
+
`;
diff --git a/src/button/__tests__/button.test.tsx b/src/button/__tests__/button.test.tsx
index f2f7f507..9d5f99eb 100644
--- a/src/button/__tests__/button.test.tsx
+++ b/src/button/__tests__/button.test.tsx
@@ -1,11 +1,12 @@
import React from 'react';
import { render } from '@test/utils';
+import { describe, it, expect } from 'vitest';
import Button from '../Button';
describe('Button 组件测试', () => {
const ButtonText = '按钮组件';
- test('content', async () => {
+ it('content', async () => {
const { queryByText } = render();
- expect(queryByText(ButtonText)).toBeInTheDocument();
+ expect(queryByText(ButtonText)).toMatchSnapshot();
});
});
diff --git a/test/snap/__snapshots__/csr.test.jsx.snap b/test/snap/__snapshots__/csr.test.jsx.snap
index 22231cf5..6c885976 100644
--- a/test/snap/__snapshots__/csr.test.jsx.snap
+++ b/test/snap/__snapshots__/csr.test.jsx.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
exports[`csr snapshot test > csr test src/grid/_example/badge.tsx 1`] = `
{
@@ -355,4 +355,4 @@ exports[`csr snapshot test > csr test src/grid/_example/badge.tsx 1`] = `
}
`;
-exports[`ssr snapshot test > ssr test src/grid/_example/badge.tsx 1`] = `"
"`;
+exports[`ssr snapshot test > ssr test src/grid/_example/badge.tsx 1`] = `""`;
diff --git a/test/snap/__snapshots__/ssr.test.jsx.snap b/test/snap/__snapshots__/ssr.test.jsx.snap
index 63ff7c43..cf6d3956 100644
--- a/test/snap/__snapshots__/ssr.test.jsx.snap
+++ b/test/snap/__snapshots__/ssr.test.jsx.snap
@@ -1,3 +1,3 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-exports[`ssr snapshot test > ssr test src/grid/_example/badge.tsx 1`] = `""`;
+exports[`ssr snapshot test > ssr test src/grid/_example/badge.tsx 1`] = `""`;
diff --git a/test/snap/csr.test.jsx b/test/snap/csr.test.jsx
index 8ba5624a..f278735e 100644
--- a/test/snap/csr.test.jsx
+++ b/test/snap/csr.test.jsx
@@ -1,4 +1,4 @@
-import glob from 'glob';
+import { glob } from 'glob';
import MockDate from 'mockdate';
import React from 'react';
import { vi } from 'vitest';
diff --git a/test/snap/ssr.test.jsx b/test/snap/ssr.test.jsx
index 1f942cb7..4a4b5b8f 100644
--- a/test/snap/ssr.test.jsx
+++ b/test/snap/ssr.test.jsx
@@ -1,4 +1,4 @@
-import glob from 'glob';
+import { glob } from 'glob';
import MockDate from 'mockdate';
import { vi } from 'vitest';
import React from 'react';
From 2695d58df6067c1fdeb9430ee69973ee733c9125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Fri, 19 Jul 2024 20:17:01 +0800
Subject: [PATCH 2/7] chore: pin glob 10.x
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 9dcdef4f..c083fec4 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,7 @@
"eslint-plugin-react": "^7.27.1",
"eslint-plugin-react-hooks": "^4.3.0",
"find-node-modules": "^2.1.2",
- "glob": "^11.0.0",
+ "glob": "^10.4.5",
"gray-matter": "^4.0.3",
"husky": "^7.0.4",
"inquirer": "^8.2.0",
From 6b17b137a4d26c78e51a46fdb560284a5a9d23e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Fri, 19 Jul 2024 21:12:26 +0800
Subject: [PATCH 3/7] chore: fix build
---
package.json | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/package.json b/package.json
index c083fec4..a769428b 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,9 @@
"@testing-library/react": "^12.1.4",
"@testing-library/user-event": "^13.5.0",
"@types/lodash": "^4.14.178",
- "@types/react": "^17.0.38",
+ "@types/node": "^20.14.11",
+ "@types/react": "^17.0.2",
+ "@types/react-dom": "17.0.2",
"@types/react-transition-group": "^4.4.4",
"@typescript-eslint/eslint-plugin": "^5.6.0",
"@typescript-eslint/parser": "^5.6.0",
From b9ee87975463abc89bd573bc7418d7db912a9ce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Fri, 19 Jul 2024 21:28:21 +0800
Subject: [PATCH 4/7] chore: fix build
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index a769428b..00083733 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,7 @@
"workbox-precaching": "^6.3.0"
},
"dependencies": {
- "@react-spring/web": "^9.7.3",
+ "@react-spring/web": "^9.6.1",
"@use-gesture/react": "^10.2.10",
"ahooks": "^3.1.9",
"classnames": "^2.3.1",
From f24f83878a1421c014aef030a5afea6dcfa2e0b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Fri, 19 Jul 2024 21:36:30 +0800
Subject: [PATCH 5/7] chore: fix build
---
package.json | 1 -
1 file changed, 1 deletion(-)
diff --git a/package.json b/package.json
index 00083733..d2a9ddac 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,6 @@
"workbox-precaching": "^6.3.0"
},
"dependencies": {
- "@react-spring/web": "^9.6.1",
"@use-gesture/react": "^10.2.10",
"ahooks": "^3.1.9",
"classnames": "^2.3.1",
From 1ed964f066f189aea946049d8385af20d372dc0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Fri, 19 Jul 2024 21:59:58 +0800
Subject: [PATCH 6/7] chore: update prebuild
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index d2a9ddac..072a0dc4 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
"test:snap": "cross-env NODE_ENV=test-snap vitest run",
"test:snap-update": "cross-env NODE_ENV=test-snap vitest run -u",
"generate:coverage-badge": "node script/generate-coverage.js",
- "prebuild": "rimraf es/* lib/* dist/* esm/*",
+ "prebuild": "rimraf es/* lib/* dist/* esm/* cjs/*",
"build": "cross-env NODE_ENV=production rollup -c script/rollup.config.js && npm run build:tsc",
"build:tsc": "concurrently \"npm:build:tsc-*\"",
"build:tsc-es": "tsc --emitDeclarationOnly -d -p ./tsconfig.build.json --outDir es/",
From adb0b6ea2a2a9d5bf453644df2c662f69ac09de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Fri, 19 Jul 2024 22:02:32 +0800
Subject: [PATCH 7/7] chore: add test:update
---
package.json | 1 +
1 file changed, 1 insertion(+)
diff --git a/package.json b/package.json
index 072a0dc4..04c11239 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
"test:unit-coverage": "vitest run --coverage",
"test:snap": "cross-env NODE_ENV=test-snap vitest run",
"test:snap-update": "cross-env NODE_ENV=test-snap vitest run -u",
+ "test:update": "vitest run -u && npm run test:snap-update",
"generate:coverage-badge": "node script/generate-coverage.js",
"prebuild": "rimraf es/* lib/* dist/* esm/* cjs/*",
"build": "cross-env NODE_ENV=production rollup -c script/rollup.config.js && npm run build:tsc",