Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature Branch] chore(merge): Merge master branch of v0.4.5 #896

Merged
merged 8 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions docs/design/design-CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ group: 基础组件

---

## 0.4.4

`2024-12-16`

- 🐞 修复 antd 重置样式的引入路径 `antd/dist/reset.css` => `~antd/dist/reset.css`,以适配 Umi 3 和 Bigfish 3 的解析逻辑。[#894](https://github.com/oceanbase/oceanbase-design/pull/894)

## 0.4.3

`2024-12-14`
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
},
"devDependencies": {
"@ant-design/colors": "^7.1.0",
"@ant-design/cssinjs": "^1.22.0",
"@ant-design/icons": "^5.5.1",
"@ant-design/cssinjs": "^1.22.1",
"@ant-design/icons": "^5.5.2",
"@babel/cli": "^7.25.9",
"@babel/preset-env": "^7.26.0",
"@chenshuai2144/less2cssinjs": "^1.0.7",
Expand All @@ -54,7 +54,7 @@
"@emotion/react": "^11.13.3",
"@emotion/server": "^11.11.0",
"@qixian.cs/github-contributors-list": "^2.0.2",
"@rc-component/trigger": "^2.2.5",
"@rc-component/trigger": "^2.2.6",
"@stackblitz/sdk": "^1.11.0",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.6.3",
Expand All @@ -67,7 +67,7 @@
"@umijs/fabric": "^4.0.1",
"@umijs/test": "^4.3.34",
"@vercel/analytics": "^1.4.0",
"antd": "^5.22.1",
"antd": "^5.22.5",
"antd-style": "^3.7.1",
"antd-token-previewer": "^2.0.8",
"babel-jest": "^29.7.0",
Expand Down Expand Up @@ -95,13 +95,13 @@
"mockdate": "^3.0.5",
"prettier": "^3.3.3",
"prismjs": "^1.29.0",
"rc-checkbox": "^3.3.0",
"rc-checkbox": "^3.5.0",
"rc-drawer": "^7.2.0",
"rc-footer": "^0.6.8",
"rc-resize-observer": "^1.4.0",
"rc-segmented": "^2.5.0",
"rc-resize-observer": "^1.4.1",
"rc-segmented": "^2.7.0",
"rc-tabs": "^15.4.0",
"rc-util": "^5.43.0",
"rc-util": "^5.44.2",
"react": "^18.3.1",
"react-color": "^2.19.3",
"react-copy-to-clipboard": "^5.1.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/charts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oceanbase/charts",
"version": "0.4.2",
"version": "0.4.3",
"description": "The Chart library for OceanBase",
"homepage": "https://github.com/oceanbase/oceanbase-design/packages/charts",
"repository": {
Expand Down Expand Up @@ -36,7 +36,7 @@
"@oceanbase/util": "workspace:^",
"classnames": "^2.5.1",
"lodash": "^4.17.21",
"rc-util": "^5.43.0",
"rc-util": "^5.44.2",
"tinycolor2": "^1.6.0",
"use-resize-observer": "^9.1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/codemod/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oceanbase/codemod",
"version": "0.4.3",
"version": "0.4.4",
"description": "Codemod for OceanBase Design upgrade",
"keywords": [
"oceanbase",
Expand Down
14 changes: 7 additions & 7 deletions packages/design/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oceanbase/design",
"version": "0.4.3",
"version": "0.4.4",
"description": "The Design System of OceanBase",
"keywords": [
"oceanbase",
Expand Down Expand Up @@ -39,27 +39,27 @@
"build": "father build && cp src/style/reset.css dist/"
},
"dependencies": {
"@ant-design/cssinjs": "^1.22.0",
"@ant-design/cssinjs": "^1.22.1",
"@oceanbase/aliyun-theme": "^0.1.6",
"@oceanbase/icons": "workspace:^",
"@oceanbase/util": "workspace:^",
"ahooks": "^2.10.14",
"antd": "^5.22.1",
"antd": "^5.22.5",
"classnames": "^2.5.1",
"lodash": "^4.17.21",
"lottie-web": "^5.12.2",
"prop-types": "^15.8.1",
"rc-util": "^5.43.0",
"rc-util": "^5.44.2",
"react-sticky-mouse-tooltip": "^0.0.1"
},
"devDependencies": {
"@babel/cli": "^7.25.9",
"@babel/preset-env": "^7.26.0",
"antd-token-previewer": "^2.0.8",
"rc-select": "^14.16.3",
"rc-select": "^14.16.4",
"rc-slider": "^11.1.7",
"rc-table": "^7.48.1",
"rc-tree-select": "^5.24.4"
"rc-table": "^7.49.0",
"rc-tree-select": "^5.25.0"
},
"peerDependencies": {
"react": ">=16.9.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/design/src/global.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'antd/dist/reset.css';
@import '~antd/dist/reset.css';

@font-face {
font-family: 'Inter';
Expand Down
4 changes: 2 additions & 2 deletions packages/icons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oceanbase/icons",
"version": "0.4.2",
"version": "0.4.3",
"description": "The Icon Library for OceanBase",
"keywords": [
"oceanbase",
Expand Down Expand Up @@ -37,7 +37,7 @@
},
"dependencies": {
"@ant-design/colors": "^7.1.0",
"@ant-design/icons": "^5.5.1",
"@ant-design/icons": "^5.5.2",
"@oceanbase/icons-svg": "^1.0.10",
"lodash.camelcase": "^4.3.0"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oceanbase/ui",
"version": "0.4.4",
"version": "0.4.5",
"description": "The UI library based on OceanBase Design",
"keywords": [
"oceanbase",
Expand Down Expand Up @@ -39,7 +39,7 @@
"build": "NODE_OPTIONS=--max_old_space_size=4096 father build"
},
"dependencies": {
"@ant-design/cssinjs": "^1.22.0",
"@ant-design/cssinjs": "^1.22.1",
"@ant-design/pro-components": "^2.8.2",
"@antv/g6": "3.4.10",
"@oceanbase/design": "workspace:^",
Expand All @@ -56,8 +56,8 @@
"moment": "^2.30.1",
"path-to-regexp": "^7.2.0",
"randexp": "^0.5.3",
"rc-picker": "^4.8.1",
"rc-util": "^5.43.0",
"rc-picker": "^4.8.3",
"rc-util": "^5.44.2",
"react-copy-to-clipboard": "^5.1.0",
"react-json-view": "^1.21.3",
"react-split-pane": "^0.1.92",
Expand Down
Loading
Loading