diff --git a/example/package-lock.json b/example/package-lock.json index aa678665..4e8dd77f 100644 --- a/example/package-lock.json +++ b/example/package-lock.json @@ -23,6 +23,7 @@ "@mpxjs/eslint-config": "^2.0.3", "@mpxjs/mpx-cli-service": "2.2.3", "@mpxjs/mpx-cube-ui": "file:../packages/mpx-cube-ui", + "@mpxjs/store": "^2.10.2", "@mpxjs/utils": "2.10.7-beta.5", "@mpxjs/vue-cli-plugin-mpx": "2.2.3", "@mpxjs/vue-cli-plugin-mpx-eslint": "^2.0.0", @@ -2839,6 +2840,29 @@ "resolved": "../packages/mpx-cube-ui", "link": true }, + "node_modules/@mpxjs/store": { + "version": "2.10.2", + "resolved": "https://registry.npmjs.org/@mpxjs/store/-/store-2.10.2.tgz", + "integrity": "sha512-/P5dBskK19eLcKBCYllnI+EOR8rfFTFzWlU05Ecm+0U2CffFTONL38ekuTHW6DS95+HPcY0EJEk7FOkZFddjAw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@mpxjs/utils": "^2.10.2" + }, + "peerDependencies": { + "@mpxjs/core": "^2.9.0" + } + }, + "node_modules/@mpxjs/store/node_modules/@mpxjs/utils": { + "version": "2.10.20", + "resolved": "https://registry.npmjs.org/@mpxjs/utils/-/utils-2.10.20.tgz", + "integrity": "sha512-PyDI7khuuN05b+Xj5gqs61qOkJASDZVs4+AKRGxRVVq1zPvQ8oOZ3NhyuiU1VwVEskHJ/5f16ocL4KDLO59ZRQ==", + "dev": true, + "license": "Apache-2.0", + "peerDependencies": { + "@mpxjs/core": "^2.9.58" + } + }, "node_modules/@mpxjs/template-engine": { "version": "2.8.7", "dev": true, diff --git a/example/package.json b/example/package.json index 4ea32d0c..21ff9da5 100644 --- a/example/package.json +++ b/example/package.json @@ -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", @@ -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" } } diff --git a/example/vue.config.js b/example/vue.config.js index 789ca652..f28bc947 100644 --- a/example/vue.config.js +++ b/example/vue.config.js @@ -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')) }, @@ -50,4 +57,4 @@ module.exports = defineConfig({ new webpack.ProgressPlugin() ] } -}) \ No newline at end of file +}) diff --git a/jest.config.js b/jest.config.js index 966102ca..c6f24989 100644 --- a/jest.config.js +++ b/jest.config.js @@ -56,5 +56,5 @@ module.exports = { '^.+\\.ts$': '/node_modules/ts-jest' }, resolver: '/scripts/jest-mpx-resolver/index.js', - transformIgnorePatterns: ['node_modules/(?!(@mpxjs|@babel))'] + transformIgnorePatterns: ['node_modules/(?!\\.pnpm|@mpxjs|@babel)'] } diff --git a/package.json b/package.json index ed4116cb..4e56df9a 100644 --- a/package.json +++ b/package.json @@ -79,5 +79,14 @@ "engines": { "node": ">=16", "pnpm": ">=8" + }, + "pnpm": { + "packageExtensions": { + "vue-server-renderer": { + "dependencies": { + "webpack": "^4.47.0" + } + } + } } } diff --git a/packages/mpx-cube-ui/__tests__/components/scroll-nav-bar/__snapshots__/scroll-nav-bar.spec.js.snap b/packages/mpx-cube-ui/__tests__/components/scroll-nav-bar/__snapshots__/scroll-nav-bar.spec.js.snap index 752c0b8e..e1895181 100644 --- a/packages/mpx-cube-ui/__tests__/components/scroll-nav-bar/__snapshots__/scroll-nav-bar.spec.js.snap +++ b/packages/mpx-cube-ui/__tests__/components/scroll-nav-bar/__snapshots__/scroll-nav-bar.spec.js.snap @@ -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`] = `"<span>快车</span><span>小巴</span><span>专车</span>"`; +exports[`component scroll-nav-bar unit test render and props check should render horizontal nav with labels and txts 1`] = `"<span>快车</span><span>小巴</span><span>专车</span>"`; -exports[`component scroll-nav-bar unit test render and props check should render vertical nav and resolve enhanced options 1`] = `"快车小巴专车"`; +exports[`component scroll-nav-bar unit test render and props check should render vertical nav and resolve enhanced options 1`] = `"快车小巴专车"`; diff --git a/packages/mpx-cube-ui/src/components/tab-bar/tab-bar.ts b/packages/mpx-cube-ui/src/components/tab-bar/tab-bar.ts index 29a02f1e..addd57ba 100644 --- a/packages/mpx-cube-ui/src/components/tab-bar/tab-bar.ts +++ b/packages/mpx-cube-ui/src/components/tab-bar/tab-bar.ts @@ -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 侧查找父组件标识 }, @@ -137,7 +137,7 @@ createComponent({ clearTimeout(this._resizeTimer) this._resizeTimer = setTimeout(() => { this.calcAllTabWidth() - }, 60) + }, 60) as unknown as number } }, [MOUNTED]() { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cc659e8d..adb8432b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,8 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +packageExtensionsChecksum: 40a9e8c86dc278da559f6b7501efcb8a + importers: .: @@ -20966,6 +20968,11 @@ snapshots: dependencies: de-indent: 1.0.2 entities: 1.1.2 + webpack: 4.47.0 + transitivePeerDependencies: + - supports-color + - webpack-cli + - webpack-command vue-server-renderer@2.7.16: dependencies: @@ -20977,6 +20984,11 @@ snapshots: resolve: 1.22.10 serialize-javascript: 6.0.2 source-map: 0.5.6 + webpack: 4.47.0 + transitivePeerDependencies: + - supports-color + - webpack-cli + - webpack-command vue-style-loader@4.1.3: dependencies: