fix: 修改包 peerDependencies 版本和样式依赖问题

antvis · Nov 21, 2024 · 11df5d5 · 11df5d5
1 parent 17e3587
commit 11df5d5
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/prerelease-notify.yml b/.github/workflows/prerelease-notify.yml
@@ -19,7 +19,7 @@ jobs:
             ${{ secrets.DING_TALK_GROUP_TOKEN }}
             ${{ secrets.DING_TALK_PUBLIC_TOKEN }}
           notify_title: '🎉 AntV/S2 测试版发布 🎉'
-          notify_body: '![preview](https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*1PTTQLk3j5AAAAAAAAAAAAAADmJ7AQ/original) <hr /> [**查看更新日志**](https://github.com/antvis/S2/releases) <hr />'
+          notify_body: '🎉 AntV/S2 新版本发布啦 🎉 <br/> ![preview](https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*1PTTQLk3j5AAAAAAAAAAAAAADmJ7AQ/original) <hr /> [**点击查看更新日志**](https://github.com/antvis/S2/releases) <hr />'
           notify_footer: '> 该版本为测试版, 请谨慎使用 ([AntV/S2 Releases](https://github.com/antvis/S2/releases))'
           at_all: false
           enable_prerelease: true
diff --git a/.github/workflows/release-notify.yml b/.github/workflows/release-notify.yml
@@ -19,7 +19,7 @@ jobs:
             ${{ secrets.DING_TALK_GROUP_TOKEN }}
             ${{ secrets.DING_TALK_PUBLIC_TOKEN }}
           notify_title: '🎉 AntV/S2 新版本发布啦 🎉'
-          notify_body: '![preview](https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*1PTTQLk3j5AAAAAAAAAAAAAADmJ7AQ/original) <hr /> [**查看更新日志**](https://github.com/antvis/S2/releases) <hr />'
+          notify_body: '🎉 AntV/S2 新版本发布啦 🎉 <br/> ![preview](https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*1PTTQLk3j5AAAAAAAAAAAAAADmJ7AQ/original) <hr /> [**点击查看更新日志**](https://github.com/antvis/S2/releases) <hr />'
           notify_footer: '> [AntV/S2 Releases](https://github.com/antvis/S2/releases)'
           at_all: false
           enable_prerelease: false
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "build:umd": "pnpm -r --filter './packages/*' --stream build:umd",
     "build:size-limit": "pnpm -r --filter './packages/*' --stream build:size-limit",
     "build:size-limit-json": "pnpm -r --filter './packages/*' --stream build:size-limit-json",
-    "release": "pnpm -r --filter !@antv/s2-site --filter !@antv/s2-react-components --workspace-concurrency=1 exec npx --no-install semantic-release",
+    "release": "pnpm -r --filter !@antv/s2-site --filter !@antv/s2-vue --workspace-concurrency=1 exec npx --no-install semantic-release",
     "release:preview": "pnpm release --dry-run --no-ci",
     "release:bump-version": "node ./scripts/bump-version.js",
     "test": "pnpm -r --filter './packages/*' --stream test",

