Skip to content

Commit 29be99c

Browse files
authored
Merge branch 'main' into node22
2 parents 3830219 + 8432bc9 commit 29be99c

File tree

164 files changed

+2460
-1308
lines changed

Some content is hidden

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

164 files changed

+2460
-1308
lines changed

.github/workflows/nodejs.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ on:
2020
permissions:
2121
contents: read # to fetch code (actions/checkout)
2222

23+
concurrency:
24+
group: ${{ github.workflow }}-${{ github.ref }}
25+
cancel-in-progress: true
26+
2327
jobs:
2428
build-rust-binding:
2529
name: Build Rust Binding
@@ -34,7 +38,6 @@ jobs:
3438
- build-rust-binding
3539
- build-rust-wasm
3640
strategy:
37-
fail-fast: false
3841
matrix:
3942
node-version: [20, 22]
4043
host: [macos-13, windows-latest, ubuntu-latest]
@@ -54,6 +57,7 @@ jobs:
5457
host: windows-latest
5558

5659
runs-on: ${{ matrix.host }}
60+
timeout-minutes: 30
5761
steps:
5862
- name: Checkout
5963
uses: actions/checkout@v4

crates/native_binding/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/binding",
3-
"version": "4.1.5",
3+
"version": "4.1.6",
44
"description": "Node binding for taro",
55
"main": "binding.js",
66
"typings": "binding.d.ts",

examples/mini-program-example/src/pages/api/taro/hooks/index.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ export default class Index extends React.Component {
9696
id: 'useOptionMenuClick',
9797
func: null,
9898
},
99+
{
100+
id: 'useKeyboardHeight',
101+
func: null,
102+
},
99103
{
100104
id: 'usePullIntercept',
101105
func: null,

npm/darwin-arm64/package.json

Lines changed: 1 addition & 1 deletion
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.1.5",
4+
"version": "4.1.6",
55
"os": [
66
"darwin"
77
],

npm/darwin-x64/package.json

Lines changed: 1 addition & 1 deletion
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.1.5",
4+
"version": "4.1.6",
55
"os": [
66
"darwin"
77
],

npm/linux-x64-gnu/package.json

Lines changed: 1 addition & 1 deletion
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.1.5",
4+
"version": "4.1.6",
55
"os": [
66
"linux"
77
],

npm/linux-x64-musl/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tarojs/binding-linux-x64-musl",
3-
"version": "4.1.5",
3+
"version": "4.1.6",
44
"os": [
55
"linux"
66
],

npm/win32-x64-msvc/package.json

Lines changed: 1 addition & 1 deletion
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.1.5",
4+
"version": "4.1.6",
55
"os": [
66
"win32"
77
],

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "taro",
3-
"version": "4.1.5",
3+
"version": "4.1.6",
44
"description": "开放式跨端跨框架开发解决方案",
55
"homepage": "https://github.com/NervJS/taro#readme",
66
"author": "O2Team",
@@ -20,7 +20,7 @@
2020
"scripts": {
2121
"preinstall": "npx only-allow pnpm",
2222
"prepare": "husky install",
23-
"build": "pnpm -r --filter=./packages/* prod",
23+
"build": "pnpm -r --aggregate-output --filter=./packages/* prod",
2424
"build:binding:debug": "pnpm --filter @tarojs/binding run build:debug",
2525
"build:binding:release": "pnpm --filter @tarojs/binding run build",
2626
"debug": "node scripts/debug.js",

0 commit comments

Comments
 (0)