diff --git a/package.json b/package.json index 19bd8ea294..7a26fc349e 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "vitest": "^0.34.6", "vitest-canvas-mock": "^0.3.3", "vue": "^3.3.4", - "vue-tsc": "1.8.15" + "vue-tsc": "^1.8.22" }, "engines": { "pnpm": ">= 8.0.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cce27980a1..d83daf7063 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -118,8 +118,8 @@ importers: specifier: ^3.3.4 version: 3.3.4 vue-tsc: - specifier: 1.8.15 - version: 1.8.15(typescript@5.2.2) + specifier: ^1.8.22 + version: 1.8.22(typescript@5.2.2) packages/nutui-auto-import-resolver: devDependencies: @@ -4017,22 +4017,23 @@ packages: pretty-format: 29.7.0 dev: true - /@volar/language-core@1.10.4: - resolution: {integrity: sha512-Na69qA6uwVIdA0rHuOc2W3pHtVQQO8hCNim7FOaKNpRJh0oAFnu5r9i7Oopo5C4cnELZkPNjTrbmpcCTiW+CMQ==} + /@volar/language-core@1.10.10: + resolution: {integrity: sha512-nsV1o3AZ5n5jaEAObrS3MWLBWaGwUj/vAsc15FVNIv+DbpizQRISg9wzygsHBr56ELRH8r4K75vkYNMtsSNNWw==} dependencies: - '@volar/source-map': 1.10.4 + '@volar/source-map': 1.10.10 dev: true - /@volar/source-map@1.10.4: - resolution: {integrity: sha512-RxZdUEL+pV8p+SMqnhVjzy5zpb1QRZTlcwSk4bdcBO7yOu4rtEWqDGahVCEj4CcXour+0yJUMrMczfSCpP9Uxg==} + /@volar/source-map@1.10.10: + resolution: {integrity: sha512-GVKjLnifV4voJ9F0vhP56p4+F3WGf+gXlRtjFZsv6v3WxBTWU3ZVeaRaEHJmWrcv5LXmoYYpk/SC25BKemPRkg==} dependencies: muggle-string: 0.3.1 dev: true - /@volar/typescript@1.10.4: - resolution: {integrity: sha512-BCCUEBASBEMCrz7qmNSi2hBEWYsXD0doaktRKpmmhvb6XntM2sAWYu6gbyK/MluLDgluGLFiFRpWgobgzUqolg==} + /@volar/typescript@1.10.10: + resolution: {integrity: sha512-4a2r5bdUub2m+mYVnLu2wt59fuoYWe7nf0uXtGHU8QQ5LDNfzAR0wK7NgDiQ9rcl2WT3fxT2AA9AylAwFtj50A==} dependencies: - '@volar/language-core': 1.10.4 + '@volar/language-core': 1.10.10 + path-browserify: 1.0.1 dev: true /@vscode/test-electron@2.0.3: @@ -4204,19 +4205,19 @@ packages: resolution: {integrity: sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==} dev: false - /@vue/language-core@1.8.15(typescript@5.2.2): - resolution: {integrity: sha512-zche5Aw8kkvp3YaghuLiOZyVIpoWHjSQ0EfjxGSsqHOPMamdCoa9x3HtbenpR38UMUoKJ88wiWuiOrV3B/Yq+A==} + /@vue/language-core@1.8.22(typescript@5.2.2): + resolution: {integrity: sha512-bsMoJzCrXZqGsxawtUea1cLjUT9dZnDsy5TuZ+l1fxRMzUGQUG9+Ypq4w//CqpWmrx7nIAJpw2JVF/t258miRw==} peerDependencies: typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@volar/language-core': 1.10.4 - '@volar/source-map': 1.10.4 + '@volar/language-core': 1.10.10 + '@volar/source-map': 1.10.10 '@vue/compiler-dom': 3.3.4 - '@vue/reactivity': 3.3.4 '@vue/shared': 3.3.4 + computeds: 0.0.1 minimatch: 9.0.3 muggle-string: 0.3.1 typescript: 5.2.2 @@ -4280,15 +4281,6 @@ packages: vue-component-type-helpers: 1.8.4 dev: true - /@vue/typescript@1.8.15(typescript@5.2.2): - resolution: {integrity: sha512-qWyanQKXOsK84S8rP7QBrqsvUdQ0nZABZmTjXMpb3ox4Bp5IbkscREA3OPUrkgl64mAxwwCzIWcOc3BPTCPjQw==} - dependencies: - '@volar/typescript': 1.10.4 - '@vue/language-core': 1.8.15(typescript@5.2.2) - transitivePeerDependencies: - - typescript - dev: true - /@webassemblyjs/ast@1.11.6: resolution: {integrity: sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==} dependencies: @@ -5849,6 +5841,10 @@ packages: - supports-color dev: true + /computeds@0.0.1: + resolution: {integrity: sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==} + dev: true + /concat-map@0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} @@ -11639,6 +11635,10 @@ packages: no-case: 3.0.4 tslib: 2.6.2 + /path-browserify@1.0.1: + resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==} + dev: true + /path-case@3.0.4: resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==} dependencies: @@ -15117,14 +15117,14 @@ packages: resolution: {integrity: sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==} dev: true - /vue-tsc@1.8.15(typescript@5.2.2): - resolution: {integrity: sha512-4DoB3LUj7IToLmggoCxRiFG+QU5lem0nv03m1ocqugXA9rSVoTOEoYYaP8vu8b99Eh+/cCVdYOeIAQ+RsgUYUw==} + /vue-tsc@1.8.22(typescript@5.2.2): + resolution: {integrity: sha512-j9P4kHtW6eEE08aS5McFZE/ivmipXy0JzrnTgbomfABMaVKx37kNBw//irL3+LlE3kOo63XpnRigyPC3w7+z+A==} hasBin: true peerDependencies: typescript: '*' dependencies: - '@vue/language-core': 1.8.15(typescript@5.2.2) - '@vue/typescript': 1.8.15(typescript@5.2.2) + '@volar/typescript': 1.10.10 + '@vue/language-core': 1.8.22(typescript@5.2.2) semver: 7.5.4 typescript: 5.2.2 dev: true diff --git a/src/config.json b/src/config.json index 49972068b5..416470dfe4 100644 --- a/src/config.json +++ b/src/config.json @@ -1108,7 +1108,7 @@ "cName": "文本省略", "desc": "文本省略", "show": true, - "taro": true, + "taro": false, "tarodoc": false, "type": "component", "author": "yangxiaolu3" diff --git a/src/packages/__VUE/actionsheet/index.taro.vue b/src/packages/__VUE/actionsheet/index.taro.vue index 96046481ac..f61530d041 100644 --- a/src/packages/__VUE/actionsheet/index.taro.vue +++ b/src/packages/__VUE/actionsheet/index.taro.vue @@ -43,7 +43,7 @@ import { createComponent } from '@/packages/utils/create'; import { useSlots } from 'vue'; import type { PropType } from 'vue'; import { popupProps } from '../popup/props'; -import Popup from '../popup/index.taro.vue'; +import NutPopup from '../popup/index.taro.vue'; import { Loading } from '@nutui/icons-vue-taro'; const { create } = createComponent('action-sheet'); export interface menuItems { @@ -56,7 +56,7 @@ export interface menuItems { } export default create({ components: { - [Popup.name]: Popup, + NutPopup, Loading }, props: { diff --git a/src/packages/__VUE/actionsheet/index.vue b/src/packages/__VUE/actionsheet/index.vue index 6e9dcee59e..dedc1e75ce 100644 --- a/src/packages/__VUE/actionsheet/index.vue +++ b/src/packages/__VUE/actionsheet/index.vue @@ -42,7 +42,7 @@ import { createComponent } from '@/packages/utils/create'; import { useSlots } from 'vue'; import type { PropType } from 'vue'; import { popupProps } from '../popup/props'; -import Popup from '../popup/index.vue'; +import NutPopup from '../popup/index.vue'; import { Loading } from '@nutui/icons-vue'; const { create } = createComponent('action-sheet'); export interface menuItems { @@ -55,7 +55,7 @@ export interface menuItems { } export default create({ components: { - [Popup.name]: Popup, + NutPopup, Loading }, props: { diff --git a/src/packages/__VUE/address/index.taro.vue b/src/packages/__VUE/address/index.taro.vue index e551a619e7..da069a776b 100644 --- a/src/packages/__VUE/address/index.taro.vue +++ b/src/packages/__VUE/address/index.taro.vue @@ -134,22 +134,22 @@ import { reactive, ref, toRefs, watch, computed, PropType } from 'vue'; import { popupProps } from '../popup/props'; import { RegionData, CustomRegionData, existRegionData } from './type'; import { createComponent } from '@/packages/utils/create'; -import Popup from '../popup/index.taro.vue'; -import Elevator from '../elevator/index.taro.vue'; +import NutPopup from '../popup/index.taro.vue'; +import NutElevator from '../elevator/index.taro.vue'; const { create, componentName, translate } = createComponent('address'); import { Location, Location2, Check, Close, Left } from '@nutui/icons-vue-taro'; -import ScrollView from '../scroll-view/index.taro.vue'; +import NutScrollView from '../scroll-view/index.taro.vue'; export default create({ components: { - [Popup.name]: Popup, - [Elevator.name]: Elevator, + NutPopup, + NutElevator, Location, Location2, Check, Close, Left, - 'nut-scroll-view': ScrollView + NutScrollView }, inheritAttrs: false, props: { diff --git a/src/packages/__VUE/address/index.vue b/src/packages/__VUE/address/index.vue index 8b346ad59e..25c55e4330 100644 --- a/src/packages/__VUE/address/index.vue +++ b/src/packages/__VUE/address/index.vue @@ -125,15 +125,15 @@ import { reactive, ref, toRefs, watch, nextTick, computed, Ref, PropType } from import { createComponent } from '@/packages/utils/create'; import { RegionData, CustomRegionData, existRegionData } from './type'; import { popupProps } from '../popup/props'; -import Popup from '../popup/index.vue'; -import Elevator from '../elevator/index.vue'; +import NutPopup from '../popup/index.vue'; +import NutElevator from '../elevator/index.vue'; const { create, translate } = createComponent('address'); import { Location, Location2, Check, Close, Left } from '@nutui/icons-vue'; export default create({ components: { - [Popup.name]: Popup, - [Elevator.name]: Elevator, + NutPopup, + NutElevator, Location, Location2, Check, diff --git a/src/packages/__VUE/addresslist/components/GeneralShell.taro.vue b/src/packages/__VUE/addresslist/components/GeneralShell.taro.vue index 682b4c8f55..e7ed8951a1 100644 --- a/src/packages/__VUE/addresslist/components/GeneralShell.taro.vue +++ b/src/packages/__VUE/addresslist/components/GeneralShell.taro.vue @@ -46,8 +46,8 @@ import { ref, h } from 'vue'; import { createComponent } from '@/packages/utils/create'; const { create } = createComponent('address-list-general'); import ItemContents from './ItemContents.taro.vue'; -import Button from '../../button/index.taro.vue'; -import Swipe from '../../swipe/index.taro.vue'; +import NutButton from '../../button/index.taro.vue'; +import NutSwipe from '../../swipe/index.taro.vue'; export default create({ props: { @@ -67,8 +67,8 @@ export default create({ emits: ['delIcon', 'editIcon', 'clickItem', 'longDown', 'longCopy', 'longSet', 'longDel', 'swipeDel'], components: { ItemContents, - [Button.name]: Button, - [Swipe.name]: Swipe + NutButton, + NutSwipe }, setup(props, { emit }) { diff --git a/src/packages/__VUE/addresslist/components/GeneralShell.vue b/src/packages/__VUE/addresslist/components/GeneralShell.vue index ecfa89cd8a..de9130c582 100644 --- a/src/packages/__VUE/addresslist/components/GeneralShell.vue +++ b/src/packages/__VUE/addresslist/components/GeneralShell.vue @@ -46,8 +46,8 @@ import { ref, h } from 'vue'; import { createComponent } from '@/packages/utils/create'; const { create } = createComponent('address-list-general'); import ItemContents from './ItemContents.vue'; -import Button from '../../button/index.vue'; -import Swipe from '../../swipe/index.vue'; +import NutButton from '../../button/index.vue'; +import NutSwipe from '../../swipe/index.vue'; export default create({ props: { @@ -67,8 +67,8 @@ export default create({ emits: ['delIcon', 'editIcon', 'clickItem', 'longDown', 'longCopy', 'longSet', 'longDel', 'swipeDel'], components: { ItemContents, - [Button.name]: Button, - [Swipe.name]: Swipe + NutButton, + NutSwipe }, setup(props, { emit }) { diff --git a/src/packages/__VUE/addresslist/index.taro.vue b/src/packages/__VUE/addresslist/index.taro.vue index 0b19ee797e..f21dc0a754 100644 --- a/src/packages/__VUE/addresslist/index.taro.vue +++ b/src/packages/__VUE/addresslist/index.taro.vue @@ -41,7 +41,7 @@ import { createComponent } from '@/packages/utils/create'; const { componentName, create, translate } = createComponent('address-list'); import GeneralShell from './components/GeneralShell.taro.vue'; import { floatData } from '@/packages/utils/util'; -import Button from '../button/index.taro.vue'; +import NutButton from '../button/index.taro.vue'; export default create({ props: { data: { @@ -67,7 +67,7 @@ export default create({ }, components: { GeneralShell, - [Button.name]: Button + NutButton }, emits: ['delIcon', 'editIcon', 'clickItem', 'longCopy', 'longSet', 'longDel', 'swipeDel', 'add'], diff --git a/src/packages/__VUE/addresslist/index.vue b/src/packages/__VUE/addresslist/index.vue index c277fe45dd..524c3054c1 100644 --- a/src/packages/__VUE/addresslist/index.vue +++ b/src/packages/__VUE/addresslist/index.vue @@ -41,7 +41,7 @@ import { createComponent } from '@/packages/utils/create'; const { componentName, create, translate } = createComponent('address-list'); import GeneralShell from './components/GeneralShell.vue'; import { floatData } from '@/packages/utils/util'; -import Button from '../button/index.vue'; +import NutButton from '../button/index.vue'; export default create({ props: { data: { @@ -67,7 +67,7 @@ export default create({ }, components: { GeneralShell, - [Button.name]: Button + NutButton }, emits: ['delIcon', 'editIcon', 'clickItem', 'longCopy', 'longSet', 'longDel', 'swipeDel', 'add'], diff --git a/src/packages/__VUE/audio/index.vue b/src/packages/__VUE/audio/index.vue index 88ff3bbbef..34d1778b01 100644 --- a/src/packages/__VUE/audio/index.vue +++ b/src/packages/__VUE/audio/index.vue @@ -60,10 +60,10 @@ diff --git a/src/packages/__VUE/form/index.vue b/src/packages/__VUE/form/index.vue index 11c460e5b5..62b29046c7 100644 --- a/src/packages/__VUE/form/index.vue +++ b/src/packages/__VUE/form/index.vue @@ -8,11 +8,11 @@ diff --git a/src/packages/__VUE/formitem/index.taro.vue b/src/packages/__VUE/formitem/index.taro.vue index 270e412630..2fbc231b2b 100644 --- a/src/packages/__VUE/formitem/index.taro.vue +++ b/src/packages/__VUE/formitem/index.taro.vue @@ -27,7 +27,7 @@ import { pxCheck } from '@/packages/utils/pxCheck'; import { computed, inject, provide, PropType, CSSProperties, getCurrentInstance, onUnmounted } from 'vue'; import type { FormItemRule } from './types'; import { createComponent } from '@/packages/utils/create'; -import Cell from '../cell/index.taro.vue'; +import NutCell from '../cell/index.taro.vue'; const { create } = createComponent('form-item'); export default create({ inheritAttrs: false, @@ -74,7 +74,7 @@ export default create({ } }, components: { - [Cell.name]: Cell + NutCell }, setup(props, { slots }) { const useParent: any = () => { diff --git a/src/packages/__VUE/formitem/index.vue b/src/packages/__VUE/formitem/index.vue index 4dc97876d0..408b7fb1c3 100644 --- a/src/packages/__VUE/formitem/index.vue +++ b/src/packages/__VUE/formitem/index.vue @@ -27,7 +27,7 @@ import { pxCheck } from '@/packages/utils/pxCheck'; import { computed, inject, provide, PropType, CSSProperties, getCurrentInstance, onUnmounted } from 'vue'; import type { FormItemRule } from './types'; import { createComponent } from '@/packages/utils/create'; -import Cell from '../cell/index.vue'; +import NutCell from '../cell/index.vue'; const { create } = createComponent('form-item'); export default create({ inheritAttrs: false, @@ -74,7 +74,7 @@ export default create({ } }, components: { - [Cell.name]: Cell + NutCell }, setup(props, { slots }) { const useParent: any = () => { diff --git a/src/packages/__VUE/imagepreview/imagePreviewItem.vue b/src/packages/__VUE/imagepreview/imagePreviewItem.vue index 10e144ecde..962a5898ff 100644 --- a/src/packages/__VUE/imagepreview/imagePreviewItem.vue +++ b/src/packages/__VUE/imagepreview/imagePreviewItem.vue @@ -20,8 +20,8 @@ import { useTouch } from '@/packages/utils/useTouch'; import { preventDefault, clamp } from '@/packages/utils/util'; import { ImageInterface } from './types'; import { baseProps } from './types'; -import Video from '../video/index.vue'; -import SwiperItem from '../swiperitem/index.vue'; +import NutVideo from '../video/index.vue'; +import NutSwiperItem from '../swiperitem/index.vue'; const { create } = createComponent('image-preview-item'); export default create({ @@ -50,8 +50,8 @@ export default create({ }, emits: ['close', 'scale'], components: { - [Video.name]: Video, - [SwiperItem.name]: SwiperItem + NutVideo, + NutSwiperItem }, setup(props, { emit }) { diff --git a/src/packages/__VUE/imagepreview/index.taro.vue b/src/packages/__VUE/imagepreview/index.taro.vue index 9f07686045..832a3f724a 100644 --- a/src/packages/__VUE/imagepreview/index.taro.vue +++ b/src/packages/__VUE/imagepreview/index.taro.vue @@ -39,9 +39,9 @@ import { CircleClose } from '@nutui/icons-vue-taro'; import { createComponent } from '@/packages/utils/create'; import { funInterceptor, Interceptor } from '@/packages/utils/util'; import { ImageInterface } from './types'; -import Popup from '../popup/index.taro.vue'; -import Swiper from '../swiper/index.taro.vue'; -import SwiperItem from '../swiperitem/index.taro.vue'; +import NutPopup from '../popup/index.taro.vue'; +import NutSwiper from '../swiper/index.taro.vue'; +import NutSwiperItem from '../swiperitem/index.taro.vue'; const { create } = createComponent('image-preview'); export default create({ @@ -94,9 +94,9 @@ export default create({ }, emits: ['close', 'change', 'longPress'], components: { - [Popup.name]: Popup, - [Swiper.name]: Swiper, - [SwiperItem.name]: SwiperItem, + NutPopup, + NutSwiper, + NutSwiperItem, CircleClose }, diff --git a/src/packages/__VUE/imagepreview/index.ts b/src/packages/__VUE/imagepreview/index.ts index 3e92f8c6ed..ab238f9fac 100644 --- a/src/packages/__VUE/imagepreview/index.ts +++ b/src/packages/__VUE/imagepreview/index.ts @@ -3,11 +3,11 @@ import { Component, h, nextTick } from 'vue'; import { ImageInterface } from './types'; import { CreateComponent } from '@/packages/utils/create'; import { Interceptor } from '@/packages/utils/util'; -import Popup from '../popup/index.vue'; -import Video from '../video/index.vue'; -import Swiper from '../swiper/index.vue'; -import SwiperItem from '../swiperitem/index.vue'; -import Overlay from '../overlay/index.vue'; +import NutPopup from '../popup/index.vue'; +import NutVideo from '../video/index.vue'; +import NutSwiper from '../swiper/index.vue'; +import NutSwiperItem from '../swiperitem/index.vue'; +import NutOverlay from '../overlay/index.vue'; export class ImagePreviewOptions { show = false; @@ -40,7 +40,7 @@ class ImagePreviewFunction { const options = Object.assign(this.options, _options); const { unmount } = CreateComponent(options, { name: 'image-preview', - components: [Popup, Video, Swiper, SwiperItem, Overlay], + components: [NutPopup, NutVideo, NutSwiper, NutSwiperItem, NutOverlay], wrapper: () => { return { setup() { diff --git a/src/packages/__VUE/imagepreview/index.vue b/src/packages/__VUE/imagepreview/index.vue index 24fed80fe0..4802880d4f 100644 --- a/src/packages/__VUE/imagepreview/index.vue +++ b/src/packages/__VUE/imagepreview/index.vue @@ -54,8 +54,8 @@ import ImagePreviewItem from './imagePreviewItem.vue'; import { ImageInterface, baseProps } from './types'; const { create } = createComponent('image-preview'); import { CircleClose } from '@nutui/icons-vue'; -import Popup from '../popup/index.vue'; -import Swiper from '../swiper/index.vue'; +import NutPopup from '../popup/index.vue'; +import NutSwiper from '../swiper/index.vue'; export default create({ props: { @@ -86,8 +86,8 @@ export default create({ components: { ImagePreviewItem: ImagePreviewItem, CircleClose, - [Popup.name]: Popup, - [Swiper.name]: Swiper + NutPopup, + NutSwiper }, setup(props, { emit }) { diff --git a/src/packages/__VUE/invoice/index.taro.vue b/src/packages/__VUE/invoice/index.taro.vue index 1e4a0ac763..fb19c21a8c 100644 --- a/src/packages/__VUE/invoice/index.taro.vue +++ b/src/packages/__VUE/invoice/index.taro.vue @@ -39,19 +39,19 @@