diff --git a/packages/s2-react-components/package.json b/packages/s2-react-components/package.json
@@ -87,7 +87,7 @@
   },
   "peerDependencies": {
     "@ant-design/icons": ">=4.7.0",
-    "@antv/s2": "^2.0.0-next.1",
+    "@antv/s2": "^2.0.0",
     "antd": ">=4.16.13",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"

diff --git a/packages/s2-react-components/src/components/common/radio-group/index.less b/packages/s2-react-components/src/components/common/radio-group/index.less
@@ -1,4 +1,4 @@
-@import '@antv/s2/src/styles/variables.less';
+@import '@antv/s2/esm/styles/variables.less';
 
 .@{s2-cls-prefix}-radio-group {
   color: #3572f9;

diff --git a/packages/s2-react-components/src/components/common/reset-button/index.less b/packages/s2-react-components/src/components/common/reset-button/index.less
@@ -1,4 +1,4 @@
-@import '@antv/s2/src/styles/variables.less';
+@import '@antv/s2/esm/styles/variables.less';
 
 .@{s2-cls-prefix}-reset-btn {
   color: #3572f9;

diff --git a/packages/s2-react-components/src/components/common/reset-group/index.less b/packages/s2-react-components/src/components/common/reset-group/index.less
@@ -1,4 +1,4 @@
-@import '@antv/s2/src/styles/variables.less';
+@import '@antv/s2/esm/styles/variables.less';
 
 .@{s2-cls-prefix}-reset-group {
   width: 340px;

diff --git a/packages/s2-react-components/src/components/text-align-panel/index.less b/packages/s2-react-components/src/components/text-align-panel/index.less
@@ -1,4 +1,4 @@
-@import '@antv/s2/src/styles/variables.less';
+@import '@antv/s2/esm/styles/variables.less';
 
 .@{s2-cls-prefix}-theme-panel-custom-color {
   display: flex;

diff --git a/packages/s2-react-components/src/components/theme-panel/color-box/index.less b/packages/s2-react-components/src/components/theme-panel/color-box/index.less
@@ -1,4 +1,4 @@
-@import '@antv/s2/src/styles/variables.less';
+@import '@antv/s2/esm/styles/variables.less';
 
 .@{s2-cls-prefix}-color-box {
   display: inline-flex;

diff --git a/packages/s2-react-components/src/components/theme-panel/color-picker-panel/index.less b/packages/s2-react-components/src/components/theme-panel/color-picker-panel/index.less
@@ -1,4 +1,4 @@
-@import '@antv/s2/src/styles/variables.less';
+@import '@antv/s2/esm/styles/variables.less';
 
 @cls-prefix: ~'@{s2-cls-prefix}-color-picker-panel';
 

diff --git a/packages/s2-react-components/src/components/theme-panel/index.less b/packages/s2-react-components/src/components/theme-panel/index.less
@@ -1,4 +1,4 @@
-@import '@antv/s2/src/styles/variables.less';
+@import '@antv/s2/esm/styles/variables.less';
 
 .@{s2-cls-prefix}-theme-panel-custom-color {
   display: flex;

diff --git a/packages/s2-react/package.json b/packages/s2-react/package.json
@@ -83,7 +83,7 @@
     "vite-plugin-svgr": "^2.2.2"
   },
   "peerDependencies": {
-    "@antv/s2": "^2.0.0-next.1",
+    "@antv/s2": "^2.0.0",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   },

diff --git a/packages/s2-react/playground/components/Header/index.less b/packages/s2-react/playground/components/Header/index.less
@@ -1,4 +1,4 @@
-@import '@antv/s2/src/styles/variables.less';
+@import '@antv/s2/esm/styles/variables.less';
 
 .sheet-header {
   padding: 0;

diff --git a/packages/s2-vue/package.json b/packages/s2-vue/package.json
@@ -69,7 +69,7 @@
     "vue-tsc": "^2.1.6"
   },
   "peerDependencies": {
-    "@antv/s2": "^2.0.0-next.1",
+    "@antv/s2": "^2.0.0",
     "ant-design-vue": "^3.2.0",
     "vue": ">=3.x"
   },

diff --git a/s2-site/.dumi/global.ts b/s2-site/.dumi/global.ts
@@ -16,9 +16,9 @@ if (window) {
   (
     window as any
   ).gPluginRoughCanvasRenderer = require('@antv/g-plugin-rough-canvas-renderer');
-  
+
   (window as any).g2 = require('@antv/g2');
-  
+
   (window as any).s2 = require('@antv/s2');
   (window as any)._extends = require('@antv/s2/extends');
 
@@ -55,7 +55,7 @@ if (window) {
     },
     {
       package: '@antv/s2-react-components',
-      version: (window as any).s2React?.version || 'development',
+      version: (window as any).s2ReactComponents?.version || 'development',
     },
     {
       package: 'react',

diff --git a/s2-site/examples/react-component/sheet/demo/chart.tsx b/s2-site/examples/react-component/sheet/demo/chart.tsx
@@ -2,7 +2,7 @@
 import React from 'react';
 import { S2DataConfig, S2Options } from '@antv/s2';
 import { SheetComponent } from '@antv/s2-react';
-import '@antv/s2-react/dist/style.min.css';
+import '@antv/s2-react/dist/s2-react.min.css';
 
 const s2Options: S2Options = {
   width: 1000,