Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Nov 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
56 changes: 28 additions & 28 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -1108,7 +1108,7 @@
"cName": "文本省略",
"desc": "文本省略",
"show": true,
"taro": true,
"taro": false,
"tarodoc": false,
"type": "component",
"author": "yangxiaolu3"
Expand Down
4 changes: 2 additions & 2 deletions src/packages/__VUE/actionsheet/index.taro.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -56,7 +56,7 @@ export interface menuItems {
}
export default create({
components: {
[Popup.name]: Popup,
NutPopup,
Loading
},
props: {
Expand Down
4 changes: 2 additions & 2 deletions src/packages/__VUE/actionsheet/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -55,7 +55,7 @@ export interface menuItems {
}
export default create({
components: {
[Popup.name]: Popup,
NutPopup,
Loading
},
props: {
Expand Down
12 changes: 6 additions & 6 deletions src/packages/__VUE/address/index.taro.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
8 changes: 4 additions & 4 deletions src/packages/__VUE/address/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -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 }) {
Expand Down
8 changes: 4 additions & 4 deletions src/packages/__VUE/addresslist/components/GeneralShell.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -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 }) {
Expand Down
4 changes: 2 additions & 2 deletions src/packages/__VUE/addresslist/index.taro.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -67,7 +67,7 @@ export default create({
},
components: {
GeneralShell,
[Button.name]: Button
NutButton
},
emits: ['delIcon', 'editIcon', 'clickItem', 'longCopy', 'longSet', 'longDel', 'swipeDel', 'add'],

Expand Down
4 changes: 2 additions & 2 deletions src/packages/__VUE/addresslist/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -67,7 +67,7 @@ export default create({
},
components: {
GeneralShell,
[Button.name]: Button
NutButton
},
emits: ['delIcon', 'editIcon', 'clickItem', 'longCopy', 'longSet', 'longDel', 'swipeDel', 'add'],

Expand Down
6 changes: 3 additions & 3 deletions src/packages/__VUE/audio/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down Expand Up @@ -108,7 +108,7 @@ export default create({
},
components: {
Service,
[Range.name]: Range as Component
NutRange
},
emits: ['fastBack', 'play', 'forward', 'ended', 'changeProgress', 'mute', 'canPlay'],

Expand Down
4 changes: 2 additions & 2 deletions src/packages/__VUE/audiooperate/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand All @@ -37,7 +37,7 @@ export default create({
}
},
components: {
[Button.name]: Button
NutButton
},
emits: ['click'],

Expand Down
4 changes: 2 additions & 2 deletions src/packages/__VUE/avatarcropper/index.taro.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -54,7 +54,7 @@ import { easySetFillStyle } from '@/packages/utils/canvas';

export default create({
components: {
[Button.name]: Button,
NutButton,
IconFont
},
props: {
Expand Down
4 changes: 2 additions & 2 deletions src/packages/__VUE/avatarcropper/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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
},
Expand Down
4 changes: 2 additions & 2 deletions src/packages/__VUE/avatargroup/index.taro.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
Loading