diff --git a/build/build.component.js b/build/build.component.js index 4fa52319e7..86d23a17e6 100644 --- a/build/build.component.js +++ b/build/build.component.js @@ -10,6 +10,8 @@ const typescript = require('rollup-plugin-typescript2') const deps = Object.keys(pkg.dependencies) +const noElPrefixFile = /(utils|directives|hooks|locale)/ + const runBuild = async () => { let index = 0 const pkgs = await getPackages() @@ -52,12 +54,20 @@ const runBuild = async () => { || deps.some(k => new RegExp('^' + k).test(id)) }, } + const getOutFile = () => { + const compName = name.split('@element-plus/')[1] + if(noElPrefixFile.test(name)) { + return `lib/${compName}/index.js` + } + return `lib/el-${compName}/index.js` + } const outOptions = { format: 'es', - file: `lib/${name.split('@element-plus/')[1]}/index.js`, + file: getOutFile(), paths(id) { if (/^@element-plus/.test(id)) { - return id.replace('@element-plus', '..') + if (noElPrefixFile.test(id)) return id.replace('@element-plus', '..') + return id.replace('@element-plus/', '../el-') } }, } diff --git a/build/rollup.config.bundle.js b/build/rollup.config.bundle.js index 73ea859939..98c7a9333f 100644 --- a/build/rollup.config.bundle.js +++ b/build/rollup.config.bundle.js @@ -21,7 +21,6 @@ export default [ terser(), nodeResolve(), // commonjs(), - css(), vue({ target: 'browser', css: false, @@ -29,6 +28,9 @@ export default [ }), typescript({ tsconfigOverride: { + compilerOptions: { + declaration: false, + }, 'include': [ 'packages/**/*', 'typings/vue-shim.d.ts', diff --git a/packages/collapse/src/collapse-item.vue b/packages/collapse/src/collapse-item.vue index 0e9fd5d4e2..4b3f838813 100644 --- a/packages/collapse/src/collapse-item.vue +++ b/packages/collapse/src/collapse-item.vue @@ -51,7 +51,7 @@ import { defineComponent, PropType, inject, computed, ref } from 'vue' import { CollapseProvider } from './collapse' import { generateId } from '@element-plus/utils/util' -import ElCollapseTransition from '@element-plus/transition/collapse-transition/index.vue' +import ElCollapseTransition from '@element-plus/collapse-transition' export default defineComponent({ name: 'ElCollapseItem', diff --git a/packages/date-picker/src/date-picker-com/panel-date-pick.vue b/packages/date-picker/src/date-picker-com/panel-date-pick.vue index ee2063042f..0166e626a4 100644 --- a/packages/date-picker/src/date-picker-com/panel-date-pick.vue +++ b/packages/date-picker/src/date-picker-com/panel-date-pick.vue @@ -159,6 +159,7 @@ import { extractDateFormat, extractTimeFormat, + TimePickPanel, } from '@element-plus/time-picker' import { t } from '@element-plus/locale' import ElInput from '@element-plus/input' @@ -169,7 +170,7 @@ import dayjs, { Dayjs } from 'dayjs' import DateTable from './basic-date-table.vue' import MonthTable from './basic-month-table.vue' import YearTable from './basic-year-table.vue' -import TimePickPanel from '@element-plus/time-picker/src/time-picker-com/panel-time-pick.vue' + import { defineComponent, computed, diff --git a/packages/date-picker/src/date-picker-com/panel-date-range.vue b/packages/date-picker/src/date-picker-com/panel-date-range.vue index 673fdb7c1b..c47af5ba55 100644 --- a/packages/date-picker/src/date-picker-com/panel-date-range.vue +++ b/packages/date-picker/src/date-picker-com/panel-date-range.vue @@ -217,7 +217,7 @@ import { extractDateFormat, extractTimeFormat, } from '@element-plus/time-picker' -import TimePickPanel from '@element-plus/time-picker/src/time-picker-com/panel-time-pick.vue' +import { TimePickPanel } from '@element-plus/time-picker' import { ClickOutside } from '@element-plus/directives' import dayjs, { Dayjs } from 'dayjs' import DateTable from './basic-date-table.vue' diff --git a/packages/date-picker/src/date-picker.ts b/packages/date-picker/src/date-picker.ts index 4e99a08717..07a54edc7e 100644 --- a/packages/date-picker/src/date-picker.ts +++ b/packages/date-picker/src/date-picker.ts @@ -1,5 +1,5 @@ import { DEFAULT_FORMATS_DATE, DEFAULT_FORMATS_DATEPICKER } from '@element-plus/time-picker/src/common/constant' -import Picker from '@element-plus/time-picker/src/common/picker.vue' +import { CommonPicker } from '@element-plus/time-picker' import DatePickPanel from './date-picker-com/panel-date-pick.vue' import DateRangePickPanel from './date-picker-com/panel-date-range.vue' import MonthRangePickPanel from './date-picker-com/panel-month-range.vue' @@ -42,7 +42,7 @@ export default { }, setup(props) { const format = DEFAULT_FORMATS_DATEPICKER[props.type] || DEFAULT_FORMATS_DATE - return () => h(Picker, { + return () => h(CommonPicker, { format, type: props.type, ...props, diff --git a/packages/locale/__test__/locale.spec.ts b/packages/locale/__test__/locale.spec.ts index 1ac359e6b7..ca09219558 100644 --- a/packages/locale/__test__/locale.spec.ts +++ b/packages/locale/__test__/locale.spec.ts @@ -1,6 +1,5 @@ import { mount } from '@vue/test-utils' import { t, use } from '../index' -import localeMixin from '../mixin' import zhCn from '../lang/zh-cn' import en from '../lang/en' @@ -18,13 +17,4 @@ describe('Locale', () => { expect(t('el.popconfirm.confirmButtonText')).toBe('确定') use(en) }) - - test('mixin', () => { - const component = { - template: `

{{ t('el.popconfirm.cancelButtonText') }}

`, - mixins: [localeMixin], - } as any - const wrapper = mount(component) - expect(wrapper.text()).toContain('No') - }) }) diff --git a/packages/locale/mixin.ts b/packages/locale/mixin.ts deleted file mode 100644 index 339e8a3a4d..0000000000 --- a/packages/locale/mixin.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { t } from './index' - -export default { - methods: { - t(...args) { - return t.apply(this, args) - }, - }, -} diff --git a/packages/menu/src/menuItemGroup.vue b/packages/menu/src/menuItemGroup.vue index 3fdea2e2a6..cf4b12972d 100644 --- a/packages/menu/src/menuItemGroup.vue +++ b/packages/menu/src/menuItemGroup.vue @@ -10,5 +10,3 @@ export default defineComponent({ props: { }, }) - diff --git a/packages/menu/src/submenu.vue b/packages/menu/src/submenu.vue index 338002fc04..b64aabcd34 100644 --- a/packages/menu/src/submenu.vue +++ b/packages/menu/src/submenu.vue @@ -100,7 +100,7 @@ import { onBeforeMount, onBeforeUnmount, } from 'vue' -import ElCollapseTransition from '@element-plus/transition/collapse-transition/index.vue' +import ElCollapseTransition from '@element-plus/collapse-transition' import { ISubmenuProps, RootMenuProvider, SubMenuProvider } from './menu' import useMenu from './useMenu' import ElPopper from '@element-plus/popper' diff --git a/packages/time-picker/index.ts b/packages/time-picker/index.ts index d2efa97489..a00d7f3c1b 100644 --- a/packages/time-picker/index.ts +++ b/packages/time-picker/index.ts @@ -1,9 +1,12 @@ import { App } from 'vue' import TimePicker from './src/time-picker' +import CommonPicker from './src/common/picker.vue' +import TimePickPanel from './src/time-picker-com/panel-time-pick.vue' export * from './src/common/date-utils' TimePicker.install = (app: App): void => { app.component(TimePicker.name, TimePicker) } +export { CommonPicker, TimePickPanel } export default TimePicker diff --git a/packages/tree/src/tree-node.vue b/packages/tree/src/tree-node.vue index d85b161efb..b59bee68c3 100644 --- a/packages/tree/src/tree-node.vue +++ b/packages/tree/src/tree-node.vue @@ -77,7 +77,7 @@