diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 327de31e82f9..e20cede5af15 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -61,7 +61,6 @@ jobs: host: windows-latest runs-on: ${{ matrix.host }} - timeout-minutes: 30 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index d517e7d4c893..3e18990f558d 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Node binding for taro", "main": "binding.js", "typings": "binding.d.ts", diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index 21cf707aab71..89365262c4e2 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -1,7 +1,7 @@ { "name": "@tarojs/binding-darwin-arm64", "description": "Native binding for taro", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index bd2950bb23cb..eb601d7289cb 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -1,7 +1,7 @@ { "name": "@tarojs/binding-darwin-x64", "description": "Native binding for taro", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index c9f08178929f..c7cfefbdec6c 100644 --- a/npm/linux-x64-gnu/package.json +++ b/npm/linux-x64-gnu/package.json @@ -1,7 +1,7 @@ { "name": "@tarojs/binding-linux-x64-gnu", "description": "Native binding for taro", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index 84f60defe350..a3f74714fc69 100644 --- a/npm/linux-x64-musl/package.json +++ b/npm/linux-x64-musl/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding-linux-x64-musl", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index fb010342e308..0a6ab2bb12eb 100644 --- a/npm/win32-x64-msvc/package.json +++ b/npm/win32-x64-msvc/package.json @@ -1,7 +1,7 @@ { "name": "@tarojs/binding-win32-x64-msvc", "description": "Native binding for taro", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "os": [ "win32" ], diff --git a/package.json b/package.json index d72405b79531..00ed7e7d760f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "开放式跨端跨框架开发解决方案", "homepage": "https://github.com/NervJS/taro#readme", "author": "O2Team", diff --git a/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json b/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json index 0220aa2116ec..e4c00a9efb50 100644 --- a/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json +++ b/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json @@ -1,6 +1,6 @@ { "name": "babel-plugin-transform-react-jsx-to-rn-stylesheet", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Transform stylesheet selector to style in JSX Elements.", "author": "O2Team", "license": "MIT", diff --git a/packages/babel-plugin-transform-solid-jsx/package.json b/packages/babel-plugin-transform-solid-jsx/package.json index 36c8886fb1db..9cc11dc604ef 100644 --- a/packages/babel-plugin-transform-solid-jsx/package.json +++ b/packages/babel-plugin-transform-solid-jsx/package.json @@ -1,7 +1,7 @@ { "name": "babel-plugin-transform-solid-jsx", "description": "A JSX to DOM plugin that wraps expressions for fine grained change detection", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index 3dc6f3e433c3..9a5a03966575 100644 --- a/packages/babel-plugin-transform-taroapi/package.json +++ b/packages/babel-plugin-transform-taroapi/package.json @@ -1,6 +1,6 @@ { "name": "babel-plugin-transform-taroapi", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-plugin-transform-taroapi/tests/__mocks__/h5-definition.json b/packages/babel-plugin-transform-taroapi/tests/__mocks__/h5-definition.json index 5525e4c5c0b1..6355e3d23876 100644 --- a/packages/babel-plugin-transform-taroapi/tests/__mocks__/h5-definition.json +++ b/packages/babel-plugin-transform-taroapi/tests/__mocks__/h5-definition.json @@ -2189,6 +2189,7 @@ "type": "Type" }, "image": { + "lang": "string", "lazyLoad": "boolean", "mode": "Mode", "nativeProps": "*", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 21f4c9d6a7e8..7be407baa8de 100644 --- a/packages/babel-preset-taro/package.json +++ b/packages/babel-preset-taro/package.json @@ -1,6 +1,6 @@ { "name": "babel-preset-taro", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index bbe191a9ab97..8c96ca6cf96e 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "create taro app with one command", "author": "O2Team", "license": "MIT", diff --git a/packages/css-to-react-native/package.json b/packages/css-to-react-native/package.json index 5606877f0e63..57b8c8bd75ae 100644 --- a/packages/css-to-react-native/package.json +++ b/packages/css-to-react-native/package.json @@ -1,7 +1,7 @@ { "name": "taro-css-to-react-native", "description": "Convert CSS text to a React Native stylesheet object", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/eslint-config-taro/package.json b/packages/eslint-config-taro/package.json index dbcc49aec95d..433ec3cf5b84 100644 --- a/packages/eslint-config-taro/package.json +++ b/packages/eslint-config-taro/package.json @@ -1,6 +1,6 @@ { "name": "eslint-config-taro", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/eslint-plugin-taro/package.json b/packages/eslint-plugin-taro/package.json index a61df73df25e..4c65867c41fc 100644 --- a/packages/eslint-plugin-taro/package.json +++ b/packages/eslint-plugin-taro/package.json @@ -1,6 +1,6 @@ { "name": "eslint-plugin-taro", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro specific linting plugin for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index cf99989008a1..a21116d06158 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "jest helper for taro", "private": true, "author": "O2Team", diff --git a/packages/postcss-html-transform/package.json b/packages/postcss-html-transform/package.json index 4d915d009655..6042f54397a6 100644 --- a/packages/postcss-html-transform/package.json +++ b/packages/postcss-html-transform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-html-transform", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "transform html tag name selector", "author": "O2Team", "license": "MIT", diff --git a/packages/postcss-plugin-constparse/package.json b/packages/postcss-plugin-constparse/package.json index 722cdc3c35e7..926b11295b9a 100644 --- a/packages/postcss-plugin-constparse/package.json +++ b/packages/postcss-plugin-constparse/package.json @@ -1,6 +1,6 @@ { "name": "postcss-plugin-constparse", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "parse constants defined in config", "author": "O2Team", "license": "MIT", diff --git a/packages/postcss-pxtransform/package.json b/packages/postcss-pxtransform/package.json index 79d5f9e4ba70..d422156d70fe 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "PostCSS plugin px 转小程序 rpx及h5 rem 单位", "author": "O2Team", "license": "MIT", diff --git a/packages/postcss-unit-transform/package.json b/packages/postcss-unit-transform/package.json index 9dae23836d4c..5d00866cf154 100644 --- a/packages/postcss-unit-transform/package.json +++ b/packages/postcss-unit-transform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-taro-unit-transform", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index bf748c813ad1..0f2c8872533d 100644 --- a/packages/rollup-plugin-copy/package.json +++ b/packages/rollup-plugin-copy/package.json @@ -1,6 +1,6 @@ { "name": "rollup-plugin-copy", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index 3e091c827d85..6cff3203a662 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro utils internal use.", "author": "O2Team", "license": "MIT", diff --git a/packages/stylelint-config-taro-rn/package.json b/packages/stylelint-config-taro-rn/package.json index ccd2d4d04849..c84c4f71b19c 100644 --- a/packages/stylelint-config-taro-rn/package.json +++ b/packages/stylelint-config-taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-config-taro-rn", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Shareable stylelint config for React Native CSS modules", "author": "O2Team", "license": "MIT", diff --git a/packages/stylelint-taro-rn/package.json b/packages/stylelint-taro-rn/package.json index c4bb29061a9f..9b8d6e6c9eab 100644 --- a/packages/stylelint-taro-rn/package.json +++ b/packages/stylelint-taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro-rn", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "A collection of React Native specific rules for stylelint", "author": "O2Team", "license": "MIT", diff --git a/packages/stylelint-taro/package.json b/packages/stylelint-taro/package.json index d4590e29b83b..039407caf234 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index cce5ff0e82a4..91e66240c3d1 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro common API", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-cli-convertor/package.json b/packages/taro-cli-convertor/package.json index bcfef8873069..7e6e2fce8d90 100644 --- a/packages/taro-cli-convertor/package.json +++ b/packages/taro-cli-convertor/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli-convertor", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "cli tool for taro-convert", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-cli/package.json b/packages/taro-cli/package.json index fd5fabfa56fd..773a53df0b0a 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "cli tool for taro", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-advanced/package.json b/packages/taro-components-advanced/package.json index d903efefcf2c..295ea11e7834 100644 --- a/packages/taro-components-advanced/package.json +++ b/packages/taro-components-advanced/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components-advanced", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index 1940e0719294..46456485a976 100644 --- a/packages/taro-components-library-react/package.json +++ b/packages/taro-components-library-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components-library-react", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-react/src/react-component-lib/utils/index.tsx b/packages/taro-components-library-react/src/react-component-lib/utils/index.tsx index bd5976361b9f..ce3e61a81052 100644 --- a/packages/taro-components-library-react/src/react-component-lib/utils/index.tsx +++ b/packages/taro-components-library-react/src/react-component-lib/utils/index.tsx @@ -2,7 +2,7 @@ * Modify from https://github.com/ionic-team/stencil-ds-output-targets/blob/main/packages/react-output-target/react-component-lib/utils/index.ts * MIT License https://github.com/ionic-team/stencil-ds-output-targets/blob/main/LICENSE */ -import React from 'react' +import React, { PropsWithoutRef } from 'react' import type { StyleReactProps } from '../interfaces' @@ -34,7 +34,7 @@ export const mergeRefs = ( export const createForwardRef = (ReactComponent: any, displayName: string) => { const forwardRef = ( - props: StencilReactExternalProps, + props: PropsWithoutRef>, ref: StencilReactForwardedRef ) => { return diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index c44198997632..5cec44a1a0c2 100644 --- a/packages/taro-components-library-solid/package.json +++ b/packages/taro-components-library-solid/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components-library-solid", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro 组件库 Solid 版本库", "private": true, "main": "index.js", diff --git a/packages/taro-components-library-vue3/package.json b/packages/taro-components-library-vue3/package.json index 16c63d2cd756..8157c82aa323 100644 --- a/packages/taro-components-library-vue3/package.json +++ b/packages/taro-components-library-vue3/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components-library-vue3", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index dd93ae22d87f..95534a7df49a 100644 --- a/packages/taro-components-react/package.json +++ b/packages/taro-components-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components-react", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "", "main:h5": "dist/index.js", "main": "dist/index.js", diff --git a/packages/taro-components-rn/package.json b/packages/taro-components-rn/package.json index f8a256b7f9b1..5f3db2990647 100644 --- a/packages/taro-components-rn/package.json +++ b/packages/taro-components-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components-rn", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index d988e1c606ed..783916b8ea7b 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro 组件库", "browser": "dist/index.js", "main:h5": "dist/index.js", diff --git a/packages/taro-extend/package.json b/packages/taro-extend/package.json index cf5fd0812339..b97d0ff65e3b 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro extend functionality", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-framework-react/package.json b/packages/taro-framework-react/package.json index 6ca313680bd7..cb939b3e6bf1 100644 --- a/packages/taro-framework-react/package.json +++ b/packages/taro-framework-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-framework-react", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "React/Preact 框架插件", "author": "O2Team", "homepage": "https://github.com/nervjs/taro", diff --git a/packages/taro-framework-solid/package.json b/packages/taro-framework-solid/package.json index 2c377b2b4e02..3cf900baf18b 100644 --- a/packages/taro-framework-solid/package.json +++ b/packages/taro-framework-solid/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-framework-solid", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Solid 框架插件", "author": "drchan", "homepage": "https://github.com/nervjs/taro", diff --git a/packages/taro-framework-vue3/package.json b/packages/taro-framework-vue3/package.json index 0717c5072d44..13ebf2961ece 100644 --- a/packages/taro-framework-vue3/package.json +++ b/packages/taro-framework-vue3/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-framework-vue3", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Vue3 框架插件", "author": "O2Team", "homepage": "https://github.com/nervjs/taro", diff --git a/packages/taro-h5/package.json b/packages/taro-h5/package.json index ed01f2c2c6e2..bb6f5bd8b48e 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro h5 framework", "browser": "dist/index.js", "main:h5": "dist/index.esm.js", diff --git a/packages/taro-helper/package.json b/packages/taro-helper/package.json index b6861fa67775..34db913984c8 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index 4a08760de087..dd869c45ac51 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro runner use webpack loader", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-alipay/package.json b/packages/taro-platform-alipay/package.json index c886af9fcacc..b27b474d31cf 100644 --- a/packages/taro-platform-alipay/package.json +++ b/packages/taro-platform-alipay/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-platform-alipay", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-ascf/package.json b/packages/taro-platform-ascf/package.json index 206068b71f71..7639f580a4f1 100644 --- a/packages/taro-platform-ascf/package.json +++ b/packages/taro-platform-ascf/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-platform-ascf", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "ascf平台插件", "author": "ascf", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 2d60d5dcfb3e..d231a640957d 100644 --- a/packages/taro-platform-h5/package.json +++ b/packages/taro-platform-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-platform-h5", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-cpp/package.json b/packages/taro-platform-harmony-cpp/package.json index 09139b50b247..a532db746d94 100644 --- a/packages/taro-platform-harmony-cpp/package.json +++ b/packages/taro-platform-harmony-cpp/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-platform-harmony-cpp", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "鸿蒙系统插件 C-API 版本", "author": "O2Team", "homepage": "https://gitee.com/openharmony-sig/taro", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index cd4f3211c990..3dda6728dd44 100644 --- a/packages/taro-platform-harmony-hybrid/package.json +++ b/packages/taro-platform-harmony-hybrid/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-platform-harmony-hybrid", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index 6c05a8d1dd5a..a7cd9f8f24e6 100644 --- a/packages/taro-platform-harmony/package.json +++ b/packages/taro-platform-harmony/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-platform-harmony-ets", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "OpenHarmony & 鸿蒙系统插件", "author": "O2Team", "homepage": "https://gitee.com/openharmony-sig/taro", diff --git a/packages/taro-platform-jd/package.json b/packages/taro-platform-jd/package.json index 97eecd954597..25fc7a63332d 100644 --- a/packages/taro-platform-jd/package.json +++ b/packages/taro-platform-jd/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-platform-jd", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 842bece942b3..0e4bfa8178cf 100644 --- a/packages/taro-platform-qq/package.json +++ b/packages/taro-platform-qq/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-platform-qq", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index 69995fb9a635..a82f951ba248 100644 --- a/packages/taro-platform-swan/package.json +++ b/packages/taro-platform-swan/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-platform-swan", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index b750403a167e..d235e9bf39e7 100644 --- a/packages/taro-platform-tt/package.json +++ b/packages/taro-platform-tt/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-platform-tt", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index e2ce6b2d0fbe..02d2cc42384b 100644 --- a/packages/taro-platform-weapp/package.json +++ b/packages/taro-platform-weapp/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-platform-weapp", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-generator/package.json b/packages/taro-plugin-generator/package.json index 1221467df8c8..e97fb6c064a5 100644 --- a/packages/taro-plugin-generator/package.json +++ b/packages/taro-plugin-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-generator", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro 生成器插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index ad3bee4de1ac..4048b5a8286b 100644 --- a/packages/taro-plugin-html/package.json +++ b/packages/taro-plugin-html/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-html", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 92301d732d98..e36448a0cc37 100644 --- a/packages/taro-plugin-http/package.json +++ b/packages/taro-plugin-http/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-http", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index 583ef08f0e91..a1aeefd2877b 100644 --- a/packages/taro-plugin-inject/package.json +++ b/packages/taro-plugin-inject/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-inject", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro 小程序端平台中间层插件", "author": "O2Team", "homepage": "https://github.com/nervjs/taro", diff --git a/packages/taro-plugin-mini-ci/package.json b/packages/taro-plugin-mini-ci/package.json index c31376fbea58..be976febfab4 100644 --- a/packages/taro-plugin-mini-ci/package.json +++ b/packages/taro-plugin-mini-ci/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-mini-ci", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro 小程序端构建后支持CI(持续集成)的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 859e8635c49c..4e59b813355b 100644 --- a/packages/taro-plugin-react-devtools/package.json +++ b/packages/taro-plugin-react-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-react-devtools", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro 小程序端支持使用 React DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-vue-devtools/package.json b/packages/taro-plugin-vue-devtools/package.json index a15640f093b7..e0dcfaca62e8 100644 --- a/packages/taro-plugin-vue-devtools/package.json +++ b/packages/taro-plugin-vue-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-vue-devtools", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index bcec3585ed57..f7f52fc3b0fd 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "like react-dom, but for mini apps.", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-runner/package.json b/packages/taro-rn-runner/package.json index 5e6d40ec5f99..6f5f1320e487 100644 --- a/packages/taro-rn-runner/package.json +++ b/packages/taro-rn-runner/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/rn-runner", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "ReactNative build tool for taro", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-style-transformer/package.json b/packages/taro-rn-style-transformer/package.json index d0ce2ac15c16..a383e2e0abc6 100644 --- a/packages/taro-rn-style-transformer/package.json +++ b/packages/taro-rn-style-transformer/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/rn-style-transformer", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index e9029aa04016..862abfafa7a3 100644 --- a/packages/taro-rn-supporter/package.json +++ b/packages/taro-rn-supporter/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/rn-supporter", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro rn supporter", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-transformer/package.json b/packages/taro-rn-transformer/package.json index ce74101b9fdd..5f66d2cd2b0c 100644 --- a/packages/taro-rn-transformer/package.json +++ b/packages/taro-rn-transformer/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/rn-transformer", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index fc355d1adc85..02f562b4cef6 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/src/lib/index.ts b/packages/taro-rn/src/lib/index.ts index 213f57031b9c..7339ea385527 100644 --- a/packages/taro-rn/src/lib/index.ts +++ b/packages/taro-rn/src/lib/index.ts @@ -1,4 +1,5 @@ // 由 getLibList.js 脚本生成, 不要进行手动修改, 请不要手动修改 +export * from './ENV_TYPE' export * from './arrayBufferToBase64' export * from './authorize' export * from './base64ToArrayBuffer' @@ -15,7 +16,6 @@ export * from './createInnerAudioContext' export * from './createSelectorQuery' export * from './createVideoContext' export * from './downloadFile' -export * from './ENV_TYPE' export * from './getAppBaseInfo' export * from './getClipboardData' export * from './getEnv' diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index d271a7da032a..db1e697e6de2 100644 --- a/packages/taro-router-rn/package.json +++ b/packages/taro-router-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router-rn", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 4c6d8009717e..73717b8b4f58 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index 19d80bcd4e32..8dc7af09428e 100644 --- a/packages/taro-runner-utils/package.json +++ b/packages/taro-runner-utils/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runner-utils", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro runner utilities.", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime-rn/package.json b/packages/taro-runtime-rn/package.json index 839150df74dd..deebf81c6119 100644 --- a/packages/taro-runtime-rn/package.json +++ b/packages/taro-runtime-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime-rn", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index d47b0a6fd90a..e16de1d6b476 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "taro runtime for mini apps.", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-service/package.json b/packages/taro-service/package.json index 0312f637f127..eb600f3b21bc 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index 22c1197f87f5..778ae96cabfe 100644 --- a/packages/taro-transformer-wx/package.json +++ b/packages/taro-transformer-wx/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/transformer-wx", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Transfrom Nerv Component to Wechat mini program.", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-vite-runner/package.json b/packages/taro-vite-runner/package.json index 29f4bb38f7e5..e001fa92626c 100644 --- a/packages/taro-vite-runner/package.json +++ b/packages/taro-vite-runner/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/vite-runner", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-vite-runner/src/common/babel-plugin-import-native-component.ts b/packages/taro-vite-runner/src/common/babel-plugin-import-native-component.ts index f62ac1ab2989..29e76b819e65 100644 --- a/packages/taro-vite-runner/src/common/babel-plugin-import-native-component.ts +++ b/packages/taro-vite-runner/src/common/babel-plugin-import-native-component.ts @@ -19,12 +19,11 @@ export default (compiler: ViteHarmonyCompilerContext | ViteMiniCompilerContext, CallExpression(ast) { // 识别所有 importNativeComponent 函数调用, 并替换为对应的组件名 if (t.isIdentifier(ast.node.callee, { name: IMPORT_COMPONENT_NAME })) { - const pathArg = resolveMainFilePath( - path.resolve( - path.dirname(id), - compiler.resolvePageImportPath(id, t.isStringLiteral(ast.node.arguments[0]) ? ast.node.arguments[0].value : '') - ) - ) + let pathArg = compiler.resolvePageImportPath(id, t.isStringLiteral(ast.node.arguments[0]) ? ast.node.arguments[0].value : '') + if (pathArg.startsWith('.')) { + pathArg = path.resolve(path.dirname(id), pathArg) + } + pathArg = resolveMainFilePath(pathArg) const nameArg = t.isStringLiteral(ast.node.arguments[1]) ? ast.node.arguments[1].value : '' const exportNameArg = t.isStringLiteral(ast.node.arguments[2]) ? ast.node.arguments[2].value : 'default' diff --git a/packages/taro-vite-runner/src/harmony/page.ts b/packages/taro-vite-runner/src/harmony/page.ts index 0aa353014759..598d24155504 100644 --- a/packages/taro-vite-runner/src/harmony/page.ts +++ b/packages/taro-vite-runner/src/harmony/page.ts @@ -105,10 +105,13 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi const ncObj: Record = {} deps.forEach(dep => { Object.entries(nCompCache.get(dep) || {}).forEach(([key, value]) => { - const absPath = value[0] - const ext = path.extname(absPath) - const basename = path.basename(absPath, ext) - ncObj[key] = [path.join(path.dirname(path.relative(path.dirname(rawId), absPath)), basename), value[1]] + let importPath = value[0] + const ext = path.extname(importPath) + const basename = path.basename(importPath, ext) + if (path.isAbsolute(importPath)) { + importPath = path.relative(path.dirname(rawId), importPath) + } + ncObj[key] = [path.join(path.dirname(importPath), basename), value[1]] }) }) if (!page.isNative) { @@ -159,10 +162,13 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi const deps = await viteCompilerContext.collectedDeps(this, escapePath(rawId), filter) deps.forEach(dep => { Object.entries(nCompCache.get(dep) || {}).forEach(([key, value]) => { - const absPath = value[0] - const ext = path.extname(absPath) - const basename = path.basename(absPath, ext) - ncObj[key] = [path.join(path.dirname(path.relative(path.dirname(rawId), absPath)), basename), value[1]] + let importPath = value[0] + const ext = path.extname(importPath) + const basename = path.basename(importPath, ext) + if (path.isAbsolute(importPath)) { + importPath = path.relative(path.dirname(rawId), importPath) + } + ncObj[key] = [path.join(path.dirname(importPath), basename), value[1]] }) }) if (!page.isNative) { diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index dd8f8344c6d4..2d9aa0592a84 100644 --- a/packages/taro-webpack5-prebundle/package.json +++ b/packages/taro-webpack5-prebundle/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/webpack5-prebundle", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro app webpack5 prebundle", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-webpack5-runner/package.json b/packages/taro-webpack5-runner/package.json index c22a95013b54..5f8b1e9fe9fa 100644 --- a/packages/taro-webpack5-runner/package.json +++ b/packages/taro-webpack5-runner/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/webpack5-runner", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro app runner", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-with-weapp/package.json b/packages/taro-with-weapp/package.json index 12dd3263aa80..94b44dc23062 100644 --- a/packages/taro-with-weapp/package.json +++ b/packages/taro-with-weapp/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/with-weapp", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index 757b54b1ffcd..cfa476710c14 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index 2cdc627bde2b..e4688afe8ec2 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.1.7", + "version": "4.1.8-alpha.0", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT",