Skip to content

Commit 33688ad

Browse files
tutuxxxtutuxxx
authored
Merge branch 'main' into chore/types
2 parents d409288 + c884896 commit 33688ad

File tree

80 files changed

+227
-312
lines changed

Some content is hidden

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

80 files changed

+227
-312
lines changed

‎.github/workflows/build-rust-binding.yml

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
3030
build: |-
3131
set -e &&
32+
npm install -g corepack@0.31.0 &&
3233
pnpm build:binding:release --target x86_64-unknown-linux-gnu &&
3334
strip crates/native_binding/*.node
3435
- host: ubuntu-20.04

‎crates/native_binding/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/binding",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Node binding for taro",
55
"main": "binding.js",
66
"typings": "binding.d.ts",

‎npm/darwin-arm64/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@tarojs/binding-darwin-arm64",
33
"description": "Native binding for taro",
4-
"version": "4.0.9",
4+
"version": "4.0.10-beta.1",
55
"os": [
66
"darwin"
77
],

‎npm/darwin-x64/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@tarojs/binding-darwin-x64",
33
"description": "Native binding for taro",
4-
"version": "4.0.9",
4+
"version": "4.0.10-beta.1",
55
"os": [
66
"darwin"
77
],

‎npm/linux-x64-gnu/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@tarojs/binding-linux-x64-gnu",
33
"description": "Native binding for taro",
4-
"version": "4.0.9",
4+
"version": "4.0.10-beta.1",
55
"os": [
66
"linux"
77
],

‎npm/linux-x64-musl/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/binding-linux-x64-musl",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"os": [
55
"linux"
66
],

‎npm/win32-x64-msvc/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@tarojs/binding-win32-x64-msvc",
33
"description": "Native binding for taro",
4-
"version": "4.0.9",
4+
"version": "4.0.10-beta.1",
55
"os": [
66
"win32"
77
],

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "taro",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "开放式跨端跨框架开发解决方案",
55
"homepage": "https://github.com/NervJS/taro#readme",
66
"author": "O2Team",

‎packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "babel-plugin-transform-react-jsx-to-rn-stylesheet",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Transform stylesheet selector to style in JSX Elements.",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/babel-plugin-transform-solid-jsx/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "babel-plugin-transform-solid-jsx",
33
"description": "A JSX to DOM plugin that wraps expressions for fine grained change detection",
4-
"version": "4.0.9",
4+
"version": "4.0.10-beta.1",
55
"license": "MIT",
66
"repository": {
77
"type": "git",

‎packages/babel-plugin-transform-taroapi/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "babel-plugin-transform-taroapi",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"author": "O2Team",
55
"license": "MIT",
66
"main": "dist/index.js",

‎packages/babel-preset-taro/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "babel-preset-taro",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Taro babel preset",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/create-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/create-app",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "create taro app with one command",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/css-to-react-native/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "taro-css-to-react-native",
33
"description": "Convert CSS text to a React Native stylesheet object",
4-
"version": "4.0.9",
4+
"version": "4.0.10-beta.1",
55
"author": "O2Team",
66
"license": "MIT",
77
"main": "dist/index.js",

‎packages/eslint-config-taro/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eslint-config-taro",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Taro specific linting rules for ESLint",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/jest-helper/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jest-taro-helper",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "jest helper for taro",
55
"private": true,
66
"author": "O2Team",

‎packages/postcss-html-transform/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "postcss-html-transform",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "transform html tag name selector",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/postcss-plugin-constparse/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "postcss-plugin-constparse",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "parse constants defined in config",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/postcss-pxtransform/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "postcss-pxtransform",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "PostCSS plugin px 转小程序 rpx及h5 rem 单位",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/postcss-unit-transform/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "postcss-taro-unit-transform",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "小程序单位转换",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/rollup-plugin-copy/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "rollup-plugin-copy",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "rollup-plugin-copy for taro",
55
"private": true,
66
"author": "O2Team",

‎packages/shared/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/shared",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Taro utils internal use.",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/stylelint-config-taro-rn/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "stylelint-config-taro-rn",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Shareable stylelint config for React Native CSS modules",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/stylelint-taro-rn/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "stylelint-taro-rn",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "A collection of React Native specific rules for stylelint",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/stylelint-taro/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "stylelint-taro",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Taro stylelint 规则集合",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/taro-api/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/api",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Taro common API",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/taro-cli-convertor/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/cli-convertor",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "cli tool for taro-convert",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/taro-cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/cli",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "cli tool for taro",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/taro-components-advanced/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/components-advanced",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/taro-components-library-react/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/components-library-react",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Taro 组件库 React 版本库",
55
"private": true,
66
"author": "O2Team",

‎packages/taro-components-library-solid/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/components-library-solid",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Taro 组件库 Solid 版本库",
55
"private": true,
66
"main": "index.js",

‎packages/taro-components-library-vue3/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/components-library-vue3",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Taro 组件库 Vue3 版本库",
55
"private": true,
66
"author": "O2Team",

‎packages/taro-components-react/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/components-react",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "",
55
"main:h5": "dist/index.js",
66
"main": "dist/index.js",

‎packages/taro-components-rn/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/components-rn",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "React Native 基础组件",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/taro-components/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/components",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Taro 组件库",
55
"browser": "dist/index.js",
66
"main:h5": "dist/index.js",

‎packages/taro-extend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/extend",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Taro extend functionality",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/taro-framework-react/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/plugin-framework-react",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "React/Preact 框架插件",
55
"author": "O2Team",
66
"homepage": "https://github.com/nervjs/taro",

‎packages/taro-framework-solid/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/plugin-framework-solid",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Solid 框架插件",
55
"author": "drchan",
66
"homepage": "https://github.com/nervjs/taro",

‎packages/taro-framework-vue3/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/plugin-framework-vue3",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Vue3 框架插件",
55
"author": "O2Team",
66
"homepage": "https://github.com/nervjs/taro",

‎packages/taro-h5/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/taro-h5",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Taro h5 framework",
55
"browser": "dist/index.js",
66
"main:h5": "dist/index.esm.js",

‎packages/taro-helper/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/helper",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Taro Helper",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/taro-loader/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/taro-loader",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Taro runner use webpack loader",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/taro-platform-alipay/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/plugin-platform-alipay",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "支付宝小程序平台插件",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/taro-platform-h5/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/plugin-platform-h5",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Web 端平台插件",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/taro-platform-h5/src/program.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,11 @@ export default class H5 extends TaroPlatformWeb {
9696
const rules = chain.module.rules
9797
const script = rules.get('script')
9898
const babelLoader = script.uses.get('babelLoader')
99+
const options = babelLoader.get('options')
99100
babelLoader.set('options', {
100-
...babelLoader.get('options'),
101+
...options,
101102
plugins: [
103+
...(options.plugins || []),
102104
[
103105
require('babel-plugin-transform-taroapi'),
104106
{

‎packages/taro-platform-harmony-hybrid/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/plugin-platform-harmony-hybrid",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "Harmony 端平台插件",
55
"author": "O2Team",
66
"license": "MIT",

‎packages/taro-platform-harmony/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/plugin-platform-harmony-ets",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "OpenHarmony & 鸿蒙系统插件",
55
"author": "O2Team",
66
"homepage": "https://gitee.com/openharmony-sig/taro",

‎packages/taro-platform-jd/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/plugin-platform-jd",
3-
"version": "4.0.9",
3+
"version": "4.0.10-beta.1",
44
"description": "京东小程序平台插件",
55
"author": "O2Team",
66
"license": "MIT",

0 commit comments

Comments
 (0)