Skip to content
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
24 changes: 24 additions & 0 deletions example/package-lock.json

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

4 changes: 2 additions & 2 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"@mpxjs/core": "2.10.7-beta.9",
"@mpxjs/webpack-plugin": "2.10.7-beta.10",
"@mpxjs/utils": "2.10.7-beta.5",
"@mpxjs/store": "^2.10.2",
"@mpxjs/mpx-cube-ui": "file:../packages/mpx-cube-ui",
"react-native-gesture-handler": "^2.23.0",
"@babel/core": "^7.10.4",
Expand Down Expand Up @@ -66,7 +67,6 @@
"vue-demi": "^0.14.6",
"vue-i18n": "^8.27.2",
"vue-i18n-bridge": "^9.2.2",
"vue-router": "^3.1.3",
"webpack": "^5.43.0"
"vue-router": "^3.1.3"
}
}
9 changes: 8 additions & 1 deletion example/vue.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@ module.exports = defineConfig({
},
chainWebpack(config) {
config.module.rules.delete('svg')
config.module
.rule('ts')
.use('ts-loader')
.tap(options => ({
...options,
onlyCompileBundledFiles: true
}))
config.resolve.alias.set('@mpxjs/core', resolve('node_modules/@mpxjs/core'))
config.resolve.alias.set('@mpxjs/webpack-plugin', resolve('node_modules/@mpxjs/webpack-plugin'))
},
Expand All @@ -50,4 +57,4 @@ module.exports = defineConfig({
new webpack.ProgressPlugin()
]
}
})
})
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@ module.exports = {
'^.+\\.ts$': '<rootDir>/node_modules/ts-jest'
},
resolver: '<rootDir>/scripts/jest-mpx-resolver/index.js',
transformIgnorePatterns: ['node_modules/(?!(@mpxjs|@babel))']
transformIgnorePatterns: ['node_modules/(?!\\.pnpm|@mpxjs|@babel)']
}
9 changes: 9 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,14 @@
"engines": {
"node": ">=16",
"pnpm": ">=8"
},
"pnpm": {
"packageExtensions": {
"vue-server-renderer": {
"dependencies": {
"webpack": "^4.47.0"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`component scroll-nav-bar unit test render and props check should render horizontal nav with labels and txts 1`] = `"<wx-view class=\\"main--cube-scroll-nav-bar\\"><wx-scroll-view class=\\"main--scroll-container\\"><wx-view class=\\"main--scroll-content\\"><wx-view data-index=\\"0\\" class=\\"main--nav-item\\"><wx-rich-text class=\\"main--nav-item-inner\\"><wx-view class=\\"rich-text\\">&lt;span&gt;快车&lt;/span&gt;</wx-view></wx-rich-text></wx-view><wx-view data-index=\\"1\\" class=\\"main--nav-item main--active\\"><wx-rich-text class=\\"main--nav-item-inner\\"><wx-view class=\\"rich-text\\">&lt;span&gt;小巴&lt;/span&gt;</wx-view></wx-rich-text></wx-view><wx-view data-index=\\"2\\" class=\\"main--nav-item\\"><wx-rich-text class=\\"main--nav-item-inner\\"><wx-view class=\\"rich-text\\">&lt;span&gt;专车&lt;/span&gt;</wx-view></wx-rich-text></wx-view></wx-view></wx-scroll-view></wx-view>"`;
exports[`component scroll-nav-bar unit test render and props check should render horizontal nav with labels and txts 1`] = `"<wx-view class=\\"main--cube-scroll-nav-bar\\"><wx-scroll-view class=\\"main--cube-scroll-container\\"><wx-view class=\\"main--cube-scroll-content\\"><wx-view data-index=\\"0\\" class=\\"main--cube-nav-item\\"><wx-rich-text class=\\"main--cube-nav-item-inner\\"><wx-view class=\\"rich-text\\">&lt;span&gt;快车&lt;/span&gt;</wx-view></wx-rich-text></wx-view><wx-view data-index=\\"1\\" class=\\"main--cube-nav-item main--cube-active\\"><wx-rich-text class=\\"main--cube-nav-item-inner\\"><wx-view class=\\"rich-text\\">&lt;span&gt;小巴&lt;/span&gt;</wx-view></wx-rich-text></wx-view><wx-view data-index=\\"2\\" class=\\"main--cube-nav-item\\"><wx-rich-text class=\\"main--cube-nav-item-inner\\"><wx-view class=\\"rich-text\\">&lt;span&gt;专车&lt;/span&gt;</wx-view></wx-rich-text></wx-view></wx-view></wx-scroll-view></wx-view>"`;

exports[`component scroll-nav-bar unit test render and props check should render vertical nav and resolve enhanced options 1`] = `"<wx-view class=\\"main--cube-scroll-nav-bar main--cube-scroll-nav-bar_vertical\\"><wx-scroll-view class=\\"main--scroll-container main--scroll-container_vertical\\"><wx-view class=\\"main--scroll-content main--scroll-content_vertical\\"><wx-view data-index=\\"0\\" class=\\"main--nav-item main--active main--nav-item_vertical\\"><wx-rich-text class=\\"main--nav-item-inner\\"><wx-view class=\\"rich-text\\">快车</wx-view></wx-rich-text></wx-view><wx-view data-index=\\"1\\" class=\\"main--nav-item main--nav-item_vertical\\"><wx-rich-text class=\\"main--nav-item-inner\\"><wx-view class=\\"rich-text\\">小巴</wx-view></wx-rich-text></wx-view><wx-view data-index=\\"2\\" class=\\"main--nav-item main--nav-item_vertical\\"><wx-rich-text class=\\"main--nav-item-inner\\"><wx-view class=\\"rich-text\\">专车</wx-view></wx-rich-text></wx-view></wx-view></wx-scroll-view></wx-view>"`;
exports[`component scroll-nav-bar unit test render and props check should render vertical nav and resolve enhanced options 1`] = `"<wx-view class=\\"main--cube-scroll-nav-bar main--cube-scroll-nav-bar_vertical\\"><wx-scroll-view class=\\"main--cube-scroll-container main--cube-scroll-container_vertical\\"><wx-view class=\\"main--cube-scroll-content main--cube-scroll-content_vertical\\"><wx-view data-index=\\"0\\" class=\\"main--cube-nav-item main--cube-active main--cube-nav-item_vertical\\"><wx-rich-text class=\\"main--cube-nav-item-inner\\"><wx-view class=\\"rich-text\\">快车</wx-view></wx-rich-text></wx-view><wx-view data-index=\\"1\\" class=\\"main--cube-nav-item main--cube-nav-item_vertical\\"><wx-rich-text class=\\"main--cube-nav-item-inner\\"><wx-view class=\\"rich-text\\">小巴</wx-view></wx-rich-text></wx-view><wx-view data-index=\\"2\\" class=\\"main--cube-nav-item main--cube-nav-item_vertical\\"><wx-rich-text class=\\"main--cube-nav-item-inner\\"><wx-view class=\\"rich-text\\">专车</wx-view></wx-rich-text></wx-view></wx-view></wx-scroll-view></wx-view>"`;
4 changes: 2 additions & 2 deletions packages/mpx-cube-ui/src/components/tab-bar/tab-bar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ createComponent({
data: {
useTransitionCopy: false,
// 下划线开头的属性不会变成响应式
_resizeTimer: null as unknown as NodeJS.Timeout,
_resizeTimer: null as unknown as number,
els: [] as WechatMiniprogram.BoundingClientRectCallbackResult[],
cubeTabBar: true // 提供 web 侧查找父组件标识
},
Expand Down Expand Up @@ -137,7 +137,7 @@ createComponent({
clearTimeout(this._resizeTimer)
this._resizeTimer = setTimeout(() => {
this.calcAllTabWidth()
}, 60)
}, 60) as unknown as number
}
},
[MOUNTED]() {
Expand Down
12 changes: 12 additions & 0 deletions pnpm-lock.yaml

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

Loading