fix: 升级 vue-tsc 版本 & 修复组件依赖的类型问题 (#2648)

jd-opensource · Nov 10, 2023 · 0ac66c2 · 0ac66c2
1 parent 9a493ea
commit 0ac66c2
Show file tree

Hide file tree

Showing 85 changed files with 270 additions and 273 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -60,10 +60,10 @@
   </div>
 </template>
 <script lang="ts">
-import { toRefs, ref, onMounted, reactive, watch, provide, Component } from 'vue';
+import { toRefs, ref, onMounted, reactive, watch, provide } from 'vue';
 import { createComponent } from '@/packages/utils/create';
 import { Service } from '@nutui/icons-vue';
-import Range from '../range/index.vue';
+import NutRange from '../range/index.vue';
 const { create } = createComponent('audio');
 
 export default create({
@@ -108,7 +108,7 @@ export default create({
   },
   components: {
     Service,
-    [Range.name]: Range as Component
+    NutRange
   },
   emits: ['fastBack', 'play', 'forward', 'ended', 'changeProgress', 'mute', 'canPlay'],
 

diff --git a/src/packages/__VUE/audiooperate/index.vue b/src/packages/__VUE/audiooperate/index.vue
@@ -25,7 +25,7 @@
 <script lang="ts">
 import { toRefs, ref, useSlots, reactive, inject } from 'vue';
 import { createComponent } from '@/packages/utils/create';
-import Button from '../button/index.vue';
+import NutButton from '../button/index.vue';
 const { create, translate } = createComponent('audio-operate');
 
 export default create({
@@ -37,7 +37,7 @@ export default create({
     }
   },
   components: {
-    [Button.name]: Button
+    NutButton
   },
   emits: ['click'],
 

diff --git a/src/packages/__VUE/avatarcropper/index.taro.vue b/src/packages/__VUE/avatarcropper/index.taro.vue
@@ -42,7 +42,7 @@
 
 <script lang="ts">
 import { watch, ref, reactive, toRefs, computed, PropType, onMounted } from 'vue';
-import Button from '../button/index.vue';
+import NutButton from '../button/index.vue';
 import { createComponent } from '@/packages/utils/create';
 import type { AvatarCropperToolbarPosition, AvatarCropperSizeType, AvatarCropperSourceType } from './types';
 const { create } = createComponent('avatar-cropper');
@@ -54,7 +54,7 @@ import { easySetFillStyle } from '@/packages/utils/canvas';
 
 export default create({
   components: {
-    [Button.name]: Button,
+    NutButton,
     IconFont
   },
   props: {

diff --git a/src/packages/__VUE/avatarcropper/index.vue b/src/packages/__VUE/avatarcropper/index.vue
@@ -42,7 +42,7 @@
 
 <script lang="ts">
 import { watch, ref, reactive, toRefs, computed, Ref, PropType } from 'vue';
-import Button from '../button/index.vue';
+import NutButton from '../button/index.vue';
 import { createComponent } from '@/packages/utils/create';
 import type { AvatarCropperToolbarPosition } from './types';
 const { create } = createComponent('avatar-cropper');
@@ -52,7 +52,7 @@ import { preventDefault, clamp } from '@/packages/utils/util';
 import { useRect } from '@/packages/utils/useRect';
 export default create({
   components: {
-    [Button.name]: Button,
+    NutButton,
     Refresh2,
     Retweet
   },

diff --git a/src/packages/__VUE/avatargroup/index.taro.vue b/src/packages/__VUE/avatargroup/index.taro.vue
@@ -19,11 +19,11 @@ import { onMounted, provide, ref, onUnmounted, nextTick, unref, PropType, comput
 import Taro from '@tarojs/taro';
 import { createComponent } from '@/packages/utils/create';
 import type { AvatarShape, AvatarSize, AvatarZIndex } from '../avatar/types';
-import Avatar from '../avatar/index.taro.vue';
+import NutAvatar from '../avatar/index.taro.vue';
 const { create } = createComponent('avatar-group');
 export default create({
   components: {
-    [Avatar.name]: Avatar
+    NutAvatar
   },
   props: {
     maxContent: {