diff --git a/docs/.vitepress/vitepress/composables/lock-screen.ts b/docs/.vitepress/vitepress/composables/lock-screen.ts index dba078f674..672f1e0d59 100644 --- a/docs/.vitepress/vitepress/composables/lock-screen.ts +++ b/docs/.vitepress/vitepress/composables/lock-screen.ts @@ -5,8 +5,8 @@ import { hasClass, getStyle, removeClass, -} from '@element-plus/utils/dom' -import getScrollBarWidth from '@element-plus/utils/scrollbar-width' + getScrollBarWidth, +} from '@element-plus/utils' export const useLockScreen = () => { let scrollBarWidth = 0 diff --git a/package.json b/package.json index 90b8d60dc2..d381b5dad1 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,6 @@ "@element-plus/theme-chalk": "workspace:*", "@element-plus/tokens": "workspace:*", "@element-plus/utils": "workspace:*", - "@element-plus/utils-v2": "workspace:*", "@popperjs/core": "^2.11.2", "@vueuse/core": "^7.6.0", "async-validator": "^4.0.7", @@ -125,6 +124,7 @@ "sucrase": "3.20.3", "ts-jest": "26.5.6", "ts-morph": "13.0.3", + "type-fest": "^2.11.2", "typescript": "4.5.5", "vue": "3.2.30", "vue-jest": "5.0.0-alpha.10", diff --git a/packages/components/affix/index.ts b/packages/components/affix/index.ts index 301872b72a..817d61cb90 100644 --- a/packages/components/affix/index.ts +++ b/packages/components/affix/index.ts @@ -1,4 +1,4 @@ -import { withInstall } from '@element-plus/utils-v2' +import { withInstall } from '@element-plus/utils' import Affix from './src/affix.vue' diff --git a/packages/components/affix/src/affix.ts b/packages/components/affix/src/affix.ts index e9e400f1be..1c98332934 100644 --- a/packages/components/affix/src/affix.ts +++ b/packages/components/affix/src/affix.ts @@ -1,4 +1,4 @@ -import { buildProps, definePropType } from '@element-plus/utils-v2' +import { buildProps, definePropType } from '@element-plus/utils' import type { ExtractPropTypes } from 'vue' import type { ZIndexProperty } from 'csstype' import type Affix from './affix.vue' diff --git a/packages/components/affix/src/affix.vue b/packages/components/affix/src/affix.vue index 87e9994cca..770894caa5 100644 --- a/packages/components/affix/src/affix.vue +++ b/packages/components/affix/src/affix.vue @@ -15,7 +15,7 @@ import { watch, } from 'vue' import { useEventListener, useResizeObserver } from '@vueuse/core' -import { getScrollContainer } from '@element-plus/utils/dom' +import { getScrollContainer } from '@element-plus/utils' import { useNamespace } from '@element-plus/hooks' import { affixEmits, affixProps } from './affix' diff --git a/packages/components/alert/__tests__/alert.spec.ts b/packages/components/alert/__tests__/alert.spec.ts index a1cd389462..77b671ce2a 100644 --- a/packages/components/alert/__tests__/alert.spec.ts +++ b/packages/components/alert/__tests__/alert.spec.ts @@ -1,5 +1,5 @@ import { mount } from '@vue/test-utils' -import { TypeComponentsMap } from '@element-plus/utils-v2' +import { TypeComponentsMap } from '@element-plus/utils' import Alert from '../src/alert.vue' const AXIOM = 'Rem is the best girl' diff --git a/packages/components/alert/index.ts b/packages/components/alert/index.ts index c5b018ec1b..5aa4e5e7c7 100644 --- a/packages/components/alert/index.ts +++ b/packages/components/alert/index.ts @@ -1,4 +1,4 @@ -import { withInstall } from '@element-plus/utils-v2' +import { withInstall } from '@element-plus/utils' import Alert from './src/alert.vue' diff --git a/packages/components/alert/src/alert.ts b/packages/components/alert/src/alert.ts index f4551fa239..756d4b83c7 100644 --- a/packages/components/alert/src/alert.ts +++ b/packages/components/alert/src/alert.ts @@ -1,4 +1,4 @@ -import { TypeComponentsMap, buildProps, keyOf } from '@element-plus/utils-v2' +import { TypeComponentsMap, buildProps, keysOf } from '@element-plus/utils' import type { ExtractPropTypes } from 'vue' import type Alert from './alert.vue' @@ -15,7 +15,7 @@ export const alertProps = buildProps({ }, type: { type: String, - values: keyOf(TypeComponentsMap), + values: keysOf(TypeComponentsMap), default: 'info', }, closable: { diff --git a/packages/components/alert/src/alert.vue b/packages/components/alert/src/alert.vue index ea595ea960..6eb1573f67 100644 --- a/packages/components/alert/src/alert.vue +++ b/packages/components/alert/src/alert.vue @@ -42,7 +42,7 @@