fix(build): fix import module path (element-plus#543)

* fix(build): fix import module path * fix: fix export constants & type * fix(popover): fix exports and import
dbarrios1907 · Nov 4, 2020 · b45f084 · b45f084
1 parent 5f32eb6
commit b45f084
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 30 deletions.
diff --git a/packages/button/src/button.vue b/packages/button/src/button.vue
@@ -27,10 +27,10 @@
 import { computed, inject, defineComponent } from 'vue'
 import { useGlobalConfig } from '@element-plus/utils/util'
 import { isValidComponentSize } from '@element-plus/utils/validators'
-import { elFormKey, elFormItemKey } from '@element-plus/form/src/token'
+import { elFormKey, elFormItemKey } from '@element-plus/form'
 
 import type { PropType } from 'vue'
-import type { ElFormContext, ElFormItemContext } from '@element-plus/form/src/token'
+import type { ElFormContext, ElFormItemContext } from '@element-plus/form'
 
 type IButtonType = PropType<'primary' | 'success' | 'warning' | 'danger' | 'info' | 'text' | 'default'>
 type IButtonNativeType = PropType<'button' | 'submit' | 'reset'>

diff --git a/packages/cascader-panel/index.ts b/packages/cascader-panel/index.ts
@@ -6,3 +6,5 @@ export default (app: App): void => {
 }
 
 export { CascaderPanel }
+export * from './src/types'
+export * from './src/config'
diff --git a/packages/cascader-panel/src/node.vue b/packages/cascader-panel/src/node.vue
@@ -54,7 +54,7 @@
 <script lang="ts">
 import { computed, defineComponent, inject, h } from 'vue'
 import { Checkbox as ElCheckbox } from '@element-plus/checkbox'
-import ElRadio from '@element-plus/radio/src/radio.vue'
+import { Radio as ElRadio } from '@element-plus/radio'
 import {
   CascaderNode,
   CASCADER_PANEL_INJECTION_KEY,

diff --git a/packages/cascader/src/index.vue b/packages/cascader/src/index.vue
@@ -149,12 +149,12 @@ import isServer from '@element-plus/utils/isServer'
 import { useGlobalConfig } from '@element-plus/utils/util'
 import { addResizeListener, removeResizeListener } from '@element-plus/utils/resize-event'
 import { isValidComponentSize } from '@element-plus/utils/validators'
-import { elFormKey, elFormItemKey } from '@element-plus/form/src/token'
-import { CommonProps } from '@element-plus/cascader-panel/src/config'
+import { elFormKey, elFormItemKey } from '@element-plus/form'
+import { CommonProps } from '@element-plus/cascader-panel'
 
 import type { ComputedRef, PropType } from 'vue'
-import type { ElFormContext, ElFormItemContext } from '@element-plus/form/src/token'
-import type { CascaderValue, CascaderNode, Tag } from '@element-plus/cascader-panel/src/types'
+import type { ElFormContext, ElFormItemContext } from '@element-plus/form'
+import type { CascaderValue, CascaderNode, Tag } from '@element-plus/cascader-panel'
 
 const DEFAULT_INPUT_HEIGHT = 40
 

diff --git a/packages/color-picker/src/index.vue b/packages/color-picker/src/index.vue
@@ -104,10 +104,10 @@ import { t } from '@element-plus/locale'
 import { UPDATE_MODEL_EVENT }  from '@element-plus/utils/constants'
 import { useGlobalConfig } from '@element-plus/utils/util'
 import { isValidComponentSize } from '@element-plus/utils/validators'
-import { elFormKey, elFormItemKey } from '@element-plus/form/src/token'
+import { elFormKey, elFormItemKey } from '@element-plus/form'
 
 import type { PropType } from 'vue'
-import type { ElFormContext, ElFormItemContext } from '@element-plus/form/src/token'
+import type { ElFormContext, ElFormItemContext } from '@element-plus/form'
 
 interface IUseOptions {
   currentColor: ComputedRef<string>

diff --git a/packages/form/index.ts b/packages/form/index.ts
@@ -10,3 +10,4 @@ export default (app: App): void => {
 }
 
 export { Form, FormItem, LabelWrap }
+export * from './src/token'
diff --git a/packages/input-number/src/index.vue b/packages/input-number/src/index.vue
@@ -63,11 +63,11 @@ import { RepeatClick } from '@element-plus/directives'
 import { Input as ElInput } from '@element-plus/input'
 import { useGlobalConfig } from '@element-plus/utils/util'
 import { isValidComponentSize } from '@element-plus/utils/validators'
-import { elFormKey, elFormItemKey } from '@element-plus/form/src/token'
+import { elFormKey, elFormItemKey } from '@element-plus/form'
 import { parseInt } from 'lodash'
 
 import type { PropType } from 'vue'
-import type { ElFormContext, ElFormItemContext } from '@element-plus/form/src/token'
+import type { ElFormContext, ElFormItemContext } from '@element-plus/form'
 
 interface IData {
   currentValue: number | string

diff --git a/packages/input/src/index.vue b/packages/input/src/index.vue
@@ -121,11 +121,11 @@ import { isObject, useGlobalConfig } from '@element-plus/utils/util'
 import isServer from '@element-plus/utils/isServer'
 import { isKorean } from '@element-plus/utils/isDef'
 import { isValidComponentSize } from '@element-plus/utils/validators'
-import { elFormKey, elFormItemKey } from '@element-plus/form/src/token'
+import { elFormKey, elFormItemKey } from '@element-plus/form'
 import calcTextareaHeight from './calcTextareaHeight'
 
 import type { PropType } from 'vue'
-import type { ElFormContext, ElFormItemContext } from '@element-plus/form/src/token'
+import type { ElFormContext, ElFormItemContext } from '@element-plus/form'
 
 type AutosizeProp = {
   minRows?: number

diff --git a/packages/popover/src/index.vue b/packages/popover/src/index.vue
@@ -1,16 +1,16 @@
 <script lang="ts">
 import { defineComponent, Fragment, createTextVNode, renderSlot, toDisplayString, createCommentVNode } from 'vue'
 import { Popper as ElPopper } from '@element-plus/popper'
-import defaultProps, { Effect } from '@element-plus/popper/src/use-popper/defaults'
-import { renderPopper, renderTrigger, renderArrow } from '@element-plus/popper/src/renderers'
+import { defaultProps, Effect } from '@element-plus/popper'
+import { renderPopper, renderTrigger, renderArrow } from '@element-plus/popper'
 
 import { warn } from '@element-plus/utils/error'
 import { renderBlock, renderIf, PatchFlags } from '@element-plus/utils/vnode'
 import { stop } from '@element-plus/utils/dom'
 import usePopover, { SHOW_EVENT, HIDE_EVENT } from './usePopover'
 
 import type { PropType } from 'vue'
-import type { TriggerType } from '@element-plus/popper/src/use-popper/defaults'
+import type { TriggerType } from '@element-plus/popper'
 
 const emits = ['update:visible', 'after-enter', 'after-leave', SHOW_EVENT, HIDE_EVENT ]
 const NAME = 'ElPopover'

diff --git a/packages/popover/src/usePopover.ts b/packages/popover/src/usePopover.ts
@@ -1,9 +1,9 @@
 import { computed, watch } from 'vue'
 import { isString } from '@element-plus/utils/util'
-import usePopper from '@element-plus/popper/src/use-popper'
+import { usePopper } from '@element-plus/popper'
 
 
-import type { IPopperOptions } from '@element-plus/popper/src/use-popper/defaults'
+import type { IPopperOptions } from '@element-plus/popper'
 import type { SetupContext } from 'vue'
 
 export interface IUsePopover extends IPopperOptions{

diff --git a/packages/popper/index.ts b/packages/popper/index.ts
@@ -6,3 +6,7 @@ export default (app: App) => {
 }
 
 export { Popper }
+export { default as defaultProps, Effect } from './src/use-popper/defaults'
+export type { TriggerType, IPopperOptions } from './src/use-popper/defaults'
+export { default as usePopper } from './src/use-popper/index'
+export * from './src/renderers/index'
diff --git a/packages/radio/src/radio-group.vue b/packages/radio/src/radio-group.vue
@@ -24,11 +24,11 @@ import {
 import { EVENT_CODE } from '@element-plus/utils/aria'
 import { UPDATE_MODEL_EVENT } from '@element-plus/utils/constants'
 import { isValidComponentSize } from '@element-plus/utils/validators'
-import { elFormItemKey } from '@element-plus/form/src/token'
+import { elFormItemKey } from '@element-plus/form'
 import radioGroupKey from './token'
 
 import type { PropType } from 'vue'
-import type { ElFormItemContext } from '@element-plus/form/src/token'
+import type { ElFormItemContext } from '@element-plus/form'
 
 export default {
   name: 'ElRadioGroup',

diff --git a/packages/rate/src/index.vue b/packages/rate/src/index.vue
@@ -47,9 +47,9 @@ import {
 import { isObject, isArray } from '@vue/shared'
 import { hasClass } from '@element-plus/utils/dom'
 import { EVENT_CODE } from '@element-plus/utils/aria'
-import { elFormKey } from '@element-plus/form/src/token'
+import { elFormKey } from '@element-plus/form'
 
-import type { ElFormContext } from '@element-plus/form/src/token'
+import type { ElFormContext } from '@element-plus/form'
 
 export default defineComponent({
   name: 'ElRate',

diff --git a/packages/switch/src/index.vue b/packages/switch/src/index.vue
@@ -42,9 +42,9 @@
 </template>
 <script lang='ts'>
 import { defineComponent, computed, onMounted, ref, inject, nextTick, watch } from 'vue'
-import { elFormKey, elFormItemKey } from '@element-plus/form/src/token'
+import { elFormKey, elFormItemKey } from '@element-plus/form'
 
-import type { ElFormContext, ElFormItemContext } from '@element-plus/form/src/token'
+import type { ElFormContext, ElFormItemContext } from '@element-plus/form'
 
 
 type ValueType = boolean | string | number;

diff --git a/packages/time-picker/src/common/picker.vue b/packages/time-picker/src/common/picker.vue
@@ -130,10 +130,10 @@ import { Popper as ElPopper } from '@element-plus/popper'
 import { EVENT_CODE } from '@element-plus/utils/aria'
 import { useGlobalConfig } from '@element-plus/utils/util'
 import { isValidComponentSize } from '@element-plus/utils/validators'
-import { elFormKey, elFormItemKey } from '@element-plus/form/src/token'
+import { elFormKey, elFormItemKey } from '@element-plus/form'
 
 import type { PropType } from 'vue'
-import type { ElFormContext, ElFormItemContext } from '@element-plus/form/src/token'
+import type { ElFormContext, ElFormItemContext } from '@element-plus/form'
 
 interface PickerOptions {
   isValidValue: any

diff --git a/packages/transfer/src/index.vue b/packages/transfer/src/index.vue
@@ -66,10 +66,10 @@ import { useCheckedChange } from './useCheckedChange'
 import { useMove } from './useMove'
 
 import { UPDATE_MODEL_EVENT } from '@element-plus/utils/constants'
-import { elFormItemKey } from '@element-plus/form/src/token'
+import { elFormItemKey } from '@element-plus/form'
 
 import type { PropType, VNode } from 'vue'
-import type { ElFormItemContext } from '@element-plus/form/src/token'
+import type { ElFormItemContext } from '@element-plus/form'
 import type {
   DataItem, Format, Key,
   Props, TargetOrder,

diff --git a/packages/upload/src/index.vue b/packages/upload/src/index.vue
@@ -10,15 +10,15 @@ import {
   onBeforeUnmount,
 } from 'vue'
 import { NOOP } from '@vue/shared'
-import { elFormKey } from '@element-plus/form/src/token'
+import { elFormKey } from '@element-plus/form'
 
 import ajax from './ajax'
 import UploadList from './upload-list.vue'
 import Upload from './upload.vue'
 import useHandlers from './useHandlers'
 
 import type { PropType } from 'vue'
-import type { ElFormContext } from '@element-plus/form/src/token'
+import type { ElFormContext } from '@element-plus/form'
 import type {
   ListType,
   UploadFile,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@ export default (app: App): void => {
		}

		export { Form, FormItem, LabelWrap }
		export * from './src/token'