Skip to content

Commit 205c6da

Browse files
author
zhuqingan.3
committed
Merge remote-tracking branch 'origin' into feat/4.1.8-feat
2 parents 0313395 + 64195c5 commit 205c6da

File tree

105 files changed

+337
-124
lines changed

Some content is hidden

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

105 files changed

+337
-124
lines changed

.github/workflows/nodejs.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ jobs:
6161
host: windows-latest
6262

6363
runs-on: ${{ matrix.host }}
64-
timeout-minutes: 30
6564
steps:
6665
- name: Checkout
6766
uses: actions/checkout@v4
@@ -112,7 +111,15 @@ jobs:
112111
- name: Move artifacts
113112
run: pnpm artifacts
114113
- name: build
115-
run: pnpm build
114+
shell: bash
115+
run: |
116+
if [ "${{ matrix.host }}" = "windows-latest" ]; then
117+
pnpm build:serial
118+
else
119+
pnpm build
120+
fi
121+
env:
122+
NODE_OPTIONS: --max_old_space_size=4096
116123
- name: test
117124
run: pnpm test
118125
env:

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.7",
3+
"version": "4.1.8-alpha.0",
44
"description": "Node binding for taro",
55
"main": "binding.js",
66
"typings": "binding.d.ts",

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.7",
4+
"version": "4.1.8-alpha.0",
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.7",
4+
"version": "4.1.8-alpha.0",
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.7",
4+
"version": "4.1.8-alpha.0",
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.7",
3+
"version": "4.1.8-alpha.0",
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.7",
4+
"version": "4.1.8-alpha.0",
55
"os": [
66
"win32"
77
],

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "taro",
3-
"version": "4.1.7",
3+
"version": "4.1.8-alpha.0",
44
"description": "开放式跨端跨框架开发解决方案",
55
"homepage": "https://github.com/NervJS/taro#readme",
66
"author": "O2Team",
@@ -21,6 +21,7 @@
2121
"preinstall": "npx only-allow pnpm",
2222
"prepare": "husky install",
2323
"build": "pnpm -r --aggregate-output --filter=./packages/* prod",
24+
"build:serial": "pnpm -r --workspace-concurrency=1 --aggregate-output --filter=./packages/* prod",
2425
"build:binding:debug": "pnpm --filter @tarojs/binding run build:debug",
2526
"build:binding:release": "pnpm --filter @tarojs/binding run build",
2627
"debug": "node scripts/debug.js",

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

Lines changed: 1 addition & 1 deletion
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.1.7",
3+
"version": "4.1.8-alpha.0",
44
"description": "Transform stylesheet selector to style in JSX Elements.",
55
"author": "O2Team",
66
"license": "MIT",

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

Lines changed: 1 addition & 1 deletion
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.1.7",
4+
"version": "4.1.8-alpha.0",
55
"license": "MIT",
66
"repository": {
77
"type": "git",

0 commit comments

Comments
 (0)