From f4e24da8aa13e5c49321122aa66d089eb3775052 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Mon, 17 Jun 2024 23:55:40 +0800 Subject: [PATCH 01/81] =?UTF-8?q?fix:=20=E6=94=AF=E6=8C=81=E5=85=B3?= =?UTF-8?q?=E9=97=AD=20jsx=20=E6=A0=B7=E5=BC=8F=E6=B3=A8=E5=85=A5=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E6=8F=90=E4=BE=9B=20css=20map?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-vite-runner/src/harmony/page.ts | 2 ++ packages/taro-vite-runner/src/harmony/style.ts | 11 ++++++++--- .../taro-vite-runner/src/harmony/template/page.ts | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/taro-vite-runner/src/harmony/page.ts b/packages/taro-vite-runner/src/harmony/page.ts index 20026deebaeb..8936e00bdb2d 100644 --- a/packages/taro-vite-runner/src/harmony/page.ts +++ b/packages/taro-vite-runner/src/harmony/page.ts @@ -62,6 +62,7 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi const tabbarPages = tabbarList.map(item => viteCompilerContext.pages.find((e: TaroHarmonyPageMeta) => { if (e.name === item.pagePath) { e.originName = item.pagePath + e.id = appendVirtualModulePrefix(e.scriptPath + PAGE_SUFFIX) return true } })!) @@ -100,6 +101,7 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi ...page, originName: page.name, name: pageName, + id, } as TaroHarmonyPageMeta, name, this.resolve), exports: ['default'], }) diff --git a/packages/taro-vite-runner/src/harmony/style.ts b/packages/taro-vite-runner/src/harmony/style.ts index 4409b509dbdb..55d644bbc21c 100644 --- a/packages/taro-vite-runner/src/harmony/style.ts +++ b/packages/taro-vite-runner/src/harmony/style.ts @@ -3,8 +3,7 @@ import path from 'node:path' import { transformSync } from '@babel/core' import { dataToEsm } from '@rollup/pluginutils' import { chalk, CSS_EXT, fs, REG_JS, REG_NODE_MODULES, REG_SCRIPTS, resolveSync } from '@tarojs/helper' -import { parse as parseJSXStyleFunction } from '@tarojs/parse-css-to-stylesheet' -import { isFunction } from '@tarojs/shared' +import { parse as parseJSXStyle } from '@tarojs/parse-css-to-stylesheet' import { isEqual } from 'lodash' import MagicString from 'magic-string' import stylelint from 'stylelint' @@ -149,6 +148,10 @@ export async function stylePlugin(viteCompilerContext: ViteHarmonyCompilerContex } }, async transform(raw, id) { + if (viteCompilerContext.loaderMeta.enableParseJSXStyle && !viteCompilerContext.loaderMeta.parseJSXStyleMapCache) { + viteCompilerContext.loaderMeta.parseJSXStyleMapCache = cssMapCache + } + if ( commonjsProxyRE.test(id) || SPECIAL_QUERY_RE.test(id) || @@ -165,9 +168,11 @@ export async function stylePlugin(viteCompilerContext: ViteHarmonyCompilerContex } } + // Note: 新版本 rust 插件不需要修改 JSX 代码 + if (!isStyleRequest(id) && viteCompilerContext.loaderMeta.enableParseJSXStyle) return + if (!isStyleRequest(id)) { if (!REG_SCRIPTS.test(id)) return - const parseJSXStyle = isFunction(viteCompilerContext.loaderMeta.parseJSXStyle) ? viteCompilerContext.loaderMeta.parseJSXStyle : parseJSXStyleFunction try { const isEntry = viteCompilerContext.taroConfig.entry.app.includes(id) if (!isEntry && !globalCssCache) { diff --git a/packages/taro-vite-runner/src/harmony/template/page.ts b/packages/taro-vite-runner/src/harmony/template/page.ts index 552f6ab44313..f2239ad8006f 100644 --- a/packages/taro-vite-runner/src/harmony/template/page.ts +++ b/packages/taro-vite-runner/src/harmony/template/page.ts @@ -22,6 +22,7 @@ export interface IMethod { } export interface TaroHarmonyPageMeta extends VitePageMeta { + id: string originName: string entryOption?: Record From 2521d2d16233f5ad7bac2330cb993b434e4daedf Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Tue, 18 Jun 2024 00:23:38 +0800 Subject: [PATCH 02/81] chore(release): publish 4.0.0-alpha.24 --tag=alpha --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index 60f20f7202a3..8bbc75ffed71 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 b75311323959..f1e95a6507c0 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index b3fc1ca3fbeb..b9e2152fe66e 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index 31bf32514e26..e765cec6d3f5 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index bba1f8d938b6..6a19cd5ad51d 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 08b0a6b83134..0cccb478465b 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "os": [ "win32" ], diff --git a/package.json b/package.json index 83dc2913dcb5..087db1342a7d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 629604c25d97..0a15ea8d22cf 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 6373f0e11aed..1d7bd7d88089 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index fbf59fe333b4..a14e0db4d4aa 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 500b4a9eae64..6cd6f0da5709 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 23cb96f08b00..325473960445 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 f06470168531..96d18266fa60 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 0c84f9a81335..d58135a29ca8 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index 87d6002c7d1c..6ca1b9dc6707 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 8aade25e2613..0b2a7eadc7bc 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 29610c8d1254..2d6a3668d479 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 317c6598cc7d..dfa525b51891 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 31ace13d277b..18a892203f69 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index ace1a19c7289..44882df13016 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index cb45f85245bd..87bc14227be1 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 477d7c7e95c9..5b54395d67ca 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 1b3eb44c7cbf..2d7efb86a5d1 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 077c24b45a7c..f56fdef61cc5 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index a26b7b5b3357..a78dfcc5d7c0 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 72c803113329..5d076eb307b0 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 92fc453dcd07..1526f0e07c7d 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 62a8ac41009a..1dc3e63229ff 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index 239e7cde1fb5..aaf2f1db5cba 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index fd3a5eb5974d..04e2362f9990 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 f37ba409ff3c..873c425f74d9 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index cffd7c5013c1..cf6f4575c103 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 8768b652c517..186719bb333c 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index fbade6a80459..58fae2b04fcf 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 32bb0ee27c60..4abfd3efd03d 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 57255ddc4986..b7299094aae5 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "React/Preact/Nerv 框架插件", "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 4f2074773f31..d43a2ae00063 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 262ec978e951..2ad3303c0d48 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 afb3806989fe..69324b8abba1 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 cb377b327ea3..51f65b8f2691 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index 585805b949cb..61cc5922e721 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 582762525f2c..341c8c6cc533 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 0b9f2216fbb3..cf49c7dcf872 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index b8166b53db82..a1cb9fdd64d2 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index b47f44787fd8..a91b568536cb 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 fee0bb313b3a..2dbf8e2eccbb 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 534430dac2ea..56c3738dd17a 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index 5b6bf77cb347..df52026dfd54 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index 8cf367da0bb9..a30a92846e99 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index a8e738c97cd9..425fb9812b97 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index 76104acc67fa..a4474c1b9b9c 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 345825960646..b9a86344b013 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index baa46545e05f..375f7230352c 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 5153e748a08a..224c9f513395 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index a780094c96f9..4615f9a27e0a 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 61d15b71fc7d..d7c6f2008b02 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index 49039c5aeb3f..bf0699eefb30 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 cb8d4016b28e..6e0d99e2e01f 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 74ce22b557fb..1c56947673c3 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index 45131f1927a3..bea7cfc4b30f 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 b976d5bfe1ff..abfd445fe47e 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index e15a81301e08..7bae7c6699d4 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index cc22c99a1a06..5e0e69fe669e 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index a6f3a210b08c..486c34098c1a 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index a78e59f547f1..7c4e1f67471e 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 564f148ef1ce..50ae24ea105b 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 8bbef791ada4..f8f21bb8a5e5 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 f743a46dffe9..b1b3d4e51871 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index 110f8e4fe5b5..6632465f46be 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 c495d4156f0c..0ab38e8fc5c6 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 6ca4f8abab3c..f9c27e1050f9 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 57f8969bc712..761c0ba3e773 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "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 aff0b5f19002..8a0d42704747 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.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index 934d2c8149c2..894c3636f784 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index 58203905cf10..f0384028d8bc 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.101", + "version": "4.0.0-alpha.24", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From 544f6ee5bee90f7345bde56700da7649f1780a86 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Tue, 18 Jun 2024 16:15:43 +0800 Subject: [PATCH 03/81] =?UTF-8?q?fix(vite):=20=E4=BF=AE=E5=A4=8D=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=A8=A1=E5=BC=8F=E9=85=8D=E7=BD=AE=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/harmony/template/app.ts | 20 +------------- .../src/harmony/template/base.ts | 26 +++++++++++++++++++ .../src/harmony/template/page.ts | 6 +++++ .../src/utils/compiler/harmony.ts | 2 +- 4 files changed, 34 insertions(+), 20 deletions(-) diff --git a/packages/taro-vite-runner/src/harmony/template/app.ts b/packages/taro-vite-runner/src/harmony/template/app.ts index 5cc8007e691a..56eb3dfc7397 100644 --- a/packages/taro-vite-runner/src/harmony/template/app.ts +++ b/packages/taro-vite-runner/src/harmony/template/app.ts @@ -35,26 +35,8 @@ export default class Parser extends BaseParser { }, '') || '' } - get pxTransformConfig () { - const pxTransformOption = this.buildConfig.postcss?.pxtransform || {} - const pxTransformConfig = pxTransformOption.config || {} - pxTransformConfig.designWidth = this.buildConfig.designWidth - pxTransformConfig.deviceRatio = this.buildConfig.deviceRatio - return pxTransformConfig - } - getInitPxTransform () { - return this.transArr2Str([ - 'initPxTransform({', - this.transArr2Str([ - `designWidth: ${this.pxTransformConfig.designWidth},`, - `deviceRatio: ${JSON.stringify(this.pxTransformConfig.deviceRatio)},`, - `baseFontSize: ${this.pxTransformConfig.baseFontSize},`, - `unitPrecision: ${this.pxTransformConfig.unitPrecision},`, - `targetUnit: ${JSON.stringify(this.pxTransformConfig.targetUnit)},`, - ], 2), - '})', - ]) + return super.getInitPxTransform(this.buildConfig) } get instantiateApp () { diff --git a/packages/taro-vite-runner/src/harmony/template/base.ts b/packages/taro-vite-runner/src/harmony/template/base.ts index c2b958307f3e..e703b569f80f 100644 --- a/packages/taro-vite-runner/src/harmony/template/base.ts +++ b/packages/taro-vite-runner/src/harmony/template/base.ts @@ -1,5 +1,7 @@ import { prettyPrintJson } from '../../utils' +import type { ViteHarmonyBuildConfig } from '@tarojs/taro/types/compile/viteCompilerContext' + export default class BaseParser { prettyPrintJson = prettyPrintJson transArr2Str (array: unknown[], prefixSpace = 0, connector = '\n') { @@ -9,4 +11,28 @@ export default class BaseParser { e instanceof Array ? this.transArr2Str(e, prefixSpace, connector) : `${' '.repeat(prefixSpace)}${e}` }`.replace(/(\x20*$)/g, ''), '') } + + getPxTransformConfig (buildConfig: ViteHarmonyBuildConfig) { + const pxTransformOption = buildConfig.postcss?.pxtransform || {} + const pxTransformConfig = pxTransformOption.config || {} + pxTransformConfig.designWidth = buildConfig.designWidth + pxTransformConfig.deviceRatio = buildConfig.deviceRatio + return pxTransformConfig + } + + getInitPxTransform (buildConfig: ViteHarmonyBuildConfig) { + const pxTransformConfig = this.getPxTransformConfig(buildConfig) + + return this.transArr2Str([ + 'initPxTransform({', + this.transArr2Str([ + `designWidth: ${pxTransformConfig.designWidth},`, + `deviceRatio: ${JSON.stringify(pxTransformConfig.deviceRatio)},`, + `baseFontSize: ${pxTransformConfig.baseFontSize},`, + `unitPrecision: ${pxTransformConfig.unitPrecision},`, + `targetUnit: ${JSON.stringify(pxTransformConfig.targetUnit)},`, + ], 2), + '})', + ]) + } } diff --git a/packages/taro-vite-runner/src/harmony/template/page.ts b/packages/taro-vite-runner/src/harmony/template/page.ts index 39ce8a5ec9d3..56e2a33a8c30 100644 --- a/packages/taro-vite-runner/src/harmony/template/page.ts +++ b/packages/taro-vite-runner/src/harmony/template/page.ts @@ -76,6 +76,10 @@ export default class Parser extends BaseParser { }, '') || '' } + getInitPxTransform () { + return super.getInitPxTransform(this.buildConfig) + } + isEnable (app?: boolean, page?: boolean) { if (app && page !== false) return true return !!page @@ -1086,8 +1090,10 @@ this.removeTabBarEvent()` : 'callFn(this.page?.onUnload, this)']) return this.transArr2Str([ `import { ${createFn} } from '${creatorLocation}'`, `import component from "${escapePath(rawId)}"`, + isBlended ? 'import { initPxTransform } from "@tarojs/taro"' : null, importFrameworkStatement, `export const config = ${this.prettyPrintJson(page.config)}`, + isBlended ? this.getInitPxTransform() : null, page?.config.enableShareTimeline ? 'component.enableShareTimeline = true' : null, page?.config.enableShareAppMessage ? 'component.enableShareAppMessage = true' : null, `export default () => ${createPageOrComponent}`, diff --git a/packages/taro-vite-runner/src/utils/compiler/harmony.ts b/packages/taro-vite-runner/src/utils/compiler/harmony.ts index e874283d4c57..8f230d06966b 100644 --- a/packages/taro-vite-runner/src/utils/compiler/harmony.ts +++ b/packages/taro-vite-runner/src/utils/compiler/harmony.ts @@ -29,7 +29,7 @@ import type { VitePageMeta, } from '@tarojs/taro/types/compile/viteCompilerContext' -function readJsonSync(file: string) { +export function readJsonSync(file: string) { const ext = path.extname(file) if (ext === '.json5') { const raw = fs.readFileSync(file, 'utf-8') From 668fb930d2919d776ee7ecc1e5b665cc430fb1a4 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Wed, 19 Jun 2024 00:04:12 +0800 Subject: [PATCH 04/81] chore(release): publish 4.0.0-alpha.25 --tag=alpha --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index 8bbc75ffed71..1fb24cdd9f27 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 f1e95a6507c0..6b335315b26b 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index b9e2152fe66e..14983c1aa636 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index e765cec6d3f5..791703b8dbf6 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index 6a19cd5ad51d..0f0f4fb009ed 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 0cccb478465b..867c5db32b97 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "os": [ "win32" ], diff --git a/package.json b/package.json index 087db1342a7d..88cd36ece555 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 0a15ea8d22cf..7fb9bbb0c57c 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 1d7bd7d88089..eadcb7d16395 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index a14e0db4d4aa..3935c17a699f 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 6cd6f0da5709..1765e6ee0d96 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 325473960445..31a26a8db025 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 96d18266fa60..5dc22f0ff345 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 d58135a29ca8..c5e605aa1a9c 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index 6ca1b9dc6707..bb2ea6afdbb3 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 0b2a7eadc7bc..708f26ada93d 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 2d6a3668d479..8bb241c5f116 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 dfa525b51891..b73a74dd68e3 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 18a892203f69..f29842843874 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 44882df13016..881a6430f8f2 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index 87bc14227be1..a7c4c8add565 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 5b54395d67ca..51b279ca5fe0 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 2d7efb86a5d1..cd65c0aabff1 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 f56fdef61cc5..e01757beb51e 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index a78dfcc5d7c0..811df1a685df 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 5d076eb307b0..a91e89ebfb29 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 1526f0e07c7d..b7ea4c0e44f0 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 1dc3e63229ff..11ee28834195 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index aaf2f1db5cba..c7600051d0c9 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index 04e2362f9990..55b958a9fe12 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 873c425f74d9..958fc97d99b1 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index cf6f4575c103..7f1a40fc93ad 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 186719bb333c..3129b9d6a81c 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 58fae2b04fcf..48f9f78e6239 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 4abfd3efd03d..91c551d691ea 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 b7299094aae5..4b0d19dfd849 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "React/Preact/Nerv 框架插件", "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 d43a2ae00063..27bf004f939d 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 2ad3303c0d48..a3af7462b805 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 69324b8abba1..86d7eb29d5cd 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 51f65b8f2691..1eac09feb409 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index 61cc5922e721..c66263f17314 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 341c8c6cc533..fade369ee741 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index cf49c7dcf872..ef9f375ff1f8 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index a1cb9fdd64d2..dde695a04785 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index a91b568536cb..ac1953d67827 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 2dbf8e2eccbb..377aff0b0610 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 56c3738dd17a..54ae8589f69f 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index df52026dfd54..b5aed1e3d35a 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index a30a92846e99..6481325a5e33 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index 425fb9812b97..1d704cb72bed 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index a4474c1b9b9c..c3a4d99a9902 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index b9a86344b013..48d4fb8a4b56 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index 375f7230352c..834926cb65d7 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 224c9f513395..66d51322b72c 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 4615f9a27e0a..f1106c2caa2b 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 d7c6f2008b02..33a8b8680afe 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index bf0699eefb30..fef200912edf 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 6e0d99e2e01f..140ce48882bc 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 1c56947673c3..82c76fcb678b 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index bea7cfc4b30f..986739dcaa53 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 abfd445fe47e..70ccd67cceeb 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index 7bae7c6699d4..21d8dd0fe055 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 5e0e69fe669e..32d32525dfc0 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 486c34098c1a..b38c54f6d47e 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index 7c4e1f67471e..b93ec82b581e 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 50ae24ea105b..9bec2a4a25ca 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index f8f21bb8a5e5..f56edeb653d8 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 b1b3d4e51871..ff05361c19c6 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index 6632465f46be..5c26874962ff 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 0ab38e8fc5c6..ac42a7b9e479 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index f9c27e1050f9..9e76a7f6f5a6 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 761c0ba3e773..77d3f25495b3 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "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 8a0d42704747..deea3fb5cd0d 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.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index 894c3636f784..d90f2c0e3ef6 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index f0384028d8bc..67d10e7c425d 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-alpha.24", + "version": "4.0.0-alpha.25", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From fff45784afa1fe5de91747ab33a5969dc80fedd3 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Thu, 20 Jun 2024 21:51:17 +0800 Subject: [PATCH 05/81] feat: update from ets runtime --- .../components-harmony-ets/input.ets | 1 + .../src/runtime-ets/dom/element/element.ts | 13 ++++++++-- .../runtime-framework/react/native-page.ts | 24 ++++++++++++++++++- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/input.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/input.ets index 86fba9512a3e..5e50ec6ad104 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/input.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/input.ets @@ -116,6 +116,7 @@ export default struct TaroInput { eventHandler(event, 'focus', this.node) }) + .enableKeyboardOnFocus(typeof (this.node._attrs as TaroAny)?.enableKeyboardOnFocus === 'undefined' ? true : (this.node._attrs as TaroAny).enableKeyboardOnFocus) .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => { if (this.node) { this.node._nodeInfo.areaInfo = res[1] diff --git a/packages/taro-platform-harmony/src/runtime-ets/dom/element/element.ts b/packages/taro-platform-harmony/src/runtime-ets/dom/element/element.ts index 258fb2b70299..8fe7cd9615fa 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/dom/element/element.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/dom/element/element.ts @@ -1,3 +1,5 @@ +// @ts-ignore +import { getPageById } from '@tarojs/plugin-framework-react/dist/runtime' import { eventCenter, eventSource } from '@tarojs/runtime/dist/runtime.esm' import { EMPTY_OBJ, toCamelCase } from '@tarojs/shared' @@ -316,6 +318,13 @@ export class TaroElement< // 3、removeChild的时候，会判断是否需要移除层级 public setLayer (value: number) { if (!this.parentNode) return // 没有父节点，不需要设置层级关系 + + + const currentPage = getPageById(this.getAttribute('__fixed')) + if (currentPage) { + this._page = currentPage + } + this._nodeInfo.layer = value const currentLayerNode = this.currentLayerNode @@ -391,7 +400,7 @@ export class TaroElement< } // 首次设置，不用实例替换 - if (!this._nodeInfo.hasAnimation) { + if (!this._nodeInfo.hasAnimation && playing) { this._nodeInfo.hasAnimation = true // 下一帧播放，等节点样式首次设置上去在进行覆盖 setTimeout(() => { @@ -416,7 +425,7 @@ export class TaroElement< if (playing) { this.playAnimation() } - }, 0) + }, playing ? 0 : 100) } } diff --git a/packages/taro-platform-harmony/src/runtime-framework/react/native-page.ts b/packages/taro-platform-harmony/src/runtime-framework/react/native-page.ts index f7e099469baf..0ab1f2e1b30b 100644 --- a/packages/taro-platform-harmony/src/runtime-framework/react/native-page.ts +++ b/packages/taro-platform-harmony/src/runtime-framework/react/native-page.ts @@ -66,7 +66,7 @@ function initNativeComponentEntry (params: InitNativeComponentEntryParams) { render () { return h( - 'view', + 'taro-page', { ref: this.root, id: this.props.compId, @@ -175,6 +175,22 @@ function initNativeComponentEntry (params: InitNativeComponentEntryParams) { } // eslint-disable-next-line react/no-deprecated ReactDOM.render(h(Entry, {}), app) + // const root = ReactDOM.createRoot(app) + // root.render?.(h(Entry)) +} + + +const pages = new Map() +export function setPageById (inst: any, id: string) { + pages.set(id, inst) +} + +export function getPageById (id: string): any { + return pages.get(id) +} + +export function removePageById (id: string) { + pages.delete(id) } export function createNativePageConfig ( @@ -223,6 +239,8 @@ export function createNativePageConfig ( const uniqueOptions = Object.assign({}, options, { $taroTimestamp: Date.now() }) const $taroPath = (this.$taroPath = getPath(id, uniqueOptions)) + setPageById(this, $taroPath) + // this.$taroParams 作为暴露给开发者的页面参数对象，可以被随意修改 if (this.$taroParams == null) { this.$taroParams = uniqueOptions @@ -268,6 +286,10 @@ export function createNativePageConfig ( window.trigger(CONTEXT_ACTIONS.DESTORY, $taroPath) // 触发onUnload生命周期 safeExecute($taroPath, ONUNLOAD) + + + removePageById($taroPath) + resetCurrent.call(this) unmounting = true Current.app!.unmount!($taroPath, () => { From 164697d16d58fec0599f3068d7275d4c8b73e79f Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Thu, 20 Jun 2024 21:51:38 +0800 Subject: [PATCH 06/81] chore(release): publish 4.0.0-alpha.26 --tag=alpha --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index 1fb24cdd9f27..0160cad9c09e 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 6b335315b26b..b6cad9146d91 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 14983c1aa636..e0839a98f1d2 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index 791703b8dbf6..52a9d0b48075 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index 0f0f4fb009ed..d8aa9df9a37b 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 867c5db32b97..64a3d61029a8 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "os": [ "win32" ], diff --git a/package.json b/package.json index 88cd36ece555..bafbffd49be4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 7fb9bbb0c57c..5a311aeb5895 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 eadcb7d16395..3f8993d81e77 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index 3935c17a699f..ffeef2140ae7 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 1765e6ee0d96..8e8ce3b7caa1 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 31a26a8db025..782e299cafb4 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 5dc22f0ff345..dac2d0175340 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 c5e605aa1a9c..ef628230567b 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index bb2ea6afdbb3..ecc983705c8b 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 708f26ada93d..7e97d4c4ad69 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 8bb241c5f116..0acb660be667 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 b73a74dd68e3..8cb2db63cbdc 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 f29842843874..f5103e7b490e 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 881a6430f8f2..64b328d1781d 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index a7c4c8add565..03f5efe1c968 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 51b279ca5fe0..1965aa4e8a9c 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 cd65c0aabff1..ad7f21d5a7b3 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 e01757beb51e..fe6a8a7347af 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index 811df1a685df..c3f69306c1e8 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 a91e89ebfb29..b9d82eacd175 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 b7ea4c0e44f0..5ac1489f3e16 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 11ee28834195..9d3d53b29c28 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index c7600051d0c9..ceb4f657fc36 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index 55b958a9fe12..ba1bd5f89147 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 958fc97d99b1..66a95e1310ce 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 7f1a40fc93ad..63d409f4f773 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 3129b9d6a81c..de901fa6ffca 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 48f9f78e6239..96c3c3c01711 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 91c551d691ea..b34d45b16fbd 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 4b0d19dfd849..30289e696dcf 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "React/Preact/Nerv 框架插件", "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 27bf004f939d..0b57c2e53589 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 a3af7462b805..e023c24900fb 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 86d7eb29d5cd..427a73c1dceb 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 1eac09feb409..6b02e3f7268a 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index c66263f17314..a082a743cc8b 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 fade369ee741..012bd74a2cf9 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index ef9f375ff1f8..ee976548bb39 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index dde695a04785..b286e4547970 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index ac1953d67827..7e717053c2aa 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 377aff0b0610..343c7e521508 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 54ae8589f69f..44e2efa29c1e 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index b5aed1e3d35a..7a34e8e97517 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index 6481325a5e33..e7303cb8b3ae 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index 1d704cb72bed..ec1491f05474 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index c3a4d99a9902..8919579bc7bf 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 48d4fb8a4b56..52ea753d8e6d 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index 834926cb65d7..65189f197790 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 66d51322b72c..0fdaefc751a0 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index f1106c2caa2b..427d3fd02dbc 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 33a8b8680afe..3f0ce4a28428 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index fef200912edf..78c6a0d1c14c 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 140ce48882bc..f6e012cac47d 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 82c76fcb678b..e3b4635e810e 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index 986739dcaa53..6f0e2b8accda 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 70ccd67cceeb..2db2fa45c23c 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index 21d8dd0fe055..953561269dd5 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 32d32525dfc0..6ba96951e67d 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index b38c54f6d47e..f79cfe518f74 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index b93ec82b581e..45f57eb17699 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 9bec2a4a25ca..a8062823fd96 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index f56edeb653d8..ab75854d3269 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 ff05361c19c6..d895ba7c338b 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index 5c26874962ff..1a01dc3afaff 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 ac42a7b9e479..fc875d67ba87 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 9e76a7f6f5a6..04324be8dd5b 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 77d3f25495b3..f9c36dead726 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "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 deea3fb5cd0d..e3a4efbf97b0 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.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index d90f2c0e3ef6..b8e7d55d545f 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index 67d10e7c425d..5f7a791bae59 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-alpha.25", + "version": "4.0.0-alpha.26", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From a2d86e356874189f4513228e9f5cbb02dc0d0d48 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Sat, 22 Jun 2024 17:44:28 +0800 Subject: [PATCH 07/81] feat(harmony): add terser plugin --- packages/taro-vite-runner/package.json | 26 ++++---- .../taro-vite-runner/src/harmony/config.ts | 61 +++++++++++-------- pnpm-lock.yaml | 57 ++++++++++++++++- 3 files changed, 103 insertions(+), 41 deletions(-) diff --git a/packages/taro-vite-runner/package.json b/packages/taro-vite-runner/package.json index fc875d67ba87..44f4f1a8287c 100644 --- a/packages/taro-vite-runner/package.json +++ b/packages/taro-vite-runner/package.json @@ -14,38 +14,40 @@ "mv:comp": "node ./mv-comp.js" }, "dependencies": { - "@tarojs/helper": "workspace:*", - "@tarojs/runtime": "workspace:*", - "@tarojs/runner-utils": "workspace:*", - "@tarojs/shared": "workspace:*", - "@tarojs/parse-css-to-stylesheet": "^0.0.69", + "@ampproject/remapping": "^2.3.0", "@babel/core": "^7.24.4", "@rollup/plugin-babel": "^6.0.4", "@rollup/plugin-inject": "^5.0.5", + "@rollup/plugin-terser": "^0.4.4", "@rollup/pluginutils": "^5.1.0", + "@tarojs/helper": "workspace:*", + "@tarojs/parse-css-to-stylesheet": "^0.0.69", + "@tarojs/runner-utils": "workspace:*", + "@tarojs/runtime": "workspace:*", + "@tarojs/shared": "workspace:*", "@vitejs/plugin-legacy": "^4.1.1", + "acorn-walk": "^8.3.2", + "autoprefixer": "^10.4.19", + "babel-plugin-transform-taroapi": "workspace:*", "connect-history-api-fallback": "^2.0.0", "fast-glob": "^3.3.2", + "html-minifier": "^4.0.0", "json5": "^2.2.3", "lodash": "^4.17.21", "magic-string": "^0.30.10", "mrmime": "^2.0.0", "picomatch": "^4.0.2", - "stylelint": "^16.4.0", - "postcss-load-config": "^5.0.3", - "@ampproject/remapping": "^2.3.0", - "acorn-walk": "^8.3.2", - "autoprefixer": "^10.4.19", - "babel-plugin-transform-taroapi": "workspace:*", - "html-minifier": "^4.0.0", "postcss-css-variables": "^0.19.0", "postcss-html-transform": "workspace:*", "postcss-import": "^16.1.0", + "postcss-load-config": "^5.0.3", "postcss-modules": "^6.0.0", "postcss-plugin-constparse": "workspace:*", "postcss-pxtransform": "workspace:*", "regenerator-runtime": "0.11", + "rollup-plugin-terser": "^7.0.2", "sax": "1.2.4", + "stylelint": "^16.4.0", "vite-plugin-static-copy": "^0.17.1" }, "devDependencies": { diff --git a/packages/taro-vite-runner/src/harmony/config.ts b/packages/taro-vite-runner/src/harmony/config.ts index ade1aa49c16f..9006ab8de090 100644 --- a/packages/taro-vite-runner/src/harmony/config.ts +++ b/packages/taro-vite-runner/src/harmony/config.ts @@ -2,6 +2,7 @@ import path from 'node:path' import { babel } from '@rollup/plugin-babel' import inject from '@rollup/plugin-inject' +import terser from '@rollup/plugin-terser' import { defaultMainFields, fs, PLATFORMS, recursiveMerge, REG_NODE_MODULES_DIR, resolveMainFilePath } from '@tarojs/helper' import { getSassLoaderOption } from '@tarojs/runner-utils' import { isArray, PLATFORM_TYPE } from '@tarojs/shared' @@ -241,6 +242,37 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi // Note: 修复虚拟模块的依赖和引用，使其能够正确的输出 output.sanitizeFileName = (filename) => filename.replace(/^_virtual[\\/]/, '').replace(/[\0?*]/g, '_') } + const rollupPlugins: InputPluginOption[] = [ + inject(getInjectOption()), + babel(getBabelOption( + taroConfig, + { + babelOption: { + extensions: ['.js', '.jsx', '.ts', '.tsx', '.mjs', '.mts', '.es6', '.es', '.ets'], + }, + } + )), + increment({ + force: (id) => /app\.config/.test(id), + comparisonId: (id = '', files) => { + const nodeModulesDirRegx = new RegExp(REG_NODE_MODULES_DIR) + if (nodeModulesDirRegx.test(id)) return false + + const rawId = stripVirtualModulePrefix(id).replace(PAGE_SUFFIX, '') + const etx = path.extname(rawId) + id = etx ? rawId.replace(new RegExp(`${etx}$`), '') : rawId + + const list = Array.from(files) + const rgx = new RegExp(`^${id}\\.config`) + return list.some(file => rgx.test(file)) + }, + }), + ] + + // Note: Vite 官方插件禁用了 es 输出模式下的 terser 插件，这里需要手动添加 + if (!taroConfig.isWatch && getMinify(taroConfig) === 'terser') { + rollupPlugins.push(terser(recursiveMerge({}, DEFAULT_TERSER_OPTIONS, taroConfig.terser?.config || {}))) + } return { mode: getMode(taroConfig), @@ -257,36 +289,11 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi // TODO doc needed: sourcemapType not supported sourcemap: taroConfig.enableSourceMap ?? taroConfig.isWatch ?? process.env.NODE_ENV !== 'production', rollupOptions: { - treeshake: !!taroConfig.isWatch, + treeshake: !taroConfig.isWatch, external: HARMONY_SCOPES, makeAbsoluteExternalsRelative: 'ifRelativeSource', output: output as any, - plugins: [ - inject(getInjectOption()) as InputPluginOption, - babel(getBabelOption( - taroConfig, - { - babelOption: { - extensions: ['.js', '.jsx', '.ts', '.tsx', '.mjs', '.mts', '.es6', '.es', '.ets'], - }, - } - )) as InputPluginOption, - increment({ - force: (id) => /app\.config/.test(id), - comparisonId: (id = '', files) => { - const nodeModulesDirRegx = new RegExp(REG_NODE_MODULES_DIR) - if (nodeModulesDirRegx.test(id)) return false - - const rawId = stripVirtualModulePrefix(id).replace(PAGE_SUFFIX, '') - const etx = path.extname(rawId) - id = etx ? rawId.replace(new RegExp(`${etx}$`), '') : rawId - - const list = Array.from(files) - const rgx = new RegExp(`^${id}\\.config`) - return list.some(file => rgx.test(file)) - }, - }), - ], + plugins: rollupPlugins, }, commonjsOptions: { // TODO: 优化过滤 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8450dd1ea92c..230ded5981a1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2398,6 +2398,9 @@ importers: '@rollup/plugin-inject': specifier: ^5.0.5 version: 5.0.5(rollup@3.29.4) + '@rollup/plugin-terser': + specifier: ^0.4.4 + version: 0.4.4(rollup@3.29.4) '@rollup/pluginutils': specifier: ^5.1.0 version: 5.1.0(rollup@3.29.4) @@ -2476,6 +2479,9 @@ importers: regenerator-runtime: specifier: '0.11' version: 0.11.1 + rollup-plugin-terser: + specifier: ^7.0.2 + version: 7.0.2(rollup@3.29.4) sax: specifier: 1.2.4 version: 1.2.4 @@ -7864,6 +7870,21 @@ packages: rollup: 4.18.0 dev: false + /@rollup/plugin-terser@0.4.4(rollup@3.29.4): + resolution: {integrity: sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==, tarball: https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^2.0.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + rollup: 3.29.4 + serialize-javascript: 6.0.2 + smob: 1.5.0 + terser: 5.31.0 + dev: false + /@rollup/plugin-typescript@11.1.6(rollup@3.29.4)(tslib@2.6.2)(typescript@5.4.5): resolution: {integrity: sha512-R92yOmIACgYdJ7dJ97p4K69I8gg6IEHt8M7dUBxN3W6nrO8uUxX5ixl0yU/N3aZTi8WhPuICvOHXQvF6FaykAA==, tarball: https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-11.1.6.tgz} engines: {node: '>=14.0.0'} @@ -10681,7 +10702,7 @@ packages: make-dir: 2.1.0 pify: 4.0.1 schema-utils: 2.7.1 - webpack: 5.91.0 + webpack: 5.91.0(esbuild@0.21.4) /babel-plugin-const-enum@1.2.0(@babel/core@7.24.4): resolution: {integrity: sha512-o1m/6iyyFnp9MRsK1dHF3bneqyf3AlM2q3A/YbgQr2pCat6B6XJVDv2TXqzfY2RYUi4mak6WAksSBPlyYGx9dg==, tarball: https://registry.npmjs.org/babel-plugin-const-enum/-/babel-plugin-const-enum-1.2.0.tgz} @@ -12273,7 +12294,7 @@ packages: normalize-path: 3.0.0 schema-utils: 4.2.0 serialize-javascript: 6.0.2 - webpack: 5.91.0 + webpack: 5.91.0(esbuild@0.21.4) /core-js-compat@3.37.1: resolution: {integrity: sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==, tarball: https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.1.tgz} @@ -18305,6 +18326,15 @@ packages: jest-util: 29.7.0 string-length: 4.0.2 + /jest-worker@26.6.2: + resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==, tarball: https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz} + engines: {node: '>= 10.13.0'} + dependencies: + '@types/node': 18.19.33 + merge-stream: 2.0.0 + supports-color: 7.2.0 + dev: false + /jest-worker@27.5.1: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==, tarball: https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz} engines: {node: '>= 10.13.0'} @@ -23514,6 +23544,19 @@ packages: - ts-node dev: true + /rollup-plugin-terser@7.0.2(rollup@3.29.4): + resolution: {integrity: sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==, tarball: https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz} + deprecated: This package has been deprecated and is no longer maintained. Please use @rollup/plugin-terser + peerDependencies: + rollup: ^2.0.0 + dependencies: + '@babel/code-frame': 7.24.6 + jest-worker: 26.6.2 + rollup: 3.29.4 + serialize-javascript: 4.0.0 + terser: 5.31.0 + dev: false + /rollup-plugin-ts@3.4.5(@babel/core@7.24.4)(@babel/preset-env@7.24.6)(@babel/runtime@7.24.6)(rollup@3.29.4)(typescript@5.4.5): resolution: {integrity: sha512-9iCstRJpEZXSRQuXitlSZAzcGlrqTbJg1pE4CMbEi6xYldxVncdPyzA2I+j6vnh73wBymZckerS+Q/iEE/M3Ow==, tarball: https://registry.npmjs.org/rollup-plugin-ts/-/rollup-plugin-ts-3.4.5.tgz} engines: {node: '>=16.15.1', npm: '>=7.0.0', pnpm: '>=3.2.0', yarn: '>=1.13'} @@ -23930,6 +23973,12 @@ packages: dependencies: type-fest: 0.13.1 + /serialize-javascript@4.0.0: + resolution: {integrity: sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==, tarball: https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz} + dependencies: + randombytes: 2.1.0 + dev: false + /serialize-javascript@6.0.2: resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==, tarball: https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz} dependencies: @@ -24141,6 +24190,10 @@ packages: resolution: {integrity: sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw==, tarball: https://registry.npmjs.org/slugify/-/slugify-1.6.6.tgz} engines: {node: '>=8.0.0'} + /smob@1.5.0: + resolution: {integrity: sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==, tarball: https://registry.npmjs.org/smob/-/smob-1.5.0.tgz} + dev: false + /snake-case@3.0.4: resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==, tarball: https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz} dependencies: From 42256c6919befb369253c73f6a7f0b3f34762b27 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Sat, 22 Jun 2024 17:44:59 +0800 Subject: [PATCH 08/81] chore(release): publish 4.0.0-alpha.27 --tag=alpha --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index 0160cad9c09e..3dad90b88617 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 b6cad9146d91..56e37f2ae7a2 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index e0839a98f1d2..ac444dd38ca0 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index 52a9d0b48075..e6ac3991f1d4 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index d8aa9df9a37b..f8cb559360ae 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 64a3d61029a8..8db479a4c1a9 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "os": [ "win32" ], diff --git a/package.json b/package.json index bafbffd49be4..476c2bdb6689 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 5a311aeb5895..efb5ffa09955 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 3f8993d81e77..f2b5852b0621 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index ffeef2140ae7..92ab1fb6ffef 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 8e8ce3b7caa1..ed3ebd9ae5ae 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 782e299cafb4..4a1d44329763 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 dac2d0175340..44d8374d5cf2 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 ef628230567b..c69e0d413585 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index ecc983705c8b..4bf83acca9a4 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 7e97d4c4ad69..749c5f190c5c 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 0acb660be667..3684744f3347 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 8cb2db63cbdc..42efa018dc1a 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 f5103e7b490e..7a3cf9c5c382 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 64b328d1781d..ca44d8f38c81 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index 03f5efe1c968..a851dec91b46 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 1965aa4e8a9c..19ad464b6076 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 ad7f21d5a7b3..5ea7d0d92b46 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 fe6a8a7347af..4ad17cb1f02c 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index c3f69306c1e8..441cadeb127d 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 b9d82eacd175..e24733399495 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 5ac1489f3e16..584e1928f877 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 9d3d53b29c28..3b2a368d0eac 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index ceb4f657fc36..711909198f81 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index ba1bd5f89147..5ceaffc9982c 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 66a95e1310ce..1192a3d5760b 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 63d409f4f773..47cde23cfa7d 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 de901fa6ffca..80646474823a 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 96c3c3c01711..baa7ce8990a8 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 b34d45b16fbd..9410453247e8 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 30289e696dcf..c676fc9e9b5c 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "React/Preact/Nerv 框架插件", "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 0b57c2e53589..f1ec9f203f1d 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 e023c24900fb..02f2dc757290 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 427a73c1dceb..5c07cb31421f 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 6b02e3f7268a..5cdd32a9693f 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index a082a743cc8b..41aeb4cd65c2 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 012bd74a2cf9..108f1feddc74 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index ee976548bb39..323ba8a18c51 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index b286e4547970..26d241201ca6 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index 7e717053c2aa..9d123eb1b6db 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 343c7e521508..229f1a7cf527 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 44e2efa29c1e..fb13f859236c 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index 7a34e8e97517..b7b084782906 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index e7303cb8b3ae..9b51313a01c3 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index ec1491f05474..fdb819e81be0 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index 8919579bc7bf..ff6a2210cc36 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 52ea753d8e6d..3cfb2ca8873f 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index 65189f197790..078125700149 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 0fdaefc751a0..5d616d1d2fe2 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 427d3fd02dbc..0a5eebc33392 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 3f0ce4a28428..e442f5657b5d 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index 78c6a0d1c14c..be2e29c35509 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 f6e012cac47d..8e6743588316 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 e3b4635e810e..ab01bbd7b49b 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index 6f0e2b8accda..052b137a2373 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 2db2fa45c23c..83f8409345e9 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index 953561269dd5..1dc0539db937 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 6ba96951e67d..8880315d9a5d 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index f79cfe518f74..2cfd2699cca3 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index 45f57eb17699..331c02e14cc5 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 a8062823fd96..9191e1d9f89b 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index ab75854d3269..517bfbae66a5 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 d895ba7c338b..a2c085ea0d6e 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index 1a01dc3afaff..cd064836cd17 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 44f4f1a8287c..155288f74e7b 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 04324be8dd5b..037f5aeabbc2 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 f9c36dead726..7240174fb63c 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "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 e3a4efbf97b0..7a3ca97fdf28 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.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index b8e7d55d545f..d5b7bb35c496 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index 5f7a791bae59..fdc0b990a02c 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-alpha.26", + "version": "4.0.0-alpha.27", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From acd17338310918e6068472ac31558b2b98d7cd3c Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Tue, 25 Jun 2024 17:43:31 +0800 Subject: [PATCH 09/81] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E5=BA=9F?= =?UTF-8?q?=E5=BC=83=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-vite-runner/package.json | 1 - pnpm-lock.yaml | 31 -------------------------- 2 files changed, 32 deletions(-) diff --git a/packages/taro-vite-runner/package.json b/packages/taro-vite-runner/package.json index 155288f74e7b..75b389de8848 100644 --- a/packages/taro-vite-runner/package.json +++ b/packages/taro-vite-runner/package.json @@ -45,7 +45,6 @@ "postcss-plugin-constparse": "workspace:*", "postcss-pxtransform": "workspace:*", "regenerator-runtime": "0.11", - "rollup-plugin-terser": "^7.0.2", "sax": "1.2.4", "stylelint": "^16.4.0", "vite-plugin-static-copy": "^0.17.1" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 230ded5981a1..46752efffb9f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2479,9 +2479,6 @@ importers: regenerator-runtime: specifier: '0.11' version: 0.11.1 - rollup-plugin-terser: - specifier: ^7.0.2 - version: 7.0.2(rollup@3.29.4) sax: specifier: 1.2.4 version: 1.2.4 @@ -18326,15 +18323,6 @@ packages: jest-util: 29.7.0 string-length: 4.0.2 - /jest-worker@26.6.2: - resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==, tarball: https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz} - engines: {node: '>= 10.13.0'} - dependencies: - '@types/node': 18.19.33 - merge-stream: 2.0.0 - supports-color: 7.2.0 - dev: false - /jest-worker@27.5.1: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==, tarball: https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz} engines: {node: '>= 10.13.0'} @@ -23544,19 +23532,6 @@ packages: - ts-node dev: true - /rollup-plugin-terser@7.0.2(rollup@3.29.4): - resolution: {integrity: sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==, tarball: https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz} - deprecated: This package has been deprecated and is no longer maintained. Please use @rollup/plugin-terser - peerDependencies: - rollup: ^2.0.0 - dependencies: - '@babel/code-frame': 7.24.6 - jest-worker: 26.6.2 - rollup: 3.29.4 - serialize-javascript: 4.0.0 - terser: 5.31.0 - dev: false - /rollup-plugin-ts@3.4.5(@babel/core@7.24.4)(@babel/preset-env@7.24.6)(@babel/runtime@7.24.6)(rollup@3.29.4)(typescript@5.4.5): resolution: {integrity: sha512-9iCstRJpEZXSRQuXitlSZAzcGlrqTbJg1pE4CMbEi6xYldxVncdPyzA2I+j6vnh73wBymZckerS+Q/iEE/M3Ow==, tarball: https://registry.npmjs.org/rollup-plugin-ts/-/rollup-plugin-ts-3.4.5.tgz} engines: {node: '>=16.15.1', npm: '>=7.0.0', pnpm: '>=3.2.0', yarn: '>=1.13'} @@ -23973,12 +23948,6 @@ packages: dependencies: type-fest: 0.13.1 - /serialize-javascript@4.0.0: - resolution: {integrity: sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==, tarball: https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz} - dependencies: - randombytes: 2.1.0 - dev: false - /serialize-javascript@6.0.2: resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==, tarball: https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz} dependencies: From ed47f42e35ba7deb4add410611562f5b9c0a0821 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Thu, 4 Jul 2024 16:55:53 +0800 Subject: [PATCH 10/81] =?UTF-8?q?feat(ets):=20=E8=B0=83=E6=95=B4=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E6=97=B6=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/apis/base/weapp/life-cycle.ts | 2 +- .../src/apis/framework/index.ts | 2 +- .../src/apis/route/index.ts | 3 +- .../src/apis/ui/background.ts | 2 +- .../src/apis/ui/navigation-bar/index.ts | 2 +- .../src/apis/ui/tab-bar.ts | 3 +- .../src/apis/utils/index.ts | 2 +- .../components-harmony-ets/button.ets | 2 +- .../components-harmony-ets/checkbox.ets | 2 +- .../components-harmony-ets/navigationBar.ets | 2 +- .../components-harmony-ets/pageMeta.ets | 2 +- .../components-harmony-ets/scrollList.ets | 4 +- .../components-harmony-ets/scrollView.ets | 2 +- .../components-harmony-ets/slider.ets | 2 +- .../components-harmony-ets/swiper.ets | 2 +- .../components-harmony-ets/utils/helper.ets | 2 +- .../src/runtime-ets/bom/URL.ts | 2 + .../src/runtime-ets/bom/document.ts | 3 +- .../src/runtime-ets/bom/getComputedStyle.ts | 5 +- .../src/runtime-ets/bom/history.ts | 1 + .../src/runtime-ets/bom/location.ts | 1 + .../src/runtime-ets/bom/navigator.ts | 22 +------- .../src/runtime-ets/bom/raf.ts | 38 +------------- .../src/runtime-ets/bom/window.ts | 9 ++-- .../src/runtime-ets/constant.ts | 11 +--- .../src/runtime-ets/current.ts | 3 +- .../src/runtime-ets/dom/document.ts | 2 +- .../src/runtime-ets/dom/element/canvas.ts | 5 +- .../src/runtime-ets/dom/element/element.ts | 11 ++-- .../src/runtime-ets/dom/event-source.ts | 1 + .../src/runtime-ets/dom/eventTarget.ts | 2 +- .../src/runtime-ets/dom/node.ts | 9 ++-- .../src/runtime-ets/emitter/emitter.ts | 1 + .../src/runtime-ets/env.ts | 1 + .../src/runtime-ets/index.ts | 18 +++++-- .../src/runtime-ets/interface/index.ts | 5 ++ .../src/runtime-ets/utils/index.ts | 7 ++- .../src/runtime-ets/utils/router.ts | 1 + .../src/runtime-framework/react/app.ts | 3 +- .../src/runtime-framework/react/hooks.ts | 2 +- .../runtime-framework/react/native-page.ts | 3 +- .../src/runtime-framework/react/page.ts | 3 +- .../src/runtime-framework/solid/app.ts | 3 +- .../src/runtime-framework/solid/hooks.ts | 2 +- .../src/runtime-framework/solid/page.ts | 3 +- .../src/harmony/template/app.ts | 2 +- .../src/harmony/template/page.ts | 50 ++++++++++--------- 47 files changed, 110 insertions(+), 155 deletions(-) create mode 100644 packages/taro-platform-harmony/src/runtime-ets/bom/URL.ts create mode 100644 packages/taro-platform-harmony/src/runtime-ets/bom/history.ts create mode 100644 packages/taro-platform-harmony/src/runtime-ets/bom/location.ts create mode 100644 packages/taro-platform-harmony/src/runtime-ets/dom/event-source.ts create mode 100644 packages/taro-platform-harmony/src/runtime-ets/emitter/emitter.ts create mode 100644 packages/taro-platform-harmony/src/runtime-ets/env.ts create mode 100644 packages/taro-platform-harmony/src/runtime-ets/utils/router.ts diff --git a/packages/taro-platform-harmony/src/apis/base/weapp/life-cycle.ts b/packages/taro-platform-harmony/src/apis/base/weapp/life-cycle.ts index a6fa9a69320a..ecb70a147690 100644 --- a/packages/taro-platform-harmony/src/apis/base/weapp/life-cycle.ts +++ b/packages/taro-platform-harmony/src/apis/base/weapp/life-cycle.ts @@ -1,4 +1,4 @@ -import { eventCenter } from '@tarojs/runtime/dist/runtime.esm' +import { eventCenter } from '@tarojs/runtime' import type Taro from '@tarojs/taro/types' diff --git a/packages/taro-platform-harmony/src/apis/framework/index.ts b/packages/taro-platform-harmony/src/apis/framework/index.ts index fc00af470a24..c364c12af3e5 100644 --- a/packages/taro-platform-harmony/src/apis/framework/index.ts +++ b/packages/taro-platform-harmony/src/apis/framework/index.ts @@ -24,4 +24,4 @@ export { Current, getCurrentInstance } from '@tarojs/runtime' export const requirePlugin = temporarilyNotSupport('requirePlugin') -export { eventCenter, Events, History } from '@tarojs/runtime/dist/runtime.esm' +export { eventCenter, Events, History } from '@tarojs/runtime' diff --git a/packages/taro-platform-harmony/src/apis/route/index.ts b/packages/taro-platform-harmony/src/apis/route/index.ts index 65eb2e1dc64c..ce85220b655d 100644 --- a/packages/taro-platform-harmony/src/apis/route/index.ts +++ b/packages/taro-platform-harmony/src/apis/route/index.ts @@ -1,6 +1,5 @@ import router from '@ohos.router' -import { window } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates -import { eventCenter } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates +import { eventCenter, window } from '@tarojs/runtime' import { queryToJson } from '@tarojs/shared' import { callAsyncFail, callAsyncSuccess } from '../utils' diff --git a/packages/taro-platform-harmony/src/apis/ui/background.ts b/packages/taro-platform-harmony/src/apis/ui/background.ts index 8ee18b847fca..c5c76321e34d 100644 --- a/packages/taro-platform-harmony/src/apis/ui/background.ts +++ b/packages/taro-platform-harmony/src/apis/ui/background.ts @@ -1,4 +1,4 @@ -import { eventCenter } from '@tarojs/runtime/dist/runtime.esm' +import { eventCenter } from '@tarojs/runtime' import { temporarilyNotSupport } from '../utils' import { MethodHandler } from '../utils/handler' diff --git a/packages/taro-platform-harmony/src/apis/ui/navigation-bar/index.ts b/packages/taro-platform-harmony/src/apis/ui/navigation-bar/index.ts index e5f0af7af0be..91c21622dd1d 100644 --- a/packages/taro-platform-harmony/src/apis/ui/navigation-bar/index.ts +++ b/packages/taro-platform-harmony/src/apis/ui/navigation-bar/index.ts @@ -1,4 +1,4 @@ -import { eventCenter } from '@tarojs/runtime/dist/runtime.esm' +import { eventCenter } from '@tarojs/runtime' import { MethodHandler } from '../../utils/handler' diff --git a/packages/taro-platform-harmony/src/apis/ui/tab-bar.ts b/packages/taro-platform-harmony/src/apis/ui/tab-bar.ts index e1187c490a6e..2cd467b81ad1 100644 --- a/packages/taro-platform-harmony/src/apis/ui/tab-bar.ts +++ b/packages/taro-platform-harmony/src/apis/ui/tab-bar.ts @@ -1,5 +1,4 @@ -import { Current } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates -import { eventCenter } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates +import { Current, eventCenter } from '@tarojs/runtime' import { callAsyncFail, callAsyncSuccess } from '../utils' diff --git a/packages/taro-platform-harmony/src/apis/utils/index.ts b/packages/taro-platform-harmony/src/apis/utils/index.ts index fe12ed85528d..ddfcf1733720 100644 --- a/packages/taro-platform-harmony/src/apis/utils/index.ts +++ b/packages/taro-platform-harmony/src/apis/utils/index.ts @@ -1,4 +1,4 @@ -import { eventCenter } from '@tarojs/runtime/dist/runtime.esm' +import { eventCenter } from '@tarojs/runtime' import { ICallbackResult, MethodHandler } from './handler' diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/button.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/button.ets index 089e7cb1fc73..d7f91907d223 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/button.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/button.ets @@ -4,7 +4,7 @@ import { BUTTON_THEME_COLOR } from './utils/constant/style' import { TOUCH_EVENT_MAP } from './utils/constant/event' import { shouldBindEvent, getNodeThresholds } from './utils/helper' -import type { TaroAny, TaroEvent, TaroButtonElement, TaroStyleType } from '@tarojs/runtime' +import type { TaroAny, TaroButtonElement, TaroEvent, TaroStyleType } from '@tarojs/runtime' interface ButtonAttrs { disabled?: boolean diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/checkbox.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/checkbox.ets index b2b68fef133b..c455801dae71 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/checkbox.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/checkbox.ets @@ -4,7 +4,7 @@ import commonStyleModify, { rowModify, columnModify } from './style' import { FlexManager } from './utils/flexManager' import { shouldBindEvent, getNodeThresholds } from './utils/helper' -import type { TaroAny, TaroEvent, TaroCheckboxElement, TaroCheckboxGroupElement } from '@tarojs/runtime' +import type { TaroAny, TaroCheckboxElement, TaroCheckboxGroupElement, TaroEvent } from '@tarojs/runtime' import { isUndefined } from '@tarojs/shared' interface CheckboxOptions { diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/navigationBar.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/navigationBar.ets index e9730000b113..d67e33e0cc3b 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/navigationBar.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/navigationBar.ets @@ -1,4 +1,4 @@ -import { eventCenter } from '@tarojs/runtime/dist/runtime.esm' +import { eventCenter } from '@tarojs/runtime' import { isTagFirstChild } from './utils/helper' diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/pageMeta.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/pageMeta.ets index 5fc56f4aff87..ef80a19ca5dc 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/pageMeta.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/pageMeta.ets @@ -1,4 +1,4 @@ -import { APP, eventCenter } from '@tarojs/runtime/dist/runtime.esm' +import { APP, eventCenter } from '@tarojs/runtime' import { getCurrentInstance, pageScrollTo } from '@tarojs/taro' import { isTagFirstChild } from './utils/helper' diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/scrollList.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/scrollList.ets index 4b55e1ceb23c..13252b83dc2a 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/scrollList.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/scrollList.ets @@ -4,7 +4,7 @@ import commonStyleModify from './style' import { TOUCH_EVENT_MAP } from './utils/constant/event' import { getNodeThresholds, shouldBindEvent } from './utils/helper' -import type { TaroScrollViewElement, TaroAny, TaroEvent } from '@tarojs/runtime' +import type { TaroAny, TaroEvent, TaroScrollViewElement } from '@tarojs/runtime' interface ScrollViewAttrs { scrollBar: BarState @@ -62,7 +62,7 @@ export default struct TaroScrollList { } } - handleScroll = (scrollOffset: number) => { + handleScroll = (scrollOffset: number) => { handleScrollEvent(this.node, 'scroll', scrollOffset) } diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/scrollView.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/scrollView.ets index d063473ad63a..c238327db7b9 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/scrollView.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/scrollView.ets @@ -6,7 +6,7 @@ import { FlexManager } from './utils/flexManager' import { TOUCH_EVENT_MAP } from './utils/constant/event' import { getNodeThresholds, getStyleAttr, shouldBindEvent } from './utils/helper' -import type { TaroAny, TaroScrollViewElement, TaroEvent } from '@tarojs/runtime' +import type { TaroAny, TaroEvent, TaroScrollViewElement } from '@tarojs/runtime' interface ScrollViewAttrs { scrollBar: BarState diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/slider.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/slider.ets index 5986875d4710..3259c49575a2 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/slider.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/slider.ets @@ -3,7 +3,7 @@ import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBL import commonStyleModify from './style' import { getNodeThresholds, shouldBindEvent } from './utils/helper' -import type { TaroAny, TaroSliderElement, TaroEvent } from '@tarojs/runtime' +import type { TaroAny, TaroEvent, TaroSliderElement } from '@tarojs/runtime' interface SliderAttrs { selectedColor?: ResourceColor diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/swiper.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/swiper.ets index 97f178b92ba9..30302ec65d34 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/swiper.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/swiper.ets @@ -3,7 +3,7 @@ import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBL import commonStyleModify from './style' import { getNodeThresholds, shouldBindEvent } from './utils/helper' -import type { TaroSwiperElement, TaroEvent, TaroAny } from '@tarojs/runtime' +import type { TaroAny, TaroEvent, TaroSwiperElement } from '@tarojs/runtime' interface SwiperAttrs { index?: number diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/utils/helper.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/utils/helper.ets index f2b3466fc36c..6d2c4234f5af 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/utils/helper.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/utils/helper.ets @@ -1,4 +1,4 @@ -import { VIEW } from '@tarojs/runtime/dist/runtime.esm' +import { VIEW } from '@tarojs/runtime' import { getNormalAttributes, getFontAttributes, getStyleAttr } from './styles' diff --git a/packages/taro-platform-harmony/src/runtime-ets/bom/URL.ts b/packages/taro-platform-harmony/src/runtime-ets/bom/URL.ts new file mode 100644 index 000000000000..8cb738ca3370 --- /dev/null +++ b/packages/taro-platform-harmony/src/runtime-ets/bom/URL.ts @@ -0,0 +1,2 @@ +export * from '@tarojs/runtime/dist/bom/URL' +export * from '@tarojs/runtime/dist/bom/URLSearchParams' diff --git a/packages/taro-platform-harmony/src/runtime-ets/bom/document.ts b/packages/taro-platform-harmony/src/runtime-ets/bom/document.ts index 5869332f7ee2..45b92886fdd3 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/bom/document.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/bom/document.ts @@ -1,5 +1,4 @@ -import { APP, BODY, HEAD, HTML } from '@tarojs/runtime/dist/runtime.esm' - +import { APP, BODY, HEAD, HTML } from '../constant' import { TaroDocument } from '../dom/document' import { window } from './window' diff --git a/packages/taro-platform-harmony/src/runtime-ets/bom/getComputedStyle.ts b/packages/taro-platform-harmony/src/runtime-ets/bom/getComputedStyle.ts index 5380b3cfd11e..fa87629024a3 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/bom/getComputedStyle.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/bom/getComputedStyle.ts @@ -1,5 +1,6 @@ -// import { TaroElement } from '../dom/element/element' +import type { TGetComputedStyle } from '@tarojs/runtime/dist/bom/getComputedStyle' -export function getComputedStyle (node: any) { +export function getComputedStyle (node: Parameters[0]) { + // @ts-ignore return node._st } diff --git a/packages/taro-platform-harmony/src/runtime-ets/bom/history.ts b/packages/taro-platform-harmony/src/runtime-ets/bom/history.ts new file mode 100644 index 000000000000..3919657a5afc --- /dev/null +++ b/packages/taro-platform-harmony/src/runtime-ets/bom/history.ts @@ -0,0 +1 @@ +export * from '@tarojs/runtime/dist/bom/history' diff --git a/packages/taro-platform-harmony/src/runtime-ets/bom/location.ts b/packages/taro-platform-harmony/src/runtime-ets/bom/location.ts new file mode 100644 index 000000000000..8418eb2ef663 --- /dev/null +++ b/packages/taro-platform-harmony/src/runtime-ets/bom/location.ts @@ -0,0 +1 @@ +export * from '@tarojs/runtime/dist/bom/location' diff --git a/packages/taro-platform-harmony/src/runtime-ets/bom/navigator.ts b/packages/taro-platform-harmony/src/runtime-ets/bom/navigator.ts index ed5c7c40af08..f5a68cc55dba 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/bom/navigator.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/bom/navigator.ts @@ -1,21 +1 @@ -const machine = 'Macintosh' -const arch = 'Intel Mac OS X 10_14_5' -const engine = 'AppleWebKit/534.36 (KHTML, like Gecko) NodeJS/v4.1.0 Chrome/76.0.3809.132 Safari/534.36' - -const msg = '(' + machine + '; ' + arch + ') ' + engine - -export const nav = { - appCodeName: 'Mozilla', - appName: 'Netscape', - appVersion: '5.0 ' + msg, - cookieEnabled: true, - mimeTypes: [], - onLine: true, - platform: 'MacIntel', - plugins: [], - product: 'Taro', - productSub: '20030107', - userAgent: 'Mozilla/5.0 ' + msg, - vendor: 'Joyent', - vendorSub: '' -} +export * from '@tarojs/runtime/dist/bom/navigator' diff --git a/packages/taro-platform-harmony/src/runtime-ets/bom/raf.ts b/packages/taro-platform-harmony/src/runtime-ets/bom/raf.ts index 646a6f8c6572..f6007cf6f838 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/bom/raf.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/bom/raf.ts @@ -1,37 +1 @@ -// https://github.com/myrne/performance-now -export let now: () => number - -(function () { - let loadTime - if ((typeof performance !== 'undefined' && performance !== null) && performance.now) { - now = () => performance.now() - } else if (Date.now) { - loadTime = Date.now() - now = () => Date.now() - loadTime - } else { - loadTime = new Date().getTime() - now = () => new Date().getTime() - loadTime - } -})() - -let lastTime = 0 - -// https://gist.github.com/paulirish/1579671 -// https://gist.github.com/jalbam/5fe05443270fa6d8136238ec72accbc0 -const _raf = typeof requestAnimationFrame !== 'undefined' && requestAnimationFrame !== null ? requestAnimationFrame : function (callback) { - const _now = now() - const nextTime = Math.max(lastTime + 16, _now) // First time will execute it immediately but barely noticeable and performance is gained. - return setTimeout(function () { callback(lastTime = nextTime) }, nextTime - _now) -} - -const _caf = typeof cancelAnimationFrame !== 'undefined' && cancelAnimationFrame !== null - ? cancelAnimationFrame - : function (seed) { - // fix https://github.com/NervJS/taro/issues/7749 - clearTimeout(seed) - } - -export { - _caf as caf, - _raf as raf -} +export * from '@tarojs/runtime/dist/bom/raf' diff --git a/packages/taro-platform-harmony/src/runtime-ets/bom/window.ts b/packages/taro-platform-harmony/src/runtime-ets/bom/window.ts index 651f2cb51f01..fc4a656afc4a 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/bom/window.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/bom/window.ts @@ -1,14 +1,17 @@ import ohosWindow from '@ohos.window' -import { History, Location } from '@tarojs/runtime/dist/runtime.esm' import { getSystemInfoSync } from '@tarojs/taro' import { TaroEventTarget } from '../dom/eventTarget' import { getComputedStyle } from './getComputedStyle' +import { History } from './history' +import { Location } from './location' import { nav } from './navigator' import type { TaroDocument } from '../dom/document' -class Window extends TaroEventTarget { +export type { TaroWindow } from '@tarojs/runtime/dist/bom/window' + +export class Window extends TaroEventTarget { public _doc: TaroDocument public __taroAppConfig: any public __ohos = ohosWindow @@ -44,8 +47,6 @@ class Window extends TaroEventTarget { } } -export { Location, Window } - export const window = new Window() export const location = window.location export const history = window.history diff --git a/packages/taro-platform-harmony/src/runtime-ets/constant.ts b/packages/taro-platform-harmony/src/runtime-ets/constant.ts index d9e056eadbc5..ac61918893e4 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/constant.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/constant.ts @@ -1,15 +1,6 @@ import { isNumber } from '@tarojs/shared' -export const TYPE = 'type' -export const VALUE = 'value' -export const INPUT = 'input' -export const CHANGE = 'change' -export const TARGET = 'target' -export const CONFIRM = 'confirm' -export const KEY_CODE = 'keyCode' -export const TIME_STAMP = 'timeStamp' -export const CURRENT_TARGET = 'currentTarget' -export const ID = 'id' +export * from '@tarojs/runtime/dist/constants' export const ATTRIBUTES_CALLBACK_TRIGGER_MAP = { scrollTop: { diff --git a/packages/taro-platform-harmony/src/runtime-ets/current.ts b/packages/taro-platform-harmony/src/runtime-ets/current.ts index 19f5eca7fe66..17e3f494008f 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/current.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/current.ts @@ -1,9 +1,10 @@ +export type { Router } from '@tarojs/runtime/dist/current' + export const context: any = { resolver: null, value: null } -// @ts-nocheck export const Current: any = { app: null, uiContext: null, diff --git a/packages/taro-platform-harmony/src/runtime-ets/dom/document.ts b/packages/taro-platform-harmony/src/runtime-ets/dom/document.ts index a1fca9f287de..941af6f482a1 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/dom/document.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/dom/document.ts @@ -1,10 +1,10 @@ -import { eventSource } from '@tarojs/runtime/dist/runtime.esm' import { isUndefined } from '@tarojs/shared' import { Current } from '../current' import { findChildNodeWithDFS, getPageScrollerOrNode } from '../utils' import { TaroComment } from './comment' import { TaroElement } from './element/element' +import { eventSource } from './event-source' import { NodeType, TaroNode, TaroTextNode } from './node' import type { Window } from '../bom/window' diff --git a/packages/taro-platform-harmony/src/runtime-ets/dom/element/canvas.ts b/packages/taro-platform-harmony/src/runtime-ets/dom/element/canvas.ts index 4b4193e77a75..0a37b7cb4a26 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/dom/element/canvas.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/dom/element/canvas.ts @@ -1,8 +1,9 @@ -import { eventSource, TaroAny, TaroNode } from '@tarojs/runtime' - +import { eventSource } from '../event-source' +import { TaroNode } from '../node' import { TaroElement } from './element' import type { CanvasProps, CanvasTouchEvent } from '@tarojs/components/types' +import type { TaroAny } from '../../interface' export class CanvasRenderingContext2DWXAdapter extends CanvasRenderingContext2D { // constructor(settings?: RenderingContextSetting) { diff --git a/packages/taro-platform-harmony/src/runtime-ets/dom/element/element.ts b/packages/taro-platform-harmony/src/runtime-ets/dom/element/element.ts index 8fe7cd9615fa..71169f699f49 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/dom/element/element.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/dom/element/element.ts @@ -1,20 +1,22 @@ // @ts-ignore import { getPageById } from '@tarojs/plugin-framework-react/dist/runtime' -import { eventCenter, eventSource } from '@tarojs/runtime/dist/runtime.esm' import { EMPTY_OBJ, toCamelCase } from '@tarojs/shared' import { ATTRIBUTES_CALLBACK_TRIGGER_MAP, ID } from '../../constant' import { Current } from '../../current' +import { eventCenter } from '../../emitter/emitter' import { findChildNodeWithDFS } from '../../utils' import { initComponentNodeInfo, triggerAttributesCallback } from '../../utils/info' import { bindAnimation } from '../bind' import { ClassList } from '../class-list' -import { type ICSSStyleDeclaration, createCSSStyleDeclaration } from '../cssStyleDeclaration' +import { createCSSStyleDeclaration } from '../cssStyleDeclaration' +import { eventSource } from '../event-source' import { NodeType, TaroNode } from '../node' import StyleSheet, { HarmonyStyle, TaroStyleType } from '../stylesheet' import type { BaseTouchEvent, ITouchEvent, StandardProps } from '@tarojs/components/types' -import type { TaroAny } from '../../utils' +import type { TaroAny } from '../../interface' +import type { ICSSStyleDeclaration } from '../cssStyleDeclaration' type NamedNodeMap = { name: string, value: string }[] @@ -72,7 +74,7 @@ export class TaroElement< } public get id(): string { - return this.getAttribute('id') || this._nid + return this.getAttribute('id') || `${this._nid}` } public set className(value: string) { @@ -319,7 +321,6 @@ export class TaroElement< public setLayer (value: number) { if (!this.parentNode) return // 没有父节点，不需要设置层级关系 - const currentPage = getPageById(this.getAttribute('__fixed')) if (currentPage) { this._page = currentPage diff --git a/packages/taro-platform-harmony/src/runtime-ets/dom/event-source.ts b/packages/taro-platform-harmony/src/runtime-ets/dom/event-source.ts new file mode 100644 index 000000000000..90e91d40c7d8 --- /dev/null +++ b/packages/taro-platform-harmony/src/runtime-ets/dom/event-source.ts @@ -0,0 +1 @@ +export * from '@tarojs/runtime/dist/dom/event-source' diff --git a/packages/taro-platform-harmony/src/runtime-ets/dom/eventTarget.ts b/packages/taro-platform-harmony/src/runtime-ets/dom/eventTarget.ts index b6703d9235d2..0da1e547710b 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/dom/eventTarget.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/dom/eventTarget.ts @@ -1,6 +1,6 @@ -import { Events } from '@tarojs/runtime/dist/runtime.esm' import { isArray } from '@tarojs/shared' +import { Events } from '../emitter/emitter' import { TaroEvent } from './event' import type { EventHandler } from '../interface' diff --git a/packages/taro-platform-harmony/src/runtime-ets/dom/node.ts b/packages/taro-platform-harmony/src/runtime-ets/dom/node.ts index d2f2d8bf6bab..6e51c59fd277 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/dom/node.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/dom/node.ts @@ -1,9 +1,8 @@ -import { eventSource } from '@tarojs/runtime/dist/runtime.esm' - import TaroDataSourceElement from './dataSource' +import { eventSource } from './event-source' import type { StandardProps } from '@tarojs/components/types' -import type { TaroAny } from '../utils' +import type { TaroAny } from '../interface' import type { TaroDocument } from './document' import type { TaroElement } from './element/element' @@ -64,11 +63,11 @@ export class TaroNode extends TaroDataSourceElement { } public getStrNid() { - return `n_${this._nid}`; + return `n_${this._nid}` } public getNumNid(id) { - return +id.slice(2); + return +id.slice(2) } public findIndex (refChild?: TaroNode): number { diff --git a/packages/taro-platform-harmony/src/runtime-ets/emitter/emitter.ts b/packages/taro-platform-harmony/src/runtime-ets/emitter/emitter.ts new file mode 100644 index 000000000000..4f999410a6a0 --- /dev/null +++ b/packages/taro-platform-harmony/src/runtime-ets/emitter/emitter.ts @@ -0,0 +1 @@ +export * from '@tarojs/runtime/dist/emitter/emitter' diff --git a/packages/taro-platform-harmony/src/runtime-ets/env.ts b/packages/taro-platform-harmony/src/runtime-ets/env.ts new file mode 100644 index 000000000000..61c62515132f --- /dev/null +++ b/packages/taro-platform-harmony/src/runtime-ets/env.ts @@ -0,0 +1 @@ +export { default as env } from '@tarojs/runtime/dist/env' diff --git a/packages/taro-platform-harmony/src/runtime-ets/index.ts b/packages/taro-platform-harmony/src/runtime-ets/index.ts index 62a137f305e7..665f570b01e8 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/index.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/index.ts @@ -1,18 +1,26 @@ +/* eslint-disable simple-import-sort/exports */ // Current必须放在前面初始化 -// eslint-disable-next-line simple-import-sort/exports export * from './current' +export { hooks } from '@tarojs/shared' +// bom export * from './bom/document' export * from './bom/getComputedStyle' +export * from './bom/history' +export * from './bom/location' export { nav as navigator } from './bom/navigator' export { caf as cancelAnimationFrame, now, raf as requestAnimationFrame } from './bom/raf' +export * from './bom/URL' export * from './bom/window' +// dom export * from './dom/element' export * from './dom/event' export * from './dom/node' export * from './dom/stylesheet' export * from './dom/cssNesting' -export * from './interface' +// others +export * from './env' +export * from './constant' +export * from './emitter/emitter' export * from './utils' -export * from './utils/info' -export { URL, URLSearchParams, eventSource, Events } from '@tarojs/runtime/dist/runtime.esm' -export { hooks } from '@tarojs/shared' +// typings +export * from './interface' diff --git a/packages/taro-platform-harmony/src/runtime-ets/interface/index.ts b/packages/taro-platform-harmony/src/runtime-ets/interface/index.ts index c475080bb89d..a1a6eb20d3f1 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/interface/index.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/interface/index.ts @@ -1 +1,6 @@ export * from './event' + +export type TaroAny = any +export type TaroFunc = (...args: TaroAny[]) => TaroAny +export type TaroIndent = string | number | boolean | undefined | null +export type TaroObject = Record diff --git a/packages/taro-platform-harmony/src/runtime-ets/utils/index.ts b/packages/taro-platform-harmony/src/runtime-ets/utils/index.ts index aa5b2520d8a0..e25d9f38c760 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/utils/index.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/utils/index.ts @@ -200,7 +200,6 @@ export function findChildNodeWithDFS (node: return null } -export type TaroAny = any -export type TaroFunc = (...args: TaroAny[]) => TaroAny -export type TaroIndent = string | number | boolean | undefined | null -export type TaroObject = Record +export * from './info' +export * from './router' +export * from '@tarojs/runtime/dist/utils/cache' diff --git a/packages/taro-platform-harmony/src/runtime-ets/utils/router.ts b/packages/taro-platform-harmony/src/runtime-ets/utils/router.ts new file mode 100644 index 000000000000..da58377c59de --- /dev/null +++ b/packages/taro-platform-harmony/src/runtime-ets/utils/router.ts @@ -0,0 +1 @@ +export * from '@tarojs/runtime/dist/utils/router' diff --git a/packages/taro-platform-harmony/src/runtime-framework/react/app.ts b/packages/taro-platform-harmony/src/runtime-framework/react/app.ts index 55949dde02df..bcc42e1c669f 100644 --- a/packages/taro-platform-harmony/src/runtime-framework/react/app.ts +++ b/packages/taro-platform-harmony/src/runtime-framework/react/app.ts @@ -1,5 +1,4 @@ -import { Current, document } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates -import { eventCenter } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates +import { Current, document, eventCenter } from '@tarojs/runtime' import { setReconciler } from './connect' import { injectPageInstance } from './page' diff --git a/packages/taro-platform-harmony/src/runtime-framework/react/hooks.ts b/packages/taro-platform-harmony/src/runtime-framework/react/hooks.ts index a0dab1346f18..5f41731b2baf 100644 --- a/packages/taro-platform-harmony/src/runtime-framework/react/hooks.ts +++ b/packages/taro-platform-harmony/src/runtime-framework/react/hooks.ts @@ -11,7 +11,7 @@ import type { PageLifeCycle, PageProps, TFunc -} from '@tarojs/runtime/dist/runtime.esm' +} from '@tarojs/runtime' const createTaroHook = (lifecycle: keyof PageLifeCycle | keyof AppInstance) => { return (fn: TFunc) => { diff --git a/packages/taro-platform-harmony/src/runtime-framework/react/native-page.ts b/packages/taro-platform-harmony/src/runtime-framework/react/native-page.ts index 0a2693f381e1..88d3194a037c 100644 --- a/packages/taro-platform-harmony/src/runtime-framework/react/native-page.ts +++ b/packages/taro-platform-harmony/src/runtime-framework/react/native-page.ts @@ -1,5 +1,4 @@ -import { Current, document, requestAnimationFrame, TaroElement, window } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates -import { addLeadingSlash, CONTEXT_ACTIONS, env, eventCenter, TFunc } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates +import { addLeadingSlash, CONTEXT_ACTIONS, Current, document, env, eventCenter, requestAnimationFrame, TaroElement, TFunc, window } from '@tarojs/runtime' import { ensure, hooks, isUndefined } from '@tarojs/shared' import { ReactMeta as reactMeta } from './app' diff --git a/packages/taro-platform-harmony/src/runtime-framework/react/page.ts b/packages/taro-platform-harmony/src/runtime-framework/react/page.ts index fbd747d700bf..c23c3abe1383 100644 --- a/packages/taro-platform-harmony/src/runtime-framework/react/page.ts +++ b/packages/taro-platform-harmony/src/runtime-framework/react/page.ts @@ -1,5 +1,4 @@ -import { Current, document, requestAnimationFrame, window } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates -import { addLeadingSlash, CONTEXT_ACTIONS, env, eventCenter } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates +import { addLeadingSlash, CONTEXT_ACTIONS, Current, document, env, eventCenter, requestAnimationFrame, window } from '@tarojs/runtime' import { hooks, isArray, isFunction, isUndefined } from '@tarojs/shared' import { ON_HIDE, ON_LOAD, ON_READY, ON_SHOW, ON_UNLOAD } from './constant' diff --git a/packages/taro-platform-harmony/src/runtime-framework/solid/app.ts b/packages/taro-platform-harmony/src/runtime-framework/solid/app.ts index c4253f75072b..c954663f1a31 100644 --- a/packages/taro-platform-harmony/src/runtime-framework/solid/app.ts +++ b/packages/taro-platform-harmony/src/runtime-framework/solid/app.ts @@ -1,6 +1,5 @@ import { createComponent, h, render } from '@tarojs/plugin-framework-solid/dist/reconciler' -import { Current, document } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates -import { eventCenter } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates +import { Current, document, eventCenter } from '@tarojs/runtime' import { hooks } from '@tarojs/shared' import { batch, createContext, createRoot, createSignal, For } from 'solid-js' diff --git a/packages/taro-platform-harmony/src/runtime-framework/solid/hooks.ts b/packages/taro-platform-harmony/src/runtime-framework/solid/hooks.ts index daedcadb7c84..c1139454db74 100644 --- a/packages/taro-platform-harmony/src/runtime-framework/solid/hooks.ts +++ b/packages/taro-platform-harmony/src/runtime-framework/solid/hooks.ts @@ -14,7 +14,7 @@ import type { AppInstance, PageLifeCycle, TFunc -} from '@tarojs/runtime/dist/runtime.esm' +} from '@tarojs/runtime' const createTaroHook = (lifecycle: keyof PageLifeCycle | keyof AppInstance) => { return (fn: TFunc) => { diff --git a/packages/taro-platform-harmony/src/runtime-framework/solid/page.ts b/packages/taro-platform-harmony/src/runtime-framework/solid/page.ts index f29d0050b12a..ec18c34157f3 100644 --- a/packages/taro-platform-harmony/src/runtime-framework/solid/page.ts +++ b/packages/taro-platform-harmony/src/runtime-framework/solid/page.ts @@ -1,5 +1,4 @@ -import { Current, document, requestAnimationFrame, window } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates -import { addLeadingSlash, CONTEXT_ACTIONS, env, eventCenter } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates +import { addLeadingSlash, CONTEXT_ACTIONS, Current, document, env, eventCenter, requestAnimationFrame, window } from '@tarojs/runtime' import { hooks, isArray, isFunction, isUndefined } from '@tarojs/shared' import { ON_HIDE, ON_LOAD, ON_READY, ON_SHOW, ON_UNLOAD } from './constant' diff --git a/packages/taro-vite-runner/src/harmony/template/app.ts b/packages/taro-vite-runner/src/harmony/template/app.ts index 56eb3dfc7397..475bb8f51f75 100644 --- a/packages/taro-vite-runner/src/harmony/template/app.ts +++ b/packages/taro-vite-runner/src/harmony/template/app.ts @@ -129,12 +129,12 @@ export default class Parser extends BaseParser { const code = this.transArr2Str([ 'import type Want from "@ohos.app.ability.Want"', 'import type ohWindow from "@ohos.window"', + 'import type { AppInstance } from "@tarojs/runtime"', '', this.#setReconciler, 'import UIAbility from "@ohos.app.ability.UIAbility"', 'import AbilityConstant from "@ohos.app.ability.AbilityConstant"', 'import { callFn, context, Current, ObjectAssign, TaroAny, window } from "@tarojs/runtime"', - 'import { AppInstance } from "@tarojs/runtime/dist/runtime.esm"', 'import { initHarmonyElement, hooks } from "@tarojs/runtime"', `import createComponent, { config } from "./${path.basename(rawId, path.extname(rawId))}${TARO_COMP_SUFFIX}"`, this.#setReconcilerPost, diff --git a/packages/taro-vite-runner/src/harmony/template/page.ts b/packages/taro-vite-runner/src/harmony/template/page.ts index f749283d49b8..3d4b49971a1b 100644 --- a/packages/taro-vite-runner/src/harmony/template/page.ts +++ b/packages/taro-vite-runner/src/harmony/template/page.ts @@ -1018,18 +1018,30 @@ this.removeTabBarEvent()` : 'callFn(this.page?.onUnload, this)']) } const importList = [ 'import type Taro from "@tarojs/taro/types"', - 'import type { TFunc } from "@tarojs/runtime/dist/runtime.esm"', + 'import type { PageInstance, TaroAny, TaroElement, TaroObject, TaroNode, TaroViewElement, TFunc } from "@tarojs/runtime"', 'import type common from "@ohos.app.ability.common"', '', isBlended ? this.#setReconciler : '', 'import router from "@ohos.router"', 'import { TaroView } from "@tarojs/components"', 'import { getSystemInfoSync } from "@tarojs/taro"', - 'import { initHarmonyElement, bindFn, callFn, convertNumber2VP, Current, ObjectAssign, TaroAny, TaroElement, TaroObject, TaroNode, TaroViewElement, window, document } from "@tarojs/runtime"', - 'import { eventCenter, PageInstance } from "@tarojs/runtime/dist/runtime.esm"', + 'import { eventCenter, bindFn, callFn, convertNumber2VP, Current, document, initHarmonyElement, ObjectAssign, window } from "@tarojs/runtime"', `import { createLazyChildren } from "${renderPath}"`, ] + if (this.isTabbarPage) { + importList.push( + ...this.tabbarList.map((e, i) => `import page${i}, { config as config${i} } from './${e.pagePath}${TARO_COMP_SUFFIX}'`), + ) + } else { + importList.push( + `import createComponent, { config } from "${path.resolve(targetRoot, (page as TaroHarmonyPageMeta).originName) + TARO_COMP_SUFFIX}"`, + ) + } + if (isBlended && this.#setReconcilerPost) { + importList.push(this.#setReconcilerPost) + } + const modifyPageImport = page instanceof Array ? page[0].modifyPageImport : page.modifyPageImport if (isFunction(modifyPageImport)) { modifyPageImport.call(this, importList, page) @@ -1037,26 +1049,18 @@ this.removeTabBarEvent()` : 'callFn(this.page?.onUnload, this)']) const code = this.transArr2Str([ ...importList, - this.isTabbarPage - ? [ - this.tabbarList.map((e, i) => `import page${i}, { config as config${i} } from './${e.pagePath}${TARO_COMP_SUFFIX}'`), - isBlended ? this.#setReconcilerPost : null, - '', - `const createComponent = [${this.tabbarList.map((_, i) => `page${i}`).join(', ')}]`, - `const config = [${this.tabbarList.map((_, i) => `config${i}`).join(', ')}]`, - '', - 'interface ITabBarItem extends Taro.TabBarItem {', - this.transArr2Str([ - 'key?: number', - 'badgeText?: string', - 'showRedDot?: boolean', - ], 2), - '}', - ] - : [ - `import createComponent, { config } from "${path.resolve(targetRoot, (page as TaroHarmonyPageMeta).originName) + TARO_COMP_SUFFIX}"`, - isBlended && this.#setReconcilerPost ? this.#setReconcilerPost : null, - ], + this.isTabbarPage ? [ + `const createComponent = [${this.tabbarList.map((_, i) => `page${i}`).join(', ')}]`, + `const config = [${this.tabbarList.map((_, i) => `config${i}`).join(', ')}]`, + '', + 'interface ITabBarItem extends Taro.TabBarItem {', + this.transArr2Str([ + 'key?: number', + 'badgeText?: string', + 'showRedDot?: boolean', + ], 2), + '}', + ] : null, '', 'const sysInfo: TaroAny = getSystemInfoSync()', this.getInstantiatePage(page), From bf00c419055a32e0bbadf625a03d3e0870403b54 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Mon, 8 Jul 2024 11:33:54 +0800 Subject: [PATCH 11/81] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=20capi=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=20runtime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/runtime-ets/bom/URL.ts | 4 ++-- .../src/runtime-ets/bom/getComputedStyle.ts | 4 +--- .../src/runtime-ets/bom/history.ts | 2 +- .../src/runtime-ets/bom/location.ts | 2 +- .../src/runtime-ets/bom/navigator.ts | 2 +- .../src/runtime-ets/bom/raf.ts | 2 +- .../src/runtime-ets/bom/window.ts | 4 +--- .../src/runtime-ets/constant.ts | 18 +++++++++++++++++- .../src/runtime-ets/current.ts | 2 -- .../src/runtime-ets/dom/event-source.ts | 2 +- .../src/runtime-ets/emitter/emitter.ts | 2 +- .../src/runtime-ets/env.ts | 2 +- .../src/runtime-ets/index.ts | 10 ++++++++-- .../src/runtime-ets/interface/index.ts | 1 + .../src/runtime-ets/utils/index.ts | 5 ++--- .../src/runtime-ets/utils/router.ts | 10 +++++++++- 16 files changed, 48 insertions(+), 24 deletions(-) diff --git a/packages/taro-platform-harmony/src/runtime-ets/bom/URL.ts b/packages/taro-platform-harmony/src/runtime-ets/bom/URL.ts index 8cb738ca3370..ec9747f2e3e9 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/bom/URL.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/bom/URL.ts @@ -1,2 +1,2 @@ -export * from '@tarojs/runtime/dist/bom/URL' -export * from '@tarojs/runtime/dist/bom/URLSearchParams' +export { parseUrl, URL } from '@tarojs/runtime/dist/runtime.esm' +export { URLSearchParams } from '@tarojs/runtime/dist/runtime.esm' diff --git a/packages/taro-platform-harmony/src/runtime-ets/bom/getComputedStyle.ts b/packages/taro-platform-harmony/src/runtime-ets/bom/getComputedStyle.ts index fa87629024a3..f1c0e5ffb375 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/bom/getComputedStyle.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/bom/getComputedStyle.ts @@ -1,6 +1,4 @@ -import type { TGetComputedStyle } from '@tarojs/runtime/dist/bom/getComputedStyle' - -export function getComputedStyle (node: Parameters[0]) { +export function getComputedStyle (node: any) { // @ts-ignore return node._st } diff --git a/packages/taro-platform-harmony/src/runtime-ets/bom/history.ts b/packages/taro-platform-harmony/src/runtime-ets/bom/history.ts index 3919657a5afc..f8e4871e5133 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/bom/history.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/bom/history.ts @@ -1 +1 @@ -export * from '@tarojs/runtime/dist/bom/history' +export { History } from '@tarojs/runtime/dist/runtime.esm' diff --git a/packages/taro-platform-harmony/src/runtime-ets/bom/location.ts b/packages/taro-platform-harmony/src/runtime-ets/bom/location.ts index 8418eb2ef663..6e5ac1c9a008 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/bom/location.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/bom/location.ts @@ -1 +1 @@ -export * from '@tarojs/runtime/dist/bom/location' +export { Location } from '@tarojs/runtime/dist/runtime.esm' diff --git a/packages/taro-platform-harmony/src/runtime-ets/bom/navigator.ts b/packages/taro-platform-harmony/src/runtime-ets/bom/navigator.ts index f5a68cc55dba..f5b3417ae826 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/bom/navigator.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/bom/navigator.ts @@ -1 +1 @@ -export * from '@tarojs/runtime/dist/bom/navigator' +export { navigator } from '@tarojs/runtime/dist/runtime.esm' diff --git a/packages/taro-platform-harmony/src/runtime-ets/bom/raf.ts b/packages/taro-platform-harmony/src/runtime-ets/bom/raf.ts index f6007cf6f838..1c233ed31e42 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/bom/raf.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/bom/raf.ts @@ -1 +1 @@ -export * from '@tarojs/runtime/dist/bom/raf' +export { cancelAnimationFrame, now, requestAnimationFrame } from '@tarojs/runtime/dist/runtime.esm' diff --git a/packages/taro-platform-harmony/src/runtime-ets/bom/window.ts b/packages/taro-platform-harmony/src/runtime-ets/bom/window.ts index fc4a656afc4a..d26c001d60fe 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/bom/window.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/bom/window.ts @@ -5,12 +5,10 @@ import { TaroEventTarget } from '../dom/eventTarget' import { getComputedStyle } from './getComputedStyle' import { History } from './history' import { Location } from './location' -import { nav } from './navigator' +import { navigator as nav } from './navigator' import type { TaroDocument } from '../dom/document' -export type { TaroWindow } from '@tarojs/runtime/dist/bom/window' - export class Window extends TaroEventTarget { public _doc: TaroDocument public __taroAppConfig: any diff --git a/packages/taro-platform-harmony/src/runtime-ets/constant.ts b/packages/taro-platform-harmony/src/runtime-ets/constant.ts index ac61918893e4..d730f830d3d8 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/constant.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/constant.ts @@ -1,6 +1,22 @@ import { isNumber } from '@tarojs/shared' -export * from '@tarojs/runtime/dist/constants' +export { + A, APP, BEHAVIORS, BODY, + CATCH_VIEW, CATCHMOVE, CHANGE, + CLASS, COMMENT, COMPILE_MODE, + CONFIRM, CONTAINER, CONTEXT_ACTIONS, + CURRENT_TARGET, CUSTOM_WRAPPER, + DATASET, DATE, DOCUMENT_ELEMENT_NAME, + DOCUMENT_FRAGMENT, EVENT_CALLBACK_RESULT, + EXTERNAL_CLASSES, FOCUS, HEAD, + HOOKS_APP_ID, HTML, ID, INPUT, + KEY_CODE, OBJECT, ON_HIDE, ON_LOAD, + ON_READY, ON_SHOW, OPTIONS, PAGE_INIT, + PROPERTY_THRESHOLD, PROPS, PURE_VIEW, ROOT_STR, + SET_DATA, SET_TIMEOUT, STATIC_VIEW, STYLE, + TARGET, TARO_RUNTIME, TIME_STAMP, + TOUCHMOVE, TYPE, UID, VALUE, VIEW +} from '@tarojs/runtime/dist/runtime.esm' export const ATTRIBUTES_CALLBACK_TRIGGER_MAP = { scrollTop: { diff --git a/packages/taro-platform-harmony/src/runtime-ets/current.ts b/packages/taro-platform-harmony/src/runtime-ets/current.ts index 17e3f494008f..bf327637301f 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/current.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/current.ts @@ -1,5 +1,3 @@ -export type { Router } from '@tarojs/runtime/dist/current' - export const context: any = { resolver: null, value: null diff --git a/packages/taro-platform-harmony/src/runtime-ets/dom/event-source.ts b/packages/taro-platform-harmony/src/runtime-ets/dom/event-source.ts index 90e91d40c7d8..70265ec01070 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/dom/event-source.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/dom/event-source.ts @@ -1 +1 @@ -export * from '@tarojs/runtime/dist/dom/event-source' +export { eventSource } from '@tarojs/runtime/dist/runtime.esm' diff --git a/packages/taro-platform-harmony/src/runtime-ets/emitter/emitter.ts b/packages/taro-platform-harmony/src/runtime-ets/emitter/emitter.ts index 4f999410a6a0..dccbe84c52cf 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/emitter/emitter.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/emitter/emitter.ts @@ -1 +1 @@ -export * from '@tarojs/runtime/dist/emitter/emitter' +export { eventCenter, Events, EventsType } from '@tarojs/runtime/dist/runtime.esm' diff --git a/packages/taro-platform-harmony/src/runtime-ets/env.ts b/packages/taro-platform-harmony/src/runtime-ets/env.ts index 61c62515132f..226a548062ea 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/env.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/env.ts @@ -1 +1 @@ -export { default as env } from '@tarojs/runtime/dist/env' +export { env } from '@tarojs/runtime/dist/runtime.esm' diff --git a/packages/taro-platform-harmony/src/runtime-ets/index.ts b/packages/taro-platform-harmony/src/runtime-ets/index.ts index 665f570b01e8..c01a694feecc 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/index.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/index.ts @@ -7,8 +7,8 @@ export * from './bom/document' export * from './bom/getComputedStyle' export * from './bom/history' export * from './bom/location' -export { nav as navigator } from './bom/navigator' -export { caf as cancelAnimationFrame, now, raf as requestAnimationFrame } from './bom/raf' +export { navigator } from './bom/navigator' +export { cancelAnimationFrame, now, requestAnimationFrame } from './bom/raf' export * from './bom/URL' export * from './bom/window' // dom @@ -24,3 +24,9 @@ export * from './emitter/emitter' export * from './utils' // typings export * from './interface' +export { + Instance, PageProps, + ReactPageComponent, ReactPageInstance, ReactAppInstance, + PageLifeCycle, PageInstance, + AppInstance, +} from '@tarojs/runtime/dist/runtime.esm' diff --git a/packages/taro-platform-harmony/src/runtime-ets/interface/index.ts b/packages/taro-platform-harmony/src/runtime-ets/interface/index.ts index a1a6eb20d3f1..5454c9f67725 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/interface/index.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/interface/index.ts @@ -1,4 +1,5 @@ export * from './event' +export { PageConfig, TFunc } from '@tarojs/runtime/dist/runtime.esm' export type TaroAny = any export type TaroFunc = (...args: TaroAny[]) => TaroAny diff --git a/packages/taro-platform-harmony/src/runtime-ets/utils/index.ts b/packages/taro-platform-harmony/src/runtime-ets/utils/index.ts index e25d9f38c760..f689a2b326f9 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/utils/index.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/utils/index.ts @@ -161,9 +161,9 @@ export function findChildNodeWithDFS (node: export function findChildNodeWithDFS (node: TaroElement, selector: string | ((ele: T) => boolean), selectAll): T[] | T | null { const queue = [node] - const nodeList: TaroElement[] = [] + const nodeList: T[] = [] while (queue.length) { - const currentNode = queue.shift() + const currentNode = queue.shift() as T if (currentNode) { if (typeof selector === 'string') { if (selector.startsWith('#')) { @@ -202,4 +202,3 @@ export function findChildNodeWithDFS (node: export * from './info' export * from './router' -export * from '@tarojs/runtime/dist/utils/cache' diff --git a/packages/taro-platform-harmony/src/runtime-ets/utils/router.ts b/packages/taro-platform-harmony/src/runtime-ets/utils/router.ts index da58377c59de..07618227c67a 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/utils/router.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/utils/router.ts @@ -1 +1,9 @@ -export * from '@tarojs/runtime/dist/utils/router' +export { + addLeadingSlash, + getCurrentPage, + getHomePage, + hasBasename, + stripBasename, + stripSuffix, + stripTrailing +} from '@tarojs/runtime/dist/runtime.esm' From a5dad29c71b9207bfbe29afc7ef7bac6402a062f Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Mon, 8 Jul 2024 13:43:25 +0800 Subject: [PATCH 12/81] feat(harmony): add cpp style --- packages/taro-react/src/props.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/taro-react/src/props.ts b/packages/taro-react/src/props.ts index 9d13c6950c36..00864b671fd3 100644 --- a/packages/taro-react/src/props.ts +++ b/packages/taro-react/src/props.ts @@ -6,6 +6,7 @@ import { capitalize, internalComponents, isFunction, isNumber, isObject, isStrin export type Props = Record const isHarmony = process.env.TARO_PLATFORM === 'harmony' +const isHarmonyCPP = /harmony.*cpp/.test(process.env.TARO_ENV || '') const IS_NON_DIMENSIONAL = /max|aspect|acit|ex(?:s|g|n|p|$)|rph|grid|ows|mnc|ntw|ine[ch]|zoo|^ord|itera/i function isEventName (s: string) { @@ -227,6 +228,9 @@ function setProperty (dom: TaroElement, name: string, value: unknown, oldValue?: ) { // skip } else if (name === 'style') { + if (isHarmonyCPP) { + return dom.setAttribute('_style4cpp', value) + } const style = dom.style if (isString(value)) { style.cssText = value From 558ff01e2b291ba61380ceebab65639425bd4098 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Mon, 8 Jul 2024 14:58:34 +0800 Subject: [PATCH 13/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components-harmony-ets/checkbox.ets | 1 - .../components-harmony-ets/form.ets | 1 - .../components-harmony-ets/index.ets | 127 +++++------------- .../components-harmony-ets/input.ets | 4 +- .../components-harmony-ets/label.ets | 3 +- .../components-harmony-ets/listView.ets | 2 +- .../components-harmony-ets/movableArea.ets | 6 +- .../components-harmony-ets/pseudo.ets | 2 +- .../components-harmony-ets/radio.ets | 5 +- .../components-harmony-ets/style.ets | 13 +- .../components-harmony-ets/switch.ets | 2 +- .../components-harmony-ets/text.ets | 4 +- .../components-harmony-ets/utils/helper.ets | 2 +- .../components-harmony-ets/utils/styles.ets | 11 +- .../components-harmony-ets/video.ets | 2 +- .../components-harmony-ets/view.ets | 3 +- .../components-harmony-ets/webView.ets | 2 +- 17 files changed, 66 insertions(+), 124 deletions(-) diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/checkbox.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/checkbox.ets index c455801dae71..f3f32396f954 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/checkbox.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/checkbox.ets @@ -5,7 +5,6 @@ import { FlexManager } from './utils/flexManager' import { shouldBindEvent, getNodeThresholds } from './utils/helper' import type { TaroAny, TaroCheckboxElement, TaroCheckboxGroupElement, TaroEvent } from '@tarojs/runtime' -import { isUndefined } from '@tarojs/shared' interface CheckboxOptions { name?: string diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/form.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/form.ets index 45213b432493..4eab90ff8905 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/form.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/form.ets @@ -7,7 +7,6 @@ import { FlexManager } from './utils/flexManager' import { shouldBindEvent, getNodeThresholds } from './utils/helper' import type { TaroAny, TaroFormElement } from '@tarojs/runtime' -import { isUndefined } from '@tarojs/shared' @Component export default struct TaroForm { diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/index.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/index.ets index 36fededd7bdf..784a85a22fe0 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/index.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/index.ets @@ -1,92 +1,39 @@ -import TaroImage, { getImageMode } from './image' -import TaroText from './text' -import TaroView from './view' -import TaroIcon from './icon' -import TaroForm from './form' -import TaroLabel from './label' -import TaroInput from './input' -import TaroVideo from './video' -import TaroCanvas from './canvas' -import TaroButton from './button' -import TaroPicker from './picker' -import TaroSlider from './slider' -import TaroSwitch from './switch' -import TaroSwiper from './swiper' -import TaroWebView from './webView' -import TaroTextArea from './textArea' -import TaroRichText from './richText' -import TaroProgress from './progress' -import TaroInnerHtml from './innerHtml' -import TaroScrollView from './scrollView' -import TaroMovableArea from './movableArea' -import TaroMovableView from './movableView' -import { TaroRadio, TaroRadioGroup } from './radio' -import { TaroCheckboxGroup, TaroCheckbox } from './checkbox' -import TaroPageMeta from './pageMeta' -import TaroNavigationBar from './navigationBar' +export { default as TaroImage, getImageMode } from './image' +export { default as TaroText } from './text' +export { default as TaroView } from './view' +export { default as TaroIcon } from './icon' +export { default as TaroForm } from './form' +export { default as TaroLabel } from './label' +export { default as TaroInput } from './input' +export { default as TaroVideo } from './video' +export { default as TaroCanvas } from './canvas' +export { default as TaroButton, getButtonColor } from './button' +export { default as TaroPicker } from './picker' +export { default as TaroSlider } from './slider' +export { default as TaroSwitch } from './switch' +export { default as TaroSwiper } from './swiper' +export { default as TaroWebView } from './webView' +export { default as TaroTextArea } from './textArea' +export { default as TaroRichText } from './richText' +export { default as TaroProgress } from './progress' +export { default as TaroInnerHtml } from './innerHtml' +export { default as TaroScrollView } from './scrollView' +export { default as TaroMovableArea } from './movableArea' +export { default as TaroMovableView } from './movableView' +export { TaroRadio, TaroRadioGroup } from './radio' +export { TaroCheckboxGroup, TaroCheckbox } from './checkbox' +export { default as TaroPageMeta, IComponentAttributeUpdateEvents } from './pageMeta' +export { default as TaroNavigationBar } from './navigationBar' -import TaroListView from './listView' -import TaroStickySection from './stickySection' -import TaroScrollList from './scrollList' +export { default as TaroListView } from './listView' +export { default as TaroStickySection } from './stickySection' +export { default as TaroScrollList } from './scrollList' -import commonStyleModify, { rowModify, columnModify, textModify, setNormalTextAttributeIntoInstance } from './style' -import { getButtonColor } from './button' -import { FlexManager } from './utils/flexManager' -import { DynamicCenter } from './utils/DynamicCenter' -import { TOUCH_EVENT_MAP } from './utils/constant/event' -import { BUTTON_THEME_COLOR } from './utils/constant/style' -import { getStyleAttr } from './utils/styles' -import { shouldBindEvent, getNodeThresholds, getNormalAttributes, getFontAttributes } from './utils/helper' - -export { - textModify, - getStyleAttr, - FlexManager, - DynamicCenter, - getButtonColor, - TOUCH_EVENT_MAP, - shouldBindEvent, - getFontAttributes, - commonStyleModify, - rowModify, - columnModify, - getNodeThresholds, - BUTTON_THEME_COLOR, - getNormalAttributes, - setNormalTextAttributeIntoInstance, - getImageMode, -} - -export { - TaroImage, - TaroCanvas, - TaroText, - TaroView, - TaroIcon, - TaroForm, - TaroLabel, - TaroInput, - TaroVideo, - TaroButton, - TaroPicker, - TaroSlider, - TaroSwitch, - TaroSwiper, - TaroWebView, - TaroTextArea, - TaroRichText, - TaroProgress, - TaroInnerHtml, - TaroScrollView, - TaroMovableArea, - TaroMovableView, - TaroRadio, - TaroRadioGroup, - TaroCheckboxGroup, - TaroCheckbox, - TaroPageMeta, - TaroNavigationBar, - TaroListView, - TaroStickySection, - TaroScrollList -} +export { default as commonStyleModify, rowModify, columnModify, textModify, setNormalTextAttributeIntoInstance } from './style' +export { TOUCH_EVENT_MAP } from './utils/constant/event' +export { BUTTON_THEME_COLOR } from './utils/constant/style' +export { DynamicCenter } from './utils/DynamicCenter' +export { FlexManager } from './utils/flexManager' +export { isTagFirstChild } from './utils/helper' +export { getStyleAttr } from './utils/styles' +export { shouldBindEvent, getNodeThresholds, getNormalAttributes, getFontAttributes } from './utils/helper' diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/input.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/input.ets index 5e50ec6ad104..274db38a7987 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/input.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/input.ets @@ -4,7 +4,7 @@ import commonStyleModify from './style' import { parseStyles, shouldBindEvent, getNodeThresholds, getStyleAttr } from './utils/helper' import { INPUT_TYPE_MAP, INPUT_CONFIRM_MAP } from './utils/constant/style' -import type { TaroStyleType, TaroAny, TaroInputElement, TaroEvent } from '@tarojs/runtime' +import type { TaroAny, TaroEvent, TaroInputElement, TaroStyleType } from '@tarojs/runtime' interface InputAttrs { textAlign?: TextAlign @@ -91,7 +91,7 @@ export default struct TaroInput { .placeholderFont(getPlaceholderFont(this.node)) .enterKeyType(INPUT_CONFIRM_MAP.get(this.node._attrs?.confirmType) || EnterKeyType.Done) .padding(0) // Note: 移出 Input 默认 padding 设置 - .backgroundColor(getStyleAttr(this.node, "backgroundColor"))// + .backgroundColor(getStyleAttr(this.node, "backgroundColor")) .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle)) .styles(this.node?.hmStyle) .attrs(getAttributes(this.node)) diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/label.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/label.ets index fe139a52ae3f..e2a10eda38de 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/label.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/label.ets @@ -6,8 +6,7 @@ import { TOUCH_EVENT_MAP } from './utils/constant/event' import { FlexManager } from './utils/flexManager' import { shouldBindEvent, getNodeThresholds } from './utils/helper' -import type { TaroLabelElement, TaroElement, TaroAny, TaroRadioElement, TaroCheckboxElement } from '@tarojs/runtime' -import { isUndefined } from '@tarojs/shared' +import type { TaroAny, TaroElement, TaroCheckboxElement, TaroLabelElement, TaroRadioElement } from '@tarojs/runtime' function handleTargetChange (id: string) { const taro: TaroAny = Current.taro diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/listView.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/listView.ets index 552a1b9204ed..39835bd86ddc 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/listView.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/listView.ets @@ -1,6 +1,6 @@ import commonStyleModify from './style' -import type { TaroViewElement, TaroAny } from '@tarojs/runtime' +import type { TaroAny, TaroViewElement } from '@tarojs/runtime' @Reusable @Component diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/movableArea.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/movableArea.ets index 931da9205bdd..9026e43088e6 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/movableArea.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/movableArea.ets @@ -1,9 +1,9 @@ -import type { TaroAny, TaroMovableAreaElement, TaroMovableViewElement } from '@tarojs/runtime' import { isTaroMovableViewElement } from '@tarojs/runtime' import commonStyleModify, { rowModify, columnModify } from './style' import { FlexManager } from './utils/flexManager' -import { isUndefined } from '@tarojs/shared' + +import type { TaroAny, TaroMovableAreaElement } from '@tarojs/runtime' @Component export default struct TaroMovableArea { @@ -123,4 +123,4 @@ function sizeChangeHandle(node: TaroMovableAreaElement, newValue: Area | SizeOpt } } }) -} \ No newline at end of file +} diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/pseudo.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/pseudo.ets index 26dee2d25862..5e3b0c6f3465 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/pseudo.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/pseudo.ets @@ -1,7 +1,7 @@ import { getFontAttributes } from './utils/helper' import { pseudoModify } from './style' -import type { TaroViewElement, TaroStyleType, TaroTextStyleType, TaroAny } from '@tarojs/runtime' +import type { TaroAny, TaroStyleType, TaroTextStyleType, TaroViewElement } from '@tarojs/runtime' @Extend(Flex) function flexAttrs (style: TaroStyleType) { diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/radio.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/radio.ets index 543902d16d70..19b86115c1d1 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/radio.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/radio.ets @@ -1,12 +1,11 @@ -import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime' +import { AREA_CHANGE_EVENT_NAME, eventHandler, getComponentEventCallback, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime' import commonStyleModify, { rowModify, columnModify } from './style' import { TOUCH_EVENT_MAP } from './utils/constant/event' import { FlexManager } from './utils/flexManager' import { shouldBindEvent, getNodeThresholds } from './utils/helper' -import { TaroEvent, TaroAny, HarmonyType, TaroRadioGroupElement, TaroRadioElement } from '@tarojs/runtime' -import { isUndefined } from '@tarojs/shared' +import type { HarmonyType, TaroAny, TaroEvent, TaroRadioElement, TaroRadioGroupElement } from '@tarojs/runtime' interface RadioAttrs { radioStyle?: HarmonyType.RadioStyle diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/style.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/style.ets index 5df8a34458f7..a4183f577f02 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/style.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/style.ets @@ -1,4 +1,3 @@ -import type { TaroAny, HarmonyStyle, TaroElement, TaroStyleType, TaroTextElement } from '@tarojs/runtime' import { ObjectAssign } from '@tarojs/runtime' import { isUndefined } from '@tarojs/shared' import { computeBackgroundPosition, convertVp2Px } from './utils' @@ -6,6 +5,8 @@ import { getNormalAttributes } from './utils/helper' import { isMaxWidthView } from './utils/styles' import { FlexManager } from './utils/flexManager' +import type { HarmonyStyle, TaroAny, TaroElement, TaroStyleType, TaroTextElement } from '@tarojs/runtime' + class TextStyleModify implements AttributeModifier { initStyle?: TaroStyleType node: TaroTextElement | null = null @@ -81,7 +82,7 @@ class CommonStyleModify implements AttributeModifier { } return this } - + setAnimationStyle (overwriteStyle: Record) { this.overwriteStyle = overwriteStyle if (this.style && this.overwriteStyle && Object.keys(this.overwriteStyle).length) { @@ -248,9 +249,9 @@ export function setNormalAttributeIntoInstance(instance: CommonAttribute, style: instance.key(style.id) } if (!isUndefined(style.display) || !isUndefined(style.visibility)) { - instance.visibility(style.display === 'none' - ? Visibility.None : - !isUndefined(style.visibility) + instance.visibility(style.display === 'none' + ? Visibility.None : + !isUndefined(style.visibility) ? (style.visibility === 'hidden' ? Visibility.Hidden : Visibility.Visible) : Visibility.Visible ) @@ -407,4 +408,4 @@ export const rowModify = new RowStyleModify() export const columnModify = new ColumnStyleModify() export const textModify = new TextStyleModify() -export default new CommonStyleModify() \ No newline at end of file +export default new CommonStyleModify() diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/switch.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/switch.ets index 895897e81f21..0b0a5f785896 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/switch.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/switch.ets @@ -3,7 +3,7 @@ import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBL import commonStyleModify from './style' import { getNodeThresholds, shouldBindEvent } from './utils/helper' -import type { TaroAny, TaroSwitchElement, TaroEvent } from '@tarojs/runtime' +import type { TaroAny, TaroEvent, TaroSwitchElement } from '@tarojs/runtime' interface SwitchAttrs { selectedColor?: ResourceColor diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/text.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/text.ets index 7204fc1dd5f7..3f3899ac47fe 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/text.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/text.ets @@ -7,7 +7,7 @@ import { getImageMode } from './image' import { BUTTON_THEME_COLOR } from './utils/constant/style' import { getNodeThresholds, getStyleAttr, shouldBindEvent, getNormalAttributes } from './utils/helper' -import type { TaroButtonElement, TaroElement, TaroTextElement, TaroAny, HarmonyStyle } from '@tarojs/runtime' +import type { HarmonyStyle, TaroAny, TaroButtonElement, TaroElement, TaroTextElement } from '@tarojs/runtime' function getButtonFontSize (node: TaroButtonElement): string | number { const isMini = node._attrs.size === 'mini' @@ -125,4 +125,4 @@ class SpanStyleModify implements AttributeModifier { } } -const spanModify = new SpanStyleModify() \ No newline at end of file +const spanModify = new SpanStyleModify() diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/utils/helper.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/utils/helper.ets index 6d2c4234f5af..bb9e58747ac7 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/utils/helper.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/utils/helper.ets @@ -2,7 +2,7 @@ import { VIEW } from '@tarojs/runtime' import { getNormalAttributes, getFontAttributes, getStyleAttr } from './styles' -import type { TaroElement, TaroNode, TaroAny } from '@tarojs/runtime' +import type { TaroAny, TaroElement, TaroNode } from '@tarojs/runtime' export const parseStyles = (styles = ''): Record => { const styleObj: Record = {} diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/utils/styles.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/utils/styles.ets index ea44cf3c42f9..c250bbcd80d3 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/utils/styles.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/utils/styles.ets @@ -4,7 +4,7 @@ import { ObjectAssign } from '@tarojs/runtime' import { FlexManager } from './flexManager' import type { StandardProps, TextProps } from '@tarojs/components/types' -import type { TaroAny, TaroElement, TaroStyleType, TaroTextStyleType, HarmonyStyle } from '@tarojs/runtime' +import type { TaroAny, TaroElement, TaroTextStyleType, HarmonyStyle } from '@tarojs/runtime' export function getFontAttributes (node: TaroElement): TaroTextStyleType { let hmStyle = getNormalAttributes(node) @@ -20,7 +20,7 @@ export function getFontAttributes (node: TaroElement): TaroTextStyleType { let WebkitLineClamp = attrs.maxLines || hmStyle.WebkitLineClamp || Infinity if (hmStyle.textOverflow && !isUndefined(hmStyle.textOverflow.overflow)) { switch (hmStyle.textOverflow.overflow) { - case TextOverflow.Clip: + case TextOverflow.Clip: case TextOverflow.Ellipsis: case TextOverflow.None: WebkitLineClamp = WebkitLineClamp || 1; break default: break @@ -90,9 +90,8 @@ export function isMaxWidthView (node: TaroElement) { export function getNormalAttributes (node: TaroElement, initStyle?: HarmonyStyle): HarmonyStyle { if (!node) return {} - + const hmStyle = node.hmStyle - if (!hmStyle) return {} const _nid = node._nid @@ -182,7 +181,7 @@ function getPseudoClass (node: TaroElement): HarmonyStyle | null { function parseNthChild(selector: string): [number, number] | null { const regex = /nth-child\((?:(-?\d*)n\s*)?([+-]?\s*\d+)?\)/; const match = selector.match(regex); - + if (match) { const a = match[1] ? parseInt(match[1]) : 0; const b = match[2] ? parseInt(match[2]) : 0; @@ -202,4 +201,4 @@ export function getStyleAttr(node: TaroElement | null, key: string): TaroAny { return isMaxWidthView(node) && isUndefined(hmStyle.width) ? '100%' : hmStyle.width } return hmStyle[key] -} \ No newline at end of file +} diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/video.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/video.ets index 19d19d8d1ef5..98e0adb165e5 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/video.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/video.ets @@ -4,7 +4,7 @@ import commonStyleModify from './style' import { TOUCH_EVENT_MAP } from './utils/constant/event' import { shouldBindEvent, getNodeThresholds } from './utils/helper' -import type { TaroAny, TaroVideoElement, TaroEvent } from '@tarojs/runtime' +import type { TaroAny, TaroEvent, TaroVideoElement } from '@tarojs/runtime' export interface VideoOptions { src?: string | Resource diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/view.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/view.ets index 2c495289e106..408f034098cb 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/view.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/view.ets @@ -6,8 +6,7 @@ import { TOUCH_EVENT_MAP } from './utils/constant/event' import { FlexManager } from './utils/flexManager' import { getNodeThresholds, shouldBindEvent } from './utils/helper' -import type { TaroViewElement, TaroAny } from '@tarojs/runtime' -import { isUndefined } from '@tarojs/shared' +import type { TaroAny, TaroViewElement } from '@tarojs/runtime' @Component export default struct TaroView { diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/webView.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/webView.ets index 7204276c3a72..b52fe00edee7 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/webView.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/webView.ets @@ -3,7 +3,7 @@ import { AREA_CHANGE_EVENT_NAME, eventHandler, getComponentEventCallback, VISIBL import commonStyleModify from './style' import { shouldBindEvent, getNodeThresholds } from './utils/helper' -import type { TaroAny, TaroWebViewElement, TaroEvent } from '@tarojs/runtime' +import type { TaroAny, TaroEvent, TaroWebViewElement } from '@tarojs/runtime' interface IPageLoad { url: string From 6f0a9d0c4a83f507092b37992fa2e90e80924d40 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Mon, 8 Jul 2024 15:02:32 +0800 Subject: [PATCH 14/81] chore(release): publish 4.0.0-alpha.36 --tag=alpha --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index 3dad90b88617..6078d340ade1 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 56e37f2ae7a2..29de3c800e04 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index ac444dd38ca0..0580742be3cf 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index e6ac3991f1d4..ecae799d2c0e 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index f8cb559360ae..706c40111866 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 8db479a4c1a9..890ef9c4d667 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "os": [ "win32" ], diff --git a/package.json b/package.json index 476c2bdb6689..e52261242ba7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 efb5ffa09955..ecf63dc64849 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 f2b5852b0621..1e944cd3c094 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index 92ab1fb6ffef..756a5a85a00e 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index ed3ebd9ae5ae..2d10f4f73d5f 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 4a1d44329763..e4d5b49e249c 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 44d8374d5cf2..aed115895882 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 c69e0d413585..f254251b3281 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index 4bf83acca9a4..91cb1f1dd080 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 749c5f190c5c..dc1b30fe67a7 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 3684744f3347..04c0224787eb 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 42efa018dc1a..a773d90811e0 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 7a3cf9c5c382..171ebe073fee 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index ca44d8f38c81..154fdbd5919b 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index a851dec91b46..c68d54dede1d 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 19ad464b6076..918c407b01ac 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 5ea7d0d92b46..524fb07e0948 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 4ad17cb1f02c..f55529fceac4 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index 441cadeb127d..dde4847bb55c 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 e24733399495..ee7283ce979c 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 584e1928f877..312a9ed17c93 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 3b2a368d0eac..8a7b7f9fae67 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index 711909198f81..08112e015fa5 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index 5ceaffc9982c..bd9a008a3b90 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 1192a3d5760b..c66e4e689b4a 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 47cde23cfa7d..192ecc59842f 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 80646474823a..e2b83ebcfcbe 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index baa7ce8990a8..b46d836d187a 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 9410453247e8..668271d2571e 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 c676fc9e9b5c..25e235af3242 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "React/Preact/Nerv 框架插件", "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 f1ec9f203f1d..64557423b88a 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 02f2dc757290..8b75fad9a0c6 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 5c07cb31421f..ee0dd1bfa002 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 5cdd32a9693f..9a3761311df0 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index 41aeb4cd65c2..540b014f24b6 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 108f1feddc74..83899abc540a 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 323ba8a18c51..63e657a31469 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index 26d241201ca6..dad75a2082ac 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index 9d123eb1b6db..ca7d3fc0c11c 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 229f1a7cf527..49569c7c9f26 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index fb13f859236c..9bd857d2eba4 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index b7b084782906..23c8d5dbef6f 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index 9b51313a01c3..7101af9f317e 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index fdb819e81be0..c5c947f4e959 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index ff6a2210cc36..fc00820a83f0 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 3cfb2ca8873f..57b5b9e72f11 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index 078125700149..8c6399ca1833 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 5d616d1d2fe2..312be27a225b 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 0a5eebc33392..954197c7714c 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 e442f5657b5d..79ee0963191a 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index be2e29c35509..bf540ccef3ac 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 8e6743588316..a81cd6c56038 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 ab01bbd7b49b..7bbcc9d17630 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index 052b137a2373..e131ab1e2307 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 83f8409345e9..e9b843b67689 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index 1dc0539db937..8fe66edeb510 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 8880315d9a5d..4d095cb98bb2 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 2cfd2699cca3..090e7ef0046a 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index 331c02e14cc5..f91fee0d2759 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 9191e1d9f89b..93fad60b6d58 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 517bfbae66a5..6d35f598a590 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 a2c085ea0d6e..23d46773bd33 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index cd064836cd17..eabcd049cdd9 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 75b389de8848..fb9d5b9f470b 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 037f5aeabbc2..017b5fe7f4c5 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 7240174fb63c..e3d7f774f1e2 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "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 7a3ca97fdf28..fb8617674474 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.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index d5b7bb35c496..49364951884a 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index fdc0b990a02c..a97e8ace121a 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-alpha.27", + "version": "4.0.0-alpha.36", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From 70a1b5917483815d5abfa3808115bd2ff1de0e70 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Mon, 8 Jul 2024 20:44:06 +0800 Subject: [PATCH 15/81] fix(harmony): update runtime --- packages/taro-platform-harmony/src/runtime-ets/index.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/taro-platform-harmony/src/runtime-ets/index.ts b/packages/taro-platform-harmony/src/runtime-ets/index.ts index c01a694feecc..1793716f54f2 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/index.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/index.ts @@ -7,13 +7,14 @@ export * from './bom/document' export * from './bom/getComputedStyle' export * from './bom/history' export * from './bom/location' -export { navigator } from './bom/navigator' -export { cancelAnimationFrame, now, requestAnimationFrame } from './bom/raf' +export * from './bom/navigator' +export * from './bom/raf' export * from './bom/URL' export * from './bom/window' // dom export * from './dom/element' export * from './dom/event' +export * from './dom/event-source' export * from './dom/node' export * from './dom/stylesheet' export * from './dom/cssNesting' From 6e50b6325ce863837ca82413eb1db2d5e5276549 Mon Sep 17 00:00:00 2001 From: mayintao3 Date: Tue, 9 Jul 2024 15:48:47 +0800 Subject: [PATCH 16/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dcssmodules?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E4=B8=8D=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-vite-runner/src/harmony/style.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/taro-vite-runner/src/harmony/style.ts b/packages/taro-vite-runner/src/harmony/style.ts index 55d644bbc21c..e6ea4d34ae7a 100644 --- a/packages/taro-vite-runner/src/harmony/style.ts +++ b/packages/taro-vite-runner/src/harmony/style.ts @@ -265,7 +265,7 @@ export async function stylePlugin(viteCompilerContext: ViteHarmonyCompilerContex validateStylelint(id, raw) if (modules && !moduleCache.has(id)) { - moduleCache.set(id, modules) + moduleCache.set(id.replace(usedRE, ''), modules) } // track deps for build watch mode From ef081c299b41a4729b73dd831fa3cc9afe8fbb24 Mon Sep 17 00:00:00 2001 From: mayintao3 Date: Tue, 9 Jul 2024 18:11:36 +0800 Subject: [PATCH 17/81] =?UTF-8?q?feat:=20comp.js=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-vite-runner/src/harmony/template/page.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/taro-vite-runner/src/harmony/template/page.ts b/packages/taro-vite-runner/src/harmony/template/page.ts index 3d4b49971a1b..4fac22baec4e 100644 --- a/packages/taro-vite-runner/src/harmony/template/page.ts +++ b/packages/taro-vite-runner/src/harmony/template/page.ts @@ -135,6 +135,7 @@ export default class Parser extends BaseParser { getInstantiatePage (page: TaroHarmonyPageMeta | TaroHarmonyPageMeta[]) { const entryOption = page instanceof Array ? page[0].entryOption : page.entryOption + console.log('entryOption', entryOption) // eslint-disable-line const { modifyInstantiate } = this.loaderMeta const structCodeArray: unknown[] = [ '@Component', @@ -1079,11 +1080,12 @@ this.removeTabBarEvent()` : 'callFn(this.page?.onUnload, this)']) parseEntry (rawId: string, page: TaroHarmonyPageMeta) { const { creatorLocation, importFrameworkStatement } = this.loaderMeta + const entryOption = page instanceof Array ? page[0].entryOption : page.entryOption const isBlended = this.buildConfig.blended || this.buildConfig.isBuildNativeComp let createFn = isBlended ? 'createNativePageConfig' : 'createPageConfig' - const nativeCreatePage = `createNativePageConfig(component, '${page.name}', React, ReactDOM, config)` - let createPageOrComponent = isBlended ? nativeCreatePage : `createPageConfig(component, '${page.name}', config)` + const nativeCreatePage = `createNativePageConfig(component, '${entryOption.routeName}', React, ReactDOM, config)` + let createPageOrComponent = isBlended ? nativeCreatePage : `createPageConfig(component, '${entryOption.routeName}', config)` // 如果是pure，说明不是一个页面，而是一个组件，这个时候修改import和createPage if (this.isPure) { From 23ad401265e7dbd03d9c3eea1da0d273b58f859f Mon Sep 17 00:00:00 2001 From: mayintao3 Date: Tue, 9 Jul 2024 18:14:45 +0800 Subject: [PATCH 18/81] =?UTF-8?q?feat:=20=E5=8E=BB=E6=8E=89console?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-vite-runner/src/harmony/template/page.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/taro-vite-runner/src/harmony/template/page.ts b/packages/taro-vite-runner/src/harmony/template/page.ts index 4fac22baec4e..dce467c6a54d 100644 --- a/packages/taro-vite-runner/src/harmony/template/page.ts +++ b/packages/taro-vite-runner/src/harmony/template/page.ts @@ -135,7 +135,6 @@ export default class Parser extends BaseParser { getInstantiatePage (page: TaroHarmonyPageMeta | TaroHarmonyPageMeta[]) { const entryOption = page instanceof Array ? page[0].entryOption : page.entryOption - console.log('entryOption', entryOption) // eslint-disable-line const { modifyInstantiate } = this.loaderMeta const structCodeArray: unknown[] = [ '@Component', From 6e7bf35779b4f78af2a499e3a838ca70d2d64e90 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Tue, 9 Jul 2024 20:58:02 +0800 Subject: [PATCH 19/81] fix: uid types --- packages/taro-platform-harmony/src/runtime-ets/dom/node.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/taro-platform-harmony/src/runtime-ets/dom/node.ts b/packages/taro-platform-harmony/src/runtime-ets/dom/node.ts index 6e51c59fd277..9544cc40d147 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/dom/node.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/dom/node.ts @@ -98,7 +98,7 @@ export class TaroNode extends TaroDataSourceElement { // 提供唯一标识，方便与小程序一致，能根据uid获取到对应的节点 public get uid (): string { - return this._nid + return `${this._nid}` } public get firstChild (): TaroNode | null { From 65492abcc8a1780d14b1cf0083c1a8fcf4b768ce Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Wed, 10 Jul 2024 16:39:23 +0800 Subject: [PATCH 20/81] =?UTF-8?q?fix(harmony):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=B8=B8=E9=87=8F=E6=9B=BF=E6=8D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-platform-harmony/src/program/arkTS.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/taro-platform-harmony/src/program/arkTS.ts b/packages/taro-platform-harmony/src/program/arkTS.ts index e87dd8e4d155..597eef11c6e2 100644 --- a/packages/taro-platform-harmony/src/program/arkTS.ts +++ b/packages/taro-platform-harmony/src/program/arkTS.ts @@ -90,6 +90,8 @@ export default class Harmony extends TaroPlatformHarmony { env.forEach(([key, value]) => { this.#defineConstants[`process.env.${key}`] = JSON.stringify(value) }) + + return this.#defineConstants } extensions = ['.js', '.jsx', '.ts', '.tsx', '.cjs', '.mjs', '.mts', '.vue', '.ets', '.d.ts'] From 857720d2355fb7e7d6f78e36247f58f1a23227bb Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Wed, 10 Jul 2024 17:39:49 +0800 Subject: [PATCH 21/81] =?UTF-8?q?fix(harmony):=20=E8=B0=83=E6=95=B4=20api?= =?UTF-8?q?=20=E4=BE=9D=E8=B5=96=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-platform-harmony/src/apis/ui/scroll/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/taro-platform-harmony/src/apis/ui/scroll/index.ts b/packages/taro-platform-harmony/src/apis/ui/scroll/index.ts index ef4cee870739..630def6592cb 100644 --- a/packages/taro-platform-harmony/src/apis/ui/scroll/index.ts +++ b/packages/taro-platform-harmony/src/apis/ui/scroll/index.ts @@ -6,8 +6,8 @@ * 文档地址 https://developer.harmonyos.com/cn/docs/documentation/doc-references/js-framework-syntax-js-0000000000611432 */ import { AREA_CHANGE_EVENT_NAME, Current, findChildNodeWithDFS, getPageScrollerOrNode, setNodeEventCallbackAndTriggerComponentUpdate } from '@tarojs/runtime' -import { pxTransformHelper } from '@tarojs/taro' +import { pxTransformHelper } from '../../index' import { MethodHandler } from '../../utils/handler' import type Taro from '@tarojs/taro/types' From 8f0575d69a5209253121c9cd2573d808ef17a121 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Sat, 13 Jul 2024 14:45:57 +0800 Subject: [PATCH 22/81] chore(release): publish 4.0.0-alpha.44 --tag=alpha --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index 6078d340ade1..b96b424514ba 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 29de3c800e04..2ec69571096f 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 0580742be3cf..53fb7e89172b 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index ecae799d2c0e..3ab92f33ae63 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index 706c40111866..e88628daafaa 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 890ef9c4d667..f5e4d98a8558 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "os": [ "win32" ], diff --git a/package.json b/package.json index e52261242ba7..5e723262ea06 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 ecf63dc64849..8bf694fa81df 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 1e944cd3c094..af0013889bc4 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index 756a5a85a00e..5c02f22cc0a8 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 2d10f4f73d5f..9ab93082c781 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index e4d5b49e249c..4dd7b4f9af6e 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 aed115895882..a3bd8bbc919f 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 f254251b3281..a57e4b53c263 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index 91cb1f1dd080..17b6b40ac999 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 dc1b30fe67a7..369364ae3b3b 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 04c0224787eb..54329be69cc4 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 a773d90811e0..457851ba72f1 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 171ebe073fee..7c8b72eefb61 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 154fdbd5919b..1668a36866ae 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index c68d54dede1d..70b64ab53939 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 918c407b01ac..57c8edd88b11 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 524fb07e0948..d0af7fce6636 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 f55529fceac4..8b0fb6e4cbc2 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index dde4847bb55c..34fd9da936d5 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 ee7283ce979c..da80c3fd8e3f 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 312a9ed17c93..a11663cd1f20 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 8a7b7f9fae67..9cfc05d915c0 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index 08112e015fa5..b61a86ad8694 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index bd9a008a3b90..f653ce384f78 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 c66e4e689b4a..cbb7b9f2175a 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 192ecc59842f..78372f64bb19 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 e2b83ebcfcbe..548a2500ad1b 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index b46d836d187a..a040d5994ded 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 668271d2571e..4bc6f9a37be9 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 25e235af3242..1e51f5c71511 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "React/Preact/Nerv 框架插件", "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 64557423b88a..246e90873d79 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 8b75fad9a0c6..77a15edbd255 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 ee0dd1bfa002..3f7e987933e5 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 9a3761311df0..423e9e9a8e15 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index 540b014f24b6..c2462b70f81c 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 83899abc540a..527a8024c25a 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 63e657a31469..e89e3db2fb6c 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index dad75a2082ac..2bc3384de5b7 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index ca7d3fc0c11c..8c494e06394a 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 49569c7c9f26..9b9bce76203d 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 9bd857d2eba4..e129000f112f 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index 23c8d5dbef6f..ceecd1f885fd 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index 7101af9f317e..4a69c37406d5 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index c5c947f4e959..cb3db958a2fd 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index fc00820a83f0..a603a9bda4d2 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 57b5b9e72f11..a4b299edad7c 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index 8c6399ca1833..b1070896d6ee 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 312be27a225b..067b6bdf199f 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 954197c7714c..5d9bc3dc04c9 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 79ee0963191a..7333cbc6dca1 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index bf540ccef3ac..7918d149bba0 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 a81cd6c56038..a67ad05a78cf 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 7bbcc9d17630..9b7063254a9a 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index e131ab1e2307..bcd9eabe1a9d 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 e9b843b67689..beafba6dd96e 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index 8fe66edeb510..bbbee79bf74a 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 4d095cb98bb2..81ac357330be 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 090e7ef0046a..76a714f6c31d 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index f91fee0d2759..2864d8c48ecd 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 93fad60b6d58..8deae2b296eb 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 6d35f598a590..1b1096a276eb 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 23d46773bd33..98d727baec2c 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index eabcd049cdd9..e2c9c947364e 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 fb9d5b9f470b..1d604bdf1482 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 017b5fe7f4c5..bf2bfb56b774 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 e3d7f774f1e2..bf2d59bb3039 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "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 fb8617674474..88ac2abcab2c 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.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index 49364951884a..7c4b5e05287e 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index a97e8ace121a..96e21eac51fc 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-alpha.36", + "version": "4.0.0-alpha.44", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From 77a16ed2856f781e675133fd3b4a897954e38cec Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Sat, 13 Jul 2024 15:39:59 +0800 Subject: [PATCH 23/81] =?UTF-8?q?fix(harmony):=20=E7=A7=BB=E9=99=A4=20onpm?= =?UTF-8?q?=20=E4=B8=8D=E8=83=BD=E8=A3=85=E8=BD=BD=E7=9A=84=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-platform-harmony/src/program/arkTS.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/taro-platform-harmony/src/program/arkTS.ts b/packages/taro-platform-harmony/src/program/arkTS.ts index e87dd8e4d155..2b717f1dd90d 100644 --- a/packages/taro-platform-harmony/src/program/arkTS.ts +++ b/packages/taro-platform-harmony/src/program/arkTS.ts @@ -234,6 +234,8 @@ export default class Harmony extends TaroPlatformHarmony { code = apiLoader(code) } if (this.extensions.includes(path.extname(lib))) { + // Note: 移除 onpm 不能装载的类型，新版本会导致 ets-loader 抛出 resolvedFileName 异常 + code = code.replace(/\/{3}\s*\n*/g, '') // Note: 查询 externals 内的依赖，并将它们添加到 externalDeps 中 code = code.replace(/(?:import\s|from\s|require\()['"]([^\\/.][^'"\s]+)['"]\)?/g, (src, p1 = '') => { if (p1.startsWith('node:') || p1.endsWith('.so')) return src From 0c84e3e6a13e6c7de03a47eb032fdc754166e0bf Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Sat, 13 Jul 2024 15:59:39 +0800 Subject: [PATCH 24/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20input=20?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=94=99=E8=AF=AF=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/components-harmony-ets/input.ets | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/input.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/input.ets index 5e50ec6ad104..71e1a168e3a9 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/input.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/input.ets @@ -91,16 +91,20 @@ export default struct TaroInput { .placeholderFont(getPlaceholderFont(this.node)) .enterKeyType(INPUT_CONFIRM_MAP.get(this.node._attrs?.confirmType) || EnterKeyType.Done) .padding(0) // Note: 移出 Input 默认 padding 设置 - .backgroundColor(getStyleAttr(this.node, "backgroundColor"))// + .backgroundColor(getStyleAttr(this.node, "backgroundColor")) .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle)) .styles(this.node?.hmStyle) .attrs(getAttributes(this.node)) .onChange((value: string) => { - const event: TaroEvent = createTaroEvent('input', { detail: { value } }, this.node) - - this.value = value - this.node?.updateFormWidgetValue(value) - eventHandler(event, 'input', this.node) + const event: TaroEvent = createTaroEvent('change', { detail: { value } }, this.node) + eventHandler(event, 'change', this.node) + + if (this.value !== value) { + const event: TaroEvent = createTaroEvent('input', { detail: { value } }, this.node) + this.value = value + this.node?.updateFormWidgetValue(value) + eventHandler(event, 'input', this.node) + } }) .onSubmit(() => { const event: TaroEvent = createTaroEvent('confirm', { detail: { value: this.value } }, this.node) From 85d21adb3b53772d6c44c0ef6f33f9204fcd7fb1 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Sat, 13 Jul 2024 16:38:20 +0800 Subject: [PATCH 25/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20form=20?= =?UTF-8?q?=E5=85=83=E7=B4=A0=E7=A7=BB=E9=99=A4=E5=B1=9E=E6=80=A7=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/runtime-ets/dom/element/form.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/taro-platform-harmony/src/runtime-ets/dom/element/form.ts b/packages/taro-platform-harmony/src/runtime-ets/dom/element/form.ts index f514f4e72671..e8cca5acbf1a 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/dom/element/form.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/dom/element/form.ts @@ -56,6 +56,12 @@ class TaroFormWidgetElement extends } } + public removeAttribute(name: string): void { + if (name === 'value') { + this.value = '' + } + } + public get name () { return this._attrs.name || '' } From 2724b8f342a28825eda06bb5fb5725b2951daa35 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Sat, 13 Jul 2024 17:52:52 +0800 Subject: [PATCH 26/81] fix(react): env shake --- .../solid/reconciler/props.ts | 19 +++++------ packages/taro-react/src/props.ts | 34 +++++++++---------- .../taro-runtime/src/dom-external/index.ts | 6 ++-- 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/packages/taro-platform-harmony/src/runtime-framework/solid/reconciler/props.ts b/packages/taro-platform-harmony/src/runtime-framework/solid/reconciler/props.ts index adf1a1f55a1b..bc57e95d598e 100644 --- a/packages/taro-platform-harmony/src/runtime-framework/solid/reconciler/props.ts +++ b/packages/taro-platform-harmony/src/runtime-framework/solid/reconciler/props.ts @@ -1,11 +1,10 @@ import { convertNumber2PX, FormElement } from '@tarojs/runtime' -import { capitalize, internalComponents, isFunction, isNumber, isObject, isString, toCamelCase } from '@tarojs/shared' +import { capitalize, internalComponents, isFunction, isNumber, isObject, isString, PLATFORM_TYPE, toCamelCase } from '@tarojs/shared' import type { Style, TaroElement } from '@tarojs/runtime' export type Props = Record -const isHarmony = process.env.TARO_PLATFORM === 'harmony' const IS_NON_DIMENSIONAL = /max|aspect|acit|ex(?:s|g|n|p|$)|rph|grid|ows|mnc|ntw|ine[ch]|zoo|^ord|itera/i function isEventName (s: string) { @@ -64,16 +63,16 @@ function setEvent (dom: TaroElement, name: string, value: unknown, oldValue?: un const compName = capitalize(toCamelCase(dom.tagName.toLowerCase())) - if (eventName === 'click' && !isHarmony && compName in internalComponents) { + if (eventName === 'click' && process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY && compName in internalComponents) { eventName = 'tap' } if (isFunction(value)) { if (oldValue) { - dom.removeEventListener(eventName, oldValue as any, !isHarmony ? false : undefined) - dom.addEventListener(eventName, value, !isHarmony ? { isCapture, sideEffect: false } : undefined) + dom.removeEventListener(eventName, oldValue as any, process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY ? false : undefined) + dom.addEventListener(eventName, value, process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY ? { isCapture, sideEffect: false } : undefined) } else { - dom.addEventListener(eventName, value, !isHarmony ? isCapture : undefined) + dom.addEventListener(eventName, value, process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY ? isCapture : undefined) } } else { dom.removeEventListener(eventName, oldValue as any) @@ -81,13 +80,13 @@ function setEvent (dom: TaroElement, name: string, value: unknown, oldValue?: un } function setStyle (style: Style, key: string, value: unknown) { - if (key[0] === '-' && !isHarmony) { + if (key[0] === '-' && process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY) { // css variables need not further judgment style.setProperty(key, (value as string).toString()) return } - if (isHarmony && key.startsWith('_')) { + if (process.env.TARO_PLATFORM === PLATFORM_TYPE.HARMONY && key.startsWith('_')) { // harmony样式已处理 style[key] = value == null ? '' : value } else { @@ -145,7 +144,7 @@ export function setProperty (dom: TaroElement, name: string, value: unknown, old for (const i in oldValue) { if (!(value && i in (value as StyleValue))) { // 鸿蒙伪类特殊处理 - if (isHarmony && (i === '::after' || i === '::before')) { + if (process.env.TARO_PLATFORM === PLATFORM_TYPE.HARMONY && (i === '::after' || i === '::before')) { setPseudo(dom, i, null) } else { style[i] = '' @@ -157,7 +156,7 @@ export function setProperty (dom: TaroElement, name: string, value: unknown, old for (const i in value) { if (!oldValue || !isEqual(value[i], (oldValue as StyleValue)[i])) { // 鸿蒙伪类特殊处理 - if (isHarmony && (i === '::after' || i === '::before')) { + if (process.env.TARO_PLATFORM === PLATFORM_TYPE.HARMONY && (i === '::after' || i === '::before')) { setPseudo(dom, i, value[i] as unknown as StyleValue) } else { style[i] = value[i] diff --git a/packages/taro-react/src/props.ts b/packages/taro-react/src/props.ts index 00864b671fd3..4c37046ea7e3 100644 --- a/packages/taro-react/src/props.ts +++ b/packages/taro-react/src/props.ts @@ -1,12 +1,12 @@ -import { type Style, type TaroElement, convertNumber2PX, FormElement } from '@tarojs/runtime' -import { capitalize, internalComponents, isFunction, isNumber, isObject, isString, toCamelCase } from '@tarojs/shared' +import { convertNumber2PX, FormElement } from '@tarojs/runtime' +import { capitalize, internalComponents, isFunction, isNumber, isObject, isString, PLATFORM_TYPE, toCamelCase } from '@tarojs/shared' + +import type { Style, TaroElement } from '@tarojs/runtime' // 拓展TaroElement的属性 export type Props = Record -const isHarmony = process.env.TARO_PLATFORM === 'harmony' -const isHarmonyCPP = /harmony.*cpp/.test(process.env.TARO_ENV || '') const IS_NON_DIMENSIONAL = /max|aspect|acit|ex(?:s|g|n|p|$)|rph|grid|ows|mnc|ntw|ine[ch]|zoo|^ord|itera/i function isEventName (s: string) { @@ -60,7 +60,7 @@ export function updatePropsByPayload (dom: TaroElement, oldProps: Props, updateP const key = updatePayload[i] const newProp = updatePayload[i + 1] const oldProp = oldProps[key] - if (isHarmony) { + if (process.env.TARO_PLATFORM === PLATFORM_TYPE.HARMONY) { if (key === '__fixed') { // hack: __fixed最先识别 fixedHandler = () => setProperty(dom, key, newProp, oldProp) @@ -76,7 +76,7 @@ export function updatePropsByPayload (dom: TaroElement, oldProps: Props, updateP setProperty(dom, key, newProp, oldProp) } } - if (isHarmony) { + if (process.env.TARO_PLATFORM === PLATFORM_TYPE.HARMONY) { fixedHandler && fixedHandler() for (let i = 0; i < handlers.length; i++) { handlers[i]() @@ -121,16 +121,16 @@ function setEvent (dom: TaroElement, name: string, value: unknown, oldValue?: un const compName = capitalize(toCamelCase(dom.tagName.toLowerCase())) - if (eventName === 'click' && !isHarmony && compName in internalComponents) { + if (eventName === 'click' && process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY && compName in internalComponents) { eventName = 'tap' } if (isFunction(value)) { if (oldValue) { - dom.removeEventListener(eventName, oldValue as any, !isHarmony ? false : undefined) - dom.addEventListener(eventName, value, !isHarmony ? { isCapture, sideEffect: false } : undefined) + dom.removeEventListener(eventName, oldValue as any, process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY ? false : undefined) + dom.addEventListener(eventName, value, process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY ? { isCapture, sideEffect: false } : undefined) } else { - dom.addEventListener(eventName, value, !isHarmony ? isCapture : undefined) + dom.addEventListener(eventName, value, process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY ? isCapture : undefined) } } else { dom.removeEventListener(eventName, oldValue as any) @@ -138,7 +138,7 @@ function setEvent (dom: TaroElement, name: string, value: unknown, oldValue?: un } function setStyle (style: Style, key: string, value: unknown) { - if (key[0] === '-' && !isHarmony) { + if (key[0] === '-' && process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY) { // css variables need not further judgment style.setProperty(key, (value as string).toString()) return @@ -146,7 +146,7 @@ function setStyle (style: Style, key: string, value: unknown) { style[key] = isNumber(value) && IS_NON_DIMENSIONAL.test(key) === false - ? (isHarmony ? value + 'px' : convertNumber2PX(value)) + ? (process.env.TARO_PLATFORM === PLATFORM_TYPE.HARMONY ? value + 'px' : convertNumber2PX(value)) : value === null ? '' : value @@ -165,7 +165,7 @@ function setHarmonyStyle(dom: TaroElement, value: unknown, oldValue?: unknown) { for (const i in oldValue) { if (!(value && i in (value as StyleValue))) { // 鸿蒙伪类特殊处理 - if (isHarmony) { + if (process.env.TARO_PLATFORM === PLATFORM_TYPE.HARMONY) { if (i === '::after' || i === '::before') { setPseudo(dom, i, null) } else if (['::first-child', '::last-child', '::empty'].includes(i) || `${i}`.indexOf('::nth-child') === 0) { @@ -191,7 +191,7 @@ function setHarmonyStyle(dom: TaroElement, value: unknown, oldValue?: unknown) { for (const i in value) { if (!oldValue || !isEqual(value[i], (oldValue as StyleValue)[i])) { // 鸿蒙伪类特殊处理 - if (isHarmony) { + if (process.env.TARO_PLATFORM === PLATFORM_TYPE.HARMONY) { if (i === '::after' || i === '::before') { setPseudo(dom, i, value[i] as unknown as StyleValue) } else if (['::first-child', '::last-child', '::empty'].includes(i) || i.startsWith('::nth-child')) { @@ -228,7 +228,7 @@ function setProperty (dom: TaroElement, name: string, value: unknown, oldValue?: ) { // skip } else if (name === 'style') { - if (isHarmonyCPP) { + if (/harmony.*cpp/.test(process.env.TARO_ENV || '')) { return dom.setAttribute('_style4cpp', value) } const style = dom.style @@ -244,7 +244,7 @@ function setProperty (dom: TaroElement, name: string, value: unknown, oldValue?: for (const i in oldValue) { if (!(value && i in (value as StyleValue))) { // Harmony特殊处理 - if (isHarmony && i === 'position' && oldValue[i] === 'fixed') { + if (process.env.TARO_PLATFORM === PLATFORM_TYPE.HARMONY && i === 'position' && oldValue[i] === 'fixed') { // @ts-ignore dom.setLayer(0) } @@ -257,7 +257,7 @@ function setProperty (dom: TaroElement, name: string, value: unknown, oldValue?: for (const i in value) { if (!oldValue || !isEqual(value[i], (oldValue as StyleValue)[i])) { // Harmony特殊处理 - if (isHarmony && i === 'position') { + if (process.env.TARO_PLATFORM === PLATFORM_TYPE.HARMONY && i === 'position') { if (value[i] === 'fixed' || (value[i] !== 'fixed' && oldValue?.[i])) { // @ts-ignore dom.setLayer(value[i] === 'fixed' ? 1 : 0) diff --git a/packages/taro-runtime/src/dom-external/index.ts b/packages/taro-runtime/src/dom-external/index.ts index c117d067987e..82cbf90f310a 100644 --- a/packages/taro-runtime/src/dom-external/index.ts +++ b/packages/taro-runtime/src/dom-external/index.ts @@ -1,3 +1,5 @@ +import { PLATFORM_TYPE } from '@tarojs/shared' + import { TaroElement } from '../dom/element' import { TaroNode } from '../dom/node' import { setInnerHTML } from '../dom-external/inner-html/html' @@ -12,9 +14,7 @@ declare const ENABLE_CONTAINS: boolean declare const ENABLE_SIZE_APIS: boolean declare const ENABLE_TEMPLATE_CONTENT: boolean -const isWeb = process.env.TARO_PLATFORM === 'web' -const isHarmony = process.env.TARO_PLATFORM === 'harmony' || process.env.TARO_ENV === 'harmony' -if (!isWeb && !isHarmony) { +if (process.env.TARO_PLATFORM !== PLATFORM_TYPE.WEB && process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY) { if (ENABLE_INNER_HTML) { TaroNode.extend('innerHTML', { set (html: string) { From 4aa3c7a170ba33827802bb31e148d565babf49c5 Mon Sep 17 00:00:00 2001 From: zhuminghui2 Date: Mon, 15 Jul 2024 11:37:57 +0800 Subject: [PATCH 27/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DstickySection?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=B8=B2=E6=9F=93list-item=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/components-harmony-ets/stickySection.ets | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/stickySection.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/stickySection.ets index 3238ca4edc0b..e8be144ffe9b 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/stickySection.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/stickySection.ets @@ -30,12 +30,7 @@ export default struct TaroStickySection { ListItemGroup({ header: this.itemHead(this.node) }) { - ForEach(this.node.children, (item: TaroElement) => { - if (item.tagName === 'LIST-VIEW') { - this.createLazyChildren(item as TaroViewElement, 0) - } - }, (item: TaroElement) => `${item._nid}-${item._nodeInfo?.layer || 0}`) - + this.createLazyChildren(this.node as TaroViewElement, 0) } .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle)) } From d1e47e95c2a1766fe75d9933cb4b03f986cfa7df Mon Sep 17 00:00:00 2001 From: zhuminghui2 Date: Mon, 15 Jul 2024 11:39:46 +0800 Subject: [PATCH 28/81] chore(release): publish 4.0.0-beta.119 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index 4949615bafca..e7990a56d0ea 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "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 060eff40e2f0..3f44b5151f61 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.0.0-beta.118", + "version": "4.0.0-beta.119", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 5a92997dfdcb..178d3c6d239f 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.0.0-beta.118", + "version": "4.0.0-beta.119", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index e51520519d07..f8742b35975e 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.0.0-beta.118", + "version": "4.0.0-beta.119", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index 5b73a8c76870..600ade4349f4 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.0.0-beta.118", + "version": "4.0.0-beta.119", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 64807f5e931e..763036d4cc0b 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.0.0-beta.118", + "version": "4.0.0-beta.119", "os": [ "win32" ], diff --git a/package.json b/package.json index 0b86a04d94b6..110fc24574a9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "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 a19933a381f8..4b9aab004b8a 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 211d882ed8ef..a897006b928c 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.0.0-beta.118", + "version": "4.0.0-beta.119", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index 67839f44f484..c952b5f5df60 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.0.0-beta.118", + "version": "4.0.0-beta.119", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 4c24a6bccd0f..47e3195de520 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index ed957e215498..2223927a51f8 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "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 66cb8037add2..459c1bb66db2 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 6db1343ef26a..b79e1ccd1309 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index 5a850540016b..8f743e6c458c 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "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 441e0347c27d..2d8b6355f273 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 ceb9f85f8a3a..9fa7dce446ca 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 44526b03660b..b1b68e982457 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "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 8c081d901e87..efc3c09ff7f9 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index c21c243aae8d..9978c4613a13 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index 16c618272805..6df93e6c80f6 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "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 81af703542e7..00719016ff97 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 88f2d2d8a9d9..ea48bc92c74a 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 6ad13bc5d326..0fb98fea2b31 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index 402420bcf710..8464d00cece7 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "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 da45dedb751a..11b1ffcc0395 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 c1a7917c7505..9deacb9522d4 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "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 749569dfe9c5..46558c533de6 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index c8ea09ceaf9e..eae1a955376e 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index b0758c30d605..e9d12c07fc1e 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 aa534230dc1c..096d0a26bb17 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 4bd616b6294e..b4bd932d3522 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 71840f27d440..3c74b5a7b5c6 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 3ae4912370f7..69c1b510d23c 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "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 7e5f8b018eba..ec3f817744ba 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "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 1e88876f3350..04621b7cef9b 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "React/Preact/Nerv 框架插件", "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 87c1599c5267..7fc793bf7a33 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 467364ea9c1f..1cefd3847676 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 9e93e8a4324e..6dda7e00a106 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "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 28f2712f1a7d..95d0895dcdad 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index 33e1ace9cbbe..47becb15cf5b 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "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 4cfeba71b496..06fb2c3c7b10 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index a98d37e5b92d..9fd41cb258ee 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index 477df4984a9a..ed4c91c85f80 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index 3cad2f5ac37b..608617c9609c 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 a5b162223286..190b23c18b4f 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index aa3f5b9e8103..02dba22f6eaf 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index 5431945805f0..40d1aeb30993 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index ff63d8cf746f..c71ac9cc4bf1 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index 6f689e89beac..e317e1793fde 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index 2f41772001f5..3d89fb755c52 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 65e028ccf56e..2fed0fdea736 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index a21fdf5eb132..e3cdcd80d0c6 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 213bb5601fb2..30b14749812a 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 45a44ca0a8e0..47fe9eb1231d 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 148fdcaba46a..b8562dc5ccd5 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index b1eaba65aa68..9e90c1faa46e 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "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 914561873dec..7e035023bcaa 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 b8a8f63e7a89..fe085f91545d 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index d66bf1a82ae3..ad5b9d10f0fa 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 549ad00a2259..f1c704795663 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index 52efe924f906..3be1cdb92a8d 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index bd037188ef21..c46514841000 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 7ed06f2c74b9..5bd0248a1111 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index f3d8961712f9..8fa90dae60f2 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 c4c226cc7873..516b70e37ed6 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 6361f291ba06..3c48fd3eb74b 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "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 0035c019d80b..8d6ffe53df56 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index b5cf8a4531b5..3ece56755497 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 da68053d3af3..3f89206e4551 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.0.0-beta.118", + "version": "4.0.0-beta.119", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 736edd05775d..7426a23ef98e 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 df9451a3743f..e26a14c8c8de 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.0.0-beta.118", + "version": "4.0.0-beta.119", "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 8fa35b04e84c..792dc78502da 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.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index 1fde19c06b7d..beef66589e24 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index 4048386af5c0..8a9dbd128952 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.118", + "version": "4.0.0-beta.119", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From cca7eed11ab931dc74303643be3f2f0365cd364d Mon Sep 17 00:00:00 2001 From: zhuminghui2 Date: Mon, 15 Jul 2024 14:42:22 +0800 Subject: [PATCH 29/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dlist-view?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/components-harmony-ets/listView.ets | 2 +- .../components/components-harmony-ets/stickySection.ets | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/listView.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/listView.ets index 552a1b9204ed..386791f2aecb 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/listView.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/listView.ets @@ -22,7 +22,7 @@ export default struct TaroListView { build() { ListItem() { - Stack() { + Column() { this.createLazyChildren(this.node, 0) } } diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/stickySection.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/stickySection.ets index e8be144ffe9b..c0d0ca0846f7 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/stickySection.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/stickySection.ets @@ -1,4 +1,5 @@ import commonStyleModify from './style' +import TaroListView from './listView' import type { TaroViewElement, TaroElement, TaroAny } from '@tarojs/runtime' @@ -30,7 +31,11 @@ export default struct TaroStickySection { ListItemGroup({ header: this.itemHead(this.node) }) { - this.createLazyChildren(this.node as TaroViewElement, 0) + ForEach(this.node.children, (item: TaroElement) => { + if (item.tagName === 'LIST-VIEW') { + TaroListView({ node: item as TaroAny, createLazyChildren: this.createLazyChildren }).reuseId(item._nid.toString()) + } + }, (item: TaroElement) => `${item._nid}-${item._nodeInfo?.layer || 0}`) } .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle)) } From 0070416a36e23d05c14d9445698939f6d370ff4d Mon Sep 17 00:00:00 2001 From: zhuminghui2 Date: Mon, 15 Jul 2024 14:44:12 +0800 Subject: [PATCH 30/81] chore(release): publish 4.0.0-beta.120 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index e7990a56d0ea..da6388eb7fbf 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "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 3f44b5151f61..48d303ac0c0b 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.0.0-beta.119", + "version": "4.0.0-beta.120", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 178d3c6d239f..67ecf3583044 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.0.0-beta.119", + "version": "4.0.0-beta.120", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index f8742b35975e..bc03be94634a 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.0.0-beta.119", + "version": "4.0.0-beta.120", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index 600ade4349f4..dc7274d905b2 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.0.0-beta.119", + "version": "4.0.0-beta.120", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 763036d4cc0b..aaac0b1b32c8 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.0.0-beta.119", + "version": "4.0.0-beta.120", "os": [ "win32" ], diff --git a/package.json b/package.json index 110fc24574a9..13bc7dd22858 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "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 4b9aab004b8a..3e465d9b19f0 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 a897006b928c..0923616ef3ba 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.0.0-beta.119", + "version": "4.0.0-beta.120", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index c952b5f5df60..d0f6f628ea79 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.0.0-beta.119", + "version": "4.0.0-beta.120", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 47e3195de520..b79945bc0753 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 2223927a51f8..e79f81b8d344 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "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 459c1bb66db2..55a7672a09b3 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 b79e1ccd1309..2b046236e9c5 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index 8f743e6c458c..7604f26a9131 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "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 2d8b6355f273..5115442acfe2 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 9fa7dce446ca..7e7862ccfedd 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 b1b68e982457..cd1c7d8055e6 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "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 efc3c09ff7f9..853a52dea973 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 9978c4613a13..712eb007a7df 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index 6df93e6c80f6..af553e1bc6b2 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "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 00719016ff97..e2babf84e90b 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 ea48bc92c74a..c8874b52764f 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 0fb98fea2b31..4279319b694e 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index 8464d00cece7..245988f0e8c0 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "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 11b1ffcc0395..0066d2036952 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 9deacb9522d4..5aa951c87634 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "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 46558c533de6..c8ad983495c8 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index eae1a955376e..ec10dabfe72f 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index e9d12c07fc1e..5897c2804283 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 096d0a26bb17..c2a5acfacdd1 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index b4bd932d3522..909bb5d28de4 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 3c74b5a7b5c6..9016aeb636cf 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 69c1b510d23c..9ce64e247e07 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "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 ec3f817744ba..bb450c63c827 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "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 04621b7cef9b..057d54abd33a 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "React/Preact/Nerv 框架插件", "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 7fc793bf7a33..db201d1b6a78 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 1cefd3847676..c75a4f025feb 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 6dda7e00a106..7a5ec45a86ac 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "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 95d0895dcdad..88eb3b0e2c53 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index 47becb15cf5b..240a5dcb7635 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "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 06fb2c3c7b10..49f9fae426d1 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 9fd41cb258ee..ed4273c03a69 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index ed4c91c85f80..09902f50010f 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index 608617c9609c..2ff62e795034 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 190b23c18b4f..1cd5f149e37b 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 02dba22f6eaf..449f194028c0 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index 40d1aeb30993..feb5c2061a10 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index c71ac9cc4bf1..4b4370305305 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index e317e1793fde..e513bdd4e860 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index 3d89fb755c52..c27fe53745af 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 2fed0fdea736..1e469e7c54ec 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index e3cdcd80d0c6..c26424b82636 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 30b14749812a..498fc114208b 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 47fe9eb1231d..93b229fc28e3 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 b8562dc5ccd5..166e219e8cb3 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index 9e90c1faa46e..f870e9be9f3a 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "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 7e035023bcaa..b045ef74b1b5 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 fe085f91545d..aa9f6d9e4763 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index ad5b9d10f0fa..ca8948df197c 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 f1c704795663..b5110c768565 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index 3be1cdb92a8d..ffd1798a8c1f 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index c46514841000..d8b53ec63fea 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 5bd0248a1111..6d79db5fe99e 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index 8fa90dae60f2..50c5709153c9 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 516b70e37ed6..ad7a3397ce1a 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 3c48fd3eb74b..c2fa7c21932a 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "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 8d6ffe53df56..8cb855bbc844 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index 3ece56755497..d215c4fc2ab0 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 3f89206e4551..5cae4529f270 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.0.0-beta.119", + "version": "4.0.0-beta.120", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 7426a23ef98e..075a43c118d0 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 e26a14c8c8de..156873d434bf 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.0.0-beta.119", + "version": "4.0.0-beta.120", "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 792dc78502da..6e263bccfe34 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.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index beef66589e24..b999cd2f4985 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index 8a9dbd128952..a101123cec3e 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.119", + "version": "4.0.0-beta.120", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From d6a8adac211b2d2f2f5581e0e263bd08039716d3 Mon Sep 17 00:00:00 2001 From: zhuminghui2 Date: Mon, 15 Jul 2024 15:27:24 +0800 Subject: [PATCH 31/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dsticky-section?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=A2=AB=E5=A4=8D=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/components-harmony-ets/listView.ets | 1 + packages/taro-vite-runner/src/harmony/template/render.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/listView.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/listView.ets index 386791f2aecb..942d9861160f 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/listView.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/listView.ets @@ -27,5 +27,6 @@ export default struct TaroListView { } } .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle)) + .zIndex(0) } } diff --git a/packages/taro-vite-runner/src/harmony/template/render.ts b/packages/taro-vite-runner/src/harmony/template/render.ts index e84f444c2d73..c79dbbd64413 100644 --- a/packages/taro-vite-runner/src/harmony/template/render.ts +++ b/packages/taro-vite-runner/src/harmony/template/render.ts @@ -279,6 +279,7 @@ export default class RenderParser extends BaseParser { name: 'StickySection', condition: `item.tagName === 'STICKY-SECTION'`, type: 'TaroViewElement', + extra: '.reuseId(item._nid.toString())' }, { name: 'ListView', From ad1d2e34412b5404865c33670a5b193fce83e307 Mon Sep 17 00:00:00 2001 From: xuanzebin Date: Mon, 15 Jul 2024 15:36:03 +0800 Subject: [PATCH 32/81] chore(release): publish 4.0.0-beta.121 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index da6388eb7fbf..57324610f1e4 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "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 48d303ac0c0b..b02d385eaf54 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.0.0-beta.120", + "version": "4.0.0-beta.121", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 67ecf3583044..e16199bf490a 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.0.0-beta.120", + "version": "4.0.0-beta.121", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index bc03be94634a..aac201645ea9 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.0.0-beta.120", + "version": "4.0.0-beta.121", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index dc7274d905b2..1425592cbd46 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.0.0-beta.120", + "version": "4.0.0-beta.121", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index aaac0b1b32c8..ef5e71effa6c 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.0.0-beta.120", + "version": "4.0.0-beta.121", "os": [ "win32" ], diff --git a/package.json b/package.json index 13bc7dd22858..1159574ed3d9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "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 3e465d9b19f0..c96b6413e40f 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 0923616ef3ba..62bc15915418 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.0.0-beta.120", + "version": "4.0.0-beta.121", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index d0f6f628ea79..2a2d73b154f5 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.0.0-beta.120", + "version": "4.0.0-beta.121", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index b79945bc0753..07fedd42effb 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index e79f81b8d344..96d87171fb02 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "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 55a7672a09b3..6cc32337f06d 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 2b046236e9c5..66e994ba9c4a 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index 7604f26a9131..0a9af77489e5 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "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 5115442acfe2..7e0390115c91 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 7e7862ccfedd..5102b73213c3 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 cd1c7d8055e6..0b47c5ada016 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "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 853a52dea973..c4f920fa0716 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 712eb007a7df..91aed13ded6f 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index af553e1bc6b2..bb14d2d6feea 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "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 e2babf84e90b..b883647d54f1 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 c8874b52764f..e2c46dc53e74 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 4279319b694e..6e30263617e4 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index 245988f0e8c0..b748b2f2e819 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "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 0066d2036952..6512b46146f3 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 5aa951c87634..afb78d8b00de 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "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 c8ad983495c8..faafae20cfde 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index ec10dabfe72f..418a86c5240e 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index 5897c2804283..78aa8d3309a0 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 c2a5acfacdd1..8ac087febf9b 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 909bb5d28de4..d796f5fbaf13 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 9016aeb636cf..5c32d5d66931 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 9ce64e247e07..54f95c26f81b 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "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 bb450c63c827..f9bee604ae51 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "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 057d54abd33a..aaea09ccd9c5 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "React/Preact/Nerv 框架插件", "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 db201d1b6a78..0f40e9652c86 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 c75a4f025feb..0f20a1dbf993 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 7a5ec45a86ac..a9df1e12217b 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "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 88eb3b0e2c53..926b75b32633 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index 240a5dcb7635..fb78fdaeea6f 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "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 49f9fae426d1..4f42553dc233 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index ed4273c03a69..2feec6b33454 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index 09902f50010f..c6b50c35cae0 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index 2ff62e795034..c02960392152 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 1cd5f149e37b..34587d7214a5 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 449f194028c0..0c6b77d71f6f 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index feb5c2061a10..fa49ad4a74fe 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index 4b4370305305..2c60bf8b256b 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index e513bdd4e860..1b3453d1d492 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index c27fe53745af..2ddedaba60b5 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 1e469e7c54ec..616d527eb77a 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index c26424b82636..5ceb9dd6686d 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 498fc114208b..6852f617bbb2 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 93b229fc28e3..8cdd9d5ea9f7 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 166e219e8cb3..c8deae91b6f9 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index f870e9be9f3a..23fac97f23c1 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "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 b045ef74b1b5..7ff2cc03cbf7 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 aa9f6d9e4763..98581ae574fc 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index ca8948df197c..aa3231368744 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 b5110c768565..036c2fcd8f0a 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index ffd1798a8c1f..fc77648b0312 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index d8b53ec63fea..5ec0c2cbc87b 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 6d79db5fe99e..550eb0062f09 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index 50c5709153c9..9b143161f8d4 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 ad7a3397ce1a..197d4ef8e5af 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index c2fa7c21932a..91d646191bc7 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "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 8cb855bbc844..a623f53818e4 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index d215c4fc2ab0..d8b1e0b359b2 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 54d61d8fa28c..7db73e993ed3 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.0.0-beta.120", + "version": "4.0.0-beta.121", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 075a43c118d0..bc1ccffbecee 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 156873d434bf..47f576bbcb02 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.0.0-beta.120", + "version": "4.0.0-beta.121", "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 6e263bccfe34..452f53d60d6a 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.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index b999cd2f4985..f138f3a2b243 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index a101123cec3e..4c433a0922d4 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.120", + "version": "4.0.0-beta.121", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From 86a30a3d57645fa7568e3b4b72113811db670581 Mon Sep 17 00:00:00 2001 From: zhuminghui2 Date: Mon, 15 Jul 2024 17:24:07 +0800 Subject: [PATCH 33/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E5=BC=95=E5=85=A5taro=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-platform-harmony/src/apis/ui/scroll/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/taro-platform-harmony/src/apis/ui/scroll/index.ts b/packages/taro-platform-harmony/src/apis/ui/scroll/index.ts index 630def6592cb..48c1fc0bf14f 100644 --- a/packages/taro-platform-harmony/src/apis/ui/scroll/index.ts +++ b/packages/taro-platform-harmony/src/apis/ui/scroll/index.ts @@ -7,7 +7,7 @@ */ import { AREA_CHANGE_EVENT_NAME, Current, findChildNodeWithDFS, getPageScrollerOrNode, setNodeEventCallbackAndTriggerComponentUpdate } from '@tarojs/runtime' -import { pxTransformHelper } from '../../index' +import { pxTransformHelper } from '@tarojs/taro' import { MethodHandler } from '../../utils/handler' import type Taro from '@tarojs/taro/types' From dd80148ad1767ac6bde2f5d3f74623ac66d7de05 Mon Sep 17 00:00:00 2001 From: zhuminghui2 Date: Mon, 15 Jul 2024 17:24:26 +0800 Subject: [PATCH 34/81] chore(release): publish 4.0.0-beta.122 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index 57324610f1e4..63e376071ed1 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "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 b02d385eaf54..b909533d9d3e 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.0.0-beta.121", + "version": "4.0.0-beta.122", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index e16199bf490a..007935efed64 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.0.0-beta.121", + "version": "4.0.0-beta.122", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index aac201645ea9..dd17542a2acd 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.0.0-beta.121", + "version": "4.0.0-beta.122", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index 1425592cbd46..5a16114577ec 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.0.0-beta.121", + "version": "4.0.0-beta.122", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index ef5e71effa6c..a4decdfc333c 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.0.0-beta.121", + "version": "4.0.0-beta.122", "os": [ "win32" ], diff --git a/package.json b/package.json index 1159574ed3d9..cc0b7e9cda7b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "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 c96b6413e40f..f4977bcb770f 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 62bc15915418..d9ec8a452fcb 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.0.0-beta.121", + "version": "4.0.0-beta.122", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index 2a2d73b154f5..aedd47b64744 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.0.0-beta.121", + "version": "4.0.0-beta.122", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 07fedd42effb..485a3eef3b56 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 96d87171fb02..b29aabaca61f 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "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 6cc32337f06d..03e5a1528f25 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 66e994ba9c4a..646832803198 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index 0a9af77489e5..736dda498d2c 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "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 7e0390115c91..7d5bada8c662 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 5102b73213c3..445ff65060b1 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 0b47c5ada016..fb1da7c52e1a 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "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 c4f920fa0716..96a7c2c07f88 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 91aed13ded6f..c33991ed034a 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index bb14d2d6feea..9a6dec52f1c6 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "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 b883647d54f1..ac4c35613cf3 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 e2c46dc53e74..36974168556e 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 6e30263617e4..bb0f6a6af84d 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index b748b2f2e819..632bcd5796e1 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "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 6512b46146f3..1cfeb8ee0b6a 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 afb78d8b00de..34d47f0541d6 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "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 faafae20cfde..8f8be1bf1aed 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index 418a86c5240e..57762dff4365 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index 78aa8d3309a0..a6def855e6bf 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 8ac087febf9b..0f788b9888fb 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index d796f5fbaf13..b3ec15822890 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 5c32d5d66931..400c9806fd02 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 54f95c26f81b..e1a6c5d70861 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "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 f9bee604ae51..1d9fab57478d 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "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 aaea09ccd9c5..ca986601d752 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "React/Preact/Nerv 框架插件", "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 0f40e9652c86..b4d1ee28c277 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 0f20a1dbf993..16538e0f7fd6 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 a9df1e12217b..b6b71404633a 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "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 926b75b32633..2e7b6fae04bd 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index fb78fdaeea6f..1e03ea1fc1ba 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "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 4f42553dc233..6e39518a23e3 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 2feec6b33454..0c3d3825256b 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index c6b50c35cae0..6e7b283c415e 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index c02960392152..e8a24d902407 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 34587d7214a5..3cdcfd7ec627 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 0c6b77d71f6f..dedd37d7dc3c 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index fa49ad4a74fe..59bbbf2eb5fc 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index 2c60bf8b256b..36434d4cc648 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index 1b3453d1d492..9c8c099ec1fd 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index 2ddedaba60b5..5c5d9b4bcbec 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 616d527eb77a..d5de40c4f6cd 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index 5ceb9dd6686d..fbb9dfe059d9 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 6852f617bbb2..d51065d72d43 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 8cdd9d5ea9f7..6e8cd0c0ff5c 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 c8deae91b6f9..e55b518e0695 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index 23fac97f23c1..bf5a016245b8 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "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 7ff2cc03cbf7..59a2a3ff6540 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 98581ae574fc..2946dd3a7dd2 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index aa3231368744..38fab9e77782 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 036c2fcd8f0a..76e691fc28f7 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index fc77648b0312..ac5d686f98d8 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 5ec0c2cbc87b..621136e062c2 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 550eb0062f09..4d7e5d7e4383 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index 9b143161f8d4..4d4d09b057ef 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 197d4ef8e5af..d066dc5d04cf 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 91d646191bc7..f276b25b0f53 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "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 a623f53818e4..68fe96e04eb4 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index d8b1e0b359b2..bc4098a1461c 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 7db73e993ed3..cf578909493b 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.0.0-beta.121", + "version": "4.0.0-beta.122", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index bc1ccffbecee..5dd3514d677e 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 47f576bbcb02..860c63ea879a 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.0.0-beta.121", + "version": "4.0.0-beta.122", "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 452f53d60d6a..23d58eb8d7c8 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.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index f138f3a2b243..011e8e10cc60 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index 4c433a0922d4..c6457940cdb5 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.121", + "version": "4.0.0-beta.122", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From fc9577e2da9c5204cb7129e6b29b58ee805c1279 Mon Sep 17 00:00:00 2001 From: zhuminghui2 Date: Mon, 15 Jul 2024 17:24:26 +0800 Subject: [PATCH 35/81] chore(release): publish 4.0.0-beta.122 --tag=beta --- packages/taro-platform-harmony/src/apis/ui/scroll/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/taro-platform-harmony/src/apis/ui/scroll/index.ts b/packages/taro-platform-harmony/src/apis/ui/scroll/index.ts index 48c1fc0bf14f..ef4cee870739 100644 --- a/packages/taro-platform-harmony/src/apis/ui/scroll/index.ts +++ b/packages/taro-platform-harmony/src/apis/ui/scroll/index.ts @@ -6,8 +6,8 @@ * 文档地址 https://developer.harmonyos.com/cn/docs/documentation/doc-references/js-framework-syntax-js-0000000000611432 */ import { AREA_CHANGE_EVENT_NAME, Current, findChildNodeWithDFS, getPageScrollerOrNode, setNodeEventCallbackAndTriggerComponentUpdate } from '@tarojs/runtime' - import { pxTransformHelper } from '@tarojs/taro' + import { MethodHandler } from '../../utils/handler' import type Taro from '@tarojs/taro/types' From 99479f14d2a2346580f0ec37fc0250992e16d83a Mon Sep 17 00:00:00 2001 From: zhuminghui2 Date: Mon, 15 Jul 2024 22:23:17 +0800 Subject: [PATCH 36/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dcssmodule?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taro-vite-runner/src/harmony/postcss/constants.ts | 2 +- packages/taro-vite-runner/src/harmony/style.ts | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/taro-vite-runner/src/harmony/postcss/constants.ts b/packages/taro-vite-runner/src/harmony/postcss/constants.ts index f541389622ae..8dea88d30d40 100644 --- a/packages/taro-vite-runner/src/harmony/postcss/constants.ts +++ b/packages/taro-vite-runner/src/harmony/postcss/constants.ts @@ -40,7 +40,7 @@ export const htmlProxyRE = /(?:\?|&)html-proxy\b/ export const commonjsProxyRE = /\?commonjs-proxy/ export const inlineRE = /(?:\?|&)inline\b/ export const inlineCSSRE = /(?:\?|&)inline-css\b/ -export const usedRE = /(?:\?|&)used\b/ +export const usedRE = /(?:\?|&)used/ export const varRE = /^var\(/i export const loadParseImportRE = /(?:\?|&)load-parse-import\b/ diff --git a/packages/taro-vite-runner/src/harmony/style.ts b/packages/taro-vite-runner/src/harmony/style.ts index e6ea4d34ae7a..4c371d580138 100644 --- a/packages/taro-vite-runner/src/harmony/style.ts +++ b/packages/taro-vite-runner/src/harmony/style.ts @@ -20,7 +20,7 @@ import { compileCSS } from './postcss' import { commonjsProxyRE, CSS_LANGS_RE, cssModuleRE, htmlProxyRE, inlineCSSRE, inlineRE, loadParseImportRE, - SPECIAL_QUERY_RE, usedRE, usedSuffix + SPECIAL_QUERY_RE, usedRE } from './postcss/constants' import { finalizeCss, stripBomTag } from './postcss/utils' @@ -212,7 +212,7 @@ export async function stylePlugin(viteCompilerContext: ViteHarmonyCompilerContex if (cssIdSet.size) { const cssRawArr = Array.from(cssIdSet).map((cssId) => { - const rawId = stripVirtualModulePrefix(cssId).replace(STYLE_SUFFIX_RE, '').replace(usedSuffix, '') + const rawId = stripVirtualModulePrefix(cssId).replace(STYLE_SUFFIX_RE, '').replace(usedRE, '') return cssCache.get(rawId) || '' }) const { code: raw_code } = parseJSXStyle(raw, cssRawArr, { @@ -264,8 +264,9 @@ export async function stylePlugin(viteCompilerContext: ViteHarmonyCompilerContex // 校验css validateStylelint(id, raw) - if (modules && !moduleCache.has(id)) { - moduleCache.set(id.replace(usedRE, ''), modules) + const rawId= id.replace(STYLE_SUFFIX_RE, '').replace(usedRE, ''); + if (modules && !moduleCache.has(rawId)) { + moduleCache.set(rawId, modules) } // track deps for build watch mode @@ -342,7 +343,7 @@ export async function stylePostPlugin(_viteCompilerContext: ViteHarmonyCompilerC const css = stripBomTag(raw) const inlined = inlineRE.test(id) - const rawId = stripVirtualModulePrefix(id).replace(STYLE_SUFFIX_RE, '').replace(usedSuffix, '') + const rawId = stripVirtualModulePrefix(id).replace(STYLE_SUFFIX_RE, '').replace(usedRE, '') const modules = cssModulesCache.get(viteConfig)!.get(rawId) // `foo.module.css` => modulesCode From affd6a411ca48e9e192aa43a838f5b51e2e5a49d Mon Sep 17 00:00:00 2001 From: zhuminghui2 Date: Mon, 15 Jul 2024 22:23:49 +0800 Subject: [PATCH 37/81] chore(release): publish 4.0.0-beta.123 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index 63e376071ed1..b6b854f81eef 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "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 b909533d9d3e..c60c9953f564 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.0.0-beta.122", + "version": "4.0.0-beta.123", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 007935efed64..5bc267591413 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.0.0-beta.122", + "version": "4.0.0-beta.123", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index dd17542a2acd..4e4240796e56 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.0.0-beta.122", + "version": "4.0.0-beta.123", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index 5a16114577ec..beac4166f87f 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.0.0-beta.122", + "version": "4.0.0-beta.123", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index a4decdfc333c..6546dd735bc6 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.0.0-beta.122", + "version": "4.0.0-beta.123", "os": [ "win32" ], diff --git a/package.json b/package.json index cc0b7e9cda7b..79cd6ba9ae06 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "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 f4977bcb770f..39af0f629b52 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 d9ec8a452fcb..221faea4b4c6 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.0.0-beta.122", + "version": "4.0.0-beta.123", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index aedd47b64744..90d9317c3fb8 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.0.0-beta.122", + "version": "4.0.0-beta.123", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 485a3eef3b56..a4cd0ba72d48 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index b29aabaca61f..a196a238b526 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "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 03e5a1528f25..7374e7bbed10 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 646832803198..4bad6bbd33d5 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index 736dda498d2c..44e73f0d795f 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "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 7d5bada8c662..39a506785f93 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 445ff65060b1..b49ccd135448 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 fb1da7c52e1a..0cae305431cd 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "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 96a7c2c07f88..1abb814ed391 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index c33991ed034a..ad8adc5974d3 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index 9a6dec52f1c6..453e905ea9e7 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "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 ac4c35613cf3..4df690454452 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 36974168556e..ec180930f76c 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 bb0f6a6af84d..95237c018086 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index 632bcd5796e1..47821362a468 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "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 1cfeb8ee0b6a..421c87e8e915 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 34d47f0541d6..6ec65ef79aef 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "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 8f8be1bf1aed..9fc5df2e21d4 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index 57762dff4365..dae848362adf 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index a6def855e6bf..f4a3e7ae2a14 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 0f788b9888fb..a19c042245e7 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index b3ec15822890..27639f1454cf 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 400c9806fd02..db4d4b16e80f 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index e1a6c5d70861..4b3021b20dbf 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "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 1d9fab57478d..bd476d2d2a80 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "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 ca986601d752..df99ab205e55 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "React/Preact/Nerv 框架插件", "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 b4d1ee28c277..3783f55c6d1d 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 16538e0f7fd6..8f3d3890b54c 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 b6b71404633a..87e177254c5f 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "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 2e7b6fae04bd..1423e90f62be 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index 1e03ea1fc1ba..39af40aef1f3 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "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 6e39518a23e3..fbc425d57938 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 0c3d3825256b..1049b92aee32 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index 6e7b283c415e..4ca67b4a127d 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index e8a24d902407..0e9a0e1af172 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 3cdcfd7ec627..875066bd1143 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index dedd37d7dc3c..7033131b290e 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index 59bbbf2eb5fc..c0057e36805e 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index 36434d4cc648..b4cf71f6323b 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index 9c8c099ec1fd..c6b179b83edf 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index 5c5d9b4bcbec..f8885579c37b 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index d5de40c4f6cd..4334156190a3 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index fbb9dfe059d9..b6df658d60e2 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 d51065d72d43..454b8c71d7e7 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 6e8cd0c0ff5c..dfe6ce076592 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 e55b518e0695..21f0a83a1c76 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index bf5a016245b8..1bcb865e832b 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "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 59a2a3ff6540..2ae882e3cbe7 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 2946dd3a7dd2..290ce1dd3cb3 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index 38fab9e77782..142f4138cfe0 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 76e691fc28f7..f89390bdf5f2 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index ac5d686f98d8..e13f0fc8234d 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 621136e062c2..2df2091c88c8 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 4d7e5d7e4383..ddb2c5afef89 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index 4d4d09b057ef..600e7d637309 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 d066dc5d04cf..d181e6ed45ea 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index f276b25b0f53..11223904bc1b 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "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 68fe96e04eb4..db3cb040a485 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index bc4098a1461c..171c2179aa2a 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 cf578909493b..6c87de54390c 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.0.0-beta.122", + "version": "4.0.0-beta.123", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 5dd3514d677e..09874abdcb44 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 860c63ea879a..f37cdd26f66e 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.0.0-beta.122", + "version": "4.0.0-beta.123", "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 23d58eb8d7c8..e47b6a6675b9 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.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index 011e8e10cc60..314c8228a973 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index c6457940cdb5..6ad3acbc6ca3 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.122", + "version": "4.0.0-beta.123", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From cdbda9697fe7e7b1e4ad150a4b11fec428ed893e Mon Sep 17 00:00:00 2001 From: xuanzebin Date: Tue, 16 Jul 2024 14:39:30 +0800 Subject: [PATCH 38/81] =?UTF-8?q?fix:=20=E4=B8=B4=E6=97=B6=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20harmony=20=E4=B8=8D=E8=83=BD=E7=BC=96=E8=AF=91=20ts?= =?UTF-8?q?=20=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/babel-preset-taro/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/babel-preset-taro/index.js b/packages/babel-preset-taro/index.js index df4bb80cf160..98c36bb90e6b 100644 --- a/packages/babel-preset-taro/index.js +++ b/packages/babel-preset-taro/index.js @@ -35,8 +35,10 @@ module.exports = (_, options = {}) => { const isSolid = options.framework === 'solid' && !isVite // vite 不需要 vue 的 preset，在内部已经处理了 const isVue3 = options.framework === 'vue3' && !isVite + // TODO：后续改为在 vite harmony 中实现对 ts 的支持 + const isHarmony = process.env.TARO_PLATFORM === 'harmony' // vite 不需要使用 babel 处理 ts，在 esbuild 中处理了 - const isTs = options.ts && !isVite + const isTs = options.ts && (!isVite || isHarmony) const moduleName = options.framework.charAt(0).toUpperCase() + options.framework.slice(1) const presetReactConfig = options.react || {} From dd9d31e1601e5a8a9167a4b5c49769426edcd52f Mon Sep 17 00:00:00 2001 From: xuanzebin Date: Tue, 16 Jul 2024 14:40:15 +0800 Subject: [PATCH 39/81] chore(release): publish 4.0.0-beta.124 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index b6b854f81eef..ae28ffb50524 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "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 c60c9953f564..e23e543cf514 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.0.0-beta.123", + "version": "4.0.0-beta.124", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 5bc267591413..27e985658666 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.0.0-beta.123", + "version": "4.0.0-beta.124", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index 4e4240796e56..dd4d51369669 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.0.0-beta.123", + "version": "4.0.0-beta.124", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index beac4166f87f..2d7f3e97e1e4 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.0.0-beta.123", + "version": "4.0.0-beta.124", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 6546dd735bc6..7961beed9e39 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.0.0-beta.123", + "version": "4.0.0-beta.124", "os": [ "win32" ], diff --git a/package.json b/package.json index 79cd6ba9ae06..97f1bf016759 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "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 39af0f629b52..86dee537f315 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 221faea4b4c6..4b460fc32b5e 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.0.0-beta.123", + "version": "4.0.0-beta.124", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index 90d9317c3fb8..7a4fd0cd4143 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.0.0-beta.123", + "version": "4.0.0-beta.124", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index a4cd0ba72d48..7da4d5d9a943 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index a196a238b526..642cb17086d7 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "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 7374e7bbed10..3e4dab2bcf19 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 4bad6bbd33d5..9e93f3ea2af4 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index 44e73f0d795f..68ff87309e2d 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "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 39a506785f93..716c110533c5 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 b49ccd135448..d547332b9e04 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 0cae305431cd..e40dd0b403e5 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "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 1abb814ed391..d6307b20a507 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index ad8adc5974d3..d9bc492b84e6 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index 453e905ea9e7..ded201919308 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "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 4df690454452..36b5b6c175ce 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 ec180930f76c..e3ef666ffb02 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 95237c018086..2f0e149b099a 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index 47821362a468..4d4e3ae487aa 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "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 421c87e8e915..1370abf39367 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 6ec65ef79aef..1904f3af947a 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "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 9fc5df2e21d4..60b7eeaee67d 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index dae848362adf..624d37984fd2 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index f4a3e7ae2a14..c063b8d89ca0 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 a19c042245e7..55298b343b6a 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 27639f1454cf..7410eb8a32fa 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 db4d4b16e80f..361a847462c5 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 4b3021b20dbf..55f154b07445 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "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 bd476d2d2a80..4cd71b65fa52 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "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 df99ab205e55..eb39fc7282b8 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "React/Preact/Nerv 框架插件", "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 3783f55c6d1d..86c180fdadc5 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 8f3d3890b54c..6030ae9eea74 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 87e177254c5f..eba086bf709b 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "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 1423e90f62be..af16d4c5c8c6 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index 39af40aef1f3..b8c37c29e439 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "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 fbc425d57938..31725cc1c6cd 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 1049b92aee32..c4bb236787f6 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index 4ca67b4a127d..b30f89e575f9 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index 0e9a0e1af172..f55d0689b6c7 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 875066bd1143..6d87cea8a3e6 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 7033131b290e..d15bbc264413 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index c0057e36805e..bde71040432b 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index b4cf71f6323b..32b5d6a580a6 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index c6b179b83edf..f5b2cec91ddd 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index f8885579c37b..e4393f39e626 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 4334156190a3..af7e0355b03d 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index b6df658d60e2..e769fc85df5b 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 454b8c71d7e7..eba48ce04663 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index dfe6ce076592..bbe9fc665828 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 21f0a83a1c76..d3afd08c7170 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index 1bcb865e832b..62bca4539290 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "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 2ae882e3cbe7..93a0904bc2bc 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 290ce1dd3cb3..6587c99222c5 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index 142f4138cfe0..d38df5734c0b 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 f89390bdf5f2..8528ff47c34e 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index e13f0fc8234d..288360909145 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 2df2091c88c8..104722a83ba6 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index ddb2c5afef89..484b66b27ec0 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index 600e7d637309..c2b8654986ab 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 d181e6ed45ea..9ad99fd3c728 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 11223904bc1b..ff6c5bd38e03 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "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 db3cb040a485..82f9395d453e 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index 171c2179aa2a..a9e74b15ac00 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 6c87de54390c..eeddb9acd7d7 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.0.0-beta.123", + "version": "4.0.0-beta.124", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 09874abdcb44..6f14a9a9d5b8 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 f37cdd26f66e..7937891b1285 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.0.0-beta.123", + "version": "4.0.0-beta.124", "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 e47b6a6675b9..9c2c481bc4cc 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.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index 314c8228a973..99b1e4ffaea3 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index 6ad3acbc6ca3..f6d31c080d23 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.123", + "version": "4.0.0-beta.124", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From f9cf02af2ec268c6261bdbd40698f27832d630e2 Mon Sep 17 00:00:00 2001 From: mayintao3 Date: Wed, 17 Jul 2024 00:07:55 +0800 Subject: [PATCH 40/81] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9=E6=89=BE?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E9=A1=B5=E9=9D=A2=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-vite-runner/src/harmony/template/page.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/taro-vite-runner/src/harmony/template/page.ts b/packages/taro-vite-runner/src/harmony/template/page.ts index dce467c6a54d..0236c0467ebf 100644 --- a/packages/taro-vite-runner/src/harmony/template/page.ts +++ b/packages/taro-vite-runner/src/harmony/template/page.ts @@ -1083,7 +1083,7 @@ this.removeTabBarEvent()` : 'callFn(this.page?.onUnload, this)']) const isBlended = this.buildConfig.blended || this.buildConfig.isBuildNativeComp let createFn = isBlended ? 'createNativePageConfig' : 'createPageConfig' - const nativeCreatePage = `createNativePageConfig(component, '${entryOption.routeName}', React, ReactDOM, config)` + const nativeCreatePage = `createNativePageConfig(component, '${entryOption?.routeName || page.name}', React, ReactDOM, config)` let createPageOrComponent = isBlended ? nativeCreatePage : `createPageConfig(component, '${entryOption.routeName}', config)` // 如果是pure，说明不是一个页面，而是一个组件，这个时候修改import和createPage From a672a793c58c7a0c8fb1870b41c408d1a9754ead Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Thu, 18 Jul 2024 15:22:06 +0800 Subject: [PATCH 41/81] =?UTF-8?q?fix(harmony):=20=E4=BC=98=E5=8C=96=20cont?= =?UTF-8?q?extPromise=20=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/apis/network/downloadFile.ts | 4 ++- .../src/apis/network/uploadFile.ts | 4 ++- .../src/apis/utils/handler.ts | 3 ++- .../src/runtime-ets/current.ts | 25 ++++++++++++++++++- .../taro-platform-harmony/types/runtime.d.ts | 7 ++++++ 5 files changed, 39 insertions(+), 4 deletions(-) diff --git a/packages/taro-platform-harmony/src/apis/network/downloadFile.ts b/packages/taro-platform-harmony/src/apis/network/downloadFile.ts index bf87911a9d65..42d4eee45115 100644 --- a/packages/taro-platform-harmony/src/apis/network/downloadFile.ts +++ b/packages/taro-platform-harmony/src/apis/network/downloadFile.ts @@ -8,10 +8,12 @@ // ❌ DownloadTask.offHeadersReceived 此接口 ohos 不支持 import request from '@ohos.request' -import Taro, { DownloadTask } from '@tarojs/taro' import { callAsyncFail, callAsyncSuccess, validateParams } from '../utils' +import type Taro from '@tarojs/taro/types' +import type { DownloadTask } from '@tarojs/taro/types' + interface IDownloadConfigOHOS { url: string header?: any diff --git a/packages/taro-platform-harmony/src/apis/network/uploadFile.ts b/packages/taro-platform-harmony/src/apis/network/uploadFile.ts index 209abd5a1dc3..9644eb79fd23 100644 --- a/packages/taro-platform-harmony/src/apis/network/uploadFile.ts +++ b/packages/taro-platform-harmony/src/apis/network/uploadFile.ts @@ -9,10 +9,12 @@ import request from '@ohos.request' import { isUndefined } from '@tarojs/shared' -import Taro, { UploadTask } from '@tarojs/taro' import { callAsyncFail, callAsyncSuccess, validateParams } from '../utils' +import type Taro from '@tarojs/taro/types' +import type { UploadTask } from '@tarojs/taro/types' + interface IOHOSFileType { filename?: string name?: string diff --git a/packages/taro-platform-harmony/src/apis/utils/handler.ts b/packages/taro-platform-harmony/src/apis/utils/handler.ts index cc30bcb69fa6..351ba460d306 100644 --- a/packages/taro-platform-harmony/src/apis/utils/handler.ts +++ b/packages/taro-platform-harmony/src/apis/utils/handler.ts @@ -1,10 +1,11 @@ import { isFunction } from '@tarojs/shared' +import type { TFunc } from '@tarojs/runtime' + export interface ICallbackResult { /** 错误信息 */ errMsg: string } -type TFunc = (...args: any[]) => any type TCallback> = (res: T) => Promise | void interface IMethodParam> { diff --git a/packages/taro-platform-harmony/src/runtime-ets/current.ts b/packages/taro-platform-harmony/src/runtime-ets/current.ts index bf327637301f..c93c81fb7188 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/current.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/current.ts @@ -3,15 +3,38 @@ export const context: any = { value: null } +export const uiContext: any = { + resolver: null, + value: null +} + export const Current: any = { app: null, - uiContext: null, + get uiContext () { + return uiContext.value + }, + set uiContext (e) { + uiContext.resolver(e) + }, router: {}, taro: {}, contextPromise: new Promise(resolve => { context.resolver = resolve return resolve + }).then(e => { + context.value = e + + return e + }), + uiContextPromise: new Promise(resolve => { + uiContext.resolver = resolve + + return resolve + }).then((e) => { + uiContext.value = e + + return e }), createHarmonyElement: null } diff --git a/packages/taro-platform-harmony/types/runtime.d.ts b/packages/taro-platform-harmony/types/runtime.d.ts index fe0b111f3ab5..71445a176442 100644 --- a/packages/taro-platform-harmony/types/runtime.d.ts +++ b/packages/taro-platform-harmony/types/runtime.d.ts @@ -18,4 +18,11 @@ declare module '@tarojs/runtime' { export function findChildNodeWithDFS (node: TaroElement, selector: string | ((ele: T) => boolean), selectAll: boolean): T[] | T | null export const window: any + export type TFunc = (...args: any[]) => any + + export const context: { + resolver: Promise.resolve + value: any + } + export const uiContext: typeof context } From 7f905a70015a9ef434a30cf3e0457db1333cb8bb Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Thu, 18 Jul 2024 17:10:33 +0800 Subject: [PATCH 42/81] =?UTF-8?q?fix(harmony):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=AF=BB=E5=8F=96=E9=85=8D=E7=BD=AE=E6=97=B6=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E5=B8=B8=E9=87=8F=E6=B3=A8=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-vite-runner/src/utils/compiler/base.ts | 2 +- packages/taro-vite-runner/src/utils/compiler/harmony.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/taro-vite-runner/src/utils/compiler/base.ts b/packages/taro-vite-runner/src/utils/compiler/base.ts index ecdcddd55230..81162889a0bd 100644 --- a/packages/taro-vite-runner/src/utils/compiler/base.ts +++ b/packages/taro-vite-runner/src/utils/compiler/base.ts @@ -65,7 +65,7 @@ export class CompilerContext const scriptPath = resolveMainFilePath(path.join(sourceDir, pageName), frameworkExts) const nativePath = resolveMainFilePath(path.join(sourceDir, pageName), nativeExt) const configPath = this.getConfigFilePath(scriptPath) - const config: PageConfig = readConfig(configPath) || {} + const config: PageConfig = readConfig(configPath, this.taroConfig) || {} const pageMeta = { name: pageName, From e026ed73327afda83b1c6289cfe4872f6c032cf0 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Thu, 18 Jul 2024 17:28:32 +0800 Subject: [PATCH 43/81] chore(release): publish 4.0.0-beta.125 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index ae28ffb50524..c69e49b09b39 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "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 e23e543cf514..88b8a0314498 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.0.0-beta.124", + "version": "4.0.0-beta.125", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 27e985658666..33cfb7d7caa0 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.0.0-beta.124", + "version": "4.0.0-beta.125", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index dd4d51369669..51c62ae1c62f 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.0.0-beta.124", + "version": "4.0.0-beta.125", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index 2d7f3e97e1e4..d1826cd4328c 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.0.0-beta.124", + "version": "4.0.0-beta.125", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 7961beed9e39..61a946aa371f 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.0.0-beta.124", + "version": "4.0.0-beta.125", "os": [ "win32" ], diff --git a/package.json b/package.json index 97f1bf016759..8c360859a258 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "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 86dee537f315..79ca40f3a80e 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 4b460fc32b5e..ec428e3a59d0 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.0.0-beta.124", + "version": "4.0.0-beta.125", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index 7a4fd0cd4143..c84455cbdd4e 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.0.0-beta.124", + "version": "4.0.0-beta.125", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 7da4d5d9a943..43ce1dd5d4de 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 642cb17086d7..c666ec22a782 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "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 3e4dab2bcf19..04d4cb198caa 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 9e93f3ea2af4..3452161cfd46 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index 68ff87309e2d..b97afda846bd 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "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 716c110533c5..91df4e5582da 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 d547332b9e04..85a11c402ea3 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 e40dd0b403e5..3bfe64852f1f 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "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 d6307b20a507..7d28e0794451 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index d9bc492b84e6..0cbb13c0d85b 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index ded201919308..9b15cb6074dc 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "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 36b5b6c175ce..08ada6231e94 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 e3ef666ffb02..5b912ba852fe 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 2f0e149b099a..29fe6c63cfc5 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index 4d4e3ae487aa..e24d11cd6a7c 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "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 1370abf39367..300b75331f75 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 1904f3af947a..ae3509f23147 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "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 60b7eeaee67d..9d7e24948e0c 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index 624d37984fd2..eddf48345c27 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index c063b8d89ca0..576ed1ac5df6 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 55298b343b6a..264154dbffd3 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 7410eb8a32fa..d03fd1515daf 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 361a847462c5..a3e4bfbe1615 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 55f154b07445..593c3f349435 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "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 4cd71b65fa52..524d57e02f3e 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "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 eb39fc7282b8..c767cebce355 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "React/Preact/Nerv 框架插件", "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 86c180fdadc5..e2ca4fa2edc0 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 6030ae9eea74..5c2a6c791d15 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 eba086bf709b..eb276e52d29c 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "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 af16d4c5c8c6..65ce6a1ae1ea 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index b8c37c29e439..17f30ee10568 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "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 31725cc1c6cd..2bb802d1269d 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index c4bb236787f6..89ff3c0682a0 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index b30f89e575f9..0a3203639ca1 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index f55d0689b6c7..8178db6d2653 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 6d87cea8a3e6..938adda7976d 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index d15bbc264413..503148fd340b 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index bde71040432b..64eea67140b1 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index 32b5d6a580a6..99da290e5361 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index f5b2cec91ddd..a532fcbb8814 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index e4393f39e626..b6e783397690 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index af7e0355b03d..584deac42d45 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index e769fc85df5b..838f1e15d612 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 eba48ce04663..c0d23644dcd1 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index bbe9fc665828..71d9218be4a5 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 d3afd08c7170..f9226359f5f3 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index 62bca4539290..3fd6a3ba0933 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "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 93a0904bc2bc..649eea718e86 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 6587c99222c5..5651e316cbd3 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index d38df5734c0b..c6b845e8921b 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 8528ff47c34e..df2dc39ea25b 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index 288360909145..0a062450802c 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 104722a83ba6..2137740431b3 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 484b66b27ec0..8834402e6491 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index c2b8654986ab..0738ad0e0175 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 9ad99fd3c728..5863c24842d4 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index ff6c5bd38e03..90789b36f8a9 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "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 82f9395d453e..8f5ede736598 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index a9e74b15ac00..1df99e850721 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 eeddb9acd7d7..646457fc91df 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.0.0-beta.124", + "version": "4.0.0-beta.125", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 6f14a9a9d5b8..aa04717a040c 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 7937891b1285..2fcd92d0fc9f 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.0.0-beta.124", + "version": "4.0.0-beta.125", "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 9c2c481bc4cc..d599601796d7 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.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index 99b1e4ffaea3..bc49c71200b6 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index f6d31c080d23..d0b8a72b8f07 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.124", + "version": "4.0.0-beta.125", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From 101d5b2cfbf81af33353bb22d369ca48baaddd92 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Thu, 18 Jul 2024 23:15:52 +0800 Subject: [PATCH 44/81] fix: code --- packages/taro-vite-runner/src/harmony/postcss/constants.ts | 1 - packages/taro-vite-runner/src/harmony/style.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/taro-vite-runner/src/harmony/postcss/constants.ts b/packages/taro-vite-runner/src/harmony/postcss/constants.ts index 8dea88d30d40..e80df0accb52 100644 --- a/packages/taro-vite-runner/src/harmony/postcss/constants.ts +++ b/packages/taro-vite-runner/src/harmony/postcss/constants.ts @@ -35,7 +35,6 @@ export const cssNotProcessedRE = /(?:gradient|element|cross-fade|image)\(/ export const cssModuleRE = new RegExp(`\\.module${CSS_LANGS_RE.source}`) export const cssGlobalModuleRE = new RegExp(`^(?!.*\\.global\\.).*${CSS_LANGS_RE.source}`) -export const usedSuffix = '?used' export const htmlProxyRE = /(?:\?|&)html-proxy\b/ export const commonjsProxyRE = /\?commonjs-proxy/ export const inlineRE = /(?:\?|&)inline\b/ diff --git a/packages/taro-vite-runner/src/harmony/style.ts b/packages/taro-vite-runner/src/harmony/style.ts index 4c371d580138..ceb297a71797 100644 --- a/packages/taro-vite-runner/src/harmony/style.ts +++ b/packages/taro-vite-runner/src/harmony/style.ts @@ -264,7 +264,7 @@ export async function stylePlugin(viteCompilerContext: ViteHarmonyCompilerContex // 校验css validateStylelint(id, raw) - const rawId= id.replace(STYLE_SUFFIX_RE, '').replace(usedRE, ''); + const rawId = id.replace(STYLE_SUFFIX_RE, '').replace(usedRE, '') if (modules && !moduleCache.has(rawId)) { moduleCache.set(rawId, modules) } From 7ef14189a629f406a386833586af43f5abec4550 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Fri, 19 Jul 2024 01:18:15 +0800 Subject: [PATCH 45/81] =?UTF-8?q?feat(harmony):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=AD=89=E8=B5=84=E6=BA=90=E6=B3=A8=E5=85=A5?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taro-vite-runner/src/harmony/asset.ts | 42 +++++++++++-------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/packages/taro-vite-runner/src/harmony/asset.ts b/packages/taro-vite-runner/src/harmony/asset.ts index c87249b9b6b5..18625efe95eb 100644 --- a/packages/taro-vite-runner/src/harmony/asset.ts +++ b/packages/taro-vite-runner/src/harmony/asset.ts @@ -1,5 +1,4 @@ import path from 'node:path' -import { parse as parseUrl } from 'node:url' import { fs, getHash } from '@tarojs/helper' import MagicString from 'magic-string' @@ -243,7 +242,7 @@ export function publicFileToBuiltUrl( export function fileToUrl( id: string, config: ResolvedConfig, - pluginContext: PluginContext, + _pluginContext: PluginContext, viteCompilerContext: ViteHarmonyCompilerContext, skipPublicCheck = false, ): string { @@ -261,25 +260,32 @@ export function fileToUrl( const content = fs.readFileSync(file) // emit as asset - const { search, hash } = parseUrl(id) - const postfix = (search || '') + (hash || '') + // const { search, hash } = parseUrl(id) + // const postfix = (search || '') + (hash || '') const { cwd: appPath, taroConfig } = viteCompilerContext - const { sourceRoot = 'src' } = taroConfig + const { sourceRoot = 'src', outputRoot = 'dist' } = taroConfig const appRoot = path.resolve(appPath, sourceRoot) - const referenceId = pluginContext.emitFile({ - // Ignore directory structure for asset file names - fileName: path.relative(appRoot, file), - name: path.basename(file), - type: 'asset', - source: content, + // const referenceId = pluginContext.emitFile({ + // // Ignore directory structure for asset file names + // fileName: path.relative(appRoot, file), + // name: path.basename(file), + // type: 'asset', + // source: content, + // }) + + // const originalName = normalizePath(path.relative(config.root, file)) + // generatedAssets.get(config)!.set(referenceId, { originalName }) + + // const url = `__TARO_VITE_ASSET__${referenceId}__${postfix ? `$_${postfix}__` : ``}` // TODO_BASE + + const resourceName = path.relative(appRoot, file).replace(/^[\\/]+/, '').replace(/[\\/-]+/g, '_') + const resourcePath = path.join(process.cwd(), outputRoot, '..', 'resources/base/media', resourceName) + fs.ensureDirSync(path.dirname(resourcePath)) + fs.writeFileSync(resourcePath, content, { + encoding: 'utf-8', }) - const originalName = normalizePath(path.relative(config.root, file)) - generatedAssets.get(config)!.set(referenceId, { originalName }) - - const url = `__TARO_VITE_ASSET__${referenceId}__${postfix ? `$_${postfix}__` : ``}` // TODO_BASE - - cache.set(id, url) - return url + cache.set(id, resourcePath) + return 'resource://base/media/' + resourceName } From 80aef2a3dd1c01dc0bcd7590b4128989203a810a Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Fri, 19 Jul 2024 01:18:45 +0800 Subject: [PATCH 46/81] chore(release): publish 4.0.0-beta.126 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index c69e49b09b39..9634a1f374e9 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "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 88b8a0314498..5535404f628b 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.0.0-beta.125", + "version": "4.0.0-beta.126", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 33cfb7d7caa0..75db8d934ab1 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.0.0-beta.125", + "version": "4.0.0-beta.126", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index 51c62ae1c62f..5916cf153a0f 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.0.0-beta.125", + "version": "4.0.0-beta.126", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index d1826cd4328c..1a580b59f4cd 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.0.0-beta.125", + "version": "4.0.0-beta.126", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 61a946aa371f..112fea1455d5 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.0.0-beta.125", + "version": "4.0.0-beta.126", "os": [ "win32" ], diff --git a/package.json b/package.json index 8c360859a258..75cd0e4162c0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "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 79ca40f3a80e..845067bb8ab1 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 ec428e3a59d0..73d492544b68 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.0.0-beta.125", + "version": "4.0.0-beta.126", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index c84455cbdd4e..7ceaab55d0bc 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.0.0-beta.125", + "version": "4.0.0-beta.126", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 43ce1dd5d4de..47134667460c 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index c666ec22a782..8fc0c8a0cadd 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "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 04d4cb198caa..da03824a713a 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 3452161cfd46..840247ea74b5 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index b97afda846bd..bf6f216cd4e1 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "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 91df4e5582da..843107d1c385 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 85a11c402ea3..78529848d1e2 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 3bfe64852f1f..9d17bf3a4742 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "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 7d28e0794451..5b3c4161d085 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 0cbb13c0d85b..9ea788d43b15 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index 9b15cb6074dc..aef2542c5d4a 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "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 08ada6231e94..1a0e063f336d 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 5b912ba852fe..a7d038d2e45d 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 29fe6c63cfc5..5d80368fc0e1 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index e24d11cd6a7c..74c9da0c94c0 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "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 300b75331f75..b3cef2292114 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 ae3509f23147..60e772bb9f6b 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "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 9d7e24948e0c..72321d8c2839 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index eddf48345c27..2ab4f0132622 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index 576ed1ac5df6..b85bcdc734ca 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 264154dbffd3..7e9f407c66cb 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index d03fd1515daf..21d16ff34379 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 a3e4bfbe1615..f013678fb464 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 593c3f349435..3654486a8c69 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "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 524d57e02f3e..8773d5d182c4 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "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 c767cebce355..7c33da9f733b 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "React/Preact/Nerv 框架插件", "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 e2ca4fa2edc0..eadc44cd664c 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 5c2a6c791d15..3d0165b65487 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 eb276e52d29c..4752182b861c 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "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 65ce6a1ae1ea..e028aa2ec085 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index 17f30ee10568..f7aaebdf5d07 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "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 2bb802d1269d..f09117472fa3 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 89ff3c0682a0..ffb69e44c026 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index 0a3203639ca1..b1e9d5958966 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index 8178db6d2653..a34870e3f30d 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 938adda7976d..a9408841b4d7 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 503148fd340b..ef87c732b587 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index 64eea67140b1..1c388ff9a30d 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index 99da290e5361..f5f2a375e84e 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index a532fcbb8814..481a795bb855 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index b6e783397690..f062698f6662 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 584deac42d45..2a2fdef501ef 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index 838f1e15d612..06c0537f3f28 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 c0d23644dcd1..c61c7060ed50 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 71d9218be4a5..a5425ead5bb5 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 f9226359f5f3..8c627bcfa40f 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index 3fd6a3ba0933..aab51b6a96d4 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "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 649eea718e86..82240c9431a5 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 5651e316cbd3..3f268fd2a6c2 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index c6b845e8921b..d915d0673fc4 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 df2dc39ea25b..188e806e6380 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index 0a062450802c..c970ca50a1e9 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 2137740431b3..463389a1b2e7 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 8834402e6491..45cfd6c94fdb 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index 0738ad0e0175..252bf03c86b6 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 5863c24842d4..8f18b360fed2 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 90789b36f8a9..8369c67d2818 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "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 8f5ede736598..737932879dc8 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index 1df99e850721..bab3ba5fa6e6 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 646457fc91df..779051c95025 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.0.0-beta.125", + "version": "4.0.0-beta.126", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index aa04717a040c..02d3cb459622 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 2fcd92d0fc9f..be2078184cb1 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.0.0-beta.125", + "version": "4.0.0-beta.126", "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 d599601796d7..d159ab2c435f 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.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index bc49c71200b6..fe96d7bb65c3 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index d0b8a72b8f07..51473c45fcc7 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.125", + "version": "4.0.0-beta.126", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From 5606d2b13f4f1723595cbe447e6be1e80fb814d5 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Mon, 22 Jul 2024 17:20:52 +0800 Subject: [PATCH 47/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20readConfig=20?= =?UTF-8?q?=E6=97=B6=E5=BC=95=E5=85=A5=20babel=20=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-helper/package.json | 1 + packages/taro-helper/src/utils.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/taro-helper/package.json b/packages/taro-helper/package.json index e028aa2ec085..08244e909deb 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -12,6 +12,7 @@ "prebuild": "pnpm run clean", "build": "tsc", "postbuild": "pnpm run swc:backup", + "predev": "pnpm run clean", "dev": "tsc -w", "prepack": "pnpm run build", "test": "jest --collectCoverage", diff --git a/packages/taro-helper/src/utils.ts b/packages/taro-helper/src/utils.ts index 65bdb545258b..38759e41cd2f 100644 --- a/packages/taro-helper/src/utils.ts +++ b/packages/taro-helper/src/utils.ts @@ -631,8 +631,8 @@ export function readPageConfig(configPath: string) { } interface IReadConfigOptions { - defineConstants?: Record alias?: Record + defineConstants?: Record } export function readConfig (configPath: string, options: T = {} as T) { @@ -643,8 +643,8 @@ export function readConfig (configPath: string, op } else { result = requireWithEsbuild(configPath, { customConfig: { - define: options.defineConstants || {}, alias: options.alias || {}, + define: options.defineConstants || {}, }, customSwcConfig: { jsc: { From f29bb7425a5ab13ccd2c20e741ef7b460aa6043f Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Mon, 22 Jul 2024 17:46:39 +0800 Subject: [PATCH 48/81] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=20lint=20?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/apis/device/wifi/NativeWifi.ts | 2 +- .../src/api/apis/harmony-native/ApiDecorator.ts | 2 +- .../src/api/apis/location/NativeLocation.ts | 2 +- .../src/api/apis/location/openLocation.ts | 2 +- .../src/components/components-react/Map/Map.tsx | 2 +- .../src/components/components-react/SameLayerRender.ts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/device/wifi/NativeWifi.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/device/wifi/NativeWifi.ts index 3092dcc2d9c5..6a4afece6b2e 100644 --- a/packages/taro-platform-harmony-hybrid/src/api/apis/device/wifi/NativeWifi.ts +++ b/packages/taro-platform-harmony-hybrid/src/api/apis/device/wifi/NativeWifi.ts @@ -37,4 +37,4 @@ class NativeWifi { const nativeWifi = new NativeWifi() -export default nativeWifi \ No newline at end of file +export default nativeWifi diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/harmony-native/ApiDecorator.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/harmony-native/ApiDecorator.ts index 06badb60464c..f343d9316914 100644 --- a/packages/taro-platform-harmony-hybrid/src/api/apis/harmony-native/ApiDecorator.ts +++ b/packages/taro-platform-harmony-hybrid/src/api/apis/harmony-native/ApiDecorator.ts @@ -8,4 +8,4 @@ export const syncAndRelease = window.MethodChannel && window.MethodChannel.jsBri export const asyncAndRelease = window.MethodChannel && window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) || (target => target) // @ts-ignore -export const asyncAndNotRelease = window.MethodChannel && window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: false }) || (target => target) \ No newline at end of file +export const asyncAndNotRelease = window.MethodChannel && window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: false }) || (target => target) diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/location/NativeLocation.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/location/NativeLocation.ts index ee93734f80ce..2d82b964303d 100644 --- a/packages/taro-platform-harmony-hybrid/src/api/apis/location/NativeLocation.ts +++ b/packages/taro-platform-harmony-hybrid/src/api/apis/location/NativeLocation.ts @@ -37,4 +37,4 @@ class NativeLocation { const nativeLocation = new NativeLocation() -export default nativeLocation \ No newline at end of file +export default nativeLocation diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/location/openLocation.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/location/openLocation.ts index 62d7f6cf84c9..12820ddcebd9 100644 --- a/packages/taro-platform-harmony-hybrid/src/api/apis/location/openLocation.ts +++ b/packages/taro-platform-harmony-hybrid/src/api/apis/location/openLocation.ts @@ -40,4 +40,4 @@ export const openLocation: typeof Taro.openLocation = (options) => { } }) }) -} \ No newline at end of file +} diff --git a/packages/taro-platform-harmony-hybrid/src/components/components-react/Map/Map.tsx b/packages/taro-platform-harmony-hybrid/src/components/components-react/Map/Map.tsx index 769265b27939..6102d8d92296 100644 --- a/packages/taro-platform-harmony-hybrid/src/components/components-react/Map/Map.tsx +++ b/packages/taro-platform-harmony-hybrid/src/components/components-react/Map/Map.tsx @@ -125,4 +125,4 @@ class HosMap extends React.Component { } } -export default HosMap \ No newline at end of file +export default HosMap diff --git a/packages/taro-platform-harmony-hybrid/src/components/components-react/SameLayerRender.ts b/packages/taro-platform-harmony-hybrid/src/components/components-react/SameLayerRender.ts index 9727d585ae03..68f367d38579 100644 --- a/packages/taro-platform-harmony-hybrid/src/components/components-react/SameLayerRender.ts +++ b/packages/taro-platform-harmony-hybrid/src/components/components-react/SameLayerRender.ts @@ -13,4 +13,4 @@ class SameLayerRender { } const sameLayerRender = new SameLayerRender() -export default sameLayerRender \ No newline at end of file +export default sameLayerRender From 1af4ae85ada8095feedc925b38ed4785606e55ef Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Mon, 22 Jul 2024 17:22:44 +0800 Subject: [PATCH 49/81] chore(release): publish 4.0.0-beta.127 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index 9634a1f374e9..e1c592951598 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "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 5535404f628b..c70df22caf79 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.0.0-beta.126", + "version": "4.0.0-beta.127", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 75db8d934ab1..615986114557 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.0.0-beta.126", + "version": "4.0.0-beta.127", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index 5916cf153a0f..54a366755d2c 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.0.0-beta.126", + "version": "4.0.0-beta.127", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index 1a580b59f4cd..5e6cd41d04ef 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.0.0-beta.126", + "version": "4.0.0-beta.127", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 112fea1455d5..5f54e879e706 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.0.0-beta.126", + "version": "4.0.0-beta.127", "os": [ "win32" ], diff --git a/package.json b/package.json index 75cd0e4162c0..a1b7b5a486f0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "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 845067bb8ab1..ccd89dd16aac 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 73d492544b68..3f98ad9fb93d 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.0.0-beta.126", + "version": "4.0.0-beta.127", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index 7ceaab55d0bc..ea0a214aea9c 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.0.0-beta.126", + "version": "4.0.0-beta.127", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 47134667460c..11d735d7536c 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 8fc0c8a0cadd..a30e2ddafd8a 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "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 da03824a713a..5f6fb9ad5c18 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 840247ea74b5..6613871466dd 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index bf6f216cd4e1..553e3471bdc0 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "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 843107d1c385..2c9ac5963b5d 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 78529848d1e2..ecbdb4d17f18 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 9d17bf3a4742..cb502acadffc 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "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 5b3c4161d085..9c060cc6d7c9 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 9ea788d43b15..55c613b0036f 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index aef2542c5d4a..6e6f6c43d49e 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "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 1a0e063f336d..7fa9c5c4fc66 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 a7d038d2e45d..10e6e9cb2e0c 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 5d80368fc0e1..80eb43f12cb0 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index 74c9da0c94c0..6d91263de223 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "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 b3cef2292114..35f17c1d2f80 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 60e772bb9f6b..17a5d68635da 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "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 72321d8c2839..39de95641923 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index 2ab4f0132622..e36ed847de60 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index b85bcdc734ca..1a4225b8e435 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 7e9f407c66cb..c510a5de9a99 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 21d16ff34379..cbcde783273f 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 f013678fb464..18752f0bc206 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 3654486a8c69..ac3c134dc8fd 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "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 8773d5d182c4..45324119662d 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "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 7c33da9f733b..9620938fe689 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "React/Preact/Nerv 框架插件", "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 eadc44cd664c..231ac261b0b5 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 3d0165b65487..8cfa6cc15325 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 4752182b861c..158075b8496e 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "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 08244e909deb..d12206a3ea7c 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index f7aaebdf5d07..b76299386a94 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "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 f09117472fa3..7367ce816185 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index ffb69e44c026..42502a1e7a00 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index b1e9d5958966..768843fe2dda 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index a34870e3f30d..137f7b3c3539 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 a9408841b4d7..feb06fd9294a 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index ef87c732b587..32cf855259ab 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index 1c388ff9a30d..df6b12b3edfa 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index f5f2a375e84e..841cf52f10fa 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index 481a795bb855..556fa2f70ac4 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index f062698f6662..a8de1c40a9f6 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 2a2fdef501ef..ef309ec536ef 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index 06c0537f3f28..efe3dfb40b6d 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 c61c7060ed50..1295d52e105d 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index a5425ead5bb5..9054b1423f7b 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 8c627bcfa40f..d7439808b9dc 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index aab51b6a96d4..0ae15ca63e90 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "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 82240c9431a5..c1c7bca3359e 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 3f268fd2a6c2..06548fc8996c 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index d915d0673fc4..e2c9e20a15a3 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 188e806e6380..35dd4eb4afd8 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index c970ca50a1e9..536de9352cc6 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 463389a1b2e7..1f31d1595bc0 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 45cfd6c94fdb..0e7041db0ba5 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index 252bf03c86b6..ed61c62c3206 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 8f18b360fed2..da52e20e1e50 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 8369c67d2818..16beb2f5954e 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "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 737932879dc8..1408ee98211a 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index bab3ba5fa6e6..ae4364d83520 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 779051c95025..9797cfb52950 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.0.0-beta.126", + "version": "4.0.0-beta.127", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 02d3cb459622..3dcbfe0ba2e1 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 be2078184cb1..ba8a04e7d83c 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.0.0-beta.126", + "version": "4.0.0-beta.127", "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 d159ab2c435f..df1c75063878 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.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index fe96d7bb65c3..a98240c240fe 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index 51473c45fcc7..53f16a23bf22 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.126", + "version": "4.0.0-beta.127", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From f24e550fe9d0a03d266b0248e135662504e63f4a Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Mon, 22 Jul 2024 20:00:22 +0800 Subject: [PATCH 50/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20readConfig=20?= =?UTF-8?q?=E6=97=B6=E5=BC=95=E5=85=A5=20babel=20=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-helper/src/utils.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/taro-helper/src/utils.ts b/packages/taro-helper/src/utils.ts index 38759e41cd2f..a5449d7ae05f 100644 --- a/packages/taro-helper/src/utils.ts +++ b/packages/taro-helper/src/utils.ts @@ -9,7 +9,7 @@ import * as babelParser from '@babel/parser' import babelTraverse from '@babel/traverse' import * as t from '@babel/types' import * as fs from 'fs-extra' -import { camelCase, flatMap, isPlainObject, mergeWith } from 'lodash' +import { camelCase, defaults, flatMap, isPlainObject, mergeWith } from 'lodash' import { CSS_EXT, @@ -644,7 +644,9 @@ export function readConfig (configPath: string, op result = requireWithEsbuild(configPath, { customConfig: { alias: options.alias || {}, - define: options.defineConstants || {}, + define: defaults(options.defineConstants || {}, { + define: 'define', // Note: 该场景下不支持 AMD 导出，这会导致 esbuild 替换 babel 的 define 方法 + }), }, customSwcConfig: { jsc: { From 1f527a271626c532d879e2ff0f1fae19a1323e6e Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Mon, 22 Jul 2024 20:00:45 +0800 Subject: [PATCH 51/81] chore(release): publish 4.0.0-beta.128 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index e1c592951598..7728f79bcafc 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "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 c70df22caf79..16efadb90cf5 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.0.0-beta.127", + "version": "4.0.0-beta.128", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 615986114557..ba7a020550e0 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.0.0-beta.127", + "version": "4.0.0-beta.128", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index 54a366755d2c..26f59be206db 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.0.0-beta.127", + "version": "4.0.0-beta.128", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index 5e6cd41d04ef..418bfc02a5e8 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.0.0-beta.127", + "version": "4.0.0-beta.128", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 5f54e879e706..6bba9162f648 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.0.0-beta.127", + "version": "4.0.0-beta.128", "os": [ "win32" ], diff --git a/package.json b/package.json index a1b7b5a486f0..42604910ab0d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "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 ccd89dd16aac..87aa94b888fe 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 3f98ad9fb93d..d47966a61cc2 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.0.0-beta.127", + "version": "4.0.0-beta.128", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index ea0a214aea9c..858c9bdac551 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.0.0-beta.127", + "version": "4.0.0-beta.128", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 11d735d7536c..6665748b4e96 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index a30e2ddafd8a..d5931c1a5123 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "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 5f6fb9ad5c18..c03c4f1fca99 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 6613871466dd..fdc6f90ce383 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index 553e3471bdc0..a8f73aa01682 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "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 2c9ac5963b5d..ed0301147f4b 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 ecbdb4d17f18..fec1b0a6b85c 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 cb502acadffc..fcfbfda1dfb1 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "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 9c060cc6d7c9..44444c7be20d 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 55c613b0036f..9db6bb2a4410 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index 6e6f6c43d49e..efe91f75a998 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "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 7fa9c5c4fc66..87d22d8ef0a2 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 10e6e9cb2e0c..47507bdffe0f 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 80eb43f12cb0..6c29a8ddc27d 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index 6d91263de223..2d73ff931a63 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "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 35f17c1d2f80..f106e8442731 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 17a5d68635da..214a1ca2bafb 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "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 39de95641923..c123d96de20f 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index e36ed847de60..c8c5cbffeb7c 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index 1a4225b8e435..8df7b1143451 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 c510a5de9a99..f26f93eb5650 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index cbcde783273f..3e9512a8bab4 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 18752f0bc206..9b6187379bc6 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index ac3c134dc8fd..96dcb0b5d8eb 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "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 45324119662d..64b253c41633 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "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 9620938fe689..c9fa82643dcc 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "React/Preact/Nerv 框架插件", "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 231ac261b0b5..8c4de0d1c058 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 8cfa6cc15325..d2d44dc99cbf 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 158075b8496e..fbc4198e57e8 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "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 d12206a3ea7c..df2259d34a9f 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index b76299386a94..2c91b73867e4 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "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 7367ce816185..2317468de24b 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 42502a1e7a00..3305d6492eb6 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index 768843fe2dda..9344181dd51a 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index 137f7b3c3539..0294e5990f4b 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 feb06fd9294a..531305b27579 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 32cf855259ab..618fde61bbe7 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index df6b12b3edfa..768bef539270 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index 841cf52f10fa..7eda6229d0f3 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index 556fa2f70ac4..fc4a65fd1b71 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index a8de1c40a9f6..62edcfb9becf 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index ef309ec536ef..dff8a723995f 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index efe3dfb40b6d..c9c49669c33e 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 1295d52e105d..4fb1123b38e1 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 9054b1423f7b..74b29c41e33b 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 d7439808b9dc..4d36bc752aab 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index 0ae15ca63e90..399115011618 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "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 c1c7bca3359e..7b9cb244dd18 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 06548fc8996c..71ce01d104e7 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index e2c9e20a15a3..9b88e5788de7 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 35dd4eb4afd8..abb55744212b 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index 536de9352cc6..15bcb3e7d4c3 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 1f31d1595bc0..2bdfd0c55aed 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 0e7041db0ba5..336e844e550d 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index ed61c62c3206..cdf9b013dbe9 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 da52e20e1e50..a9d03c62288f 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 16beb2f5954e..a1aaf0ec8d80 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "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 1408ee98211a..d58873843fe3 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index ae4364d83520..2bdcf0e9997b 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 9797cfb52950..60bda2a7cbb0 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.0.0-beta.127", + "version": "4.0.0-beta.128", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 3dcbfe0ba2e1..d5727f672ced 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 ba8a04e7d83c..3b8be60bfc99 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.0.0-beta.127", + "version": "4.0.0-beta.128", "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 df1c75063878..e5cd6fd75200 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.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index a98240c240fe..14592d9ff56d 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index 53f16a23bf22..572d11edd685 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.127", + "version": "4.0.0-beta.128", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From 4b924f502b49cee779216f73ea965dc826400d25 Mon Sep 17 00:00:00 2001 From: zhuminghui2 Date: Thu, 25 Jul 2024 13:55:10 +0800 Subject: [PATCH 52/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dscroll=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=A6=81=E6=AD=A2=E6=BB=9A=E5=8A=A8=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/components-harmony-ets/scrollView.ets | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/scrollView.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/scrollView.ets index dd5449eb4f3a..bc096a2fc309 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/scrollView.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/scrollView.ets @@ -36,8 +36,13 @@ function getAttributes (node: TaroScrollViewElement): ScrollViewAttrs { function getScrollable (node: TaroScrollViewElement) { const _attrs = node._attrs - - return _attrs.scrollX ? ScrollDirection.Horizontal : ScrollDirection.Vertical + if (_attrs.scrollX) { + return ScrollDirection.Horizontal + } else if (_attrs.scrollY) { + return ScrollDirection.Vertical + } else { + return ScrollDirection.None + } } function handleScrollEvent (node: TaroScrollViewElement, eventName = 'scroll', xOffset?: number, yOffset?: number) { From 799d88ba04f86d9e03e5e1f525e523495a92a271 Mon Sep 17 00:00:00 2001 From: zhuminghui2 Date: Thu, 25 Jul 2024 13:55:53 +0800 Subject: [PATCH 53/81] chore(release): publish 4.0.0-beta.129 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index 7728f79bcafc..8e785b18d8f2 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "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 16efadb90cf5..e39597ffb51d 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.0.0-beta.128", + "version": "4.0.0-beta.129", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index ba7a020550e0..8e516516c50c 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.0.0-beta.128", + "version": "4.0.0-beta.129", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index 26f59be206db..0cc68e65443b 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.0.0-beta.128", + "version": "4.0.0-beta.129", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index 418bfc02a5e8..8261de2eab3d 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.0.0-beta.128", + "version": "4.0.0-beta.129", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 6bba9162f648..07ffcfca386c 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.0.0-beta.128", + "version": "4.0.0-beta.129", "os": [ "win32" ], diff --git a/package.json b/package.json index 42604910ab0d..746f89d335be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "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 87aa94b888fe..dee8235fc832 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 d47966a61cc2..21c240998a97 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.0.0-beta.128", + "version": "4.0.0-beta.129", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index 858c9bdac551..ed1f00421f48 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.0.0-beta.128", + "version": "4.0.0-beta.129", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 6665748b4e96..cced24182175 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index d5931c1a5123..7b9e6aedcb71 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "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 c03c4f1fca99..d96b739c7f2a 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 fdc6f90ce383..5fe0e0eccd65 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index a8f73aa01682..a18a863a297e 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "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 ed0301147f4b..135192bb1ef8 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 fec1b0a6b85c..33d95cc9bba2 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 fcfbfda1dfb1..d6a66b5c49b0 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "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 44444c7be20d..412f8a8749f0 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 9db6bb2a4410..95f5b2f102c1 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index efe91f75a998..ea73ff997efd 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "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 87d22d8ef0a2..b245295d61a3 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 47507bdffe0f..be91a1c864f7 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 6c29a8ddc27d..1509d0cd27cc 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index 2d73ff931a63..d244657f24b8 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "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 f106e8442731..421e40019f20 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 214a1ca2bafb..e7b617e0557b 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "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 c123d96de20f..f0cb2c0184d7 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index c8c5cbffeb7c..e502d5c8ce97 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index 8df7b1143451..a87d2dd74055 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 f26f93eb5650..13126f8b2918 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 3e9512a8bab4..27a7b89cb4de 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 9b6187379bc6..b30bcd94bf94 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 96dcb0b5d8eb..2a76a77d78f6 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "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 64b253c41633..4166f07a5890 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "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 c9fa82643dcc..b5ea17b0a50b 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "React/Preact/Nerv 框架插件", "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 8c4de0d1c058..562bf64e51f1 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 d2d44dc99cbf..65e767229ad8 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 fbc4198e57e8..afdd9a502a5e 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "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 df2259d34a9f..721f1da37267 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index 2c91b73867e4..58ac11b949d8 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "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 2317468de24b..7425a19488a0 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 3305d6492eb6..40b665e02a31 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index 9344181dd51a..24c70367ab1a 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index 0294e5990f4b..974f9188edf3 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 531305b27579..fc34241d8858 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 618fde61bbe7..2312c6766dfa 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index 768bef539270..b300833c46a3 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index 7eda6229d0f3..7dac54a084e6 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index fc4a65fd1b71..8d9ac773b208 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index 62edcfb9becf..9e75bb13292c 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index dff8a723995f..1c4d82b3d2e0 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index c9c49669c33e..67fdd9c4e341 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 4fb1123b38e1..8ef2c4c15fc6 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 74b29c41e33b..e36d99305abe 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 4d36bc752aab..a827f3e1c83b 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index 399115011618..69bae92118ed 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "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 7b9cb244dd18..bc8aae6f0d4c 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 71ce01d104e7..cf7bc8dacf34 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index 9b88e5788de7..e2e875a2c916 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 abb55744212b..6a2ea15a52f1 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index 15bcb3e7d4c3..e5c46bdd07cd 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 2bdfd0c55aed..7e5d165347ab 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 336e844e550d..55619e6d3a6c 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index cdf9b013dbe9..44649c938e1a 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 a9d03c62288f..f1c30989dbc6 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index a1aaf0ec8d80..b4ad43619407 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "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 d58873843fe3..86d1d883e4fd 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index 2bdcf0e9997b..b22ca6c00ee8 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 60bda2a7cbb0..ef021d95118f 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.0.0-beta.128", + "version": "4.0.0-beta.129", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index d5727f672ced..6d86042f3416 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 3b8be60bfc99..2cebf2588850 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.0.0-beta.128", + "version": "4.0.0-beta.129", "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 e5cd6fd75200..83f6ae4815a4 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.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index 14592d9ff56d..b7e0c2879a7d 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index 572d11edd685..53c4990c7a77 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.128", + "version": "4.0.0-beta.129", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From 31923728a19fcfabef2241781b57a7fe2a0656d5 Mon Sep 17 00:00:00 2001 From: mayintao3 Date: Thu, 25 Jul 2024 14:09:59 +0800 Subject: [PATCH 54/81] =?UTF-8?q?feat:=20=E5=9C=A8style=E7=9A=84opacity?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=88=90=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?= =?UTF-8?q?=E9=87=8C=E6=8A=8A=E4=BB=96=E8=AE=BE=E7=BD=AE=E6=88=901?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8Dharmony=20beta2=E6=8A=8Aopacity?= =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E5=80=BC=E8=AE=BE=E7=BD=AE=E6=88=90?= =?UTF-8?q?0=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/components-harmony-ets/style.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/style.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/style.ets index a4183f577f02..e88255561f92 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/style.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/style.ets @@ -363,7 +363,7 @@ export function setNormalAttributeIntoInstance(instance: CommonAttribute, style: }) } if (!isUndefined(style.opacity)) { - instance.opacity(style.opacity) + instance.opacity(style.opacity === '' ? 1: style.opacity) } if (!isUndefined(style.overflow)) { instance.clip(style.overflow === 'hidden') From ff4f3f8890d49b02f15528454341bdb3d665d905 Mon Sep 17 00:00:00 2001 From: xuanzebin Date: Thu, 25 Jul 2024 20:51:51 +0800 Subject: [PATCH 55/81] chore(release): publish 4.0.0-beta.130 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index 8e785b18d8f2..2c70618dd977 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "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 e39597ffb51d..429c93e4c915 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.0.0-beta.129", + "version": "4.0.0-beta.130", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 8e516516c50c..0e6f6dadc0e1 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.0.0-beta.129", + "version": "4.0.0-beta.130", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index 0cc68e65443b..d2be1a410cc0 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.0.0-beta.129", + "version": "4.0.0-beta.130", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index 8261de2eab3d..12aacd88c93c 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.0.0-beta.129", + "version": "4.0.0-beta.130", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 07ffcfca386c..9549d43e19ff 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.0.0-beta.129", + "version": "4.0.0-beta.130", "os": [ "win32" ], diff --git a/package.json b/package.json index 746f89d335be..cdf62b4f7afb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "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 dee8235fc832..b03277ef5f8f 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 21c240998a97..decbb49c6682 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.0.0-beta.129", + "version": "4.0.0-beta.130", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index ed1f00421f48..eb4cf490b920 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.0.0-beta.129", + "version": "4.0.0-beta.130", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index cced24182175..a52b37986329 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 7b9e6aedcb71..596354283abc 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "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 d96b739c7f2a..08f1ed037579 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 5fe0e0eccd65..8961cc01440c 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index a18a863a297e..938d8f614c24 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "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 135192bb1ef8..ad71e66f06cb 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 33d95cc9bba2..9c83822dccad 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 d6a66b5c49b0..9c7acf286be4 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "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 412f8a8749f0..7fdb8c4f3802 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 95f5b2f102c1..14b56c97e72b 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index ea73ff997efd..9441db3f76b6 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "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 b245295d61a3..0eae452c7283 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 be91a1c864f7..70a47bc22877 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 1509d0cd27cc..ee94791db37a 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index d244657f24b8..48b45cc1d899 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "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 421e40019f20..84796a5df1b2 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 e7b617e0557b..377149ba5322 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "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 f0cb2c0184d7..aa48ab4d6b03 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index e502d5c8ce97..abbd8af98b8d 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index a87d2dd74055..17d3dbec2079 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 13126f8b2918..75c13bebd061 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 27a7b89cb4de..dc87ed0126b3 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 b30bcd94bf94..f3bdd2c0b980 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 2a76a77d78f6..de690f56e495 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "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 4166f07a5890..e96c7380e1c3 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "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 b5ea17b0a50b..f6a99774149d 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "React/Preact/Nerv 框架插件", "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 562bf64e51f1..c0911f44e8de 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 65e767229ad8..0b364fdd429f 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 afdd9a502a5e..f75fbefe7066 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "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 721f1da37267..b1818998569a 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index 58ac11b949d8..7910806b7aa9 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "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 7425a19488a0..0ed0f12d85fb 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 40b665e02a31..7f2ae44bc034 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index 24c70367ab1a..7871be964c78 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index 974f9188edf3..2ade63299bf5 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 fc34241d8858..c7ca4db333ad 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 2312c6766dfa..f064e21dc3aa 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index b300833c46a3..b7adceb50750 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index 7dac54a084e6..f83a8a35e7db 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index 8d9ac773b208..4f7e4968c50f 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index 9e75bb13292c..138be692c952 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 1c4d82b3d2e0..ea92b54dec19 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index 67fdd9c4e341..3db0fa8cfe90 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 8ef2c4c15fc6..8482e4316c18 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index e36d99305abe..716a61b2760a 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 a827f3e1c83b..01a0eb249b70 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index 69bae92118ed..7c529ff3e165 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "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 bc8aae6f0d4c..5d5ddd609999 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 cf7bc8dacf34..b80158d10299 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index e2e875a2c916..b5621c7690f2 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 6a2ea15a52f1..054920981700 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index e5c46bdd07cd..855986e85098 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 7e5d165347ab..dbf857dba5b7 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 55619e6d3a6c..ec9321941399 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index 44649c938e1a..f8ba017b007a 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 f1c30989dbc6..25b0350e3a2a 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index b4ad43619407..193b38e06452 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "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 86d1d883e4fd..73f45145b30b 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index b22ca6c00ee8..44e88740d5d6 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 ef021d95118f..3cb0cbf8ec12 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.0.0-beta.129", + "version": "4.0.0-beta.130", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 6d86042f3416..532463f8d9af 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 2cebf2588850..ce8e35488224 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.0.0-beta.129", + "version": "4.0.0-beta.130", "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 83f6ae4815a4..08d5084a189c 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.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index b7e0c2879a7d..5a3498ab0671 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index 53c4990c7a77..32a77eb4a27e 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.129", + "version": "4.0.0-beta.130", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From dc21b684ae3ada3719de37528afbf3fb1fb76bcf Mon Sep 17 00:00:00 2001 From: liuzejia Date: Thu, 25 Jul 2024 22:03:20 +0800 Subject: [PATCH 56/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=B8=BF?= =?UTF-8?q?=E8=92=99=E7=AB=AF=E7=9A=84pagaName=E8=8E=B7=E5=8F=96=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98=E5=92=8Cets=E7=9A=84?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/components-harmony-ets/style.ets | 2 +- packages/taro-vite-runner/src/harmony/template/page.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/style.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/style.ets index e88255561f92..8bc9fefda2d7 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/style.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/style.ets @@ -363,7 +363,7 @@ export function setNormalAttributeIntoInstance(instance: CommonAttribute, style: }) } if (!isUndefined(style.opacity)) { - instance.opacity(style.opacity === '' ? 1: style.opacity) + instance.opacity(String(style.opacity) === '' ? 1: style.opacity) } if (!isUndefined(style.overflow)) { instance.clip(style.overflow === 'hidden') diff --git a/packages/taro-vite-runner/src/harmony/template/page.ts b/packages/taro-vite-runner/src/harmony/template/page.ts index 0236c0467ebf..4780948784e8 100644 --- a/packages/taro-vite-runner/src/harmony/template/page.ts +++ b/packages/taro-vite-runner/src/harmony/template/page.ts @@ -1082,9 +1082,9 @@ this.removeTabBarEvent()` : 'callFn(this.page?.onUnload, this)']) const entryOption = page instanceof Array ? page[0].entryOption : page.entryOption const isBlended = this.buildConfig.blended || this.buildConfig.isBuildNativeComp let createFn = isBlended ? 'createNativePageConfig' : 'createPageConfig' - - const nativeCreatePage = `createNativePageConfig(component, '${entryOption?.routeName || page.name}', React, ReactDOM, config)` - let createPageOrComponent = isBlended ? nativeCreatePage : `createPageConfig(component, '${entryOption.routeName}', config)` + const pageName = entryOption?.routeName || page.name + const nativeCreatePage = `createNativePageConfig(component, '${pageName}', React, ReactDOM, config)` + let createPageOrComponent = isBlended ? nativeCreatePage : `createPageConfig(component, '${pageName}', config)` // 如果是pure，说明不是一个页面，而是一个组件，这个时候修改import和createPage if (this.isPure) { From 00d3990437a8fe6b659af6834994b78e7b8ccf85 Mon Sep 17 00:00:00 2001 From: liuzejia Date: Tue, 23 Jul 2024 21:23:23 +0800 Subject: [PATCH 57/81] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9readConfig?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-helper/src/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/taro-helper/src/utils.ts b/packages/taro-helper/src/utils.ts index a5449d7ae05f..21849d29f142 100644 --- a/packages/taro-helper/src/utils.ts +++ b/packages/taro-helper/src/utils.ts @@ -644,7 +644,7 @@ export function readConfig (configPath: string, op result = requireWithEsbuild(configPath, { customConfig: { alias: options.alias || {}, - define: defaults(options.defineConstants || {}, { + define: defaults({}, options.defineConstants || {}, { define: 'define', // Note: 该场景下不支持 AMD 导出，这会导致 esbuild 替换 babel 的 define 方法 }), }, From ba717c9f58265ffef711a3246dcc1dfe7cc47941 Mon Sep 17 00:00:00 2001 From: liuzejia Date: Thu, 25 Jul 2024 22:12:03 +0800 Subject: [PATCH 58/81] chore(release): publish 4.0.0-beta.131 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index 2c70618dd977..9d195276a717 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "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 429c93e4c915..6f727d54f617 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.0.0-beta.130", + "version": "4.0.0-beta.131", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 0e6f6dadc0e1..dab2aed3e6e1 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.0.0-beta.130", + "version": "4.0.0-beta.131", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index d2be1a410cc0..e68b4f03c46c 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.0.0-beta.130", + "version": "4.0.0-beta.131", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index 12aacd88c93c..45192bc8b46a 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.0.0-beta.130", + "version": "4.0.0-beta.131", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 9549d43e19ff..de5ceccee4f4 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.0.0-beta.130", + "version": "4.0.0-beta.131", "os": [ "win32" ], diff --git a/package.json b/package.json index cdf62b4f7afb..a22596ff10a3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "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 b03277ef5f8f..e6219e4c5eb5 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 decbb49c6682..fce042876497 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.0.0-beta.130", + "version": "4.0.0-beta.131", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index eb4cf490b920..3153ac46436d 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.0.0-beta.130", + "version": "4.0.0-beta.131", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index a52b37986329..381660dbc520 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 596354283abc..b061a45d1bb7 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "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 08f1ed037579..b7ef34c1782a 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 8961cc01440c..9287a6355751 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index 938d8f614c24..9c8b95159993 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "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 ad71e66f06cb..0f2e1461ae71 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 9c83822dccad..a23f906ddb17 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 9c7acf286be4..46c193264de3 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "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 7fdb8c4f3802..bea121c821f4 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 14b56c97e72b..9de08192c424 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index 9441db3f76b6..38314d6c1bd8 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "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 0eae452c7283..09f9159234b0 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 70a47bc22877..087677a075b1 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 ee94791db37a..ea8e8c2a9e3b 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index 48b45cc1d899..248c309ee6f8 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "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 84796a5df1b2..024a65aca1b0 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 377149ba5322..1f567afa61ce 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "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 aa48ab4d6b03..b6e70a596dd1 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index abbd8af98b8d..457e2db86271 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index 17d3dbec2079..61a445a37587 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 75c13bebd061..41b0722e518f 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index dc87ed0126b3..704c3c16e56b 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 f3bdd2c0b980..916593a6aa5c 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index de690f56e495..d6440d9a4249 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "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 e96c7380e1c3..11b71e8a282b 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "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 f6a99774149d..d31fd6032c8a 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "React/Preact/Nerv 框架插件", "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 c0911f44e8de..f4f52b4c86e8 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 0b364fdd429f..2fee5c41a48f 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 f75fbefe7066..075958e01e20 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "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 b1818998569a..0525090b22db 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index 7910806b7aa9..dd80b77b5230 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "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 0ed0f12d85fb..d59b5b84e363 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 7f2ae44bc034..8cb4eb9f9373 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index 7871be964c78..adc65d3f22c2 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index 2ade63299bf5..6a2df923e6cb 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 c7ca4db333ad..65e638709b5d 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index f064e21dc3aa..3e7cfe2db29f 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index b7adceb50750..5a645743826f 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index f83a8a35e7db..12bd381e0756 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index 4f7e4968c50f..923b44f00365 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index 138be692c952..58a14ab371dd 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index ea92b54dec19..952498dc8940 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index 3db0fa8cfe90..d370b49762d6 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 8482e4316c18..d51d83fbf307 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 716a61b2760a..1c8dfa0d1223 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 01a0eb249b70..dfc734e1493a 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index 7c529ff3e165..5f24c2695f8a 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "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 5d5ddd609999..2827b7d25358 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 b80158d10299..ec8bff5779f5 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index b5621c7690f2..b93fb7ca115a 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 054920981700..93488eea089e 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index 855986e85098..4a7848582d97 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index dbf857dba5b7..4bed66c73307 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index ec9321941399..07c7af8332e0 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index f8ba017b007a..93f96bf21a77 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 25b0350e3a2a..4f278fad5d91 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 193b38e06452..72b1ddaa66d8 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "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 73f45145b30b..a869e22843ad 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index 44e88740d5d6..858ea6731ea0 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 3cb0cbf8ec12..76c5212136cd 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.0.0-beta.130", + "version": "4.0.0-beta.131", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 532463f8d9af..ca65f7abfe13 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 ce8e35488224..16129a25d1e9 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.0.0-beta.130", + "version": "4.0.0-beta.131", "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 08d5084a189c..dc07f6668f94 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.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index 5a3498ab0671..32c1d8f04f13 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index 32a77eb4a27e..08595c558267 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.130", + "version": "4.0.0-beta.131", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From 843941d3bf8dcefa89414475f14637063bd0743b Mon Sep 17 00:00:00 2001 From: zhuminghui2 Date: Fri, 26 Jul 2024 16:58:06 +0800 Subject: [PATCH 59/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbeta2=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E4=B8=8D=E6=9B=B4=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-platform-harmony/src/runtime-ets/dom/node.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/taro-platform-harmony/src/runtime-ets/dom/node.ts b/packages/taro-platform-harmony/src/runtime-ets/dom/node.ts index 9544cc40d147..aeb525f70cf4 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/dom/node.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/dom/node.ts @@ -190,6 +190,11 @@ export class TaroNode extends TaroDataSourceElement { this.childNodes.push(child) this.notifyDataAdd(this.childNodes.length - 1) + if (this.nodeName === "TEXT") { + // 修复beta2版本文字从undefined -> 有值时的 不更新问题 + this.updateComponent() + } + // @ts-ignore child.toggleLayer?.(true) From f58dadf0bf81028dc712b919a60694d7d6aa8163 Mon Sep 17 00:00:00 2001 From: zhuminghui2 Date: Fri, 26 Jul 2024 16:58:51 +0800 Subject: [PATCH 60/81] chore(release): publish 4.0.0-beta.132 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index 9d195276a717..da0711ddd062 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "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 6f727d54f617..b755f57ff6b8 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.0.0-beta.131", + "version": "4.0.0-beta.132", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index dab2aed3e6e1..a31c29780361 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.0.0-beta.131", + "version": "4.0.0-beta.132", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index e68b4f03c46c..cb70cc4b12eb 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.0.0-beta.131", + "version": "4.0.0-beta.132", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index 45192bc8b46a..a1f3fc176c7b 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.0.0-beta.131", + "version": "4.0.0-beta.132", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index de5ceccee4f4..91cebfe72c89 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.0.0-beta.131", + "version": "4.0.0-beta.132", "os": [ "win32" ], diff --git a/package.json b/package.json index a22596ff10a3..ef27471365e8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "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 e6219e4c5eb5..92ae7281d35b 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 fce042876497..8af76af79dcd 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.0.0-beta.131", + "version": "4.0.0-beta.132", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index 3153ac46436d..d7ca8c43be8f 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.0.0-beta.131", + "version": "4.0.0-beta.132", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 381660dbc520..09f6eb39cacc 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index b061a45d1bb7..ed4ae5489081 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "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 b7ef34c1782a..74c214a030a9 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 9287a6355751..29974af71e36 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index 9c8b95159993..d5ddeebd2c2c 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "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 0f2e1461ae71..35fbd30bc090 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 a23f906ddb17..9c8e208658aa 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 46c193264de3..7f20b70ab061 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "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 bea121c821f4..76bf45cddc6d 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 9de08192c424..99917242f724 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index 38314d6c1bd8..08b7eef04b27 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "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 09f9159234b0..ad202ba43e74 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 087677a075b1..520919e2c4c3 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 ea8e8c2a9e3b..71ec1989e97b 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index 248c309ee6f8..a9bb886a44d6 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "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 024a65aca1b0..ec4574e32435 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 1f567afa61ce..ac97a04da4e5 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "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 b6e70a596dd1..be12ce0c4e69 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index 457e2db86271..173d1d837d4d 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index 61a445a37587..07f32432846b 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 41b0722e518f..38bff9bc2679 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 704c3c16e56b..50441436a9bb 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 916593a6aa5c..bf7469f84972 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index d6440d9a4249..8b441422aee4 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "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 11b71e8a282b..66c9ae108e9b 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "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 d31fd6032c8a..b32ceca38111 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "React/Preact/Nerv 框架插件", "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 f4f52b4c86e8..71e130ca4115 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 2fee5c41a48f..75f014eec0e3 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 075958e01e20..33c4e5f7ab78 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "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 0525090b22db..64c59e67307e 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index dd80b77b5230..6836ed568c37 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "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 d59b5b84e363..bfc3d8bd327f 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 8cb4eb9f9373..c04907ebcca5 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index adc65d3f22c2..b27273ec9c05 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index 6a2df923e6cb..16c80affec1b 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 65e638709b5d..be2ae07dc6d3 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 3e7cfe2db29f..fb7fb39ff662 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index 5a645743826f..6a937b758ff1 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index 12bd381e0756..596bc9d7e858 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index 923b44f00365..1b5dddcf74ff 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index 58a14ab371dd..625f1d15b13d 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 952498dc8940..eabe9667476c 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index d370b49762d6..f204e0cb454b 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 d51d83fbf307..ac253a7f7e8e 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 1c8dfa0d1223..fb923e840997 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 dfc734e1493a..54f725b08b20 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index 5f24c2695f8a..76d53a45f0f1 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "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 2827b7d25358..2d680161c6a0 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 ec8bff5779f5..06bfa130baad 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index b93fb7ca115a..016d90a6f25e 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 93488eea089e..0d2a9ad65b8a 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index 4a7848582d97..89a86f9ba0f3 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 4bed66c73307..b68e23148a9a 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 07c7af8332e0..f7d6e5e4ea39 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index 93f96bf21a77..021b0d4c3a3e 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 4f278fad5d91..b34a3ddd6c53 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 72b1ddaa66d8..4448c1538a10 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "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 a869e22843ad..013e4478d52d 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index 858ea6731ea0..fe61a79f7caa 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 76c5212136cd..4451a3d7b26c 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.0.0-beta.131", + "version": "4.0.0-beta.132", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index ca65f7abfe13..7cde95e54dd2 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 16129a25d1e9..0329c98ed907 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.0.0-beta.131", + "version": "4.0.0-beta.132", "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 dc07f6668f94..7aefefc40615 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.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index 32c1d8f04f13..00abd5d0ff03 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index 08595c558267..eee29c8adef8 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.131", + "version": "4.0.0-beta.132", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From 52f162a738e13e0d908e758f44080796cfa2cb24 Mon Sep 17 00:00:00 2001 From: xuanzebin Date: Wed, 7 Aug 2024 19:40:33 +0800 Subject: [PATCH 61/81] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20overflow=20?= =?UTF-8?q?=E6=98=AF=20scroll=20=E5=92=8C=20auto=20=E6=83=85=E5=86=B5?= =?UTF-8?q?=E4=B8=8B=20scrollview=20=E4=B8=8D=E8=83=BD=E6=BB=9A=E5=8A=A8?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/components-harmony-ets/scrollView.ets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/scrollView.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/scrollView.ets index bc096a2fc309..7e6898875717 100644 --- a/packages/taro-platform-harmony/src/components/components-harmony-ets/scrollView.ets +++ b/packages/taro-platform-harmony/src/components/components-harmony-ets/scrollView.ets @@ -36,6 +36,9 @@ function getAttributes (node: TaroScrollViewElement): ScrollViewAttrs { function getScrollable (node: TaroScrollViewElement) { const _attrs = node._attrs + if (node?.hmStyle?.overflow === "scroll" || node?.hmStyle?.overflow === "auto") { + return ScrollDirection.Vertical + } if (_attrs.scrollX) { return ScrollDirection.Horizontal } else if (_attrs.scrollY) { From 1612f9bc1f4d22a855f7474dc4e1dca44be889ba Mon Sep 17 00:00:00 2001 From: xuanzebin Date: Wed, 7 Aug 2024 19:41:28 +0800 Subject: [PATCH 62/81] chore(release): publish 4.0.0-beta.133 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index da0711ddd062..bc571c495584 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "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 b755f57ff6b8..18ad46c038e7 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.0.0-beta.132", + "version": "4.0.0-beta.133", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index a31c29780361..78dccaf3c640 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.0.0-beta.132", + "version": "4.0.0-beta.133", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index cb70cc4b12eb..f9bb104141c5 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.0.0-beta.132", + "version": "4.0.0-beta.133", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index a1f3fc176c7b..b5d439b3804a 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.0.0-beta.132", + "version": "4.0.0-beta.133", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 91cebfe72c89..717004c030b0 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.0.0-beta.132", + "version": "4.0.0-beta.133", "os": [ "win32" ], diff --git a/package.json b/package.json index ef27471365e8..efa1b56f64eb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "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 92ae7281d35b..8038fe5ca6e3 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 8af76af79dcd..fbec9c0dd506 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.0.0-beta.132", + "version": "4.0.0-beta.133", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index d7ca8c43be8f..c0ead682c39e 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.0.0-beta.132", + "version": "4.0.0-beta.133", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 09f6eb39cacc..d45bb0871d03 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index ed4ae5489081..95f7930512ed 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "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 74c214a030a9..95a7e34e7ded 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 29974af71e36..cb986eb64a62 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index d5ddeebd2c2c..0dba6b7adb7c 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "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 35fbd30bc090..908a3a2df787 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 9c8e208658aa..724521a0bfbd 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 7f20b70ab061..87649ad22aea 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "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 76bf45cddc6d..8583a4a3f42a 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 99917242f724..4202471baba2 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index 08b7eef04b27..df7007df441c 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "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 ad202ba43e74..03de03f70bb5 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 520919e2c4c3..4c04ac35c4dd 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 71ec1989e97b..3312392cbbdb 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index a9bb886a44d6..b21c4de234b9 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "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 ec4574e32435..4de8727c7b0e 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 ac97a04da4e5..b41eb844fba3 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "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 be12ce0c4e69..36790e3660ee 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index 173d1d837d4d..08ea0ef66bf2 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index 07f32432846b..bfadee8bbed7 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 38bff9bc2679..a3ce72702ff4 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 50441436a9bb..4aee0d9d8d32 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 bf7469f84972..2b13ff0079a5 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 8b441422aee4..5f2f0427e5ea 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "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 66c9ae108e9b..55c290ab5cc8 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "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 b32ceca38111..2ab1533ef0e7 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "React/Preact/Nerv 框架插件", "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 71e130ca4115..6b5b70426af7 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 75f014eec0e3..80509de79b24 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 33c4e5f7ab78..95c0cf5f74ff 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "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 64c59e67307e..b7b8a6682fec 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index 6836ed568c37..f7dfb309ea2d 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "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 bfc3d8bd327f..cacc3f8734cc 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index c04907ebcca5..144a748ebd1c 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index b27273ec9c05..8eb34c5f96cf 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index 16c80affec1b..7fa542755140 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 be2ae07dc6d3..5e4ba92564dc 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index fb7fb39ff662..8b7608cf0780 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index 6a937b758ff1..541b759e1fbc 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index 596bc9d7e858..de20180e66f0 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index 1b5dddcf74ff..942a9ac17a5f 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index 625f1d15b13d..bcd3539915d9 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index eabe9667476c..22deeb13e2b2 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index f204e0cb454b..b5852748c237 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 ac253a7f7e8e..af4c017e527c 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index fb923e840997..4aefad2eaa71 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 54f725b08b20..55e920d39039 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index 76d53a45f0f1..9b9f614bfe24 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "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 2d680161c6a0..9c2a22f22732 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 06bfa130baad..1895998ac992 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index 016d90a6f25e..a4c0f401e49d 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 0d2a9ad65b8a..4128ed6f8c91 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index 89a86f9ba0f3..a0fd9572f281 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index b68e23148a9a..d47cb2d25513 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index f7d6e5e4ea39..993294522586 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index 021b0d4c3a3e..88bac74baf47 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 b34a3ddd6c53..62d200eab2b5 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 4448c1538a10..80fd7a0166fe 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "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 013e4478d52d..1b40df9b2df4 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index fe61a79f7caa..ddf6db50f9af 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 4451a3d7b26c..7b7534f7f04f 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.0.0-beta.132", + "version": "4.0.0-beta.133", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 7cde95e54dd2..3d7dfde273b5 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 0329c98ed907..9de573996930 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.0.0-beta.132", + "version": "4.0.0-beta.133", "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 7aefefc40615..fb92d77adc3e 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.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index 00abd5d0ff03..a3d091f2deea 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index eee29c8adef8..e2bd2d0a7676 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.132", + "version": "4.0.0-beta.133", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From dae68373f43ed37cb3932042df4a7630fa976fc4 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Thu, 8 Aug 2024 11:18:38 +0800 Subject: [PATCH 63/81] fix(types): update picker region data --- packages/taro-components/types/Picker.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/taro-components/types/Picker.d.ts b/packages/taro-components/types/Picker.d.ts index 3bcecd0a1ad8..6d62dbe56c07 100644 --- a/packages/taro-components/types/Picker.d.ts +++ b/packages/taro-components/types/Picker.d.ts @@ -289,6 +289,7 @@ declare namespace PickerRegionProps { value: string code: string postcode?: string + children?: RegionData[] } interface Level { /** 省级选择器 */ From 80bb090b42a457bc9ebfa856a58a73611b92585f Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Thu, 8 Aug 2024 16:27:22 +0800 Subject: [PATCH 64/81] =?UTF-8?q?fix(runner):=20=E6=95=B4=E7=90=86=20page?= =?UTF-8?q?=20entry=20=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/harmony/template/page.ts | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/taro-vite-runner/src/harmony/template/page.ts b/packages/taro-vite-runner/src/harmony/template/page.ts index 4780948784e8..9dde97d2ac7b 100644 --- a/packages/taro-vite-runner/src/harmony/template/page.ts +++ b/packages/taro-vite-runner/src/harmony/template/page.ts @@ -1078,19 +1078,19 @@ this.removeTabBarEvent()` : 'callFn(this.page?.onUnload, this)']) } parseEntry (rawId: string, page: TaroHarmonyPageMeta) { - const { creatorLocation, importFrameworkStatement } = this.loaderMeta + const { creatorLocation, frameworkArgs, importFrameworkStatement } = this.loaderMeta const entryOption = page instanceof Array ? page[0].entryOption : page.entryOption const isBlended = this.buildConfig.blended || this.buildConfig.isBuildNativeComp - let createFn = isBlended ? 'createNativePageConfig' : 'createPageConfig' + // FIXME: pure 参数应该使用 page.entryOption 替代 + const createFn = this.isPure + ? 'createNativeComponentConfig' + : isBlended + ? 'createNativePageConfig' : 'createPageConfig' const pageName = entryOption?.routeName || page.name - const nativeCreatePage = `createNativePageConfig(component, '${pageName}', React, ReactDOM, config)` - let createPageOrComponent = isBlended ? nativeCreatePage : `createPageConfig(component, '${pageName}', config)` - - // 如果是pure，说明不是一个页面，而是一个组件，这个时候修改import和createPage - if (this.isPure) { - createFn = 'createNativeComponentConfig' - createPageOrComponent = `createNativeComponentConfig(component, React, ReactDOM, config)` - } + const createPageOrComponent = `${createFn}(component, ${this.isPure + ? `${frameworkArgs}` + : isBlended + ? `'${pageName}', ${frameworkArgs}` : `'${pageName}', config`})` return this.transArr2Str([ `import { ${createFn} } from '${creatorLocation}'`, From 9fd63a72b8de4209795f63bd7f7259298d4ec295 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Thu, 8 Aug 2024 16:33:00 +0800 Subject: [PATCH 65/81] fix(runner): word spelling --- packages/taro-vite-runner/src/harmony/template/page.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/taro-vite-runner/src/harmony/template/page.ts b/packages/taro-vite-runner/src/harmony/template/page.ts index 9dde97d2ac7b..e1d620c30b62 100644 --- a/packages/taro-vite-runner/src/harmony/template/page.ts +++ b/packages/taro-vite-runner/src/harmony/template/page.ts @@ -34,7 +34,7 @@ export interface TaroHarmonyPageMeta extends VitePageMeta { modifyPageAppear?: (this: Parser, appearStr: string, page: TaroHarmonyPageMeta | TaroHarmonyPageMeta[]) => string - modifyPageDisAppear?: (this: Parser, appearStr: string, page: TaroHarmonyPageMeta | TaroHarmonyPageMeta[]) => string + modifyPageDisappear?: (this: Parser, appearStr: string, page: TaroHarmonyPageMeta | TaroHarmonyPageMeta[]) => string modifyPageBuild?: (this: Parser, buildStr: string, page: TaroHarmonyPageMeta | TaroHarmonyPageMeta[]) => string @@ -944,17 +944,17 @@ ${this.transArr2Str(pageStr.split('\n'), 6)} } generatePageAboutToDisAppear (page: TaroHarmonyPageMeta | TaroHarmonyPageMeta[]) { - const modifyPageDisAppear = page instanceof Array ? page[0].modifyPageDisAppear : page.modifyPageDisAppear + const modifyPageDisappear = page instanceof Array ? page[0].modifyPageDisappear : page.modifyPageDisappear - // 生成 aboutToDisAppear 函数内容 + // 生成 aboutToDisappear 函数内容 let disAppearStr = this.transArr2Str([ this.isTabbarPage ? `this.pageList?.forEach(item => { callFn(item?.onUnload, this) }) this.removeTabBarEvent()` : 'callFn(this.page?.onUnload, this)']) - if (isFunction(modifyPageDisAppear)) { - disAppearStr = modifyPageDisAppear.call(this, disAppearStr, page) + if (isFunction(modifyPageDisappear)) { + disAppearStr = modifyPageDisappear.call(this, disAppearStr, page) } return disAppearStr From e5c3836a7e0c5b12b6daaed685dfc39c611377fd Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Thu, 8 Aug 2024 16:56:48 +0800 Subject: [PATCH 66/81] feat(runner): add modifyEntryFile func --- .../taro-vite-runner/src/harmony/template/app.ts | 11 +++++++---- .../taro-vite-runner/src/harmony/template/page.ts | 14 ++++++++------ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/packages/taro-vite-runner/src/harmony/template/app.ts b/packages/taro-vite-runner/src/harmony/template/app.ts index 475bb8f51f75..67ca98997763 100644 --- a/packages/taro-vite-runner/src/harmony/template/app.ts +++ b/packages/taro-vite-runner/src/harmony/template/app.ts @@ -1,5 +1,7 @@ import path from 'node:path' +import { isFunction } from '@tarojs/shared' + import { escapePath, resolveAbsoluteRequire } from '../../utils' import { TARO_COMP_SUFFIX } from '../entry' import { TARO_TABBAR_PAGE_PATH } from '../page' @@ -116,8 +118,8 @@ export default class Parser extends BaseParser { } ` - if (typeof modifyInstantiate === 'function') { - instantiateApp = modifyInstantiate(instantiateApp, 'app') + if (isFunction(modifyInstantiate)) { + instantiateApp = modifyInstantiate.call(this, instantiateApp, 'app') } return instantiateApp @@ -156,10 +158,11 @@ export default class Parser extends BaseParser { } parseEntry (rawId: string, config = {}) { - const { creator, creatorLocation, frameworkArgs, importFrameworkStatement } = this.loaderMeta + const { creator, creatorLocation, frameworkArgs, importFrameworkStatement, modifyEntryFile } = this.loaderMeta const createApp = `${creator}(component, ${frameworkArgs})` + const rawCode = isFunction(modifyEntryFile) ? modifyEntryFile.call(this, 'app', rawId, config) : '' - return this.transArr2Str([ + return rawCode || this.transArr2Str([ 'import { initPxTransform } from "@tarojs/taro"', `import { ${creator} } from "${creatorLocation}"`, `import component from "${escapePath(rawId)}"`, diff --git a/packages/taro-vite-runner/src/harmony/template/page.ts b/packages/taro-vite-runner/src/harmony/template/page.ts index e1d620c30b62..f5f06fb7091d 100644 --- a/packages/taro-vite-runner/src/harmony/template/page.ts +++ b/packages/taro-vite-runner/src/harmony/template/page.ts @@ -705,7 +705,7 @@ for (let i = 0; i < taskQueen.length; i++) { let instantiatePage = this.transArr2Str(structCodeArray) if (isFunction(modifyInstantiate)) { - instantiatePage = modifyInstantiate(instantiatePage, 'page') + instantiatePage = modifyInstantiate.call(this, instantiatePage, 'page') } return instantiatePage @@ -947,17 +947,17 @@ ${this.transArr2Str(pageStr.split('\n'), 6)} const modifyPageDisappear = page instanceof Array ? page[0].modifyPageDisappear : page.modifyPageDisappear // 生成 aboutToDisappear 函数内容 - let disAppearStr = this.transArr2Str([ + let disappearStr = this.transArr2Str([ this.isTabbarPage ? `this.pageList?.forEach(item => { callFn(item?.onUnload, this) }) this.removeTabBarEvent()` : 'callFn(this.page?.onUnload, this)']) if (isFunction(modifyPageDisappear)) { - disAppearStr = modifyPageDisappear.call(this, disAppearStr, page) + disappearStr = modifyPageDisappear.call(this, disappearStr, page) } - return disAppearStr + return disappearStr } generatePageShown () { @@ -1078,7 +1078,7 @@ this.removeTabBarEvent()` : 'callFn(this.page?.onUnload, this)']) } parseEntry (rawId: string, page: TaroHarmonyPageMeta) { - const { creatorLocation, frameworkArgs, importFrameworkStatement } = this.loaderMeta + const { creatorLocation, frameworkArgs, importFrameworkStatement, modifyEntryFile } = this.loaderMeta const entryOption = page instanceof Array ? page[0].entryOption : page.entryOption const isBlended = this.buildConfig.blended || this.buildConfig.isBuildNativeComp // FIXME: pure 参数应该使用 page.entryOption 替代 @@ -1092,7 +1092,9 @@ this.removeTabBarEvent()` : 'callFn(this.page?.onUnload, this)']) : isBlended ? `'${pageName}', ${frameworkArgs}` : `'${pageName}', config`})` - return this.transArr2Str([ + const rawCode = isFunction(modifyEntryFile) ? modifyEntryFile.call(this, 'page', rawId, page) : '' + + return rawCode || this.transArr2Str([ `import { ${createFn} } from '${creatorLocation}'`, `import component from "${escapePath(rawId)}"`, isBlended ? 'import { initPxTransform } from "@tarojs/taro"' : null, From df9bd5b75c454ff12ed8f1224b3deeca7fda790b Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Sun, 11 Aug 2024 22:15:16 +0800 Subject: [PATCH 67/81] chore(release): publish 4.0.0-beta.134 --tag=beta --- .github/workflows/build-rust-binding.yml | 2 +- .github/workflows/nodejs.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/sync-components-types.yml | 2 +- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-harmony/src/runtime-ets/dom/node.ts | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 80 files changed, 80 insertions(+), 80 deletions(-) diff --git a/.github/workflows/build-rust-binding.yml b/.github/workflows/build-rust-binding.yml index 3fb22d3bcbb7..6f5201990377 100644 --- a/.github/workflows/build-rust-binding.yml +++ b/.github/workflows/build-rust-binding.yml @@ -48,7 +48,7 @@ jobs: - name: Setup pnpm uses: pnpm/action-setup@v3.0.0 with: - version: 8 + version: 9 - name: Setup Node.js ${{ matrix.node-version }} uses: actions/setup-node@v4 if: ${{ !matrix.settings.docker }} diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 6242e217a018..f9bfba15e873 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -64,7 +64,7 @@ jobs: - name: Setup pnpm uses: pnpm/action-setup@v3.0.0 with: - version: 8 + version: 9 - name: Setup Node.js ${{ matrix.node-version }} uses: actions/setup-node@v4 with: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 15a7a96465d8..ba1c172174bf 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -88,7 +88,7 @@ jobs: - name: Setup pnpm uses: pnpm/action-setup@v3.0.0 with: - version: 8 + version: 9 - name: Setup Node 18 uses: actions/setup-node@v4 with: diff --git a/.github/workflows/sync-components-types.yml b/.github/workflows/sync-components-types.yml index 2971c67f104d..a7b4a2cc6207 100644 --- a/.github/workflows/sync-components-types.yml +++ b/.github/workflows/sync-components-types.yml @@ -36,7 +36,7 @@ jobs: - name: install uses: pnpm/action-setup@v3.0.0 with: - version: 8 + version: 9 run_install: | - recursive: true args: [--frozen-lockfile, --strict-peer-dependencies] diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index bc571c495584..908cf65d9cbf 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "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 18ad46c038e7..5c7d6dbe32dc 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.0.0-beta.133", + "version": "4.0.0-beta.134", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 78dccaf3c640..7dec262775b3 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.0.0-beta.133", + "version": "4.0.0-beta.134", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index f9bb104141c5..ed46f93083e0 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.0.0-beta.133", + "version": "4.0.0-beta.134", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index b5d439b3804a..c88b4de2866e 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.0.0-beta.133", + "version": "4.0.0-beta.134", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 717004c030b0..3c0caf0d25b2 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.0.0-beta.133", + "version": "4.0.0-beta.134", "os": [ "win32" ], diff --git a/package.json b/package.json index e4d501e2ecbf..94f1445851f2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "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 8038fe5ca6e3..b1c58b60d7ca 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 fbec9c0dd506..d61657c621c6 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.0.0-beta.133", + "version": "4.0.0-beta.134", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index c0ead682c39e..a01b4330bda1 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.0.0-beta.133", + "version": "4.0.0-beta.134", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index d45bb0871d03..54692054d6d3 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 95f7930512ed..d5470219c87c 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "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 95a7e34e7ded..0d42b92965fe 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 cb986eb64a62..08cf8aa8a335 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index 0dba6b7adb7c..37df320db41d 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "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 908a3a2df787..f27f99fb0d4e 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 724521a0bfbd..efd3d0ad03f0 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 87649ad22aea..f9aee21bf684 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "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 8583a4a3f42a..e24a8632e2fa 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 4202471baba2..3ea10f4d9f64 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index df7007df441c..e1d50e120310 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "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 03de03f70bb5..7fe1f73d3ecd 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 4c04ac35c4dd..90b9eb668b36 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 3312392cbbdb..2f23280129f6 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index b21c4de234b9..a2f79600b734 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "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 4de8727c7b0e..b6da85ff7ad2 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 b41eb844fba3..0110c4f14382 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "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 36790e3660ee..b9f41d7bf0ba 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index 08ea0ef66bf2..a3c7db7e48b9 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index bfadee8bbed7..c10f63e52f9d 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 a3ce72702ff4..dcfe8408b470 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 4aee0d9d8d32..5068e256af16 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 2b13ff0079a5..da8b4cd79872 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 86e87d38844a..110627ef60f4 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "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 55c290ab5cc8..4bef910722d6 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "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 57548c97530b..dc2e2551517a 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 6b5b70426af7..e47e6fe90a4c 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 80509de79b24..57b0d2e87181 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 95c0cf5f74ff..872e4e3ccca7 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "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 b7b8a6682fec..7dc3e0f8f55d 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index f7dfb309ea2d..01c9b4c62962 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "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 cacc3f8734cc..075d4a65e1bb 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 144a748ebd1c..68288251fe67 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index 8eb34c5f96cf..a65425ff88e7 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index 7fa542755140..629443145654 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "OpenHarmony & 鸿蒙系统插件", "author": "O2Team", "homepage": "https://gitee.com/openharmony-sig/taro", diff --git a/packages/taro-platform-harmony/src/runtime-ets/dom/node.ts b/packages/taro-platform-harmony/src/runtime-ets/dom/node.ts index aeb525f70cf4..f3f4fc731b95 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/dom/node.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/dom/node.ts @@ -190,7 +190,7 @@ export class TaroNode extends TaroDataSourceElement { this.childNodes.push(child) this.notifyDataAdd(this.childNodes.length - 1) - if (this.nodeName === "TEXT") { + if (this.nodeName === 'TEXT') { // 修复beta2版本文字从undefined -> 有值时的 不更新问题 this.updateComponent() } diff --git a/packages/taro-platform-jd/package.json b/packages/taro-platform-jd/package.json index 35522e2119b6..535721c3dae5 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 8b7608cf0780..54cd1b2ff61a 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index 541b759e1fbc..c6a36c03409c 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index de20180e66f0..9d2044ef997f 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index 942a9ac17a5f..4f29fe3d8edf 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index bcd3539915d9..3535461804fe 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 22deeb13e2b2..7a0cfcca03ae 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index b5852748c237..6d95025dd593 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 af4c017e527c..b5758d5f4c82 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 4aefad2eaa71..ced9ba6889d0 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 55e920d39039..b55f86afd3fa 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index 9b9f614bfe24..43b90baeaf19 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "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 9c2a22f22732..0e248518a271 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 554991e91a24..0f6d649821c5 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index a4c0f401e49d..56f4707c29a9 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 4128ed6f8c91..4a186db6c52c 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index a0fd9572f281..bb4fd3431a9f 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index d47cb2d25513..5ea9756e36a2 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 993294522586..7e54dcbc9545 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index 88bac74baf47..320152f179a4 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 62d200eab2b5..aaa939fb7e10 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 80fd7a0166fe..6b10d4aa7f5b 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "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 1b40df9b2df4..6c1470f3e888 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index ddf6db50f9af..fd776522fdb5 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 7b7534f7f04f..bc8fff230acd 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.0.0-beta.133", + "version": "4.0.0-beta.134", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 3d7dfde273b5..0e9cfb3b15bf 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 9de573996930..045c75ac21da 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.0.0-beta.133", + "version": "4.0.0-beta.134", "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 fb92d77adc3e..f11341e082c1 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.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index a3d091f2deea..a74a526478b3 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index e2bd2d0a7676..35ab3ec9d293 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.133", + "version": "4.0.0-beta.134", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From f12e134e824ec52f3b4a186f98e3990abdc21269 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Mon, 12 Aug 2024 19:33:31 +0800 Subject: [PATCH 68/81] fix: update runner hooks --- packages/taro-vite-runner/src/harmony/template/app.ts | 6 +++--- packages/taro-vite-runner/src/harmony/template/page.ts | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/taro-vite-runner/src/harmony/template/app.ts b/packages/taro-vite-runner/src/harmony/template/app.ts index 67ca98997763..94ab4ab09835 100644 --- a/packages/taro-vite-runner/src/harmony/template/app.ts +++ b/packages/taro-vite-runner/src/harmony/template/app.ts @@ -160,9 +160,7 @@ export default class Parser extends BaseParser { parseEntry (rawId: string, config = {}) { const { creator, creatorLocation, frameworkArgs, importFrameworkStatement, modifyEntryFile } = this.loaderMeta const createApp = `${creator}(component, ${frameworkArgs})` - const rawCode = isFunction(modifyEntryFile) ? modifyEntryFile.call(this, 'app', rawId, config) : '' - - return rawCode || this.transArr2Str([ + const rawCode = this.transArr2Str([ 'import { initPxTransform } from "@tarojs/taro"', `import { ${creator} } from "${creatorLocation}"`, `import component from "${escapePath(rawId)}"`, @@ -171,5 +169,7 @@ export default class Parser extends BaseParser { this.getInitPxTransform(), `export default () => ${createApp}`, ]) + + return isFunction(modifyEntryFile) ? modifyEntryFile.call(this, 'app', rawId, rawCode, config) : rawCode } } diff --git a/packages/taro-vite-runner/src/harmony/template/page.ts b/packages/taro-vite-runner/src/harmony/template/page.ts index f5f06fb7091d..a74d3979a068 100644 --- a/packages/taro-vite-runner/src/harmony/template/page.ts +++ b/packages/taro-vite-runner/src/harmony/template/page.ts @@ -705,7 +705,7 @@ for (let i = 0; i < taskQueen.length; i++) { let instantiatePage = this.transArr2Str(structCodeArray) if (isFunction(modifyInstantiate)) { - instantiatePage = modifyInstantiate.call(this, instantiatePage, 'page') + instantiatePage = modifyInstantiate.call(this, instantiatePage, 'page', page) } return instantiatePage @@ -1092,9 +1092,7 @@ this.removeTabBarEvent()` : 'callFn(this.page?.onUnload, this)']) : isBlended ? `'${pageName}', ${frameworkArgs}` : `'${pageName}', config`})` - const rawCode = isFunction(modifyEntryFile) ? modifyEntryFile.call(this, 'page', rawId, page) : '' - - return rawCode || this.transArr2Str([ + const rawCode = this.transArr2Str([ `import { ${createFn} } from '${creatorLocation}'`, `import component from "${escapePath(rawId)}"`, isBlended ? 'import { initPxTransform } from "@tarojs/taro"' : null, @@ -1105,5 +1103,7 @@ this.removeTabBarEvent()` : 'callFn(this.page?.onUnload, this)']) page?.config.enableShareAppMessage ? 'component.enableShareAppMessage = true' : null, `export default () => ${createPageOrComponent}`, ]) + + return isFunction(modifyEntryFile) ? modifyEntryFile.call(this, 'page', rawId, rawCode, page) : rawCode } } From 5ff77a88896d6638270fa70a256268ded133fab2 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Mon, 12 Aug 2024 19:33:55 +0800 Subject: [PATCH 69/81] chore(release): publish 4.0.0-beta.135 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index 908cf65d9cbf..4fedf662e26a 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "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 5c7d6dbe32dc..355e37a7653a 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.0.0-beta.134", + "version": "4.0.0-beta.135", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 7dec262775b3..2d6edc05c14e 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.0.0-beta.134", + "version": "4.0.0-beta.135", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index ed46f93083e0..4753f6811f9e 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.0.0-beta.134", + "version": "4.0.0-beta.135", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index c88b4de2866e..b8d9743bedd6 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.0.0-beta.134", + "version": "4.0.0-beta.135", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 3c0caf0d25b2..b1d8b84ea37c 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.0.0-beta.134", + "version": "4.0.0-beta.135", "os": [ "win32" ], diff --git a/package.json b/package.json index 94f1445851f2..b9ad5536c4cc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "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 b1c58b60d7ca..7c417edc6c4d 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 d61657c621c6..a2e109ae9956 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.0.0-beta.134", + "version": "4.0.0-beta.135", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index a01b4330bda1..5c46c1069064 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.0.0-beta.134", + "version": "4.0.0-beta.135", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 54692054d6d3..0ae9a68321e6 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index d5470219c87c..d1ced5696cd2 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "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 0d42b92965fe..1b6f88409339 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 08cf8aa8a335..1b6efb96b0ab 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index 37df320db41d..b29934656ab2 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "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 f27f99fb0d4e..c31ca7d7e567 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 efd3d0ad03f0..55ce797d5984 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 f9aee21bf684..bdc364447a8a 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "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 e24a8632e2fa..8217d2bd0fa3 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 3ea10f4d9f64..5c0c0b39fcea 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index e1d50e120310..e3a13a9d3258 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "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 7fe1f73d3ecd..2b68ab872642 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 90b9eb668b36..5b0504a33c1e 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 2f23280129f6..1ba826aa351b 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index a2f79600b734..375b92d36615 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "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 b6da85ff7ad2..5cee82b622a9 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 0110c4f14382..6c40c1d51aea 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "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 b9f41d7bf0ba..c4c9472fb4dc 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index a3c7db7e48b9..3cd7b75f4f18 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index c10f63e52f9d..0a7f4ea9514e 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 dcfe8408b470..9915558fe58b 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 5068e256af16..7744c1e515e8 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 da8b4cd79872..c3668d6c3432 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 110627ef60f4..1a022937c271 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "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 4bef910722d6..779d4a9da096 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "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 dc2e2551517a..5aa480cd7557 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 e47e6fe90a4c..5316387c4249 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 57b0d2e87181..062cf666e8cb 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 872e4e3ccca7..cc8b962dfce1 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "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 7dc3e0f8f55d..dd8671aae66d 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index 01c9b4c62962..006a2a89a486 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "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 075d4a65e1bb..8502d1e5df77 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 68288251fe67..76c9d43a2dcf 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index a65425ff88e7..2c97b9ea9d10 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index 629443145654..fd0391c99e58 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 535721c3dae5..ad57ee36e19c 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 54cd1b2ff61a..0c9578164a8e 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index c6a36c03409c..c29703a207e9 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index 9d2044ef997f..1be9afc8f5f8 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index 4f29fe3d8edf..1084352f2fa6 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index 3535461804fe..6441d65288b1 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 7a0cfcca03ae..466c13ff9eb8 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index 6d95025dd593..f6911585325f 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 b5758d5f4c82..0f46b1ba3e8e 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index ced9ba6889d0..9ae4750f7011 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 b55f86afd3fa..973100183737 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index 43b90baeaf19..3560c6953420 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "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 0e248518a271..f24f1caaca51 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 0f6d649821c5..ee28268d937e 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index 56f4707c29a9..8b60dbfd66fe 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 4a186db6c52c..592352fe5fa8 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index bb4fd3431a9f..e4dfddbe7202 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 5ea9756e36a2..0433b5287a47 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 7e54dcbc9545..161fee4b5802 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index 320152f179a4..139cf9c7f628 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 aaa939fb7e10..53446537fa11 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 6b10d4aa7f5b..283ddb14b7c8 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "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 6c1470f3e888..3236b14b1e37 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index fd776522fdb5..e348be7ef55b 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 bc8fff230acd..7661a5f7abd1 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.0.0-beta.134", + "version": "4.0.0-beta.135", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 0e9cfb3b15bf..58842287266b 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 045c75ac21da..46e3f805965a 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.0.0-beta.134", + "version": "4.0.0-beta.135", "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 f11341e082c1..b99463165f4a 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.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index a74a526478b3..6445900f42e8 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index 35ab3ec9d293..1f89e5b44016 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.134", + "version": "4.0.0-beta.135", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From ebc82ee20c6c31679ab23325044e812f11ec427d Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Tue, 20 Aug 2024 16:48:59 +0800 Subject: [PATCH 70/81] =?UTF-8?q?fix(harmony):=20=E5=AF=B9=E9=BD=90=20page?= =?UTF-8?q?=20=E5=90=84=E7=94=9F=E5=91=BD=E5=91=A8=E6=9C=9F=E4=B8=AD?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E5=AF=B9=E8=B1=A1=E5=AE=9E=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-vite-runner/src/harmony/page.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/taro-vite-runner/src/harmony/page.ts b/packages/taro-vite-runner/src/harmony/page.ts index 8936e00bdb2d..c17f53f6589f 100644 --- a/packages/taro-vite-runner/src/harmony/page.ts +++ b/packages/taro-vite-runner/src/harmony/page.ts @@ -94,15 +94,15 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi pageName = 'index' } + const page_ = page as TaroHarmonyPageMeta + page_.id = id + page_.originName = page.name + page_.name = pageName + this.emitFile({ type: 'prebuilt-chunk', fileName: viteCompilerContext.getTargetFilePath(pageName, '.ets'), - code: parse.parse(path.resolve(appRoot, pageName), { - ...page, - originName: page.name, - name: pageName, - id, - } as TaroHarmonyPageMeta, name, this.resolve), + code: parse.parse(path.resolve(appRoot, pageName), page_, name, this.resolve), exports: ['default'], }) }) From e065b0c09d2c532d822b6a47b1c2b6bf69eceb44 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Tue, 20 Aug 2024 16:50:29 +0800 Subject: [PATCH 71/81] chore(release): publish 4.0.0-beta.136 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index 4fedf662e26a..f3d18971898d 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "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 355e37a7653a..61544df50ea0 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.0.0-beta.135", + "version": "4.0.0-beta.136", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 2d6edc05c14e..923de38661c3 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.0.0-beta.135", + "version": "4.0.0-beta.136", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index 4753f6811f9e..1f1284aaa6d9 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.0.0-beta.135", + "version": "4.0.0-beta.136", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index b8d9743bedd6..280700a73b2c 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.0.0-beta.135", + "version": "4.0.0-beta.136", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index b1d8b84ea37c..4bff23922cd3 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.0.0-beta.135", + "version": "4.0.0-beta.136", "os": [ "win32" ], diff --git a/package.json b/package.json index b9ad5536c4cc..06bd28d93380 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "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 7c417edc6c4d..1764ba417683 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 a2e109ae9956..02f985e095ef 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.0.0-beta.135", + "version": "4.0.0-beta.136", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index 5c46c1069064..247bcc0932eb 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.0.0-beta.135", + "version": "4.0.0-beta.136", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 0ae9a68321e6..f711f1229e80 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index d1ced5696cd2..3b4d5cf5bcf4 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "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 1b6f88409339..660ab20a8642 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 1b6efb96b0ab..fcff12555db0 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index b29934656ab2..d2bf09224caf 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "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 c31ca7d7e567..406ba9764aaf 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 55ce797d5984..d12e5b43c1fe 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 bdc364447a8a..ab544792e7dd 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "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 8217d2bd0fa3..b65e327ee66d 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 5c0c0b39fcea..3f151ea30a19 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index e3a13a9d3258..048865843406 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "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 2b68ab872642..38aee47639e6 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 5b0504a33c1e..1abfe75d5b1f 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 1ba826aa351b..918b08f0ea1c 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index 375b92d36615..81970e46ac8f 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "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 5cee82b622a9..8e539b1300a9 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 6c40c1d51aea..fa8b04a4b020 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "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 c4c9472fb4dc..403e3f7e7584 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index 3cd7b75f4f18..12b284cc058c 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index 0a7f4ea9514e..081d94fce17c 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 9915558fe58b..5c4f1b076833 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 7744c1e515e8..ae568af220e6 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 c3668d6c3432..9733c5dadd57 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 1a022937c271..077d52c602be 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "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 779d4a9da096..7f88f4483efe 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "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 5aa480cd7557..a1fc11bb39bd 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 5316387c4249..741a2cec6789 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 062cf666e8cb..32d395f489d8 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 cc8b962dfce1..7e2e80590581 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "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 dd8671aae66d..febe43e2cb02 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index 006a2a89a486..53a285b70053 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "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 8502d1e5df77..cef21844bfea 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 76c9d43a2dcf..3bf9b73962c6 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index 2c97b9ea9d10..f9b332cbef51 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index fd0391c99e58..f344d177fadd 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 ad57ee36e19c..268b0cb29adc 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 0c9578164a8e..a63b9716f1ff 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index c29703a207e9..5fba0382f6aa 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index 1be9afc8f5f8..4a7b77e147b6 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index 1084352f2fa6..5e22ea855091 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index 6441d65288b1..238be0e2ce7f 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 466c13ff9eb8..1e8290ef87f3 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index f6911585325f..0fac89859d74 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 0f46b1ba3e8e..2b51645491a0 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 9ae4750f7011..a6421ae380b0 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 973100183737..ad2045038298 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index 3560c6953420..49f209d74abd 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "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 f24f1caaca51..ddc2fd07784d 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 ee28268d937e..17aba0b05998 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index 8b60dbfd66fe..7894b279a1db 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 592352fe5fa8..6a592b963506 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index e4dfddbe7202..bcc2038e631f 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 0433b5287a47..3419286f2a3d 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 161fee4b5802..0e64980076f4 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index 139cf9c7f628..a5598deb3fc0 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 53446537fa11..0dd47fb850b3 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 283ddb14b7c8..13871b5b6f37 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "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 3236b14b1e37..dd5e25e37223 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index e348be7ef55b..ccc94aff0cad 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 7661a5f7abd1..58d6143e0d5a 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.0.0-beta.135", + "version": "4.0.0-beta.136", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 58842287266b..30bdb0c9f717 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 46e3f805965a..05f00f12de35 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.0.0-beta.135", + "version": "4.0.0-beta.136", "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 b99463165f4a..86e1613cdfe0 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.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index 6445900f42e8..03ad6359af7f 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index 1f89e5b44016..a1f245ee1128 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.135", + "version": "4.0.0-beta.136", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From 72d764d29c26f122c995fd63565f5bd463bd4eda Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Wed, 21 Aug 2024 21:00:20 +0800 Subject: [PATCH 72/81] =?UTF-8?q?fix(harmony):=20=E5=AF=B9=E9=BD=90=20cust?= =?UTF-8?q?om=20=E8=B7=AF=E7=94=B1=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-vite-runner/src/harmony/config.ts | 5 ++++- packages/taro-vite-runner/src/harmony/emit.ts | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/taro-vite-runner/src/harmony/config.ts b/packages/taro-vite-runner/src/harmony/config.ts index 9006ab8de090..48e5a917b9b4 100644 --- a/packages/taro-vite-runner/src/harmony/config.ts +++ b/packages/taro-vite-runner/src/harmony/config.ts @@ -20,6 +20,7 @@ import type { RollupInjectOptions } from '@rollup/plugin-inject' import type { ViteHarmonyCompilerContext } from '@tarojs/taro/types/compile/viteCompilerContext' import type { InputPluginOption, OutputOptions } from 'rollup' import type { Plugin, PluginOption } from 'vite' +import type { TaroHarmonyPageMeta } from './template/page' export default function (viteCompilerContext: ViteHarmonyCompilerContext): PluginOption { const { taroConfig, cwd: appPath } = viteCompilerContext @@ -200,7 +201,9 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi name = name.replace(/[\\/]+/g, '/') const appId = viteCompilerContext.app.config.appId || 'app' - const isTaroComp = appId === name || viteCompilerContext.pages.some(page => page.name === name) || viteCompilerContext.components?.some(comp => comp.name === name) + const isTaroComp = appId === name || + viteCompilerContext.pages.some((page: TaroHarmonyPageMeta) => [page.name, page.originName].includes(name)) || + viteCompilerContext.components?.some((comp: TaroHarmonyPageMeta) => [comp.name, comp.originName].includes(name)) // 如果同时存在app.ets和app.js，因为鸿蒙IDE编译会把app.ets编译成app.ts，会跟app.js冲突，识别都是/app，导致app.js被app.ts覆盖了，所以需要名字 const suffix = isTaroComp ? virtualModulePrefixREG.test(chunkInfo.facadeModuleId || '') ? TARO_COMP_SUFFIX : '_comp' : '' name = stripMultiPlatformExt(`${name}${suffix}`) + taroConfig.fileType.script diff --git a/packages/taro-vite-runner/src/harmony/emit.ts b/packages/taro-vite-runner/src/harmony/emit.ts index b8be437bdef5..35858e781c55 100644 --- a/packages/taro-vite-runner/src/harmony/emit.ts +++ b/packages/taro-vite-runner/src/harmony/emit.ts @@ -9,6 +9,7 @@ import { componentConfig } from '../utils/component' import type { ViteHarmonyCompilerContext } from '@tarojs/taro/types/compile/viteCompilerContext' import type { PluginOption } from 'vite' +import type { TaroHarmonyPageMeta } from './template/page' export default function (viteCompilerContext: ViteHarmonyCompilerContext): PluginOption { const { taroConfig } = viteCompilerContext @@ -104,8 +105,11 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi const comps = viteCompilerContext.getComponents() || [] const lines: string[] = [] - comps.forEach(comp => { - const key = Object.keys(taroConfig.router?.customRoutes || {}).find(e => [comp.name, addLeadingSlash(comp.name)].includes(e)) + comps.forEach((comp: TaroHarmonyPageMeta) => { + const key = Object.keys(taroConfig.router?.customRoutes || {}).find(e => { + const name = comp.originName || comp.name + return [name, addLeadingSlash(name)].includes(e) + }) if (key) { const alias = taroConfig.router?.customRoutes![key] From 78a3f5bd120fab763a1da8c7179017b948c59e95 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Wed, 21 Aug 2024 21:01:52 +0800 Subject: [PATCH 73/81] chore(release): publish 4.0.0-beta.137 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index f3d18971898d..89ec98b1b5af 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "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 61544df50ea0..8586d81b047d 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.0.0-beta.136", + "version": "4.0.0-beta.137", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 923de38661c3..5aacbbbdc7b6 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.0.0-beta.136", + "version": "4.0.0-beta.137", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index 1f1284aaa6d9..2b840f78e160 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.0.0-beta.136", + "version": "4.0.0-beta.137", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index 280700a73b2c..ab330dc74afd 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.0.0-beta.136", + "version": "4.0.0-beta.137", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 4bff23922cd3..504e6aa0526b 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.0.0-beta.136", + "version": "4.0.0-beta.137", "os": [ "win32" ], diff --git a/package.json b/package.json index 06bd28d93380..d977de3b839c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "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 1764ba417683..6dc406cbd6e8 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 02f985e095ef..ff1068de3730 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.0.0-beta.136", + "version": "4.0.0-beta.137", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index 247bcc0932eb..811e4a3c3f2a 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.0.0-beta.136", + "version": "4.0.0-beta.137", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index f711f1229e80..6f0e9a4abeb5 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 3b4d5cf5bcf4..edb8d91ab5df 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "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 660ab20a8642..774102f1cd3e 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 fcff12555db0..0d1024074194 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index d2bf09224caf..da0d4fc4569a 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "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 406ba9764aaf..ac425f27f14c 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 d12e5b43c1fe..96aa3a51ce01 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 ab544792e7dd..e4316e513577 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "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 b65e327ee66d..a25f5690a4df 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 3f151ea30a19..cbd24424001e 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index 048865843406..643dd97734cb 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "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 38aee47639e6..249fdfe42a14 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 1abfe75d5b1f..0436ae1ab56c 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 918b08f0ea1c..ce484bb57960 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index 81970e46ac8f..5f3de7450569 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "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 8e539b1300a9..33f5300f9186 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 fa8b04a4b020..412bf570b99a 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "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 403e3f7e7584..3fd8ff6f06f0 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index 12b284cc058c..3a869452a891 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index 081d94fce17c..d9ee5504d88e 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 5c4f1b076833..f81c8257254d 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index ae568af220e6..484b63b6497d 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 9733c5dadd57..3d29f62ef265 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 077d52c602be..a31b7c1ec945 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "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 7f88f4483efe..469f90580a21 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "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 a1fc11bb39bd..a57fc8748535 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 741a2cec6789..1f3e57a3a8c1 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 32d395f489d8..880b398c23a1 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 7e2e80590581..865aef65333b 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "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 febe43e2cb02..819a67053422 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index 53a285b70053..d448a53a1b39 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "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 cef21844bfea..c370d198b377 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 3bf9b73962c6..8aa057338bb4 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index f9b332cbef51..af94a0ea4ca0 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index f344d177fadd..10b8a20dbb4e 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 268b0cb29adc..10a7ab04e2e6 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index a63b9716f1ff..07f3ef325c86 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index 5fba0382f6aa..4614ec51f673 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index 4a7b77e147b6..919adb4d3de6 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index 5e22ea855091..03134053d0b7 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index 238be0e2ce7f..fba234d0da06 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 1e8290ef87f3..3cd809a3b0b2 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index 0fac89859d74..53b715d28770 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 2b51645491a0..4c01a206830a 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index a6421ae380b0..1a89a00cc8b1 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 ad2045038298..891b4ee1be9c 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index 49f209d74abd..a201cb52d250 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "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 ddc2fd07784d..31a96a18ef0d 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 17aba0b05998..a41682f940e0 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index 7894b279a1db..96b08673c870 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 6a592b963506..cbc069dde9aa 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index bcc2038e631f..0d6e4c7711ce 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 3419286f2a3d..8cfa646a46aa 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 0e64980076f4..419ea1bb0fc6 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index a5598deb3fc0..def93e1e66f9 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 0dd47fb850b3..8894653b8aa4 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 13871b5b6f37..cd265f539f31 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "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 dd5e25e37223..0aac4a9471ea 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index ccc94aff0cad..ee76bb7f8c45 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 58d6143e0d5a..a251c4785fe5 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.0.0-beta.136", + "version": "4.0.0-beta.137", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 30bdb0c9f717..37e7c1135467 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 05f00f12de35..3720f93d405d 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.0.0-beta.136", + "version": "4.0.0-beta.137", "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 86e1613cdfe0..3f6527012cf2 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.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index 03ad6359af7f..c22e58a866a2 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index a1f245ee1128..6c8a5f464c2c 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.136", + "version": "4.0.0-beta.137", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From 7607b10d8f028de1cb7176c758dd492fa8e028f1 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Wed, 28 Aug 2024 18:53:14 +0800 Subject: [PATCH 74/81] fix(runner): for wins path --- packages/taro-vite-runner/src/harmony/template/render.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/taro-vite-runner/src/harmony/template/render.ts b/packages/taro-vite-runner/src/harmony/template/render.ts index c79dbbd64413..64129d4355e9 100644 --- a/packages/taro-vite-runner/src/harmony/template/render.ts +++ b/packages/taro-vite-runner/src/harmony/template/render.ts @@ -116,7 +116,8 @@ export default class RenderParser extends BaseParser { if (meta.isPackage) { importList.push(`import ${meta.name} from '${meta.scriptPath}'`) } else { - const nativePath = path.relative(this.context.sourceDir, meta.scriptPath).replace(/\.ets$/, '') + const nativePath = path.posix.relative(this.context.sourceDir, meta.scriptPath) + .replace(/[\\/]+/g, '/').replace(/\.ets$/, '') importList.push(`import ${meta.name} from './${nativePath}'`) } }) From cfbcea74266a24cf352bdeec439d7ea6d7ade725 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Wed, 28 Aug 2024 18:53:38 +0800 Subject: [PATCH 75/81] chore(release): publish 4.0.0-beta.138 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index 89ec98b1b5af..e99e86aa8622 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "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 8586d81b047d..1c63841d2bf9 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.0.0-beta.137", + "version": "4.0.0-beta.138", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 5aacbbbdc7b6..86bf23f94d63 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.0.0-beta.137", + "version": "4.0.0-beta.138", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index 2b840f78e160..570399342fa3 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.0.0-beta.137", + "version": "4.0.0-beta.138", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index ab330dc74afd..e43462a2fbe4 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.0.0-beta.137", + "version": "4.0.0-beta.138", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 504e6aa0526b..d427ddd5cd5d 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.0.0-beta.137", + "version": "4.0.0-beta.138", "os": [ "win32" ], diff --git a/package.json b/package.json index d977de3b839c..ccb5d90bdaa4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "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 6dc406cbd6e8..a9d6e9f12856 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 ff1068de3730..4b2781d6d2b0 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.0.0-beta.137", + "version": "4.0.0-beta.138", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index 811e4a3c3f2a..607fbb7b0f4c 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.0.0-beta.137", + "version": "4.0.0-beta.138", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 6f0e9a4abeb5..03c1da681fd1 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index edb8d91ab5df..d722b57e5da3 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "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 774102f1cd3e..b15027852689 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 0d1024074194..c641f4f37227 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index da0d4fc4569a..a5c490224dd2 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "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 ac425f27f14c..c5b010c52d22 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 96aa3a51ce01..5bf262ce0c72 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 e4316e513577..72bfbbd4f75e 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "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 a25f5690a4df..4fea3ea76300 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index cbd24424001e..227de9159ff1 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index 643dd97734cb..8881de206a11 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "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 249fdfe42a14..6484f407b06e 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 0436ae1ab56c..c867bfd816a8 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 ce484bb57960..112bf6b465ec 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index 5f3de7450569..569ff83be9e7 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "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 33f5300f9186..9bea663995d5 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 412bf570b99a..e068469a639c 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "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 3fd8ff6f06f0..58fa2c383d25 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index 3a869452a891..b350dfb0a638 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index d9ee5504d88e..14f5d6fb7c15 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 f81c8257254d..1b722eb9113e 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 484b63b6497d..4c051e8c37ae 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 3d29f62ef265..7b7a78c4ae13 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index a31b7c1ec945..b9c4471cf3c9 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "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 469f90580a21..e8103410a91d 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "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 a57fc8748535..fabb4940e6f9 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 1f3e57a3a8c1..4f2b700845f2 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 880b398c23a1..9f76dccff815 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 865aef65333b..e768a756d442 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "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 819a67053422..e2a9a89808dc 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index d448a53a1b39..faa7f6872d50 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "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 c370d198b377..5b6d9df2da2f 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 8aa057338bb4..f9922166694d 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index af94a0ea4ca0..9ccccb01febf 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index 10b8a20dbb4e..9e08938aea9d 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 10a7ab04e2e6..bb01b6649028 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 07f3ef325c86..59146b03feba 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index 4614ec51f673..ba862dfce916 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index 919adb4d3de6..8293b97022b7 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index 03134053d0b7..3e5b35c38c41 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index fba234d0da06..a8bf14bfaf28 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 3cd809a3b0b2..660b0e4a8066 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index 53b715d28770..46cad43498a2 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 4c01a206830a..c944a08d7ec7 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 1a89a00cc8b1..44b60ab7374f 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 891b4ee1be9c..c5a225edf9af 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index a201cb52d250..39d1f48450eb 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "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 31a96a18ef0d..49d723277b11 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 a41682f940e0..07cc04bd88dd 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index 96b08673c870..314b21edc3fd 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 cbc069dde9aa..078bb8de58c0 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index 0d6e4c7711ce..c1e146aaa8e0 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 8cfa646a46aa..1005ba0b5914 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 419ea1bb0fc6..9226244808ef 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index def93e1e66f9..fdb09e4b7f5e 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 8894653b8aa4..bb9624154ad1 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index cd265f539f31..35f8f1956968 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "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 0aac4a9471ea..451c1a3734aa 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index ee76bb7f8c45..0085be830b6b 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 a251c4785fe5..730186eb7702 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.0.0-beta.137", + "version": "4.0.0-beta.138", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 37e7c1135467..394bfe9fd511 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 3720f93d405d..58377fc62d2e 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.0.0-beta.137", + "version": "4.0.0-beta.138", "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 3f6527012cf2..58ffd4ebdec4 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.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index c22e58a866a2..f68b0d1cc311 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index 6c8a5f464c2c..7567677b9236 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.137", + "version": "4.0.0-beta.138", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From e1ba95b8045176fc493853902565ece700798d35 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Fri, 25 Oct 2024 14:43:06 +0800 Subject: [PATCH 76/81] =?UTF-8?q?feat(vite):=20=E4=BF=AE=E5=A4=8D=20wins?= =?UTF-8?q?=20=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-vite-runner/src/harmony/emit.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/taro-vite-runner/src/harmony/emit.ts b/packages/taro-vite-runner/src/harmony/emit.ts index 35858e781c55..da6959cb9af1 100644 --- a/packages/taro-vite-runner/src/harmony/emit.ts +++ b/packages/taro-vite-runner/src/harmony/emit.ts @@ -114,12 +114,12 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi if (key) { const alias = taroConfig.router?.customRoutes![key] if (alias instanceof Array) { - alias.forEach(item => lines.push(`export * from './${path.join('src/main', 'ets', item)}'`)) + alias.forEach(item => lines.push(`export * from './${path.posix.join('src/main', 'ets', item)}'`)) } else if (typeof alias === 'string') { - lines.push(`export * from './${path.join('src/main', 'ets', alias)}'`) + lines.push(`export * from './${path.posix.join('src/main', 'ets', alias)}'`) } } else { - lines.push(`export * from './${path.join('src/main', 'ets', comp.name)}'`) + lines.push(`export * from './${path.posix.join('src/main', 'ets', comp.name)}'`) } }) lines.push('') From 188e5e27b3fb07a98e20216e8d75ce4c22952073 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Fri, 25 Oct 2024 14:43:50 +0800 Subject: [PATCH 77/81] chore(release): publish 4.0.0-beta.139 --tag=beta --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-solid-jsx/package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-solid/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index e99e86aa8622..bc0798074b11 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "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 1c63841d2bf9..a829fa6b4f9c 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.0.0-beta.138", + "version": "4.0.0-beta.139", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 86bf23f94d63..b91fe9975f9e 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.0.0-beta.138", + "version": "4.0.0-beta.139", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index 570399342fa3..b24a268d670a 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.0.0-beta.138", + "version": "4.0.0-beta.139", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index e43462a2fbe4..8fb795ae654d 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.0.0-beta.138", + "version": "4.0.0-beta.139", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index d427ddd5cd5d..22ccbc6c49df 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.0.0-beta.138", + "version": "4.0.0-beta.139", "os": [ "win32" ], diff --git a/package.json b/package.json index ccb5d90bdaa4..455d8568cfa6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "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 a9d6e9f12856..5b4e9006881f 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 4b2781d6d2b0..a138c31521cc 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.0.0-beta.138", + "version": "4.0.0-beta.139", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index 607fbb7b0f4c..25cedf69e3e7 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.0.0-beta.138", + "version": "4.0.0-beta.139", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 03c1da681fd1..849e905046e2 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index d722b57e5da3..feda53617933 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "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 b15027852689..5f25332b3a34 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 c641f4f37227..02c6382eb016 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index a5c490224dd2..3d31e9a5fe45 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "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 c5b010c52d22..e8a05676f8d3 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 5bf262ce0c72..1d05506925c9 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 72bfbbd4f75e..adeeda99abf7 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "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 4fea3ea76300..6bf4162a19d4 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 227de9159ff1..1ddaafc77977 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index 8881de206a11..d665cd9d6fb5 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "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 6484f407b06e..babc8bcc7faf 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 c867bfd816a8..7c371036eb47 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 112bf6b465ec..a87db7fa0556 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index 569ff83be9e7..5290a86aff30 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "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 9bea663995d5..27dbdfe31035 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 e068469a639c..973f48f256f5 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "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 58fa2c383d25..06d3cfe57c82 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index b350dfb0a638..273454a73313 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index 14f5d6fb7c15..b310342da13f 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 1b722eb9113e..d163cacf68cd 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 4c051e8c37ae..7cd886e57dae 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 7b7a78c4ae13..fa49585c0242 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index b9c4471cf3c9..cb5ef007bd49 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "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 e8103410a91d..b1d023f83562 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "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 fabb4940e6f9..4554780c9147 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 4f2b700845f2..941368d8ce88 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 9f76dccff815..fbad3914e497 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 e768a756d442..7a440a3bb064 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "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 e2a9a89808dc..cb4670ce2830 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index faa7f6872d50..7dec3f7f67a9 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "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 5b6d9df2da2f..59463672d35c 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index f9922166694d..7549feaf20b1 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index 9ccccb01febf..8e80509334ad 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index 9e08938aea9d..274bcf42a8bf 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 bb01b6649028..a15ace1b25e7 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index 59146b03feba..6ed80f28b4c4 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index ba862dfce916..05241abd8b1e 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index 8293b97022b7..d0a2536cee46 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index 3e5b35c38c41..2adf6797ad7b 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index a8bf14bfaf28..713db029d217 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 660b0e4a8066..c69cbbc60979 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index 46cad43498a2..7de13ee13d36 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 c944a08d7ec7..d10c5ecfd610 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 44b60ab7374f..62a981a74f68 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 c5a225edf9af..0c99be7854a6 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index 39d1f48450eb..399149f9ab0f 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "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 49d723277b11..c70c84d37be6 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 07cc04bd88dd..79e784702f2d 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index 314b21edc3fd..e005a9d0830e 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 078bb8de58c0..aabf0b60a610 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index c1e146aaa8e0..71d37987c50b 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 1005ba0b5914..d25e66071f18 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 9226244808ef..39b2eeed0f1d 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index fdb09e4b7f5e..3b1669724899 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 bb9624154ad1..2e08e6913787 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 35f8f1956968..0d201a57618e 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "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 451c1a3734aa..e452203dad43 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index 0085be830b6b..d04f6873ff19 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 730186eb7702..0f895c4089c2 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.0.0-beta.138", + "version": "4.0.0-beta.139", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index 394bfe9fd511..a329dd4a22d0 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 58377fc62d2e..30e049f2bf75 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.0.0-beta.138", + "version": "4.0.0-beta.139", "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 58ffd4ebdec4..08ecd91d2bb4 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.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index f68b0d1cc311..a1453a653b4f 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index 7567677b9236..753ab23c0fc2 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.0-beta.138", + "version": "4.0.0-beta.139", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From 33209f215df7592e528321e104c837d1ea07fd09 Mon Sep 17 00:00:00 2001 From: mayintao3 Date: Tue, 10 Dec 2024 19:51:59 +0800 Subject: [PATCH 78/81] =?UTF-8?q?chore:=20=E6=A0=87=E8=AE=B0=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E8=A2=AB=E5=BA=9F=E5=BC=83=E7=9A=84=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=92=8C=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/runtime-ets/dom/element/element.ts | 95 +++++++++++-------- .../src/harmony/template/render.ts | 16 +++- 2 files changed, 64 insertions(+), 47 deletions(-) diff --git a/packages/taro-platform-harmony/src/runtime-ets/dom/element/element.ts b/packages/taro-platform-harmony/src/runtime-ets/dom/element/element.ts index 1d595da1255c..b1225099a52a 100644 --- a/packages/taro-platform-harmony/src/runtime-ets/dom/element/element.ts +++ b/packages/taro-platform-harmony/src/runtime-ets/dom/element/element.ts @@ -33,14 +33,13 @@ export class TaroElement< > extends TaroNode { public _innerHTML = '' public _nodeInfo: TaroAny = { - layer: 0 // 渲染层级 + layer: 0, // 渲染层级 } public _hm_instance: TaroAny public weak_hm_instance: WeakRef public use_weak_hm_instance: boolean = true - public get hm_instance(): TaroAny { if (this.use_weak_hm_instance && this.weak_hm_instance) { return this.weak_hm_instance?.deref() @@ -56,17 +55,16 @@ export class TaroElement< this._hm_instance = instance } - - public get _instance () { + public get _instance() { return this.hm_instance } - public set _instance (value) { + public set _instance(value) { this.hm_instance = value if (this._nodeInfo.aboutToAppear) { let task // eslint-disable-next-line no-cond-assign - while (task = this._nodeInfo.aboutToAppear.shift()) { + while ((task = this._nodeInfo.aboutToAppear.shift())) { task() } } @@ -144,6 +142,10 @@ export class TaroElement< // 混合开发的组件没办法自动更新，需要把父级的结点删掉新建 // Current.nativeComponentNames会在render.ets中赋值 + /** + * @deprecated + * 这个逻辑分支在多线程中需要要去掉 + */ if (Current.nativeComponentNames?.includes(this.tagName)) { const idxOfRef = this.parentNode?.findIndex(this) @@ -159,7 +161,7 @@ export class TaroElement< id: this._nid, tagName: this.tagName, attribute: name, - value + value, }) } else { const attributeTriggerValue: TaroAny = ATTRIBUTES_CALLBACK_TRIGGER_MAP[name] @@ -266,7 +268,7 @@ export class TaroElement< if (!this._pseudo_before) { this._pseudo_before = new StyleSheet() } - Object.keys(value).forEach(key => { + Object.keys(value).forEach((key) => { this._pseudo_before!.hmStyle[key] = value[key] }) } else { @@ -281,7 +283,7 @@ export class TaroElement< if (!this._pseudo_after) { this._pseudo_after = new StyleSheet() } - Object.keys(value).forEach(key => { + Object.keys(value).forEach((key) => { this._pseudo_after!.hmStyle[key] = value[key] }) } else { @@ -299,7 +301,7 @@ export class TaroElement< if (!this._pseudo_class[name]) { this._pseudo_class[name] = new StyleSheet() } - Object.keys(value).forEach(key => { + Object.keys(value).forEach((key) => { this._pseudo_class[name]!.hmStyle[key] = value[key] }) } else { @@ -307,7 +309,7 @@ export class TaroElement< } } - get currentLayerNode () { + get currentLayerNode() { if (!this._page) return null if (typeof this._page.tabBarCurrentIndex !== 'undefined') { this._page.layerNode ||= [] @@ -320,7 +322,7 @@ export class TaroElement< } } - get currentLayerParents () { + get currentLayerParents() { if (!this._page) return null if (typeof this._page.tabBarCurrentIndex !== 'undefined') { this._page.layerParents ||= {} @@ -337,7 +339,7 @@ export class TaroElement< // 1、appendChild的时候会判断是否需要设置层级 // 2、taro-react的setProperty，在处理属性变化的时候，会判断是否需要设置层级 // 3、removeChild的时候，会判断是否需要移除层级 - public setLayer (value: number) { + public setLayer(value: number) { if (!this.parentNode) return // 没有父节点，不需要设置层级关系 const currentPage = getPageById(this.getAttribute('__fixed')) @@ -359,7 +361,7 @@ export class TaroElement< generateLayerParentIds(_parentRecord, this) currentLayerParents[this.getStrNid()] = _parentRecord } else { - const idx = currentLayerNode.childNodes.findIndex(n => n.getStrNid() === this.getStrNid()) + const idx = currentLayerNode.childNodes.findIndex((n) => n.getStrNid() === this.getStrNid()) currentLayerNode.childNodes.splice(idx, 1) currentLayerNode.notifyDataDelete(idx) @@ -385,7 +387,7 @@ export class TaroElement< delete currentLayerParents[this.getStrNid()] this.setLayer(0) } else { - Object.keys(currentLayerParents).forEach(fixedId => { + Object.keys(currentLayerParents).forEach((fixedId) => { const parentIds = currentLayerParents[fixedId] if (parentIds[this.getStrNid()]) { // 需要移除fixedId @@ -401,7 +403,7 @@ export class TaroElement< } // 设置动画 - public setAnimation (playing) { + public setAnimation(playing) { if (!this._instance) { if (!this._nodeInfo.aboutToAppear) { this._nodeInfo.aboutToAppear = [] @@ -436,41 +438,50 @@ export class TaroElement< this.parentNode.notifyDataDelete(idx) // 下一帧播放，等实例被移除掉，再重新插入 - setTimeout(() => { - // insert - this.parentNode?.childNodes.splice(idx, 0, this) - this.parentNode?.notifyDataAdd(idx) - - // 执行动画 - if (playing) { - this.playAnimation() - } - }, playing ? 0 : 100) + setTimeout( + () => { + // insert + this.parentNode?.childNodes.splice(idx, 0, this) + this.parentNode?.notifyDataAdd(idx) + + // 执行动画 + if (playing) { + this.playAnimation() + } + }, + playing ? 0 : 100 + ) } } - private playAnimation () { + private playAnimation() { const { - animationDuration = 0, animationDelay = 0, animationIterationCount = 1, animationName: keyframes, - animationTimingFunction + animationDuration = 0, + animationDelay = 0, + animationIterationCount = 1, + animationName: keyframes, + animationTimingFunction, } = this._st.hmStyle if (keyframes) { let cur_percentage = 0 - this._instance.getUIContext()?.keyframeAnimateTo({ - delay: animationDelay, - iterations: animationIterationCount, - }, keyframes.map(item => { - const duration = (item.percentage - cur_percentage) * animationDuration - cur_percentage = item.percentage - return { - duration: duration, - curve: item.event.animationTimingFunction || animationTimingFunction, - event: () => { - this._instance.overwriteStyle = item.event + this._instance.getUIContext()?.keyframeAnimateTo( + { + delay: animationDelay, + iterations: animationIterationCount, + }, + keyframes.map((item) => { + const duration = (item.percentage - cur_percentage) * animationDuration + cur_percentage = item.percentage + return { + duration: duration, + curve: item.event.animationTimingFunction || animationTimingFunction, + event: () => { + this._instance.overwriteStyle = item.event + }, } - } - })) + }) + ) } } } diff --git a/packages/taro-vite-runner/src/harmony/template/render.ts b/packages/taro-vite-runner/src/harmony/template/render.ts index 64129d4355e9..4b0a624192a9 100644 --- a/packages/taro-vite-runner/src/harmony/template/render.ts +++ b/packages/taro-vite-runner/src/harmony/template/render.ts @@ -116,8 +116,10 @@ export default class RenderParser extends BaseParser { if (meta.isPackage) { importList.push(`import ${meta.name} from '${meta.scriptPath}'`) } else { - const nativePath = path.posix.relative(this.context.sourceDir, meta.scriptPath) - .replace(/[\\/]+/g, '/').replace(/\.ets$/, '') + const nativePath = path.posix + .relative(this.context.sourceDir, meta.scriptPath) + .replace(/[\\/]+/g, '/') + .replace(/\.ets$/, '') importList.push(`import ${meta.name} from './${nativePath}'`) } }) @@ -280,13 +282,13 @@ export default class RenderParser extends BaseParser { name: 'StickySection', condition: `item.tagName === 'STICKY-SECTION'`, type: 'TaroViewElement', - extra: '.reuseId(item._nid.toString())' + extra: '.reuseId(item._nid.toString())', }, { name: 'ListView', condition: `item.tagName === 'LIST-VIEW'`, type: 'TaroViewElement', - extra: '.reuseId(item._nid.toString())' + extra: '.reuseId(item._nid.toString())', }, { name: 'View', @@ -309,7 +311,7 @@ export default class RenderParser extends BaseParser { name, condition: `item.tagName === '${name.replace(new RegExp('(?<=.)([A-Z])', 'g'), '-$1').toUpperCase()}'`, args: [], - fullArgument: 'item._attrs as TaroAny' + fullArgument: 'item._attrs as TaroAny', }) }) @@ -395,6 +397,10 @@ export { createChildItem, createLazyChildren }`, }` } + /** + * @deprecated + * 这个方法在多线程中需要要去掉 + */ generateNativeComponentNamesInit() { if (this.context.nativeComponents.size === 0) return '' const commentsList: string[] = [] From 414baf5d050fc978194db4fef5655b2952cdfe61 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Mon, 16 Dec 2024 14:43:57 +0800 Subject: [PATCH 79/81] =?UTF-8?q?feat(runner):=20vite=20runner=20=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E9=80=9A=E8=BF=87=20importNativeComponent=20=E6=B3=A8?= =?UTF-8?q?=E5=85=A5=E5=8E=9F=E7=94=9F=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crates/swc_plugin_define_config/src/lib.rs | 70 ++++++++++++- packages/taro-helper/src/babelRegister.ts | 4 + .../swc-backup/swc_plugin_define_config.wasm | Bin 572927 -> 575173 bytes .../src/runtime-ets/dom/element/element.ts | 4 - .../babel-plugin-import-native-component.ts | 66 ++++++++++++ .../src/common/babel-plugin-remove-config.ts | 22 ++++ ...t-plugin.ts => rollup-plugin-increment.ts} | 0 .../{assets.ts => vite-plugin-assets.ts} | 0 ...lugin.ts => vite-plugin-multi-platform.ts} | 4 +- packages/taro-vite-runner/src/h5/index.ts | 4 +- .../taro-vite-runner/src/harmony/config.ts | 4 +- .../taro-vite-runner/src/harmony/entry.ts | 29 ++++-- .../taro-vite-runner/src/harmony/index.ts | 2 +- packages/taro-vite-runner/src/harmony/page.ts | 95 +++++++++++++++++- .../src/harmony/template/render.ts | 9 +- packages/taro-vite-runner/src/mini/entry.ts | 11 +- packages/taro-vite-runner/src/mini/index.ts | 4 +- packages/taro-vite-runner/src/mini/page.ts | 93 ++++++++++++++++- .../src/utils/compiler/base.ts | 16 +++ .../src/utils/compiler/harmony.ts | 21 ++-- .../src/utils/compiler/mini.ts | 21 ++-- .../src/utils/createFilter.ts | 24 ++++- packages/taro-vite-runner/src/utils/index.ts | 22 +--- packages/taro-vite-runner/src/utils/map.ts | 44 ++++++++ .../src/plugins/HarmonyPlugin.ts | 7 +- .../src/plugins/MiniPlugin.ts | 7 +- .../types/compile/viteCompilerContext.d.ts | 4 + packages/taro/types/index.d.ts | 1 + packages/taro/types/taro.config.d.ts | 2 +- 29 files changed, 503 insertions(+), 87 deletions(-) mode change 100644 => 100755 packages/taro-helper/swc-backup/swc_plugin_define_config.wasm create mode 100644 packages/taro-vite-runner/src/common/babel-plugin-import-native-component.ts create mode 100644 packages/taro-vite-runner/src/common/babel-plugin-remove-config.ts rename packages/taro-vite-runner/src/common/{rollup-increment-plugin.ts => rollup-plugin-increment.ts} (100%) rename packages/taro-vite-runner/src/common/{assets.ts => vite-plugin-assets.ts} (100%) rename packages/taro-vite-runner/src/common/{multi-platform-plugin.ts => vite-plugin-multi-platform.ts} (97%) create mode 100644 packages/taro-vite-runner/src/utils/map.ts diff --git a/crates/swc_plugin_define_config/src/lib.rs b/crates/swc_plugin_define_config/src/lib.rs index e3d5c9840986..4c8f536eb582 100644 --- a/crates/swc_plugin_define_config/src/lib.rs +++ b/crates/swc_plugin_define_config/src/lib.rs @@ -11,6 +11,7 @@ use swc_core::{ struct DefineConfigVisitor { fn_name: Option, + imp_name: Option, } impl VisitMut for DefineConfigVisitor { @@ -20,6 +21,8 @@ impl VisitMut for DefineConfigVisitor { if let Expr::Ident(ident) = &**expr { if ident.sym == "defineAppConfig" || ident.sym == "definePageConfig" { self.fn_name = Some(ident.clone()); + } else if ident.sym == "importNativeComponent" { + self.imp_name = Some(ident.clone()); } } } @@ -30,9 +33,12 @@ pub struct TransformVisitor; impl VisitMut for TransformVisitor { fn visit_mut_module_items(&mut self, items: &mut Vec) { - let mut folder = DefineConfigVisitor { fn_name: None }; + let mut folder = DefineConfigVisitor { + fn_name: None, + imp_name: None, + }; - let is_found = items.iter_mut().any(|item| { + let mut is_found = items.iter_mut().any(|item| { item.visit_mut_with(&mut folder); folder.fn_name.is_some() }); @@ -64,6 +70,66 @@ impl VisitMut for TransformVisitor { ModuleItem::Stmt(Stmt::Decl(Decl::Fn(func.into_fn_decl(fn_name)))), ); } + + is_found = items.iter_mut().any(|item| { + item.visit_mut_with(&mut folder); + folder.imp_name.is_some() + }); + + if is_found { + let imp_name = folder.imp_name.take().unwrap(); + let func = Function { + span, + decorators: Default::default(), + params: vec![ + // path 参数,默认值为空字符串 + Param { + span, + decorators: Default::default(), + pat: Pat::Assign(AssignPat { + span, + left: Box::new(Pat::Ident(quote_ident!("path").into())), + right: Box::new(Expr::Lit(Lit::Str("".into()))), + }), + }, + // name 参数,默认值为空字符串 + Param { + span, + decorators: Default::default(), + pat: Pat::Assign(AssignPat { + span, + left: Box::new(Pat::Ident(quote_ident!("name").into())), + right: Box::new(Expr::Lit(Lit::Str("".into()))), + }), + }, + // exportName 参数,默认值为 'default' + Param { + span, + decorators: Default::default(), + pat: Pat::Assign(AssignPat { + span, + left: Box::new(Pat::Ident(quote_ident!("exportName").into())), + right: Box::new(Expr::Lit(Lit::Str("default".into()))), + }), + }, + ], + body: Some(BlockStmt { + span, + stmts: vec![Stmt::Return(ReturnStmt { + span, + arg: Some(Box::new(quote_ident!("name").into())), + })], + }), + is_async: false, + is_generator: false, + type_params: None, + return_type: None, + }; + prepend_stmt( + items, + ModuleItem::Stmt(Stmt::Decl(Decl::Fn(func.into_fn_decl(imp_name)))), + ); + } } } diff --git a/packages/taro-helper/src/babelRegister.ts b/packages/taro-helper/src/babelRegister.ts index c583357ff947..c081f96e2417 100644 --- a/packages/taro-helper/src/babelRegister.ts +++ b/packages/taro-helper/src/babelRegister.ts @@ -9,6 +9,7 @@ import type { NodePath, parse, PluginItem } from '@babel/core' export function injectDefineConfigHeader (babel: { parse: typeof parse }): PluginItem { const appConfig = 'function defineAppConfig(config) { return config }' const pageConfig = 'function definePageConfig(config) { return config }' + const importNative = "function importNativeComponent(path = '', name = '', exportName = '') { return name }" const prependHeader = (nodePath: NodePath, header: string) => { const parsedHeader = babel.parse(header, { filename: '' })?.program.body[0] @@ -27,6 +28,9 @@ export function injectDefineConfigHeader (babel: { parse: typeof parse }): Plugi return prependHeader(nodePath, appConfig) case 'definePageConfig': return prependHeader(nodePath, pageConfig) + case 'importNativeComponent': + return prependHeader(nodePath, importNative) + default: } } }) diff --git a/packages/taro-helper/swc-backup/swc_plugin_define_config.wasm b/packages/taro-helper/swc-backup/swc_plugin_define_config.wasm old mode 100644 new mode 100755 index 85cb7d7310d0357cd98a822cca6889f60152e2c1..b2d2e34f2528d4f0feeca3c307cb5b2dd1c89a35 GIT binary patch literal 575173 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 literal 572927 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 lo$&ik#~&z?&71wc|5d^)%vZ-F`jm0 string +export default (compiler: ViteHarmonyCompilerContext | ViteMiniCompilerContext, id: string, cb: TCallback) => { + return function pluginImportNativeComponent (babel: typeof BabelCore): BabelCore.PluginObj { + const t = babel.types + let enableImportComponent = true + + return { + name: 'plugin:import-native-component', + visitor: { + 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 : '') + ) + ) + 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' + + if (enableImportComponent) { + const nativeName = cb(pathArg, nameArg, exportNameArg) + ast.replaceWith(t.stringLiteral(nativeName)) + } + } + }, + FunctionDeclaration(ast) { + if (t.isIdentifier(ast.node.id, { name: IMPORT_COMPONENT_NAME })) { + enableImportComponent = false + cb(false) + } + }, + ImportDeclaration(ast) { + ast.node.specifiers.forEach(specifier => { + if ( + (t.isImportSpecifier(specifier) || t.isImportDefaultSpecifier(specifier)) && + specifier.local.name === IMPORT_COMPONENT_NAME + ) { + enableImportComponent = false + cb(false) + } + }) + }, + VariableDeclarator(ast) { + if ( + t.isIdentifier(ast.node.id, { name: IMPORT_COMPONENT_NAME }) && + (t.isArrowFunctionExpression(ast.node.init) || + t.isFunctionExpression(ast.node.init)) + ) { + enableImportComponent = false + cb(false) + } + } + } + } + } +} diff --git a/packages/taro-vite-runner/src/common/babel-plugin-remove-config.ts b/packages/taro-vite-runner/src/common/babel-plugin-remove-config.ts new file mode 100644 index 000000000000..715db8286ad5 --- /dev/null +++ b/packages/taro-vite-runner/src/common/babel-plugin-remove-config.ts @@ -0,0 +1,22 @@ +import type * as BabelCore from '@babel/core' + +export default (id = '') => { + return function pluginRemovePageConfig (babel: typeof BabelCore): BabelCore.PluginObj { + const { types: t } = babel + + return { + name: 'plugin:remove_pageconfig', + visitor: { + CallExpression (nodePath, state) { + if (!/\.config\.(t|j)sx?$/.test(state.filename || id)) return + + const { callee } = nodePath.node + if (!t.isIdentifier(callee)) return + if (!['defineAppConfig', 'definePageConfig'].includes(callee.name)) return + + nodePath.remove() + } + } + } + } +} diff --git a/packages/taro-vite-runner/src/common/rollup-increment-plugin.ts b/packages/taro-vite-runner/src/common/rollup-plugin-increment.ts similarity index 100% rename from packages/taro-vite-runner/src/common/rollup-increment-plugin.ts rename to packages/taro-vite-runner/src/common/rollup-plugin-increment.ts diff --git a/packages/taro-vite-runner/src/common/assets.ts b/packages/taro-vite-runner/src/common/vite-plugin-assets.ts similarity index 100% rename from packages/taro-vite-runner/src/common/assets.ts rename to packages/taro-vite-runner/src/common/vite-plugin-assets.ts diff --git a/packages/taro-vite-runner/src/common/multi-platform-plugin.ts b/packages/taro-vite-runner/src/common/vite-plugin-multi-platform.ts similarity index 97% rename from packages/taro-vite-runner/src/common/multi-platform-plugin.ts rename to packages/taro-vite-runner/src/common/vite-plugin-multi-platform.ts index 5aa6de35958f..5ac71391d83b 100644 --- a/packages/taro-vite-runner/src/common/multi-platform-plugin.ts +++ b/packages/taro-vite-runner/src/common/vite-plugin-multi-platform.ts @@ -19,8 +19,8 @@ function isViteDepsPath(filePath: string) { return isViteDeps } -export default function (complier: ViteH5CompilerContext | ViteHarmonyCompilerContext | ViteMiniCompilerContext): PluginOption { - const { taroConfig } = complier +export default function (compiler: ViteH5CompilerContext | ViteHarmonyCompilerContext | ViteMiniCompilerContext): PluginOption { + const { taroConfig } = compiler return { name: 'taro:vite-multi-platform-plugin', diff --git a/packages/taro-vite-runner/src/h5/index.ts b/packages/taro-vite-runner/src/h5/index.ts index 74dce9b0c6f2..51bc260cb5af 100644 --- a/packages/taro-vite-runner/src/h5/index.ts +++ b/packages/taro-vite-runner/src/h5/index.ts @@ -1,5 +1,5 @@ -import assets from '../common/assets' -import multiPlatformPlugin from '../common/multi-platform-plugin' +import assets from '../common/vite-plugin-assets' +import multiPlatformPlugin from '../common/vite-plugin-multi-platform' import { getMode } from '../utils' import configPlugin from './config' import entryPlugin from './entry' diff --git a/packages/taro-vite-runner/src/harmony/config.ts b/packages/taro-vite-runner/src/harmony/config.ts index 48e5a917b9b4..43d4a38e389d 100644 --- a/packages/taro-vite-runner/src/harmony/config.ts +++ b/packages/taro-vite-runner/src/harmony/config.ts @@ -7,7 +7,7 @@ import { defaultMainFields, fs, PLATFORMS, recursiveMerge, REG_NODE_MODULES_DIR, import { getSassLoaderOption } from '@tarojs/runner-utils' import { isArray, PLATFORM_TYPE } from '@tarojs/shared' -import increment from '../common/rollup-increment-plugin' +import increment from '../common/rollup-plugin-increment' import { getDefaultPostcssConfig } from '../postcss/postcss.harmony' import { getBabelOption, getCSSModulesOptions, getMinify, getMode, getPostcssPlugins, isVirtualModule, stripMultiPlatformExt, stripVirtualModulePrefix, virtualModulePrefixREG } from '../utils' import { DEFAULT_TERSER_OPTIONS, HARMONY_SCOPES } from '../utils/constants' @@ -251,7 +251,7 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi taroConfig, { babelOption: { - extensions: ['.js', '.jsx', '.ts', '.tsx', '.mjs', '.mts', '.es6', '.es', '.ets'], + extensions: ['.js', '.jsx', '.ts', '.tsx', '.es6', '.es', '.mjs', '.mts', '.ets'], }, } )), diff --git a/packages/taro-vite-runner/src/harmony/entry.ts b/packages/taro-vite-runner/src/harmony/entry.ts index 9029c5cbbb85..546fe6172ead 100644 --- a/packages/taro-vite-runner/src/harmony/entry.ts +++ b/packages/taro-vite-runner/src/harmony/entry.ts @@ -29,7 +29,7 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi } return null }, - load (id) { + async load (id) { if (viteCompilerContext && id.endsWith(ENTRY_SUFFIX)) { const rawId = stripVirtualModulePrefix(id).replace(ENTRY_SUFFIX, '') const { taroConfig, cwd: appPath, app } = viteCompilerContext @@ -49,7 +49,7 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi const tabbar = appConfig.tabBar const parse = new AppParser(appPath, appConfig, taroConfig, viteCompilerContext.loaderMeta) // emit pages - viteCompilerContext.pages.forEach(page => { + await Promise.all(viteCompilerContext.pages.map(async page => { if (page.isNative) { const { sourceDir, nativeExt } = viteCompilerContext as ViteHarmonyCompilerContext const nativePath = resolveMainFilePath(path.join(sourceDir, page.name), nativeExt) @@ -67,19 +67,22 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi fileName: viteCompilerContext.getScriptPath(page.name + TARO_COMP_SUFFIX), implicitlyLoadedAfterOneOf: [rawId] }) + await this.load({ + id: page.scriptPath, + resolveDependencies: true + }) } - }) + })) // native components for (const comp of viteCompilerContext.nativeComponents.values()) { - if (!comp.isPackage) { - this.emitFile({ - type: 'chunk', - id: comp.templatePath + QUERY_IS_NATIVE_SCRIPT, - fileName: path.relative(viteCompilerContext.sourceDir, comp.templatePath) + QUERY_IS_NATIVE_SCRIPT, - implicitlyLoadedAfterOneOf: [rawId] - }) - } + if (comp.isPackage) continue + this.emitFile({ + type: 'chunk', + id: comp.templatePath + QUERY_IS_NATIVE_SCRIPT, + fileName: path.relative(viteCompilerContext.sourceDir, comp.templatePath) + QUERY_IS_NATIVE_SCRIPT, + implicitlyLoadedAfterOneOf: [rawId] + }) } // emit tabbar @@ -134,6 +137,10 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi code: parse.parse(rawId, name, this.resolve), exports: ['default'], }) + await this.load({ + id: rawId, + resolveDependencies: true + }) return parse.parseEntry(rawId, appConfig) } }, diff --git a/packages/taro-vite-runner/src/harmony/index.ts b/packages/taro-vite-runner/src/harmony/index.ts index 4b79c94c2d6b..a194e8e926a3 100644 --- a/packages/taro-vite-runner/src/harmony/index.ts +++ b/packages/taro-vite-runner/src/harmony/index.ts @@ -1,4 +1,4 @@ -import multiPlatformPlugin from '../common/multi-platform-plugin' +import multiPlatformPlugin from '../common/vite-plugin-multi-platform' import { assetPlugin } from './asset' import importPlugin from './babel' import { compileModePrePlugin } from './compile' diff --git a/packages/taro-vite-runner/src/harmony/page.ts b/packages/taro-vite-runner/src/harmony/page.ts index c17f53f6589f..43b50ceb239e 100644 --- a/packages/taro-vite-runner/src/harmony/page.ts +++ b/packages/taro-vite-runner/src/harmony/page.ts @@ -1,23 +1,50 @@ import path from 'node:path' +import { transformSync } from '@babel/core' import { removeHeadSlash } from '@tarojs/helper' -import { addLeadingSlash, appendVirtualModulePrefix, stripVirtualModulePrefix, virtualModulePrefixREG } from '../utils' +import pluginImportNativeComponent from '../common/babel-plugin-import-native-component' +import pluginRemovePageConfig from '../common/babel-plugin-remove-config' +import { addLeadingSlash, appendVirtualModulePrefix, escapePath, stripVirtualModulePrefix, virtualModulePrefixREG } from '../utils' +import { createFilterWithCompileOptions } from '../utils/createFilter' +import { UniqueKeyMap } from '../utils/map' import { PageParser } from './template' import type { ViteHarmonyCompilerContext } from '@tarojs/taro/types/compile/viteCompilerContext' -import type { PluginOption } from 'vite' +import type { PluginOption, ResolvedConfig } from 'vite' import type { TaroHarmonyPageMeta } from './template/page' export const PAGE_SUFFIX = '?page-loader=true' export const TARO_TABBAR_PAGE_PATH = 'taro_tabbar' +const nativeComponentMapCache = new WeakMap>>() +const nativeUniqueKeyMap = new WeakMap>() export default function (viteCompilerContext: ViteHarmonyCompilerContext): PluginOption { const name = 'taro:vite-harmony-page' + const { taroConfig, sourceDir } = viteCompilerContext + const filter = createFilterWithCompileOptions(taroConfig.compile, [sourceDir, /(?<=node_modules[\\/]).*taro/], []) + + let viteConfig: ResolvedConfig + let nCompCache: Map> + let nCompUniqueKeyMap: UniqueKeyMap return { name, enforce: 'pre', + configResolved(config) { + viteConfig = config + }, + buildStart() { + if (nativeComponentMapCache.has(viteConfig)) { + nCompCache = nativeComponentMapCache.get(viteConfig)! + nCompUniqueKeyMap = nativeUniqueKeyMap.get(viteConfig)! + } else { + nCompCache = new Map>() + nativeComponentMapCache.set(viteConfig, nCompCache) + nCompUniqueKeyMap = new UniqueKeyMap() + nativeUniqueKeyMap.set(viteConfig, nCompUniqueKeyMap) + } + }, resolveId (source, importer, options) { if ((viteCompilerContext?.isPage(source) || viteCompilerContext?.isComponent(source)) && options.isEntry) { if (viteCompilerContext.getPageById(source)?.isNative) return null @@ -36,7 +63,7 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi } return null }, - load (id) { + async load (id) { if (!viteCompilerContext) return const { taroConfig, cwd: appPath, app, loaderMeta } = viteCompilerContext const appConfig = app.config @@ -73,6 +100,9 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi code: parse.parse(tabbarId, tabbarPages as TaroHarmonyPageMeta[], name, this.resolve), exports: ['default'], }) + await Promise.all(tabbarPages.map(async page => { + await viteCompilerContext.collectedDeps(this, escapePath(page.scriptPath), filter) + })) } } else { const list: string[] = [] @@ -88,7 +118,7 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi list.push(page.name) } - list.forEach(pageName => { + await Promise.all(list.map(async pageName => { pageName = removeHeadSlash(pageName) if (!pageName) { pageName = 'index' @@ -105,10 +135,65 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi code: parse.parse(path.resolve(appRoot, pageName), page_, name, this.resolve), exports: ['default'], }) - }) + const deps: Set = await viteCompilerContext.collectedDeps(this, escapePath(rawId), filter) + 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]] + }) + }) + if (!page.isNative) { + page.config.usingComponents = { + ...page.config.usingComponents, + ...ncObj, + } + } + viteCompilerContext.collectNativeComponents(page) + })) } return parse.parseEntry(rawId, page as TaroHarmonyPageMeta) } }, + async transform(code, id) { + if (/\.m?[jt]sx?$/.test(id) && filter(id)) { + const scopeNativeComp = new Map() + let enableImportComponent = true + + const result = transformSync(code, { + filename: id, + parserOpts: { + plugins: [ + 'jsx', + 'typescript', + ], + }, + plugins: [ + pluginRemovePageConfig(id), + pluginImportNativeComponent(viteCompilerContext, id, (path, name = '', exportName = '') => { + if (path === false) { + enableImportComponent = false + return '' + } + + let key = `${name}${exportName !== 'default' ? `_${exportName}` : ''}`.toLowerCase() + key = nCompUniqueKeyMap.add(key, path) + scopeNativeComp.set(key, [path, exportName]) + return key + }), + ] + }) + + if (enableImportComponent) { + nCompCache.set(id, Object.fromEntries(scopeNativeComp)) + return { + code: result?.code || code, + map: result?.map || null, + } + } + } + } } } diff --git a/packages/taro-vite-runner/src/harmony/template/render.ts b/packages/taro-vite-runner/src/harmony/template/render.ts index 4b0a624192a9..7b597806f6c0 100644 --- a/packages/taro-vite-runner/src/harmony/template/render.ts +++ b/packages/taro-vite-runner/src/harmony/template/render.ts @@ -113,14 +113,15 @@ export default class RenderParser extends BaseParser { }) this.context.nativeComponents.forEach((meta) => { + const name = meta.exportName === 'default' ? meta.name : `{ ${meta.exportName} as ${meta.name} }` if (meta.isPackage) { - importList.push(`import ${meta.name} from '${meta.scriptPath}'`) + importList.push(`import ${name} from '${meta.scriptPath}'`) } else { const nativePath = path.posix .relative(this.context.sourceDir, meta.scriptPath) .replace(/[\\/]+/g, '/') .replace(/\.ets$/, '') - importList.push(`import ${meta.name} from './${nativePath}'`) + importList.push(`import ${name} from './${nativePath}'`) } }) @@ -397,10 +398,6 @@ export { createChildItem, createLazyChildren }`, }` } - /** - * @deprecated - * 这个方法在多线程中需要要去掉 - */ generateNativeComponentNamesInit() { if (this.context.nativeComponents.size === 0) return '' const commentsList: string[] = [] diff --git a/packages/taro-vite-runner/src/mini/entry.ts b/packages/taro-vite-runner/src/mini/entry.ts index 10b870791cad..9b52403a2db8 100644 --- a/packages/taro-vite-runner/src/mini/entry.ts +++ b/packages/taro-vite-runner/src/mini/entry.ts @@ -6,6 +6,7 @@ import { isString } from '@tarojs/shared' import { appendVirtualModulePrefix, escapePath, prettyPrintJson, stripVirtualModulePrefix } from '../utils' import { baseCompName, customWrapperName } from '../utils/constants' import { miniTemplateLoader, QUERY_IS_NATIVE_COMP, QUERY_IS_NATIVE_PAGE } from './native-support' +import { PAGE_SUFFIX } from './page' import type { ViteMiniCompilerContext } from '@tarojs/taro/types/compile/viteCompilerContext' import type { PluginOption } from 'vite' @@ -22,7 +23,7 @@ export default function (viteCompilerContext: ViteMiniCompilerContext): PluginOp } return null }, - load (id) { + async load (id) { if (viteCompilerContext && id.endsWith(ENTRY_SUFFIX)) { const rawId = stripVirtualModulePrefix(id).replace(ENTRY_SUFFIX, '') const { taroConfig, app } = viteCompilerContext @@ -56,7 +57,7 @@ export default function (viteCompilerContext: ViteMiniCompilerContext): PluginOp } // pages - viteCompilerContext.pages.forEach(page => { + await Promise.all(viteCompilerContext.pages.map(async page => { // 小程序原生页面 if (page.isNative) { if (page.templatePath) { @@ -75,7 +76,11 @@ export default function (viteCompilerContext: ViteMiniCompilerContext): PluginOp fileName: viteCompilerContext.getScriptPath(page.name), implicitlyLoadedAfterOneOf: [rawId] }) - }) + await this.load({ + id: appendVirtualModulePrefix(page.scriptPath + PAGE_SUFFIX), + resolveDependencies: true + }) + })) // native components for (const comp of viteCompilerContext.nativeComponents.values()) { diff --git a/packages/taro-vite-runner/src/mini/index.ts b/packages/taro-vite-runner/src/mini/index.ts index b70e847a693a..700081d08415 100644 --- a/packages/taro-vite-runner/src/mini/index.ts +++ b/packages/taro-vite-runner/src/mini/index.ts @@ -1,5 +1,5 @@ -import assetsPlugin from '../common/assets' -import multiPlatformPlugin from '../common/multi-platform-plugin' +import assetsPlugin from '../common/vite-plugin-assets' +import multiPlatformPlugin from '../common/vite-plugin-multi-platform' import configPlugin from './config' import emitPlugin from './emit' import entryPlugin from './entry' diff --git a/packages/taro-vite-runner/src/mini/page.ts b/packages/taro-vite-runner/src/mini/page.ts index d0a73450ca29..b9c8e38333f5 100644 --- a/packages/taro-vite-runner/src/mini/page.ts +++ b/packages/taro-vite-runner/src/mini/page.ts @@ -1,14 +1,45 @@ +import path from 'node:path' + +import { transformSync } from '@babel/core' + +import pluginImportNativeComponent from '../common/babel-plugin-import-native-component' +import pluginRemovePageConfig from '../common/babel-plugin-remove-config' import { appendVirtualModulePrefix, escapePath, prettyPrintJson, stripVirtualModulePrefix } from '../utils' +import { createFilterWithCompileOptions } from '../utils/createFilter' +import { UniqueKeyMap } from '../utils/map' import type { ViteMiniCompilerContext } from '@tarojs/taro/types/compile/viteCompilerContext' -import type { PluginOption } from 'vite' +import type { PluginOption, ResolvedConfig } from 'vite' -const PAGE_SUFFIX = '?page-loader=true' +export const PAGE_SUFFIX = '?page-loader=true' +const nativeComponentMapCache = new WeakMap>>() +const nativeUniqueKeyMap = new WeakMap>() export default function (viteCompilerContext: ViteMiniCompilerContext): PluginOption { + const { taroConfig, sourceDir } = viteCompilerContext + const filter = createFilterWithCompileOptions(taroConfig.compile, [sourceDir, /(?<=node_modules[\\/]).*taro/], []) + + let viteConfig: ResolvedConfig + let nCompCache: Map> + let nCompUniqueKeyMap: UniqueKeyMap + return { name: 'taro:vite-mini-page', enforce: 'pre', + configResolved(config) { + viteConfig = config + }, + buildStart() { + if (nativeComponentMapCache.has(viteConfig)) { + nCompCache = nativeComponentMapCache.get(viteConfig)! + nCompUniqueKeyMap = nativeUniqueKeyMap.get(viteConfig)! + } else { + nCompCache = new Map>() + nativeComponentMapCache.set(viteConfig, nCompCache) + nCompUniqueKeyMap = new UniqueKeyMap() + nativeUniqueKeyMap.set(viteConfig, nCompUniqueKeyMap) + } + }, resolveId (source, _importer, options) { if (viteCompilerContext?.isPage(source) && options.isEntry) { if (viteCompilerContext.getPageById(source)?.isNative) return null @@ -16,7 +47,7 @@ export default function (viteCompilerContext: ViteMiniCompilerContext): PluginOp } return null }, - load (id) { + async load (id) { if (viteCompilerContext && id.endsWith(PAGE_SUFFIX)) { const rawId = stripVirtualModulePrefix(id).replace(PAGE_SUFFIX, '') const page = viteCompilerContext.getPageById(rawId) @@ -34,6 +65,24 @@ export default function (viteCompilerContext: ViteMiniCompilerContext): PluginOp instantiatePage = viteCompilerContext.loaderMeta.modifyInstantiate(instantiatePage, 'page') } + const deps: Set = await viteCompilerContext.collectedDeps(this, escapePath(rawId), filter) + const ncObj: Record = {} + deps.forEach(dep => { + Object.entries(nCompCache.get(dep) || {}).forEach(([key, value]) => { + const absPath = value + const ext = path.extname(absPath) + const basename = path.basename(absPath, ext) + ncObj[key] = path.join(path.dirname(path.relative(path.dirname(rawId), absPath)), basename) + }) + }) + if (!page.isNative) { + page.config.usingComponents = { + ...page.config.usingComponents, + ...ncObj, + } + } + viteCompilerContext.collectNativeComponents(page) + return [ 'import { createPageConfig } from "@tarojs/runtime"', `import component from "${escapePath(rawId)}"`, @@ -43,6 +92,44 @@ export default function (viteCompilerContext: ViteMiniCompilerContext): PluginOp instantiatePage, ].join('\n') } + }, + async transform(code, id) { + if (/\.m?[jt]sx?$/.test(id) && filter(id)) { + const scopeNativeComp = new Map() + let enableImportComponent = true + + const result = transformSync(code, { + filename: id, + parserOpts: { + plugins: [ + 'jsx', + 'typescript', + ], + }, + plugins: [ + pluginRemovePageConfig(id), + pluginImportNativeComponent(viteCompilerContext, id, (path, name = '', exportName = '') => { + if (path === false) { + enableImportComponent = false + return '' + } + + let key = `${name}${exportName !== 'default' ? `_${exportName}` : ''}`.toLowerCase() + key = nCompUniqueKeyMap.add(key, path) + scopeNativeComp.set(key, path) + return key + }), + ] + }) + + if (enableImportComponent) { + nCompCache.set(id, Object.fromEntries(scopeNativeComp)) + return { + code: result?.code || code, + map: result?.map || null, + } + } + } } } } diff --git a/packages/taro-vite-runner/src/utils/compiler/base.ts b/packages/taro-vite-runner/src/utils/compiler/base.ts index 81162889a0bd..4c6846607b2d 100644 --- a/packages/taro-vite-runner/src/utils/compiler/base.ts +++ b/packages/taro-vite-runner/src/utils/compiler/base.ts @@ -54,6 +54,22 @@ export class CompilerContext ()): Promise> { + if (!/\.m?[jt]sx?$/.test(id) || !filter(id) || cache.has(id)) return cache + + cache.add(id) + const moduleInfo = await rollupCtx.load({ + id, + resolveDependencies: true, + }) + + await Promise.all(moduleInfo.importedIds.map(async (importedId) => { + return this.collectedDeps(rollupCtx, importedId, filter, cache) + })) + + return cache + } + watchConfigFile (rollupCtx: PluginContext) { this.configFileList.forEach((configFile) => rollupCtx.addWatchFile(configFile)) } diff --git a/packages/taro-vite-runner/src/utils/compiler/harmony.ts b/packages/taro-vite-runner/src/utils/compiler/harmony.ts index 8e2da1822881..8f03820f199b 100644 --- a/packages/taro-vite-runner/src/utils/compiler/harmony.ts +++ b/packages/taro-vite-runner/src/utils/compiler/harmony.ts @@ -120,24 +120,30 @@ export class TaroCompilerContext extends CompilerContext return pageMeta } + resolvePageImportPath (scriptPath: string, importPath: string) { + const alias = this.taroConfig.alias + if (isAliasPath(importPath, alias)) { + importPath = replaceAliasPath(scriptPath, importPath, alias) + } + return importPath + } + collectNativeComponents(meta: ViteAppMeta | VitePageMeta | ViteNativeCompMeta) { const { name, scriptPath, config } = meta const { usingComponents } = config if (!usingComponents) return - Object.entries(usingComponents).forEach(([compName, compPath]) => { - const alias = this.taroConfig.alias - - if (isAliasPath(compPath, alias)) { - compPath = replaceAliasPath(scriptPath, compPath, alias) - usingComponents[compName] = compPath - } + Object.entries(usingComponents).forEach(([compName, value]) => { + const compPath = value instanceof Array ? value[0] : value + const exportName = value instanceof Array ? value[1] : 'default' + usingComponents[compName] = this.resolvePageImportPath(scriptPath, compPath) // 如果是鸿蒙的包 if (this.ohpmPackageList?.length && new RegExp(`^(${this.ohpmPackageList.join('|')})`).test(compPath)) { const nativeCompMeta: ViteNativeCompMeta = { name: compName, + exportName, scriptPath: compPath, config: {}, configPath: '', @@ -163,6 +169,7 @@ export class TaroCompilerContext extends CompilerContext name: compName.replace(/(\w)-(\w)/g, (_, p1, p2) => { return p1 + p2.toUpperCase() }), + exportName, scriptPath: compScriptPath, config: {}, configPath: '', diff --git a/packages/taro-vite-runner/src/utils/compiler/mini.ts b/packages/taro-vite-runner/src/utils/compiler/mini.ts index 4a8a6349c834..54fc4da3f811 100644 --- a/packages/taro-vite-runner/src/utils/compiler/mini.ts +++ b/packages/taro-vite-runner/src/utils/compiler/mini.ts @@ -87,21 +87,23 @@ export class TaroCompilerContext extends CompilerContext im return pageMeta } + resolvePageImportPath (scriptPath: string, importPath: string) { + const alias = this.taroConfig.alias + if (isAliasPath(importPath, alias)) { + importPath = replaceAliasPath(scriptPath, importPath, alias) + } + return importPath + } + collectNativeComponents (meta: ViteAppMeta | VitePageMeta | ViteNativeCompMeta) { const { name, scriptPath, config } = meta const { usingComponents } = config if (!usingComponents) return - Object.entries(usingComponents).forEach(([compName, compPath]) => { - const alias = this.taroConfig.alias - - if (isAliasPath(compPath, alias)) { - compPath = replaceAliasPath(scriptPath, compPath, alias) - usingComponents[compName] = compPath - } - + Object.entries(usingComponents).forEach(([compName, value]) => { + const compPath = value instanceof Array ? value[0] : value + usingComponents[compName] = this.resolvePageImportPath(scriptPath, compPath) const compScriptPath = resolveMainFilePath(path.resolve(path.dirname(scriptPath), compPath)) - if (this.nativeComponents.has(compScriptPath)) return const configPath = this.getConfigPath(compScriptPath) @@ -114,6 +116,7 @@ export class TaroCompilerContext extends CompilerContext im const nativeCompMeta: ViteNativeCompMeta = { name: getComponentName(this, compScriptPath), + exportName: 'default', scriptPath: compScriptPath, configPath, config: readConfig(configPath) || {}, diff --git a/packages/taro-vite-runner/src/utils/createFilter.ts b/packages/taro-vite-runner/src/utils/createFilter.ts index e69e9561ed7b..d1a6f56a221c 100644 --- a/packages/taro-vite-runner/src/utils/createFilter.ts +++ b/packages/taro-vite-runner/src/utils/createFilter.ts @@ -5,7 +5,7 @@ */ import path from 'node:path' -import { isArray } from '@tarojs/shared' +import { isArray, isFunction } from '@tarojs/shared' import pm from 'picomatch' function ensureArray(thing) { @@ -75,3 +75,25 @@ export default function createFilter(include, exclude, options?) { return !includeMatchers.length } } + +export function createFilterWithCompileOptions(compile: { + exclude?: any[] + include?: any[] + /** 对应 @rollup/plugin-babel 插件的 filter 配置。只在 vite 编译模式下有效 */ + filter?: (filename: string) => boolean +} = {}, defaultInclude: any[] = [], defaultExclude: any[] = []) { + if (isFunction(compile.filter)) { + return compile.filter + } else { + let exclude: (string | RegExp)[] = [...defaultInclude] + const include: (string | RegExp)[] = [...defaultExclude] + if (Array.isArray(compile.include)) { + include.unshift(...compile.include) + } + // Note：如果 compile 有 传递exclude，那么就进行覆盖，与 webpack5 逻辑保持一致 + if (Array.isArray(compile.exclude)) { + exclude = [...compile.exclude] + } + return createFilter(include, exclude) + } +} diff --git a/packages/taro-vite-runner/src/utils/index.ts b/packages/taro-vite-runner/src/utils/index.ts index c7668601201f..09c720582c85 100644 --- a/packages/taro-vite-runner/src/utils/index.ts +++ b/packages/taro-vite-runner/src/utils/index.ts @@ -5,7 +5,7 @@ import { isNpmPkg, normalizePath, recursiveMerge, REG_NODE_MODULES, resolveSync import { isFunction, isString } from '@tarojs/shared' import { backSlashRegEx, MINI_EXCLUDE_POSTCSS_PLUGIN_NAME, needsEscapeRegEx, quoteNewlineRegEx } from './constants' -import createFilter from './createFilter' +import { createFilterWithCompileOptions } from './createFilter' import { logger } from './logger' import type { RollupBabelInputPluginOptions } from '@rollup/plugin-babel' @@ -207,25 +207,7 @@ export function getBabelOption ( compact: false, ...babelOption, } - const filter = compile.filter - if (isFunction(filter)) { - opts.filter = filter - } else { - let exclude: (string | RegExp)[] = [...defaultExclude] - const include: (string | RegExp)[] = [...defaultInclude] - - if (Array.isArray(compile.include)) { - include.unshift(...compile.include) - } - - // Note：如果 compile 有 传递exclude，那么就进行覆盖，与 webpack5 逻辑保持一致 - if (Array.isArray(compile.exclude)) { - exclude = [...compile.exclude] - } - - const filter = createFilter(include, exclude) - opts.filter = filter - } + opts.filter = createFilterWithCompileOptions(compile, defaultInclude, defaultExclude) return opts } diff --git a/packages/taro-vite-runner/src/utils/map.ts b/packages/taro-vite-runner/src/utils/map.ts new file mode 100644 index 000000000000..eb46df8cd51e --- /dev/null +++ b/packages/taro-vite-runner/src/utils/map.ts @@ -0,0 +1,44 @@ +import { isEqual } from 'lodash' + +export class UniqueKeyMap { + store: Map + counters: Map + + constructor() { + this.store = new Map() + this.counters = new Map() + } + + add(key: string, value: T) { + if (!this.store.has(key)) { + this.store.set(key, value) + return key + } else if (isEqual(this.store.get(key), value)) { + return key + } + + let counter = this.counters.get(key) || 1 + let newKey = `${key}_${counter++}` + + while (this.store.has(newKey)) { + newKey = `${key}_${counter++}` + } + + this.counters.set(key, counter) + this.store.set(newKey, value) + return newKey + } + + get(key: string) { + return this.store.get(key) + } + + has(key: string) { + return this.store.has(key) + } + + // 获取所有存储的内容 + getAll() { + return Object.fromEntries(this.store) + } +} diff --git a/packages/taro-webpack5-runner/src/plugins/HarmonyPlugin.ts b/packages/taro-webpack5-runner/src/plugins/HarmonyPlugin.ts index 959bb26f726b..0fdfee9389b5 100644 --- a/packages/taro-webpack5-runner/src/plugins/HarmonyPlugin.ts +++ b/packages/taro-webpack5-runner/src/plugins/HarmonyPlugin.ts @@ -823,10 +823,11 @@ export default class TaroHarmonyPlugin { if (!usingComponents) return for (const [key, value] of Object.entries(usingComponents)) { - if (!value.includes(NODE_MODULES)) return + const compPath = value instanceof Array ? value[0] : value + if (!compPath.includes(NODE_MODULES)) return - const match = value.replace(NODE_MODULES, 'npm').match(/npm.*/) - usingComponents[key] = match ? `${path.sep}${match[0]}` : value + const match = compPath.replace(NODE_MODULES, 'npm').match(/npm.*/) + usingComponents[key] = match ? `${path.sep}${match[0]}` : compPath } } diff --git a/packages/taro-webpack5-runner/src/plugins/MiniPlugin.ts b/packages/taro-webpack5-runner/src/plugins/MiniPlugin.ts index 26b59f4c9ba2..eaaf55d0e95d 100644 --- a/packages/taro-webpack5-runner/src/plugins/MiniPlugin.ts +++ b/packages/taro-webpack5-runner/src/plugins/MiniPlugin.ts @@ -1109,10 +1109,11 @@ export default class TaroMiniPlugin { if (!usingComponents || this.options.skipProcessUsingComponents) return for (const [key, value] of Object.entries(usingComponents)) { - if (!value.includes(NODE_MODULES)) return + const compPath = value instanceof Array ? value[0] : value + if (!compPath.includes(NODE_MODULES)) return - const match = value.replace(NODE_MODULES, 'npm').match(/npm.*/) - usingComponents[key] = match ? `${path.sep}${match[0]}` : value + const match = compPath.replace(NODE_MODULES, 'npm').match(/npm.*/) + usingComponents[key] = match ? `${path.sep}${match[0]}` : compPath } } diff --git a/packages/taro/types/compile/viteCompilerContext.d.ts b/packages/taro/types/compile/viteCompilerContext.d.ts index 48f11ede8203..6ac0acdf6a82 100644 --- a/packages/taro/types/compile/viteCompilerContext.d.ts +++ b/packages/taro/types/compile/viteCompilerContext.d.ts @@ -9,6 +9,7 @@ import type { AppConfig, PageConfig } from '../index' export interface ViteNativeCompMeta { name: string + exportName: string scriptPath: string configPath: string config: PageConfig @@ -109,6 +110,7 @@ export interface ViteCompilerContext { configFileList: string[] compilePage: (pageName: string) => VitePageMeta watchConfigFile: (rollupCtx: PluginContext) => void + collectedDeps: (rollupCtx: PluginContext, id: string, filter, cache: Set = new Set()) => Promise> getAppScriptPath: () => string getApp: () => ViteAppMeta getPages: () => VitePageMeta[] @@ -140,6 +142,7 @@ export interface ViteHarmonyCompilerContext extends ViteCompilerContext string[] modifyHarmonyConfig: (config: Partial) => void modifyHostPackage: (deps?: Record, devDeps?: Record) => Exclude + resolvePageImportPath: (scriptPath: string, pageName: string) => string collectNativeComponents: (meta: ViteAppMeta | VitePageMeta | ViteNativeCompMeta) => void getScriptPath: (filePath: string) => string getStylePath: (filePath: string) => string @@ -151,6 +154,7 @@ export interface ViteMiniCompilerContext extends ViteCompilerContext getCommonChunks: () => string[] + resolvePageImportPath: (scriptPath: string, pageName: string) => string collectNativeComponents: (meta: ViteAppMeta | VitePageMeta | ViteNativeCompMeta) => void getScriptPath: (filePath: string) => string getTemplatePath: (filePath: string) => string diff --git a/packages/taro/types/index.d.ts b/packages/taro/types/index.d.ts index da8ec8360884..de679c27cfe1 100644 --- a/packages/taro/types/index.d.ts +++ b/packages/taro/types/index.d.ts @@ -192,4 +192,5 @@ declare namespace Taro { declare global { const defineAppConfig: (config: Taro.AppConfig) => Taro.AppConfig const definePageConfig: (config: Taro.PageConfig) => Taro.Config + const importNativeComponent: (path: string, name = '', exportName = 'default') => Awaited } diff --git a/packages/taro/types/taro.config.d.ts b/packages/taro/types/taro.config.d.ts index 1bae7fbde63f..5113b2b18d4f 100644 --- a/packages/taro/types/taro.config.d.ts +++ b/packages/taro/types/taro.config.d.ts @@ -193,7 +193,7 @@ declare module './index' { /** 页面自定义组件配置 * @see https://developers.weixin.qq.com/miniprogram/dev/framework/custom-component/ */ - usingComponents?: Record + usingComponents?: Record /** 指定使用升级后的 weui 样式 * - v2: 可表明启用新版的组件样式 * @default default From ab4bab609608f80db05e167f74d5f53057a8101a Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Mon, 16 Dec 2024 14:45:11 +0800 Subject: [PATCH 80/81] chore(release): publish 4.0.9-beta.1 --- crates/native_binding/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/jest-helper/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- .../postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/postcss-unit-transform/package.json | 2 +- packages/rollup-plugin-copy/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/stylelint-taro/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- .../taro-components-library-react/package.json | 2 +- .../taro-components-library-solid/package.json | 2 +- .../taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-framework-react/package.json | 2 +- packages/taro-framework-solid/package.json | 2 +- packages/taro-framework-vue3/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-platform-alipay/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- .../build/config/harmony-definition.json | 18 ++++++++++-------- .../taro-platform-harmony-hybrid/package.json | 2 +- packages/taro-platform-harmony/package.json | 2 +- packages/taro-platform-jd/package.json | 2 +- packages/taro-platform-qq/package.json | 2 +- packages/taro-platform-swan/package.json | 2 +- packages/taro-platform-tt/package.json | 2 +- packages/taro-platform-weapp/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- .../taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- .../taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-transformer-wx/package.json | 2 +- packages/taro-vite-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 76 files changed, 85 insertions(+), 83 deletions(-) diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json index c2f1b21bb21d..03626dfcc516 100644 --- a/crates/native_binding/package.json +++ b/crates/native_binding/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/binding", - "version": "4.0.8", + "version": "4.0.9-beta.1", "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 5a88358492f2..9de2d3307199 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.0.8", + "version": "4.0.9-beta.1", "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index d54d880129ec..c49b72c29675 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.0.8", + "version": "4.0.9-beta.1", "os": [ "darwin" ], diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index cfa2be8614b6..536ff0f186fe 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.0.8", + "version": "4.0.9-beta.1", "os": [ "linux" ], diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index bc31aa30d2dd..41b397bb035d 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.0.8", + "version": "4.0.9-beta.1", "os": [ "linux" ], diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 498c55e89c84..b1caf0e7e5c4 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.0.8", + "version": "4.0.9-beta.1", "os": [ "win32" ], diff --git a/package.json b/package.json index a0507f971ad0..e651190bdbb9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "4.0.8", + "version": "4.0.9-beta.1", "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 b5a8e9e83e43..605f2e8acd85 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.0.8", + "version": "4.0.9-beta.1", "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 f0c9ebaa0b96..dfec43aa6140 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.0.8", + "version": "4.0.9-beta.1", "license": "MIT", "repository": { "type": "git", diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json index 83eb1acb47fb..fabf023f8821 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.0.8", + "version": "4.0.9-beta.1", "author": "O2Team", "license": "MIT", "main": "dist/index.js", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index d2cac713e3fb..619a18eb9ca8 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.0.8", + "version": "4.0.9-beta.1", "description": "Taro babel preset", "author": "O2Team", "license": "MIT", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 0985474d3c3e..d40d585bebda 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "4.0.8", + "version": "4.0.9-beta.1", "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 e6e8e4957096..3c33c69e945e 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.0.8", + "version": "4.0.9-beta.1", "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 932b8d206e8c..87a6be572de5 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.0.8", + "version": "4.0.9-beta.1", "description": "Taro specific linting rules for ESLint", "author": "O2Team", "license": "MIT", diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json index 0b20e3d01f16..4ea0162c29e2 100644 --- a/packages/jest-helper/package.json +++ b/packages/jest-helper/package.json @@ -1,6 +1,6 @@ { "name": "jest-taro-helper", - "version": "4.0.8", + "version": "4.0.9-beta.1", "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 60d6d971f518..193ed733eccc 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.0.8", + "version": "4.0.9-beta.1", "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 6cb77ea13470..f3a660cbcf05 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.0.8", + "version": "4.0.9-beta.1", "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 5ed16c7b352e..7b81c9f20fa0 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "4.0.8", + "version": "4.0.9-beta.1", "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 605a0c376a40..8a6a579169e5 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.0.8", + "version": "4.0.9-beta.1", "description": "小程序单位转换", "author": "O2Team", "license": "MIT", diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json index 3e5879bc81c3..bf3a50e0e1e0 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.0.8", + "version": "4.0.9-beta.1", "description": "rollup-plugin-copy for taro", "private": true, "author": "O2Team", diff --git a/packages/shared/package.json b/packages/shared/package.json index 8f8e51435aa1..c96b341648ef 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "4.0.8", + "version": "4.0.9-beta.1", "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 b01b8d273ba0..992cb13cbd6d 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.0.8", + "version": "4.0.9-beta.1", "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 e3f4208bf21f..5ae4a82be426 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.0.8", + "version": "4.0.9-beta.1", "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 94ce0c84d1f9..f5fab068bcad 100644 --- a/packages/stylelint-taro/package.json +++ b/packages/stylelint-taro/package.json @@ -1,6 +1,6 @@ { "name": "stylelint-taro", - "version": "4.0.8", + "version": "4.0.9-beta.1", "description": "Taro stylelint 规则集合", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json index 00cf7551105e..3a06168cdac5 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "4.0.8", + "version": "4.0.9-beta.1", "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 e4b443c232ad..06593c550eee 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.0.8", + "version": "4.0.9-beta.1", "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 4dfec96e10a7..8606541b0a4b 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "4.0.8", + "version": "4.0.9-beta.1", "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 c6cf28f064b0..7b916f4655f5 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.0.8", + "version": "4.0.9-beta.1", "description": "", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index a3915e0773f8..73f6bc7dcbf2 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.0.8", + "version": "4.0.9-beta.1", "description": "Taro 组件库 React 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index 06fe69c93703..2143ea3d54ec 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.0.8", + "version": "4.0.9-beta.1", "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 b1a1b3b0a73b..a0b2bf3b5957 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.0.8", + "version": "4.0.9-beta.1", "description": "Taro 组件库 Vue3 版本库", "private": true, "author": "O2Team", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 6ea728e4d9cf..73afff13d3c2 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.0.8", + "version": "4.0.9-beta.1", "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 9de58802ca12..0ad69540f3bf 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.0.8", + "version": "4.0.9-beta.1", "description": "React Native 基础组件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 00c5022b37c6..b664b3159330 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "4.0.8", + "version": "4.0.9-beta.1", "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 356b140abb21..9b57a3e00b7a 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "4.0.8", + "version": "4.0.9-beta.1", "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 ea143ab8651f..ad3ddbe64548 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.0.8", + "version": "4.0.9-beta.1", "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 a05d3161767f..2b68ff273c1b 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.0.8", + "version": "4.0.9-beta.1", "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 c53c6b068986..26ea4c37a65c 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.0.8", + "version": "4.0.9-beta.1", "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 3124978ac953..73ecc1f15904 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "4.0.8", + "version": "4.0.9-beta.1", "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 57f73178af19..f31459f5dd7c 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "4.0.8", + "version": "4.0.9-beta.1", "description": "Taro Helper", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index fc9ccbd84203..fd915026fc0e 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "4.0.8", + "version": "4.0.9-beta.1", "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 ef8df22e8728..a79c13fe3ec5 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.0.8", + "version": "4.0.9-beta.1", "description": "支付宝小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index dfb80aecfeb8..3dc8ce0df0d9 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.0.8", + "version": "4.0.9-beta.1", "description": "Web 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony-hybrid/build/config/harmony-definition.json b/packages/taro-platform-harmony-hybrid/build/config/harmony-definition.json index 32222d2a421c..e6341301337c 100644 --- a/packages/taro-platform-harmony-hybrid/build/config/harmony-definition.json +++ b/packages/taro-platform-harmony-hybrid/build/config/harmony-definition.json @@ -2176,7 +2176,7 @@ }, "custom-wrapper": true, "double-tap-gesture-handler": { - "should-response-on-move-worklet": false + "tag": false }, "draggable-sheet": { "initial-child-size": false, @@ -2193,7 +2193,9 @@ "show-img-resize": false }, "follow-swan": false, - "force-press-gesture-handler": false, + "force-press-gesture-handler": { + "tag": false + }, "form": { "report-submit": false, "report-submit-timeout": false @@ -2236,7 +2238,7 @@ "padding": false }, "horizontal-drag-gesture-handler": { - "should-response-on-move-worklet": false + "tag": false }, "icon": { "type": { @@ -2461,7 +2463,7 @@ }, "login": false, "long-press-gesture-handler": { - "should-response-on-move-worklet": false + "tag": false }, "lottie": false, "map": { @@ -2640,7 +2642,7 @@ "page-orientation": false }, "pan-gesture-handler": { - "should-response-on-move-worklet": false + "tag": false }, "picker": { "mode": { @@ -2742,7 +2744,7 @@ "rtc-room": false, "rtc-room-item": false, "scale-gesture-handler": { - "should-response-on-move-worklet": false + "tag": false }, "script": { "src": false, @@ -2899,7 +2901,7 @@ "tab-item": false, "tabs": false, "tap-gesture-handler": { - "should-response-on-move-worklet": false + "tag": false }, "text": { "selectable": false, @@ -2950,7 +2952,7 @@ "default-value": false }, "vertical-drag-gesture-handler": { - "should-response-on-move-worklet": false + "tag": false }, "video": { "src": true, diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index 477ab2f61a96..356aa5a2525f 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.0.8", + "version": "4.0.9-beta.1", "description": "Harmony 端平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json index 3c998f88d683..c3eb37f684e2 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.0.8", + "version": "4.0.9-beta.1", "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 cdb7d7e218b3..b89353d17283 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.0.8", + "version": "4.0.9-beta.1", "description": "京东小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-qq/package.json b/packages/taro-platform-qq/package.json index d009e86d0472..2c25a61b1172 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.0.8", + "version": "4.0.9-beta.1", "description": "QQ 小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-swan/package.json b/packages/taro-platform-swan/package.json index 5fa00d75abf0..e5795d4dc0f6 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.0.8", + "version": "4.0.9-beta.1", "description": "百度小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-tt/package.json b/packages/taro-platform-tt/package.json index c7e77a331ee7..d84eee95d3d0 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.0.8", + "version": "4.0.9-beta.1", "description": "头条小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-platform-weapp/package.json b/packages/taro-platform-weapp/package.json index 8d9f2825f774..a933a1701e09 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.0.8", + "version": "4.0.9-beta.1", "description": "微信小程序平台插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index db877ef03a45..30a74898e1b3 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.0.8", + "version": "4.0.9-beta.1", "description": "Taro 小程序端支持使用 HTML 标签的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index f7e948b61009..fc278a9d10f1 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.0.8", + "version": "4.0.9-beta.1", "description": "Taro 小程序端支持使用 web 请求 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index 0d48a42e9964..3ef976e50aed 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.0.8", + "version": "4.0.9-beta.1", "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 b5d3b3722d87..41e8dce9080b 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.0.8", + "version": "4.0.9-beta.1", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 9a6839a9f257..37f096e4ef95 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.0.8", + "version": "4.0.9-beta.1", "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 7cbf2e38865f..2aa552e20bfa 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.0.8", + "version": "4.0.9-beta.1", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index 6ddbc07893e4..288ed005f4db 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "4.0.8", + "version": "4.0.9-beta.1", "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 b40584eb9daf..1ad55ecb81fb 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.0.8", + "version": "4.0.9-beta.1", "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 b2b718b6a113..08772a7e109d 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.0.8", + "version": "4.0.9-beta.1", "description": "提供 Taro RN 统一处理样式文件能力", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index b09fc4899249..f7c197920825 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.0.8", + "version": "4.0.9-beta.1", "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 eeeed97c78ee..06d5eb71f6a3 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.0.8", + "version": "4.0.9-beta.1", "description": "Taro RN 入口文件处理", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index 9f6259ad51ea..2b5a21ae2778 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "4.0.8", + "version": "4.0.9-beta.1", "description": "Taro RN framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 13f1bb899dbf..b9076c81bb15 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.0.8", + "version": "4.0.9-beta.1", "description": "Taro-router-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 794081252268..6f51db738ca9 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "4.0.8", + "version": "4.0.9-beta.1", "description": "Taro-router", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index a33f16d3dca7..ac2ebfad43cd 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.0.8", + "version": "4.0.9-beta.1", "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 a51f06615789..2d36d00cc2ae 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.0.8", + "version": "4.0.9-beta.1", "description": "taro-runtime-rn", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 0086ac99dce2..5391d860d58c 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "4.0.8", + "version": "4.0.9-beta.1", "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 c55c821a98a2..a6dcabdce2e7 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "4.0.8", + "version": "4.0.9-beta.1", "description": "Taro Service", "author": "O2Team", "license": "MIT", diff --git a/packages/taro-transformer-wx/package.json b/packages/taro-transformer-wx/package.json index 06b94cf49c6c..5665455545a9 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.0.8", + "version": "4.0.9-beta.1", "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 84cd1a13d2d5..3d94f0a1a69c 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.0.8", + "version": "4.0.9-beta.1", "main": "index.js", "license": "MIT", "files": [ diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index ce7cf6ee8280..95ad1e66b070 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.0.8", + "version": "4.0.9-beta.1", "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 71b69c709104..ba3cef9c7762 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.0.8", + "version": "4.0.9-beta.1", "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 d36ef3b24eed..903f1ff432ef 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.0.8", + "version": "4.0.9-beta.1", "description": "taroize 之后的运行时", "author": "O2Team", "license": "MIT", diff --git a/packages/taro/package.json b/packages/taro/package.json index 33c99d3a302f..1212598a3be9 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "4.0.8", + "version": "4.0.9-beta.1", "description": "Taro framework", "author": "O2Team", "license": "MIT", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index 711addcf9441..8ac0f2745bf3 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "4.0.8", + "version": "4.0.9-beta.1", "description": "转换原生微信小程序代码为 Taro 代码", "author": "O2Team", "license": "MIT", From 29f91f995d0e607dab13339d323a927043ba6fe6 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Mon, 16 Dec 2024 15:25:57 +0800 Subject: [PATCH 81/81] =?UTF-8?q?fix(runner):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=89=93=E5=8C=85=E5=8E=9F=E7=94=9F=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=97=B6,=20=E5=90=8E=E7=BC=80=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E8=AF=86=E5=88=AB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-vite-runner/src/harmony/template/render.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/taro-vite-runner/src/harmony/template/render.ts b/packages/taro-vite-runner/src/harmony/template/render.ts index 7b597806f6c0..8f59644d4330 100644 --- a/packages/taro-vite-runner/src/harmony/template/render.ts +++ b/packages/taro-vite-runner/src/harmony/template/render.ts @@ -117,10 +117,11 @@ export default class RenderParser extends BaseParser { if (meta.isPackage) { importList.push(`import ${name} from '${meta.scriptPath}'`) } else { + const etx = path.extname(meta.scriptPath) const nativePath = path.posix .relative(this.context.sourceDir, meta.scriptPath) .replace(/[\\/]+/g, '/') - .replace(/\.ets$/, '') + .replace(new RegExp(`\\${etx}$`), '') importList.push(`import ${name} from './${nativePath}'`) } })