Skip to content

Commit 3502466

Browse files
authored
refactor(mobile): remove @opentiny/mobile-utils package, and add alia… (#2767)
* refactor(mobile): remove @opentiny/mobile-utils package, and add alias to utils * refactor(mobile): fix pnpm dev
1 parent 6eb80f1 commit 3502466

File tree

118 files changed

+204
-207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+204
-207
lines changed

.eslintrc.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ module.exports = {
5151
'@typescript-eslint/restrict-template-expressions': 'off',
5252
'@typescript-eslint/no-invalid-this': 'off',
5353
'vue/no-deprecated-dollar-scopedslots-api': 'off',
54-
'@typescript-eslint/lines-between-class-members': 'off'
54+
'@typescript-eslint/lines-between-class-members': 'off',
55+
'@typescript-eslint/no-this-alias': 'off'
5556
}
5657
}

examples/sites/vite.config.ts

+1
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ export default defineConfig((config) => {
135135
resolve: {
136136
extensions: ['.js', '.ts', '.tsx', '.vue'],
137137
alias: {
138+
'@mobile-root': pathFromWorkspaceRoot('packages/mobile'),
138139
'@': path.resolve('src'),
139140
'@demos': path.resolve(`${demosPath}`),
140141
'@menu': menuPath,

examples/vue3/vite.config.ts

+1
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ export default defineConfig((config) => {
9292
resolve: {
9393
extensions: ['.js', '.ts', '.tsx', '.vue'],
9494
alias: {
95+
'@mobile-root': pathFromWorkspaceRoot('packages/mobile'),
9596
'vue': path.resolve('node_modules/vue/dist/vue.esm-bundler.js'),
9697
'vue-i18n': 'vue-i18n/dist/vue-i18n.cjs.js',
9798
'@': pathFromWorkspaceRoot('examples/docs/newsrc'),

packages/mobile/components/action-sheet/src/mobile.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
<script lang="ts">
5454
import { renderless, api } from './renderless/vue'
55-
import { $prefix, setup, defineComponent } from '../../../vue-common'
55+
import { $prefix, setup, defineComponent } from '@mobile-root/vue-common'
5656
import '@opentiny/vue-theme-mobile/action-sheet/index.less'
5757
import BScroll from '@better-scroll/core'
5858
import { actionSheetProps } from './action-sheet'

packages/mobile/components/alert/src/mobile.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<script lang="ts">
3030
import { renderless, api } from './renderless/vue'
31-
import { setup, defineComponent } from '../../../vue-common'
31+
import { setup, defineComponent } from '@mobile-root/vue-common'
3232
import { iconClose, iconSuccess, iconError, iconHelp, iconWarningTriangle } from '@opentiny/vue-icon'
3333
import type { IAlertApi } from './alert'
3434
import { alertProps } from './alert'

packages/mobile/components/avatar/src/mobile.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
-->
1212
<script lang="tsx">
13-
import { $prefix, setup, h, defineComponent } from '../../../vue-common'
13+
import { $prefix, setup, h, defineComponent } from '@mobile-root/vue-common'
1414
import { renderless, api } from './renderless/vue'
1515
import '@opentiny/vue-theme-mobile/avatar/index.less'
1616

packages/mobile/components/badge/src/mobile.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
<script lang="ts">
4040
import { renderless, api } from './renderless/vue'
41-
import { setup, defineComponent } from '../../../vue-common'
41+
import { setup, defineComponent } from '@mobile-root/vue-common'
4242
import { badgeProps } from './badge'
4343
import '@opentiny/vue-theme-mobile/badge/index.less'
4444

packages/mobile/components/badge/src/renderless/vue.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
import { computedContent, computedValueRef, computedTransform } from './index'
14-
import { xss } from '@opentiny/mobile-utils/xss'
14+
import { xss } from '@mobile-root/utils/xss'
1515
import type { IBadgeState, IBadgeProps, IBadgeApi, IBadgeRenderlessParams } from '../badge'
1616

1717
export const api = ['state']

packages/mobile/components/button/src/mobile.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
<script lang="ts">
4747
import { renderless, api } from './renderless/vue'
48-
import { setup, defineComponent } from '../../../vue-common'
48+
import { setup, defineComponent } from '@mobile-root/vue-common'
4949
import { buttonProps } from './button'
5050
import '@opentiny/vue-theme-mobile/button/index.less'
5151

packages/mobile/components/button/src/renderless/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*/
1212
import type { IButtonRenderlessParams, IButtonState } from '../button'
13-
import { xss } from '@opentiny/mobile-utils'
13+
import { xss } from '@mobile-root/utils'
1414

1515
export const handleClick =
1616
({ emit, props, state }: Pick<IButtonRenderlessParams, 'emit' | 'props' | 'state'>) =>

packages/mobile/components/checkbox-group/src/mobile.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<script lang="tsx">
2828
import { renderless, api } from './renderless/vue'
29-
import { $prefix, setup, defineComponent } from '../../../vue-common'
29+
import { $prefix, setup, defineComponent } from '@mobile-root/vue-common'
3030
import Checkbox from '../../checkbox'
3131
import { CheckboxGroupProps } from './checkbox-group'
3232
import '@opentiny/vue-theme-mobile/checkbox-group/index.less'

packages/mobile/components/checkbox/src/checkbox.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
* A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
1010
*
1111
*/
12-
import { $prefix } from '../../../vue-common'
13-
import type { PropType } from '../../../vue-common'
12+
import { $prefix } from '@mobile-root/vue-common'
13+
import type { PropType } from '@mobile-root/vue-common'
1414
import type { ExtractPropTypes, ComputedRef } from 'vue'
1515
import type { ISharedRenderlessFunctionParams, ISharedRenderlessParamUtils } from '../../../types/shared.type'
1616

packages/mobile/components/checkbox/src/mobile.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464

6565
<script lang="ts">
6666
import { renderless, api } from './renderless/vue'
67-
import { $prefix, setup, defineComponent } from '../../../vue-common'
67+
import { $prefix, setup, defineComponent } from '@mobile-root/vue-common'
6868
import { checkboxProps } from './checkbox'
6969
import '@opentiny/vue-theme-mobile/checkbox/index.less'
7070

packages/mobile/components/checkbox/src/renderless/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
import type { ICheckboxRenderlessParams, ICheckboxState, ICheckboxChangeEvent, ICheckboxProps } from '../checkbox'
14-
import { isNull } from '@opentiny/mobile-utils/type'
14+
import { isNull } from '@mobile-root/utils/type'
1515

1616
export const addToStore =
1717
({ state, props }: Pick<ICheckboxRenderlessParams, 'state' | 'props'>) =>

packages/mobile/components/container/src/mobile.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<script lang="ts">
2727
import { renderless, api } from './renderless/vue'
28-
import { setup, defineComponent } from '../../../vue-common'
28+
import { setup, defineComponent } from '@mobile-root/vue-common'
2929
import { containerProps } from './container'
3030
import '@opentiny/vue-theme-mobile/container/index.less'
3131

packages/mobile/components/container/src/renderless/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*/
1212

13-
import { isNumber } from '@opentiny/mobile-utils/type'
13+
import { isNumber } from '@mobile-root/utils/type'
1414

1515
export const computedShowHeader =
1616
({ constants, props }) =>
@@ -128,7 +128,7 @@ export const computedLeftStyle =
128128
export const computedShowRight =
129129
({ constants, props }) =>
130130
() => {
131-
return props.pattern === constants.DEFAULT ? false : true
131+
return props.pattern !== constants.DEFAULT
132132
}
133133

134134
export const computedRightStyle =

packages/mobile/components/date-picker/src/date-picker.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
* A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
1010
*
1111
*/
12-
import type { PropType } from '../../../vue-common'
12+
import type { PropType } from '@mobile-root/vue-common'
1313
import { iconClose } from '@opentiny/vue-icon'
1414
import type { ComputedRef, ExtractPropTypes } from 'vue'
1515
import type { ISharedRenderlessFunctionParams, ISharedRenderlessParamUtils } from '../../../types/shared.type'
16+
1617
export type { ISharedRenderlessParamHooks } from '../../../types/shared.type'
1718

1819
const currentYear = new Date().getFullYear()

packages/mobile/components/date-picker/src/mobile.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</template>
3636

3737
<script lang="ts">
38-
import { props, setup, defineComponent } from '../../../vue-common'
38+
import { props, setup, defineComponent } from '@mobile-root/vue-common'
3939
import { renderless, api } from './renderless/vue'
4040
import MiniPicker from '../../mini-picker'
4141
import Input from '../../input'

packages/mobile/components/date-picker/src/renderless/vue.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
onChange,
2828
updateColumnValue
2929
} from './index'
30-
import { DATE } from '@opentiny/mobile-utils'
30+
import { DATE } from '@mobile-root/utils'
3131
import type {
3232
IDatePickerApi,
3333
IDatePickerProps,

packages/mobile/components/dialog-box/src/dialog-box.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*/
1212

13-
import { $prefix } from '../../../vue-common'
13+
import { $prefix } from '@mobile-root/vue-common'
1414
import type { ExtractPropTypes } from 'vue'
1515
import type {
1616
handleCancel,

packages/mobile/components/dialog-box/src/mobile.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
<script lang="ts">
4040
import { renderless, api } from './renderless/vue'
41-
import { setup, defineComponent } from '../../../vue-common'
41+
import { setup, defineComponent } from '@mobile-root/vue-common'
4242
import { dialogBoxProps } from './dialog-box'
4343
import '@opentiny/vue-theme-mobile/dialog-box/index.less'
4444

packages/mobile/components/dialog-box/src/renderless/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
*
1111
*/
1212

13-
import { on, off, addClass, removeClass } from '@opentiny/mobile-utils/deps/dom'
14-
import { emitEvent } from '@opentiny/mobile-utils/event'
15-
import { getDomNode } from '@opentiny/mobile-utils/deps/dom'
13+
import { on, off, addClass, removeClass } from '@mobile-root/utils/deps/dom'
14+
import { emitEvent } from '@mobile-root/utils/event'
15+
import { getDomNode } from '@mobile-root/utils/deps/dom'
1616
import type { IDialogBoxRenderlessParams, IDialogBoxStyle } from '../dialog-box'
1717

1818
export const computedAnimationName =

packages/mobile/components/dialog-box/src/renderless/vue.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import {
3131
hideScrollbar,
3232
computedBodyStyle
3333
} from './index'
34-
import usePopup from '@opentiny/mobile-utils/deps/vue-popup'
34+
import usePopup from '@mobile-root/utils/deps/vue-popup'
3535
import type {
3636
IDialogBoxApi,
3737
IDialogBoxProps,

packages/mobile/components/dropdown-item/src/mobile.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@
9999

100100
<script lang="ts">
101101
import { renderless, api } from './renderless/vue'
102-
import { setup, defineComponent, directive } from '../../../vue-common'
102+
import { setup, defineComponent, directive } from '@mobile-root/vue-common'
103103
import { iconYes } from '@opentiny/vue-icon'
104104
import Popup from '../../popup'
105105
import Button from '../../button'
106-
import Clickoutside from '@opentiny/mobile-utils/deps/clickoutside'
106+
import Clickoutside from '@mobile-root/utils/deps/clickoutside'
107107
import '@opentiny/vue-theme-mobile/dropdown-item/index.less'
108108
import { dropdownItemProps } from './dropdown-item'
109109

packages/mobile/components/dropdown-item/src/renderless/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import type {
1616
IDropdownItemTag,
1717
IDropdownItemOptionStyle
1818
} from '../dropdown-item'
19-
import { on, off } from '@opentiny/mobile-utils/deps/dom'
19+
import { on, off } from '@mobile-root/utils/deps/dom'
2020

2121
export const getTitle = (props: IDropdownItemRenderlessParams['props']) => (): string => {
2222
if (props.title) {

packages/mobile/components/dropdown-menu/src/mobile.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
item.type === 'filter'
5252
? 'IconUnfilter'
5353
: item.type === 'selection' && item.state.showPopup
54-
? 'IconUp'
55-
: 'IconDown'
54+
? 'IconUp'
55+
: 'IconDown'
5656
"
5757
:class="[item.type === 'filter' ? 'filter-icon' : '']"
5858
/>
@@ -68,10 +68,10 @@
6868

6969
<script lang="ts">
7070
import { renderless, api } from './renderless/vue'
71-
import { setup, defineComponent, directive } from '../../../vue-common'
71+
import { setup, defineComponent, directive } from '@mobile-root/vue-common'
7272
import { iconUp, iconDown, iconUnfilter, iconSort, iconDeltaDown, iconDeltaUp } from '@opentiny/vue-icon'
7373
import { dropdownMenuProps } from './dropdown-menu'
74-
import Clickoutside from '@opentiny/mobile-utils/deps/clickoutside'
74+
import Clickoutside from '@mobile-root/utils/deps/clickoutside'
7575
import '@opentiny/vue-theme-mobile/dropdown-menu/index.less'
7676

7777
export default defineComponent({

packages/mobile/components/dropdown-menu/src/renderless/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
import type { IDropdownMenuRenderlessParams, IDropdownMenuPopperParams, IDropdownItemVm } from '../dropdown-menu'
14-
import userPopper from '@opentiny/mobile-utils/deps/vue-popper'
14+
import userPopper from '@mobile-root/utils/deps/vue-popper'
1515

1616
export const toggleItem =
1717
(state: IDropdownMenuRenderlessParams['state']) =>

packages/mobile/components/exception/src/mobile.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
<script>
4040
import { renderless, api } from './renderless/vue'
41-
import { setup, $prefix, defineComponent } from '../../../vue-common'
41+
import { setup, $prefix, defineComponent } from '@mobile-root/vue-common'
4242
import Button from '../../button'
4343
import { exceptionProps } from './exception'
4444
import '@opentiny/vue-theme-mobile/exception/index.less'

packages/mobile/components/file-upload/src/file-upload.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ import type {
8585
} from './renderless'
8686
import type { downloadFile as ordinaryDownload } from '../../upload-list/src/upload-list'
8787
import type { IUploadFormData } from '../../upload/src/upload'
88-
import { $props } from '../../../vue-common'
88+
import { $props } from '@mobile-root/vue-common'
8989

9090
export type { ISharedRenderlessParamHooks } from '../../../types/shared.type'
9191

packages/mobile/components/file-upload/src/mobile.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-->
1212
<script lang="tsx">
1313
import { renderless, api } from './renderless/vue'
14-
import { setup, h, defineComponent } from '../../../vue-common'
14+
import { setup, h, defineComponent } from '@mobile-root/vue-common'
1515
import UploadList from '../../upload-list'
1616
import Upload from '../../upload'
1717
import { iconUpload } from '@opentiny/vue-icon'

packages/mobile/components/file-upload/src/renderless/index.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ import type {
2929
IFileUploadLargeDocumentDownload
3030
} from '../file-upload'
3131

32-
import { extend } from '@opentiny/mobile-utils/object'
33-
import { xss, log } from '@opentiny/mobile-utils/xss'
34-
import uploadAjax from '@opentiny/mobile-utils/deps/upload-ajax'
35-
import { isObject } from '@opentiny/mobile-utils/type'
36-
import { isEmptyObject } from '@opentiny/mobile-utils/type'
32+
import { extend } from '@mobile-root/utils/object'
33+
import { xss, log } from '@mobile-root/utils/xss'
34+
import uploadAjax from '@mobile-root/utils/deps/upload-ajax'
35+
import { isObject } from '@mobile-root/utils/type'
36+
import { isEmptyObject } from '@mobile-root/utils/type'
3737

3838
let initTokenPromise = null
3939

packages/mobile/components/file-upload/src/renderless/vue.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import type {
2020
IFileUploadStreamsaver
2121
} from '../file-upload'
2222
import { downloadFile as ordinaryDownload } from '../../../upload-list/src/renderless'
23-
import { formatFileSize } from '@opentiny/mobile-utils/string'
23+
import { formatFileSize } from '@mobile-root/utils/string'
2424

2525
import {
2626
initService,
@@ -96,7 +96,7 @@ import {
9696
closeRecordPanel,
9797
getTipMessage
9898
} from './index'
99-
import { isEmptyObject } from '@opentiny/mobile-utils/type'
99+
import { isEmptyObject } from '@mobile-root/utils/type'
100100

101101
export const api = [
102102
'state',

packages/mobile/components/form-item/src/label-wrap.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { setup, h, $props, defineComponent } from '../../../vue-common'
1+
import { setup, h, $props, defineComponent } from '@mobile-root/vue-common'
22

33
export default defineComponent({
44
props: {

packages/mobile/components/form-item/src/mobile.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
-->
1212
<script lang="tsx">
13-
import { $prefix, setup, parseVnode, h, defineComponent, isVue2 } from '../../../vue-common'
13+
import { $prefix, setup, parseVnode, h, defineComponent, isVue2 } from '@mobile-root/vue-common'
1414
import { renderless, api } from './renderless/vue'
1515
import LabelWrap from './label-wrap'
1616
import Tooltip from '../../tooltip'

packages/mobile/components/form-item/src/renderless/index.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
*
1111
*/
1212

13-
import { POSITION, VALIDATE_STATE } from '@opentiny/mobile-utils'
14-
import { omitText } from '@opentiny/mobile-utils/string'
15-
import { merge } from '@opentiny/mobile-utils/object'
16-
import Validator from '@opentiny/mobile-utils/validate'
17-
import { isNull } from '@opentiny/mobile-utils/type'
18-
import debounce from '@opentiny/mobile-utils/deps/debounce'
13+
import { POSITION, VALIDATE_STATE } from '@mobile-root/utils'
14+
import { omitText } from '@mobile-root/utils/string'
15+
import { merge } from '@mobile-root/utils/object'
16+
import Validator from '@mobile-root/utils/validate'
17+
import { isNull } from '@mobile-root/utils/type'
18+
import debounce from '@mobile-root/utils/deps/debounce'
1919
import type {
2020
IFormItemRenderlessParams,
2121
IFormItemDisplayedValueParam,

packages/mobile/components/form/src/mobile.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<script lang="tsx">
2727
import { renderless, api } from './renderless/vue'
28-
import { $prefix, setup, defineComponent } from '../../../vue-common'
28+
import { $prefix, setup, defineComponent } from '@mobile-root/vue-common'
2929
import type { IFormApi } from '@opentiny/vue-renderless/types/form.type'
3030
import { formProps } from './form'
3131
import '@opentiny/vue-theme-mobile/form/index.less'

packages/mobile/components/form/src/renderless/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*/
1212

13-
import { merge } from '@opentiny/mobile-utils/object'
13+
import { merge } from '@mobile-root/utils/object'
1414

1515
import type { IFormRenderlessParams } from '../form'
1616

0 commit comments

Comments
 (0)