chore: 移除 s2-vue 中的 shared 依赖

antvis · Sep 23, 2024 · efbea58 · efbea58
1 parent 91e3401
commit efbea58
Show file tree

Hide file tree

Showing 20 changed files with 50 additions and 41 deletions.
diff --git a/packages/s2-core/src/shared/styles/tooltip/index.less b/packages/s2-core/src/shared/styles/tooltip/index.less
@@ -1,4 +1,4 @@
-@import '../variables.less';
+@import '../../../ui/tooltip/index.less';
 
 .@{tooltip-cls-prefix} {
   &-tips,

diff --git a/packages/s2-core/src/styles/variables.less b/packages/s2-core/src/styles/variables.less
@@ -1,11 +1,11 @@
 // s2 类名前缀
 @s2-cls-prefix: antv-s2;
 
-// Tooltip
-@tooltip-cls-prefix: ~'@{s2-cls-prefix}-tooltip';
-
 // css 变量前缀
 @css-var-prefix: ~'--@{s2-cls-prefix}';
 
+// Tooltip
+@tooltip-cls-prefix: ~'@{s2-cls-prefix}-tooltip';
+
 // 图标
 @icon-cls-prefix: ~'@{s2-cls-prefix}-icon';
diff --git a/packages/s2-react-components/src/components/common/icons/index.tsx b/packages/s2-react-components/src/components/common/icons/index.tsx
@@ -1,9 +1,9 @@
-import { ReactComponent as CalendarIcon } from '@antv/s2/shared/src/icons/calendar-icon.svg';
-import { ReactComponent as ColIcon } from '@antv/s2/shared/src/icons/col-icon.svg';
-import { ReactComponent as LocationIcon } from '@antv/s2/shared/src/icons/location-icon.svg';
-import { ReactComponent as RowIcon } from '@antv/s2/shared/src/icons/row-icon.svg';
-import { ReactComponent as TextIcon } from '@antv/s2/shared/src/icons/text-icon.svg';
-import { ReactComponent as ValueIcon } from '@antv/s2/shared/src/icons/value-icon.svg';
+import { ReactComponent as CalendarIcon } from '@antv/s2/esm/shared/icons/calendar-icon.svg';
+import { ReactComponent as ColIcon } from '@antv/s2/esm/shared/icons/col-icon.svg';
+import { ReactComponent as LocationIcon } from '@antv/s2/esm/shared/icons/location-icon.svg';
+import { ReactComponent as RowIcon } from '@antv/s2/esm/shared/icons/row-icon.svg';
+import { ReactComponent as TextIcon } from '@antv/s2/esm/shared/icons/text-icon.svg';
+import { ReactComponent as ValueIcon } from '@antv/s2/esm/shared/icons/value-icon.svg';
 import './index.less';
 
 export { CalendarIcon, ColIcon, LocationIcon, RowIcon, TextIcon, ValueIcon };
diff --git a/packages/s2-react-components/tsconfig.json b/packages/s2-react-components/tsconfig.json
@@ -6,6 +6,7 @@
     "paths": {
       "@antv/s2":["s2-core/src/index.ts"],
       "@antv/s2/*":["s2-core/src/*"],
+      "@antv/s2/shared":["s2-core/src/shared/index.ts"],
       "@antv/s2-react":["s2-react/src/index.ts"],
       "@/*":["s2-react-components/src/*"],
       "tests/*":["s2-react-components/__tests__/*"]

diff --git a/packages/s2-react/src/components/tooltip/components/operator.tsx b/packages/s2-react/src/components/tooltip/components/operator.tsx
@@ -8,7 +8,7 @@ import type {
 } from '../interface';
 import { TooltipIcon } from './icon';
 
-import '@antv/s2/shared/esm/styles/tooltip/operator.less';
+import '@antv/s2/esm/shared/styles/tooltip/operator.less';
 
 export const TooltipOperator: React.FC<Required<TooltipOperatorProps>> =
   React.memo((props) => {

diff --git a/packages/s2-react/tsconfig.json b/packages/s2-react/tsconfig.json
@@ -6,6 +6,7 @@
     "paths": {
       "@antv/s2": ["s2-core/src/index.ts"],
       "@antv/s2/*": ["s2-core/src/*"],
+      "@antv/s2/shared": ["s2-core/src/shared/index.ts"],
       "@antv/s2-react-components": ["s2-react-components/src/index.ts"],
       "@/*": ["s2-react/src/*"],
       "tests/*": ["s2-react/__tests__/*"]

diff --git a/packages/s2-vue/package.json b/packages/s2-vue/package.json
@@ -37,7 +37,7 @@
     "README.md"
   ],
   "scripts": {
-    "build": "pnpm clean && father build && pnpm build:dts",
+    "build": "npm-run-all clean --parallel build:umd build:cjs build:esm",
     "build:analysis": "cross-env FORMAT=es ANALYSIS=true vite build",
     "build:cjs": "cross-env FORMAT=cjs vite build",
     "build:dts": "run-s dts:*",

diff --git a/packages/s2-vue/playground/App.vue b/packages/s2-vue/playground/App.vue
@@ -5,7 +5,7 @@ import type {
   PartDrillDown,
   PartDrillDownInfo,
   SheetType,
-} from '@antv/s2-shared';
+} from '@antv/s2/shared';
 import { forEach, random } from 'lodash';
 import { defineComponent, reactive, ref, shallowRef } from 'vue';
 import { SheetComponent } from '../src';

diff --git a/packages/s2-vue/src/components/drill-down/index.vue b/packages/s2-vue/src/components/drill-down/index.vue
@@ -1,19 +1,19 @@
 <script lang="ts">
 import { defineComponent, ref } from 'vue';
 import type { Ref } from 'vue';
-import type {
-  BaseDrillDownDataSet,
-  BaseDrillDownComponentProps,
-} from '@antv/s2-shared';
+import {
+  DRILL_DOWN_PRE_CLASS,
+  type BaseDrillDownDataSet,
+  type BaseDrillDownComponentProps,
+} from '@antv/s2/shared';
 import { Button, Input, Empty, Menu, MenuItem } from 'ant-design-vue';
 import type { SelectInfo } from 'ant-design-vue/lib/menu/src/interface';
 import { isEmpty } from 'lodash';
-import LocationIcon from '@antv/s2-shared/src/icons/location-icon.svg?component';
-import TextIcon from '@antv/s2-shared/src/icons/text-icon.svg?component';
-import CalendarIcon from '@antv/s2-shared/src/icons/calendar-icon.svg?component';
+import LocationIcon from '@antv/s2/esm/shared/icons/location-icon.svg?component';
+import TextIcon from '@antv/s2/esm/shared/icons/text-icon.svg?component';
+import CalendarIcon from '@antv/s2/esm/shared/icons/calendar-icon.svg?component';
 import type { Key } from 'ant-design-vue/lib/_util/type';
 import type { ChangeEvent } from 'ant-design-vue/lib/_util/EventInterface';
-import { DRILL_DOWN_PRE_CLASS } from '@antv/s2-shared';
 import {
   initDrillDownEmits,
   initDrillDownProps,
@@ -147,5 +147,5 @@ export default defineComponent({
 </template>
 
 <style lang="less" scoped>
-@import '@antv/s2-shared/src/styles/drill-down.less';
+@import '@antv/s2/esm/shared/styles/drill-down.less';
 </style>
diff --git a/packages/s2-vue/src/components/sheets/base-sheet.vue b/packages/s2-vue/src/components/sheets/base-sheet.vue
@@ -76,7 +76,7 @@ export default defineComponent({
 </template>
 
 <style lang="less">
-@import '@antv/s2-shared/src/styles/variables.less';
+@import '@antv/s2/esm/shared/styles/variables.less';
 
 .@{s2-cls-prefix} {
   &-spin.ant-spin-nested-loading,

diff --git a/packages/s2-vue/src/components/sheets/index.vue b/packages/s2-vue/src/components/sheets/index.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import type { SheetType } from '@antv/s2-shared';
+import type { SheetType } from '@antv/s2/shared';
 import { computed, defineComponent } from 'vue';
 import { useExpose } from '../../hooks/useExpose';
 import type { BaseSheetInitEmits, BaseSheetInitProps } from '../../interface';

diff --git a/packages/s2-vue/src/components/sheets/pivot-sheet.vue b/packages/s2-vue/src/components/sheets/pivot-sheet.vue
@@ -1,9 +1,13 @@
 <script lang="ts">
-import { computed, defineComponent, ref, toRefs, createVNode } from 'vue';
+import type { S2Options } from '@antv/s2';
+import {
+  buildDrillDownOptions,
+  handleDrillDown,
+  type ActionIconCallbackParams,
+  type PartDrillDown,
+} from '@antv/s2/shared';
 import { isEmpty } from 'lodash';
-import { buildDrillDownOptions, handleDrillDown } from '@antv/s2-shared';
-import type { SpreadSheet, S2Options } from '@antv/s2';
-import type { PartDrillDown, ActionIconCallbackParams } from '@antv/s2-shared';
+import { computed, createVNode, defineComponent, ref, toRefs } from 'vue';
 import { useExpose } from '../../hooks/useExpose';
 import type { BaseSheetInitEmits } from '../../interface';
 import { initBaseSheetProps } from '../../utils/initPropAndEmits';
@@ -36,7 +40,7 @@ export default defineComponent({
           drillFields: fields,
           fetchData: partDrillDown.value?.['fetchData'],
           drillItemsNum: partDrillDown.value?.['drillItemsNum'],
-          spreadsheet: instance as SpreadSheet,
+          spreadsheet: instance,
         });
       }
     };
@@ -71,7 +75,7 @@ export default defineComponent({
     // 展示下钻icon
     const options = computed(() =>
       buildDrillDownOptions(
-        pivotOptions.value as S2Options,
+        pivotOptions.value as any,
         partDrillDown.value as PartDrillDown,
         (params) => onDrillDownIconClick(params),
       ),

diff --git a/packages/s2-vue/src/components/tooltip/components/operator/index.vue b/packages/s2-vue/src/components/tooltip/components/operator/index.vue
@@ -4,7 +4,7 @@ import {
   type TooltipBaseOperatorMenuItem,
   TOOLTIP_PREFIX_CLS,
 } from '@antv/s2';
-import type { TooltipOperatorProps as BaseTooltipOperatorProps } from '@antv/s2-shared';
+import type { TooltipOperatorProps as BaseTooltipOperatorProps } from '@antv/s2/shared';
 import { Menu, Dropdown, type MenuProps } from 'ant-design-vue';
 import { defineComponent } from 'vue';
 import type { MenuClickEventHandler } from 'ant-design-vue/lib/menu/src/interface';
@@ -83,5 +83,5 @@ export default defineComponent({
 </template>
 
 <style lang="less">
-@import '@antv/s2-shared/src/styles/tooltip/operator.less';
+@import '@antv/s2/esm/shared/styles/tooltip/operator.less';
 </style>
diff --git a/packages/s2-vue/src/components/tooltip/index.vue b/packages/s2-vue/src/components/tooltip/index.vue
@@ -77,6 +77,5 @@ export default defineComponent({
 </template>
 
 <style lang="less">
-@import '@antv/s2/src/ui/tooltip/index.less';
-@import '@antv/s2-shared/src/styles/tooltip/index.less';
+@import '@antv/s2/esm/shared/styles/tooltip/index.less';
 </style>
diff --git a/packages/s2-vue/src/hooks/useResize.ts b/packages/s2-vue/src/hooks/useResize.ts
@@ -1,5 +1,5 @@
 import type { SpreadSheet } from '@antv/s2';
-import { createResizeObserver } from '@antv/s2-shared';
+import { createResizeObserver } from '@antv/s2/shared';
 import { ref, watch, type Ref } from 'vue';
 import type { BaseSheetProps } from '../utils/initPropAndEmits';
 

diff --git a/packages/s2-vue/src/interface.ts b/packages/s2-vue/src/interface.ts
@@ -3,7 +3,7 @@ import type {
   BaseDrillDownComponentProps,
   BaseSheetComponentProps,
   PartDrillDown,
-} from '@antv/s2-shared';
+} from '@antv/s2/shared';
 import type { UnionToIntersection } from '@vue/shared';
 import type { PaginationProps } from 'ant-design-vue';
 import type { PropType } from 'vue';

diff --git a/packages/s2-vue/src/utils/extendLocale.ts b/packages/s2-vue/src/utils/extendLocale.ts
@@ -1,4 +1,4 @@
 import { extendLocale } from '@antv/s2';
-import { Locale } from '@antv/s2-shared';
+import { Locale } from '@antv/s2/shared';
 
 extendLocale(Locale);
diff --git a/packages/s2-vue/src/utils/initPropAndEmits.ts b/packages/s2-vue/src/utils/initPropAndEmits.ts
@@ -4,7 +4,7 @@ import type {
   Adaptive,
   BaseDrillDownDataSet,
   SheetType,
-} from '@antv/s2-shared';
+} from '@antv/s2/shared';
 import type { ExtractPropTypes, PropType } from 'vue';
 import type {
   BaseDrillDownEmitKeys,

diff --git a/packages/s2-vue/src/utils/options.ts b/packages/s2-vue/src/utils/options.ts
@@ -1,5 +1,5 @@
 import type { S2Options } from '@antv/s2';
-import { getBaseSheetComponentOptions } from '@antv/s2-shared';
+import { getBaseSheetComponentOptions } from '@antv/s2/shared';
 import { RENDER_TOOLTIP_OPTION } from '../common/constant';
 
 export const getSheetComponentOptions = (

diff --git a/packages/s2-vue/tsconfig.json b/packages/s2-vue/tsconfig.json
@@ -4,9 +4,13 @@
     "target": "ESNext",
     "jsx": "preserve",
     "strict": false,
-    // father 对于 vue 打包有点问题, 还是使用单独打包 dts 的方式
-    "declaration": false,
+    "declaration": true,
     "noImplicitAny": false,
+    "paths": {
+      "@antv/s2": ["s2-core/src/index.ts"],
+      "@antv/s2/*": ["s2-core/src/*"],
+      "@antv/s2/shared": ["s2-core/src/shared/index.ts"]
+    },
   },
   "exclude": ["node_modules", "coverage", "esm", "lib", "dist", "temp"],
   "include": ["src", "./typings.d.ts", "../../global.d.ts"]