diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 74daffee2..4da53bc65 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -1,5 +1,11 @@ # CHANGELOG +## 2.40.3 + +`2024-12-02` + +- Fix marquee is not exported with correct name. + ## 2.40.2 `2024-11-26` diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 6cf9772ae..163dc6a49 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -1,5 +1,11 @@ # CHANGELOG +## 2.40.3 + +`2024-12-02` + +- 修复 marquee 没有被用正确的名字导出 + ## 2.40.2 `2024-11-26` diff --git a/package.json b/package.json index 96a05adb0..b12d50542 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "naive-ui", - "version": "2.40.2", + "version": "2.40.3", "packageManager": "pnpm@9.5.0", "description": "A Vue 3 Component Library. Fairly Complete, Theme Customizable, Uses TypeScript, Fast", "author": "07akioni", diff --git a/scripts/post-build/index.js b/scripts/post-build/index.js index 7a36562c8..b30299a41 100644 --- a/scripts/post-build/index.js +++ b/scripts/post-build/index.js @@ -1,12 +1,9 @@ // terse cssr -const { replaceDefine, outDirs, srcDir } = require('../utils') -const { terseCssr } = require('./terse-cssr') - // replace __DEV__ - +const { replaceDefine, outDirs, srcDir } = require('../utils') const { completePath } = require('./complete-path') const { genWebTypes } = require('./gen-web-types') - +const { terseCssr } = require('./terse-cssr') ; (async () => { diff --git a/src/_mixins/index.ts b/src/_mixins/index.ts index f8df2423a..fa1daf6bf 100644 --- a/src/_mixins/index.ts +++ b/src/_mixins/index.ts @@ -1,4 +1,4 @@ -export { default as useConfig, defaultClsPrefix } from './use-config' +export { defaultClsPrefix, default as useConfig } from './use-config' export { useThemeClass } from './use-css-vars-class' export { default as useFormItem } from './use-form-item' export { default as useHljs } from './use-hljs' diff --git a/src/config-provider/src/internal-interface.ts b/src/config-provider/src/internal-interface.ts index 312cfd7c8..3e44d9f4d 100644 --- a/src/config-provider/src/internal-interface.ts +++ b/src/config-provider/src/internal-interface.ts @@ -7,22 +7,22 @@ import type { Hljs } from '../../_mixins' import type { AlertTheme } from '../../alert/styles' import type { AnchorTheme } from '../../anchor/styles' import type { AutoCompleteTheme } from '../../auto-complete/styles' -import type { AvatarTheme } from '../../avatar/styles' import type { AvatarGroupTheme } from '../../avatar-group/styles' +import type { AvatarTheme } from '../../avatar/styles' import type { BackTopTheme } from '../../back-top/styles' import type { BadgeTheme } from '../../badge/styles' import type { BreadcrumbTheme } from '../../breadcrumb/styles' +import type { ButtonGroupTheme } from '../../button-group/styles/light' import type { Size as ButtonSize } from '../../button/src/interface' import type { ButtonTheme } from '../../button/styles' -import type { ButtonGroupTheme } from '../../button-group/styles/light' import type { CalendarTheme } from '../../calendar/styles' import type { CardTheme } from '../../card/styles' import type { CarouselTheme } from '../../carousel/styles' import type { CascaderTheme } from '../../cascader/styles' import type { CheckboxTheme } from '../../checkbox/styles' import type { CodeTheme } from '../../code/styles' -import type { CollapseTheme } from '../../collapse/styles' import type { CollapseTransitionTheme } from '../../collapse-transition/styles' +import type { CollapseTheme } from '../../collapse/styles' import type { ColorPickerTheme } from '../../color-picker/styles' import type { DataTableRenderFilter, @@ -44,16 +44,16 @@ import type { EmptyProps } from '../../empty' import type { EmptyTheme } from '../../empty/styles' import type { EquationTheme } from '../../equation/styles' import type { FlexTheme } from '../../flex/styles' -import type { FloatButtonTheme } from '../../float-button/styles' import type { FloatButtonGroupTheme } from '../../float-button-group/styles' +import type { FloatButtonTheme } from '../../float-button/styles' import type { FormTheme } from '../../form/styles' import type { GradientTextTheme } from '../../gradient-text/styles' -import type { IconTheme } from '../../icon/styles' import type { IconWrapperTheme } from '../../icon-wrapper/styles' +import type { IconTheme } from '../../icon/styles' import type { ImageTheme } from '../../image/styles' +import type { InputNumberTheme } from '../../input-number/styles' import type { Size as InputSize } from '../../input/src/interface' import type { InputTheme } from '../../input/styles' -import type { InputNumberTheme } from '../../input-number/styles' import type { LayoutTheme } from '../../layout/styles' import type { RowTheme } from '../../legacy-grid/styles' import type { LegacyTransferTheme } from '../../legacy-transfer/styles' @@ -96,8 +96,8 @@ import type { TimePickerTheme } from '../../time-picker/styles' import type { TimelineTheme } from '../../timeline/styles' import type { TooltipTheme } from '../../tooltip/styles' import type { TransferTheme } from '../../transfer/styles' -import type { TreeTheme } from '../../tree/styles' import type { TreeSelectTheme } from '../../tree-select/styles' +import type { TreeTheme } from '../../tree/styles' import type { TypographyTheme } from '../../typography/styles' import type { UploadTheme } from '../../upload/styles' import type { WatermarkTheme } from '../../watermark/styles' diff --git a/src/data-table/index.ts b/src/data-table/index.ts index 60df88c95..2de0bb87b 100644 --- a/src/data-table/index.ts +++ b/src/data-table/index.ts @@ -1,26 +1,26 @@ export { default as NDataTable } from './src/DataTable' export { dataTableProps } from './src/interface' export type { + TableBaseColumn as DataTableBaseColumn, + TableColumn as DataTableColumn, + TableColumnGroup as DataTableColumnGroup, ColumnKey as DataTableColumnKey, + TableColumns as DataTableColumns, CreateRowClassName as DataTableCreateRowClassName, CreateRowKey as DataTableCreateRowKey, CreateRowProps as DataTableCreateRowProps, CreateSummary as DataTableCreateSummary, + TableExpandColumn as DataTableExpandColumn, + FilterState as DataTableFilterState, DataTableInst, DataTableProps, - FilterState as DataTableFilterState, RenderFilter as DataTableRenderFilter, RenderFilterIcon as DataTableRenderFilterIcon, RenderSorter as DataTableRenderSorter, RenderSorterIcon as DataTableRenderSorterIcon, RowData as DataTableRowData, RowKey as DataTableRowKey, - SortState as DataTableSortState, - TableBaseColumn as DataTableBaseColumn, - TableColumn as DataTableColumn, - TableColumnGroup as DataTableColumnGroup, - TableColumns as DataTableColumns, - TableExpandColumn as DataTableExpandColumn, - TableSelectionColumn as DataTableSelectionColumn + TableSelectionColumn as DataTableSelectionColumn, + SortState as DataTableSortState } from './src/interface' export * from './src/publicTypes' diff --git a/src/descriptions/index.ts b/src/descriptions/index.ts index cbb45a364..d7555eaa3 100644 --- a/src/descriptions/index.ts +++ b/src/descriptions/index.ts @@ -1,7 +1,7 @@ -export { default as NDescriptions, descriptionsProps } from './src/Descriptions' +export { descriptionsProps, default as NDescriptions } from './src/Descriptions' export type { DescriptionProps, DescriptionsProps } from './src/Descriptions' export { - default as NDescriptionsItem, - descriptionsItemProps + descriptionsItemProps, + default as NDescriptionsItem } from './src/DescriptionsItem' export type { DescriptionItemProps } from './src/DescriptionsItem' diff --git a/src/divider/index.ts b/src/divider/index.ts index cf442d0d4..6df16d496 100644 --- a/src/divider/index.ts +++ b/src/divider/index.ts @@ -1,2 +1,2 @@ -export { default as NDivider, dividerProps } from './src/Divider' +export { dividerProps, default as NDivider } from './src/Divider' export type { DividerProps } from './src/Divider' diff --git a/src/drawer/index.ts b/src/drawer/index.ts index bc1260791..c0b32896e 100644 --- a/src/drawer/index.ts +++ b/src/drawer/index.ts @@ -1,8 +1,8 @@ -export { default as NDrawer, drawerProps } from './src/Drawer' +export { drawerProps, default as NDrawer } from './src/Drawer' export type { DrawerProps } from './src/Drawer' export type { Placement as DrawerPlacement } from './src/DrawerBodyWrapper' export { - default as NDrawerContent, - drawerContentProps + drawerContentProps, + default as NDrawerContent } from './src/DrawerContent' export type { DrawerContentProps } from './src/DrawerContent' diff --git a/src/dropdown/index.ts b/src/dropdown/index.ts index e09da4342..bc46e58c2 100644 --- a/src/dropdown/index.ts +++ b/src/dropdown/index.ts @@ -1,10 +1,10 @@ -export { default as NDropdown, dropdownProps } from './src/Dropdown' +export { dropdownProps, default as NDropdown } from './src/Dropdown' export type { DropdownProps } from './src/Dropdown' export type { DropdownDividerOption, DropdownGroupOption, DropdownMenuProps, + NodeProps as DropdownNodeProps, DropdownOption, - DropdownRenderOption, - NodeProps as DropdownNodeProps + DropdownRenderOption } from './src/interface' diff --git a/src/dynamic-input/index.ts b/src/dynamic-input/index.ts index f9b7081f6..63739648f 100644 --- a/src/dynamic-input/index.ts +++ b/src/dynamic-input/index.ts @@ -1,2 +1,2 @@ -export { default as NDynamicInput, dynamicInputProps } from './src/DynamicInput' +export { dynamicInputProps, default as NDynamicInput } from './src/DynamicInput' export type { DynamicInputProps } from './src/DynamicInput' diff --git a/src/dynamic-input/styles/rtl.ts b/src/dynamic-input/styles/rtl.ts index f0ceeee39..39c111d09 100644 --- a/src/dynamic-input/styles/rtl.ts +++ b/src/dynamic-input/styles/rtl.ts @@ -1,9 +1,9 @@ import type { RtlItem } from '../../config-provider/src/internal-interface' -import { buttonRtl } from '../../button/styles/rtl' import { buttonGroupRtl } from '../../button-group/styles/rtl' +import { buttonRtl } from '../../button/styles/rtl' import { checkboxRtl } from '../../checkbox/styles/rtl' -import { inputRtl } from '../../input/styles/rtl' import { inputNumberRtl } from '../../input-number/styles/rtl' +import { inputRtl } from '../../input/styles/rtl' import rtlStyle from '../src/styles/rtl.cssr' export const dynamicInputRtl: RtlItem = { diff --git a/src/dynamic-tags/index.ts b/src/dynamic-tags/index.ts index a1301dec5..8cfb36317 100644 --- a/src/dynamic-tags/index.ts +++ b/src/dynamic-tags/index.ts @@ -1,3 +1,3 @@ -export { default as NDynamicTags, dynamicTagsProps } from './src/DynamicTags' +export { dynamicTagsProps, default as NDynamicTags } from './src/DynamicTags' export type { DynamicTagsProps } from './src/DynamicTags' export type { DynamicTagsOption } from './src/interface' diff --git a/src/element/index.ts b/src/element/index.ts index 514b2c358..f0d116e94 100644 --- a/src/element/index.ts +++ b/src/element/index.ts @@ -1,3 +1,3 @@ -export { default as NElement, elementProps } from './src/Element' +export { elementProps, default as NElement } from './src/Element' export { default as NEl } from './src/Element' export type { ElementProps } from './src/Element' diff --git a/src/ellipsis/index.ts b/src/ellipsis/index.ts index 324f146ed..f7bd592b9 100644 --- a/src/ellipsis/index.ts +++ b/src/ellipsis/index.ts @@ -1,3 +1,3 @@ -export { default as NEllipsis, ellipsisProps } from './src/Ellipsis' +export { ellipsisProps, default as NEllipsis } from './src/Ellipsis' export type { EllipsisProps } from './src/Ellipsis' export { NPerformantEllipsis } from './src/PerformantEllipsis' diff --git a/src/empty/index.ts b/src/empty/index.ts index d51ef8637..57951868b 100644 --- a/src/empty/index.ts +++ b/src/empty/index.ts @@ -1,2 +1,2 @@ -export { default as NEmpty, emptyProps } from './src/Empty' +export { emptyProps, default as NEmpty } from './src/Empty' export type { EmptyProps } from './src/Empty' diff --git a/src/equation/index.ts b/src/equation/index.ts index 2aaf9539e..fcc37b60c 100644 --- a/src/equation/index.ts +++ b/src/equation/index.ts @@ -1,2 +1,2 @@ -export { Equation as NEquation, equationProps } from './src/Equation' +export { equationProps, Equation as NEquation } from './src/Equation' export type { EquationProps } from './src/Equation' diff --git a/src/flex/index.ts b/src/flex/index.ts index 9d75499c5..130cab141 100644 --- a/src/flex/index.ts +++ b/src/flex/index.ts @@ -1,3 +1,3 @@ -export { default as NFlex, flexProps } from './src/Flex' +export { flexProps, default as NFlex } from './src/Flex' export type { FlexProps } from './src/Flex' export type { FlexAlign, FlexJustify } from './src/type' diff --git a/src/float-button-group/index.ts b/src/float-button-group/index.ts index 9275fe0e2..c2812f517 100644 --- a/src/float-button-group/index.ts +++ b/src/float-button-group/index.ts @@ -1,5 +1,5 @@ export { - default as NFloatButtonGroup, - floatButtonGroupProps + floatButtonGroupProps, + default as NFloatButtonGroup } from './src/FloatButtonGroup' export type { FloatButtonGroupProps } from './src/FloatButtonGroup' diff --git a/src/float-button/index.ts b/src/float-button/index.ts index 86e65b48f..d8a368223 100644 --- a/src/float-button/index.ts +++ b/src/float-button/index.ts @@ -1,2 +1,2 @@ -export { default as NFloatButton, floatButtonProps } from './src/FloatButton' +export { floatButtonProps, default as NFloatButton } from './src/FloatButton' export type { FloatButtonProps } from './src/FloatButton' diff --git a/src/form/index.ts b/src/form/index.ts index 0a4480a83..78c902a49 100644 --- a/src/form/index.ts +++ b/src/form/index.ts @@ -1,15 +1,15 @@ -export { default as NForm, formProps } from './src/Form' +export { formProps, default as NForm } from './src/Form' export type { FormProps } from './src/Form' -export { default as NFormItem, formItemProps } from './src/FormItem' +export { formItemProps, default as NFormItem } from './src/FormItem' export type { FormItemProps } from './src/FormItem' // deprecated export { default as NFormItemCol } from './src/FormItemCol' export type { FormItemColProps } from './src/FormItemCol' export { - default as NFormItemGridItem, - default as NFormItemGi, formItemGiProps, - formItemGiProps as formItemGridItemProps + formItemGiProps as formItemGridItemProps, + default as NFormItemGi, + default as NFormItemGridItem } from './src/FormItemGridItem' export type { diff --git a/src/gradient-text/index.ts b/src/gradient-text/index.ts index 71514e794..3ec0ea839 100644 --- a/src/gradient-text/index.ts +++ b/src/gradient-text/index.ts @@ -1,2 +1,2 @@ -export { default as NGradientText, gradientTextProps } from './src/GradientText' +export { gradientTextProps, default as NGradientText } from './src/GradientText' export type { GradientTextProps } from './src/GradientText' diff --git a/src/grid/index.ts b/src/grid/index.ts index b152ea24f..1f3e9d5d9 100644 --- a/src/grid/index.ts +++ b/src/grid/index.ts @@ -1,5 +1,5 @@ -export { default as NGrid, gridProps } from './src/Grid' +export { gridProps, default as NGrid } from './src/Grid' export type { GridProps } from './src/Grid' -export { default as NGridItem, gridItemProps } from './src/GridItem' -export { default as NGi, gridItemProps as giProps } from './src/GridItem' +export { gridItemProps, default as NGridItem } from './src/GridItem' +export { gridItemProps as giProps, default as NGi } from './src/GridItem' export type { GridItemProps } from './src/GridItem' diff --git a/src/highlight/index.ts b/src/highlight/index.ts index 65288fe92..42fe29bb7 100644 --- a/src/highlight/index.ts +++ b/src/highlight/index.ts @@ -1,2 +1,2 @@ -export { default as NHighlight, highlightProps } from './src/Highlight' +export { highlightProps, default as NHighlight } from './src/Highlight' export type * from './src/public-types' diff --git a/src/image/index.ts b/src/image/index.ts index 38480f896..c1b5dc8d4 100644 --- a/src/image/index.ts +++ b/src/image/index.ts @@ -1,5 +1,5 @@ -export { default as NImage, imageProps } from './src/Image' +export { imageProps, default as NImage } from './src/Image' export type { ImageProps } from './src/Image' -export { default as NImageGroup, imageGroupProps } from './src/ImageGroup' +export { imageGroupProps, default as NImageGroup } from './src/ImageGroup' export type { ImageGroupProps } from './src/ImageGroup' export type * from './src/public-types' diff --git a/src/image/src/styles/index.cssr.ts b/src/image/src/styles/index.cssr.ts index 6e99fae85..d81327971 100644 --- a/src/image/src/styles/index.cssr.ts +++ b/src/image/src/styles/index.cssr.ts @@ -1,5 +1,5 @@ -import { fadeInTransition } from '../../../_styles/transitions/fade-in.cssr' import { fadeInScaleUpTransition } from '../../../_styles/transitions/fade-in-scale-up.cssr' +import { fadeInTransition } from '../../../_styles/transitions/fade-in.cssr' import { c, cB, cNotM } from '../../../_utils/cssr' // vars: diff --git a/src/infinite-scroll/index.ts b/src/infinite-scroll/index.ts index dd3dfab41..a9f311cad 100644 --- a/src/infinite-scroll/index.ts +++ b/src/infinite-scroll/index.ts @@ -1,5 +1,5 @@ export { - default as NInfiniteScroll, - infiniteScrollProps + infiniteScrollProps, + default as NInfiniteScroll } from './src/InfiniteScroll' export type { InfiniteScrollProps } from './src/InfiniteScroll' diff --git a/src/input-number/index.ts b/src/input-number/index.ts index bc0fb9a10..1a62030fe 100644 --- a/src/input-number/index.ts +++ b/src/input-number/index.ts @@ -1,3 +1,3 @@ -export { default as NInputNumber, inputNumberProps } from './src/InputNumber' +export { inputNumberProps, default as NInputNumber } from './src/InputNumber' export type { InputNumberProps } from './src/InputNumber' export type { InputNumberInst } from './src/interface' diff --git a/src/input/index.ts b/src/input/index.ts index e45361296..1de75680d 100644 --- a/src/input/index.ts +++ b/src/input/index.ts @@ -1,10 +1,10 @@ -export { default as NInput, inputProps } from './src/Input' +export { inputProps, default as NInput } from './src/Input' export type { InputProps } from './src/Input' -export { default as NInputGroup, inputGroupProps } from './src/InputGroup' +export { inputGroupProps, default as NInputGroup } from './src/InputGroup' export type { InputGroupProps } from './src/InputGroup' export { - default as NInputGroupLabel, - inputGroupLabelProps + inputGroupLabelProps, + default as NInputGroupLabel } from './src/InputGroupLabel' export type { InputGroupLabelProps } from './src/InputGroupLabel' export type { InputInst } from './src/interface' diff --git a/src/layout/index.ts b/src/layout/index.ts index e3c2add9b..c42cbe0b4 100644 --- a/src/layout/index.ts +++ b/src/layout/index.ts @@ -1,24 +1,24 @@ export type { - LayoutInst, LayoutInst as LayoutContentInst, + LayoutInst, LayoutSiderInst } from './src/interface' export { - default as NLayout, + layoutProps as layoutContentProps, layoutProps, - layoutProps as layoutContentProps + default as NLayout } from './src/Layout' export type { - LayoutProps, - LayoutProps as LayoutContentProps + LayoutProps as LayoutContentProps, + LayoutProps } from './src/Layout' export { default as NLayoutContent } from './src/LayoutContent' -export { default as NLayoutFooter, layoutFooterProps } from './src/LayoutFooter' +export { layoutFooterProps, default as NLayoutFooter } from './src/LayoutFooter' export type { LayoutFooterProps } from './src/LayoutFooter' export { - default as NLayoutHeader, - headerProps as layoutHeaderProps + headerProps as layoutHeaderProps, + default as NLayoutHeader } from './src/LayoutHeader' export type { LayoutHeaderProps } from './src/LayoutHeader' -export { default as NLayoutSider, layoutSiderProps } from './src/LayoutSider' +export { layoutSiderProps, default as NLayoutSider } from './src/LayoutSider' export type { LayoutSiderProps } from './src/LayoutSider' diff --git a/src/legacy-transfer/index.ts b/src/legacy-transfer/index.ts index 7b5a6bf1f..ec290fa6a 100644 --- a/src/legacy-transfer/index.ts +++ b/src/legacy-transfer/index.ts @@ -1,6 +1,6 @@ export type { Option as LegacyTransferOption } from './src/interface' export { - default as NLegacyTransfer, - transferProps as legacyTransferProps + transferProps as legacyTransferProps, + default as NLegacyTransfer } from './src/Transfer' export type { transferProps as LegacyTransferProps } from './src/Transfer' diff --git a/src/list/index.ts b/src/list/index.ts index 77ee62f89..f6bb86f99 100644 --- a/src/list/index.ts +++ b/src/list/index.ts @@ -1,3 +1,3 @@ -export { default as NList, listProps } from './src/List' +export { listProps, default as NList } from './src/List' export type { ListProps } from './src/List' export { default as NListItem } from './src/ListItem' diff --git a/src/loading-bar/index.ts b/src/loading-bar/index.ts index 49fe4e0e8..0a51b0cc7 100644 --- a/src/loading-bar/index.ts +++ b/src/loading-bar/index.ts @@ -1,6 +1,6 @@ export { - default as NLoadingBarProvider, - loadingBarProviderProps + loadingBarProviderProps, + default as NLoadingBarProvider } from './src/LoadingBarProvider' export type { LoadingBarApiInjection as LoadingBarApi, diff --git a/src/log/index.ts b/src/log/index.ts index be3f17c59..7a7779fbe 100644 --- a/src/log/index.ts +++ b/src/log/index.ts @@ -1,2 +1,2 @@ -export { default as NLog, logProps } from './src/Log' +export { logProps, default as NLog } from './src/Log' export type { LogInst, LogProps } from './src/Log' diff --git a/src/marquee/index.ts b/src/marquee/index.ts index 447b55373..70450cb31 100644 --- a/src/marquee/index.ts +++ b/src/marquee/index.ts @@ -1,2 +1,2 @@ -export { default as NMarqueue } from './src/Marquee' +export { default as NMarquee } from './src/Marquee' export type * from './src/public-types' diff --git a/src/marquee/tests/Marquee.spec.ts b/src/marquee/tests/Marquee.spec.ts index 7109b7265..5ad72f5a4 100644 --- a/src/marquee/tests/Marquee.spec.ts +++ b/src/marquee/tests/Marquee.spec.ts @@ -1,8 +1,8 @@ import { mount } from '@vue/test-utils' -import { NMarqueue } from '../index' +import { NMarquee } from '../index' describe('n-marquee', () => { it('should work with import on demand', () => { - mount(NMarqueue) + mount(NMarquee) }) }) diff --git a/src/mention/index.ts b/src/mention/index.ts index 1cfcefd54..be5037edd 100644 --- a/src/mention/index.ts +++ b/src/mention/index.ts @@ -1,3 +1,3 @@ export type { MentionInst, MentionOption } from './src/interface' -export { default as NMention, mentionProps } from './src/Mention' +export { mentionProps, default as NMention } from './src/Mention' export type { MentionProps } from './src/Mention' diff --git a/src/menu/index.ts b/src/menu/index.ts index 0914fbc3f..08d9b22a9 100644 --- a/src/menu/index.ts +++ b/src/menu/index.ts @@ -5,5 +5,5 @@ export type { MenuNodeProps, MenuOption } from './src/interface' -export { default as NMenu, menuProps } from './src/Menu' +export { menuProps, default as NMenu } from './src/Menu' export type { MenuProps } from './src/Menu' diff --git a/src/message/index.ts b/src/message/index.ts index fb53cf5ad..edb6b4937 100644 --- a/src/message/index.ts +++ b/src/message/index.ts @@ -1,6 +1,6 @@ export { - default as NMessageProvider, - messageProviderProps + messageProviderProps, + default as NMessageProvider } from './src/MessageProvider' export type { MessageApiInjection as MessageApi, diff --git a/src/modal/index.ts b/src/modal/index.ts index a4347165b..8bb99f7a2 100644 --- a/src/modal/index.ts +++ b/src/modal/index.ts @@ -1,5 +1,5 @@ export { useModal, useModalReactiveList } from './src/composables' -export { default as NModal, modalProps } from './src/Modal' +export { modalProps, default as NModal } from './src/Modal' export type { ModalProps } from './src/Modal' export { modalProviderProps, NModalProvider } from './src/ModalProvider' diff --git a/src/modal/src/styles/index.cssr.ts b/src/modal/src/styles/index.cssr.ts index e0ac6522e..4a336477a 100644 --- a/src/modal/src/styles/index.cssr.ts +++ b/src/modal/src/styles/index.cssr.ts @@ -1,5 +1,5 @@ -import { fadeInTransition } from '../../../_styles/transitions/fade-in.cssr' import { fadeInScaleUpTransition } from '../../../_styles/transitions/fade-in-scale-up.cssr' +import { fadeInTransition } from '../../../_styles/transitions/fade-in.cssr' import { c, cB } from '../../../_utils/cssr' // vars: diff --git a/src/styles.ts b/src/styles.ts index bebdcda4d..284829f63 100644 --- a/src/styles.ts +++ b/src/styles.ts @@ -7,16 +7,16 @@ export { commonDark, commonLight } from './_styles/common' export { alertDark, alertRtl as unstableAlertRtl } from './alert/styles' export { anchorDark } from './anchor/styles' export { autoCompleteDark } from './auto-complete/styles' -export { avatarDark } from './avatar/styles' export { avatarGroupRtl as unstableAvatarGroupRtl } from './avatar-group/styles' +export { avatarDark } from './avatar/styles' export { backTopDark } from './back-top/styles' export { badgeDark, badgeRtl as unstableBadgeRtl } from './badge/styles' export { breadcrumbDark } from './breadcrumb/styles' -export { buttonDark, buttonRtl as unstableButtonRtl } from './button/styles' export { buttonGroupDark, buttonGroupRtl as unstableButtonGroupRtl } from './button-group/styles' +export { buttonDark, buttonRtl as unstableButtonRtl } from './button/styles' export { cardDark, cardRtl as unstableCardRtl } from './card/styles' export { cascaderDark } from './cascader/styles' export { @@ -24,11 +24,11 @@ export { checkboxRtl as unstableCheckboxRtl } from './checkbox/styles' export { codeDark } from './code/styles' +export { collapseTransitionRtl as unstableCollapseTransitionRtl } from './collapse-transition/styles' export { collapseDark, collapseRtl as unstableCollapseRtl } from './collapse/styles' -export { collapseTransitionRtl as unstableCollapseTransitionRtl } from './collapse-transition/styles' export { DataTableRtl as unstableDataTableRtl } from './data-table/styles' export { dataTableDark } from './data-table/styles' export { datePickerDark } from './date-picker/styles' @@ -48,11 +48,11 @@ export { flexDark, flexRtl as unstableFlexRtl } from './flex/styles' export { formDark } from './form/styles' export { gradientTextDark } from './gradient-text/styles' export { iconDark } from './icon/styles' -export { inputDark, inputRtl as unstableInputRtl } from './input/styles' export { inputNumberDark, inputNumberRtl as unstableInputNumberRtl } from './input-number/styles' +export { inputDark, inputRtl as unstableInputRtl } from './input/styles' export { layoutDark } from './layout/styles' export { rowRtl as unstableRowRtl } from './legacy-grid/styles' export { listDark, listRtl as unstableListRtl } from './list/styles' @@ -95,9 +95,9 @@ export { timePickerDark } from './time-picker/styles' export { timelineDark } from './timeline/styles' export { tooltipDark } from './tooltip/styles' export { transferDark } from './transfer/styles' -export { treeDark, treeRtl as unstableTreeRtl } from './tree/styles' - export { treeSelectDark } from './tree-select/styles' + +export { treeDark, treeRtl as unstableTreeRtl } from './tree/styles' export { typographyDark } from './typography/styles' export { uploadDark } from './upload/styles' export { watermarkDark } from './watermark/styles' diff --git a/src/themes/dark.ts b/src/themes/dark.ts index 5f3811e88..fc69da0bc 100644 --- a/src/themes/dark.ts +++ b/src/themes/dark.ts @@ -4,21 +4,21 @@ import { commonDark } from '../_styles/common' import { alertDark } from '../alert/styles' import { anchorDark } from '../anchor/styles' import { autoCompleteDark } from '../auto-complete/styles' -import { avatarDark } from '../avatar/styles' import { avatarGroupDark } from '../avatar-group/styles' +import { avatarDark } from '../avatar/styles' import { backTopDark } from '../back-top/styles' import { badgeDark } from '../badge/styles' import { breadcrumbDark } from '../breadcrumb/styles' -import { buttonDark } from '../button/styles' import { buttonGroupDark } from '../button-group/styles' +import { buttonDark } from '../button/styles' import { calendarDark } from '../calendar/styles' import { cardDark } from '../card/styles' import { carouselDark } from '../carousel/styles' import { cascaderDark } from '../cascader/styles' import { checkboxDark } from '../checkbox/styles' import { codeDark } from '../code/styles' -import { collapseDark } from '../collapse/styles' import { collapseTransitionDark } from '../collapse-transition/styles' +import { collapseDark } from '../collapse/styles' import { colorPickerDark } from '../color-picker/styles' import { dataTableDark } from '../data-table/styles' import { datePickerDark } from '../date-picker/styles' @@ -33,15 +33,15 @@ import { elementDark } from '../element/styles' import { ellipsisDark } from '../ellipsis/styles' import { emptyDark } from '../empty/styles' import { equationDark } from '../equation/styles' -import { floatButtonDark } from '../float-button/styles' import { floatButtonGroupDark } from '../float-button-group/styles' +import { floatButtonDark } from '../float-button/styles' import { formDark } from '../form/styles' import { gradientTextDark } from '../gradient-text/styles' -import { iconDark } from '../icon/styles' import { iconWrapperDark } from '../icon-wrapper/styles' +import { iconDark } from '../icon/styles' import { imageDark } from '../image/styles' -import { inputDark } from '../input/styles' import { inputNumberDark } from '../input-number/styles' +import { inputDark } from '../input/styles' import { layoutDark } from '../layout/styles' import { rowDark } from '../legacy-grid/styles' import { legacyTransferDark } from '../legacy-transfer/styles' @@ -82,8 +82,8 @@ import { timePickerDark } from '../time-picker/styles' import { timelineDark } from '../timeline/styles' import { tooltipDark } from '../tooltip/styles' import { transferDark } from '../transfer/styles' -import { treeDark } from '../tree/styles' import { treeSelectDark } from '../tree-select/styles' +import { treeDark } from '../tree/styles' import { typographyDark } from '../typography/styles' import { uploadDark } from '../upload/styles' import { watermarkDark } from '../watermark/styles' diff --git a/src/themes/light.ts b/src/themes/light.ts index c52fcce80..ad7c3911d 100644 --- a/src/themes/light.ts +++ b/src/themes/light.ts @@ -6,21 +6,21 @@ import { commonLight } from '../_styles/common' import { alertLight } from '../alert/styles' import { anchorLight } from '../anchor/styles' import { autoCompleteLight } from '../auto-complete/styles' -import { avatarLight } from '../avatar/styles' import { avatarGroupLight } from '../avatar-group/styles' +import { avatarLight } from '../avatar/styles' import { backTopLight } from '../back-top/styles' import { badgeLight } from '../badge/styles' import { breadcrumbLight } from '../breadcrumb/styles' -import { buttonLight } from '../button/styles' import { buttonGroupLight } from '../button-group/styles' +import { buttonLight } from '../button/styles' import { calendarLight } from '../calendar/styles' import { cardLight } from '../card/styles' import { carouselLight } from '../carousel/styles' import { cascaderLight } from '../cascader/styles' import { checkboxLight } from '../checkbox/styles' import { codeLight } from '../code/styles' -import { collapseLight } from '../collapse/styles' import { collapseTransitionLight } from '../collapse-transition/styles' +import { collapseLight } from '../collapse/styles' import { colorPickerLight } from '../color-picker/styles' import { dataTableLight } from '../data-table/styles' import { datePickerLight } from '../date-picker/styles' @@ -36,15 +36,15 @@ import { ellipsisLight } from '../ellipsis/styles' import { emptyLight } from '../empty/styles' import { equationLight } from '../equation/styles' import { flexLight } from '../flex/styles' -import { floatButtonLight } from '../float-button/styles' import { floatButtonGroupLight } from '../float-button-group/styles' +import { floatButtonLight } from '../float-button/styles' import { formLight } from '../form/styles' import { gradientTextLight } from '../gradient-text/styles' -import { iconLight } from '../icon/styles' import { iconWrapperLight } from '../icon-wrapper/styles' +import { iconLight } from '../icon/styles' import { imageLight } from '../image/styles' -import { inputLight } from '../input/styles' import { inputNumberLight } from '../input-number/styles' +import { inputLight } from '../input/styles' import { layoutLight } from '../layout/styles' import { rowLight } from '../legacy-grid/styles' import { legacyTransferLight } from '../legacy-transfer/styles' @@ -84,8 +84,8 @@ import { timePickerLight } from '../time-picker/styles' import { timelineLight } from '../timeline/styles' import { tooltipLight } from '../tooltip/styles' import { transferLight } from '../transfer/styles' -import { treeLight } from '../tree/styles' import { treeSelectLight } from '../tree-select/styles' +import { treeLight } from '../tree/styles' import { typographyLight } from '../typography/styles' import { uploadLight } from '../upload/styles' import { watermarkLight } from '../watermark/styles' diff --git a/src/version.ts b/src/version.ts index d56d2941c..19e2a94a0 100644 --- a/src/version.ts +++ b/src/version.ts @@ -1 +1 @@ -export default '2.40.2' +export default '2.40.3' diff --git a/volar.d.ts b/volar.d.ts index 4d5b570f1..85665f4de 100644 --- a/volar.d.ts +++ b/volar.d.ts @@ -151,7 +151,7 @@ declare module 'vue' { NVirtualList: (typeof import('naive-ui'))['NVirtualList'] NWatermark: (typeof import('naive-ui'))['NWatermark'] NHighlight: (typeof import('naive-ui'))['NHighlight'] - NMarqueue: (typeof import('naive-ui'))['NMarqueue'] + NMarquee: (typeof import('naive-ui'))['NMarquee'] } } export {}