Skip to content

Commit

Permalink
Build/component (element-plus#656)
Browse files Browse the repository at this point in the history
* build: update build conf

* chore: update

* chore: update

* chore: update

* fix: rm mixin
  • Loading branch information
zazzaz committed Nov 23, 2020
1 parent a9c8b7c commit 5a424d4
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 31 deletions.
14 changes: 12 additions & 2 deletions build/build.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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-')
}
},
}
Expand Down
4 changes: 3 additions & 1 deletion build/rollup.config.bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,16 @@ export default [
terser(),
nodeResolve(),
// commonjs(),
css(),
vue({
target: 'browser',
css: false,
exposeFilename: false,
}),
typescript({
tsconfigOverride: {
compilerOptions: {
declaration: false,
},
'include': [
'packages/**/*',
'typings/vue-shim.d.ts',
Expand Down
2 changes: 1 addition & 1 deletion packages/collapse/src/collapse-item.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 2 additions & 1 deletion packages/date-picker/src/date-picker-com/panel-date-pick.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions packages/date-picker/src/date-picker.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -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,
Expand Down
10 changes: 0 additions & 10 deletions packages/locale/__test__/locale.spec.ts
Original file line number Diff line number Diff line change
@@ -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'

Expand All @@ -18,13 +17,4 @@ describe('Locale', () => {
expect(t('el.popconfirm.confirmButtonText')).toBe('确定')
use(en)
})

test('mixin', () => {
const component = {
template: `<p>{{ t('el.popconfirm.cancelButtonText') }}</p>`,
mixins: [localeMixin],
} as any
const wrapper = mount(component)
expect(wrapper.text()).toContain('No')
})
})
9 changes: 0 additions & 9 deletions packages/locale/mixin.ts

This file was deleted.

2 changes: 0 additions & 2 deletions packages/menu/src/menuItemGroup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,3 @@ export default defineComponent({
props: { },
})
</script>
<style scoped>
</style>
2 changes: 1 addition & 1 deletion packages/menu/src/submenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 3 additions & 0 deletions packages/time-picker/index.ts
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion packages/tree/src/tree-node.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
</template>
<script lang='ts'>
import { defineComponent, getCurrentInstance, ref, watch, nextTick, inject, provide, PropType, ComponentInternalInstance } from 'vue'
import ElCollapseTransition from '@element-plus/transition/collapse-transition/index.vue'
import ElCollapseTransition from '@element-plus/collapse-transition'
import ElCheckbox from '@element-plus/checkbox'
import NodeContent from './tree-node-content.vue'
import { getNodeKey as getNodeKeyUtil } from './model/util'
Expand Down
Binary file removed public/favicon.ico
Binary file not shown.

0 comments on commit 5a424d4

Please sign in to comment.