From 7d39b37f008b1af9beb40472098c3d83afabc9bf Mon Sep 17 00:00:00 2001 From: jeremywu <15975785+JeremyWuuuuu@users.noreply.github.com> Date: Wed, 23 Jun 2021 19:58:02 +0800 Subject: [PATCH] fix(project): fix beta 49 build issue (#2310) - Fix the build issue caused by internal objects Co-authored-by: jeremywuuuuu --- build/rollup.config.js | 2 +- packages/internal/props/use-popper-props.ts | 2 +- packages/popover/src/index.vue | 6 +++--- packages/popover/src/usePopover.ts | 2 +- packages/popper/src/index.vue | 2 +- packages/popper/src/renderers/popper.ts | 2 +- packages/popper/src/use-popper/index.ts | 2 +- packages/popper/src/use-popper/popper-options.ts | 2 +- packages/tooltip/src/index.ts | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build/rollup.config.js b/build/rollup.config.js index ede36781d4..dc61ca19c9 100644 --- a/build/rollup.config.js +++ b/build/rollup.config.js @@ -20,7 +20,7 @@ const inputs = getPackagesSync() .map(pkg => pkg.name) .filter(name => name.includes('@element-plus') && - !name.includes('utils'), + !name.includes('utils') && !name.includes('internal'), ) export default inputs.map(name => ({ diff --git a/packages/internal/props/use-popper-props.ts b/packages/internal/props/use-popper-props.ts index 877e9153cd..d0892a5176 100644 --- a/packages/internal/props/use-popper-props.ts +++ b/packages/internal/props/use-popper-props.ts @@ -1,5 +1,5 @@ -import { DEFAULT_TRIGGER, DEFAULT_FALLBACK_PLACEMENTS } from '@element-plus/constants/popper.constants' +import { DEFAULT_TRIGGER, DEFAULT_FALLBACK_PLACEMENTS } from '../../constants/popper.constants' import type { PropType, ExtractPropTypes } from 'vue' import type { Placement, PositioningStrategy, Instance as PopperInstance, Options } from '@popperjs/core' diff --git a/packages/popover/src/index.vue b/packages/popover/src/index.vue index 513f1aa571..b6646e2ac5 100644 --- a/packages/popover/src/index.vue +++ b/packages/popover/src/index.vue @@ -4,14 +4,14 @@ import ElPopper from '@element-plus/popper' import { renderPopper, renderTrigger, renderArrow } from '@element-plus/popper' import { ClickOutside } from '@element-plus/directives' import { warn } from '@element-plus/utils/error' -import defaultProps from '@element-plus/internal/props/use-popper-props' -import { LIGHT_EFFECT } from '@element-plus/constants/popper.constants' import { renderIf, PatchFlags } from '@element-plus/utils/vnode' +import { LIGHT_EFFECT } from '../../constants/popper.constants' +import defaultProps from '../../internal/props/use-popper-props' import usePopover, { SHOW_EVENT, HIDE_EVENT } from './usePopover' import type { PropType } from 'vue' -import type { TriggerType } from '@element-plus/internal/props/use-popper-props' +import type { TriggerType } from '../../internal/props/use-popper-props' 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 index 077135850b..4059c0613a 100644 --- a/packages/popover/src/usePopover.ts +++ b/packages/popover/src/usePopover.ts @@ -5,7 +5,7 @@ import PopupManager from '@element-plus/utils/popup-manager' import type { SetupContext } from 'vue' import type { EmitType } from '@element-plus/popper/src/use-popper' -import type { IPopperOptions } from '@element-plus/internal/props/use-popper-props' +import type { IPopperOptions } from '../../internal/props/use-popper-props' export interface IUsePopover extends IPopperOptions { width: number | string diff --git a/packages/popper/src/index.vue b/packages/popper/src/index.vue index 0c4935a10e..bdeb2c5042 100644 --- a/packages/popper/src/index.vue +++ b/packages/popper/src/index.vue @@ -14,9 +14,9 @@ import { } from 'vue' import throwError from '@element-plus/utils/error' -import defaultProps from '@element-plus/internal/props/use-popper-props' import usePopper from './use-popper/index' +import defaultProps from '../../internal/props/use-popper-props' import { renderPopper, renderTrigger, renderArrow } from './renderers' import { ClickOutside } from '@element-plus/directives' diff --git a/packages/popper/src/renderers/popper.ts b/packages/popper/src/renderers/popper.ts index b02182c2d6..b1f310375f 100644 --- a/packages/popper/src/renderers/popper.ts +++ b/packages/popper/src/renderers/popper.ts @@ -3,7 +3,7 @@ import { NOOP } from '@vue/shared' import { stop } from '@element-plus/utils/dom' import type { VNode, Ref } from 'vue' -import type { Effect } from '@element-plus/internal/props/use-popper-props' +import type { Effect } from '../../../internal/props/use-popper-props' interface IRenderPopperProps { effect: Effect diff --git a/packages/popper/src/use-popper/index.ts b/packages/popper/src/use-popper/index.ts index a793cfbb7c..045ef617b5 100644 --- a/packages/popper/src/use-popper/index.ts +++ b/packages/popper/src/use-popper/index.ts @@ -19,7 +19,7 @@ import type { IPopperOptions, TriggerType, PopperInstance, -} from '@element-plus/internal/props/use-popper-props' +} from '../../../internal/props/use-popper-props' export type ElementType = ComponentPublicInstance | HTMLElement export type EmitType = 'update:visible' | 'after-enter' | 'after-leave' | 'before-enter' | 'before-leave' diff --git a/packages/popper/src/use-popper/popper-options.ts b/packages/popper/src/use-popper/popper-options.ts index e58ae76d56..8cd73ea510 100644 --- a/packages/popper/src/use-popper/popper-options.ts +++ b/packages/popper/src/use-popper/popper-options.ts @@ -2,7 +2,7 @@ import { computed } from 'vue' import buildModifiers from './build-modifiers' import type { Ref } from 'vue' -import type { IPopperOptions } from '@element-plus/internal/props/use-popper-props' +import type { IPopperOptions } from '../../../internal/props/use-popper-props' interface IUsePopperState { arrow: Ref diff --git a/packages/tooltip/src/index.ts b/packages/tooltip/src/index.ts index 6ed2b1d2e9..4661b422cf 100644 --- a/packages/tooltip/src/index.ts +++ b/packages/tooltip/src/index.ts @@ -2,7 +2,7 @@ import { defineComponent, h, ref, cloneVNode } from 'vue' import ElPopper from '@element-plus/popper' import { UPDATE_MODEL_EVENT } from '@element-plus/utils/constants' import throwError from '@element-plus/utils/error' -import defaultProps from '@element-plus/internal/props/use-popper-props' +import defaultProps from '../../internal/props/use-popper-props' import { getFirstValidNode } from '@element-plus/utils/vnode' /**