Merge branch 'v4.0.0' into v4.0.0-probebug

# Conflicts:
#	editor/assets/default_renderpipeline/builtin-pipeline.ts

Author: xubing0906

.github/workflows/eslint.ps1

@@ -20,8 +20,14 @@ if ($env:GITHUB_BASE_REF) {
     # Push
     $gitHubEvent = Get-Content $env:GITHUB_EVENT_PATH | ConvertFrom-Json
     Write-Host "GitHub event: $gitHubEvent"
-    git fetch origin $gitHubEvent.before --depth=1
-    $diffFiles = git diff --name-only --diff-filter=$diffFilter $gitHubEvent.before $env:GITHUB_SHA
+    $beforeSha = $gitHubEvent.before
+    # On tag creation or initial push, before is all zeros - skip diff in that case
+    if ($beforeSha -match '^0+$') {
+        Write-Host "No previous commit (tag creation or initial push). Skipping diff."
+        return
+    }
+    git fetch origin $beforeSha --depth=1
+    $diffFiles = git diff --name-only --diff-filter=$diffFilter $beforeSha $env:GITHUB_SHA
 }
 
 Write-Host "Diff files: $diffFiles"

.github/workflows/native-clang-format.yml

@@ -18,25 +18,21 @@ jobs:
       with:
         token: ${{ github.token }}
         ref: ${{ github.head_sha }}
+        fetch-depth: 0
 
     - id: get_change_files
       uses: fish9167/file-changes-action@v1.2.3
       with:
         output: ' '
         fileOutput: ' '
 
-    - name: Echo change files
-      run: |
-        cat $HOME/files.txt
-        mv $HOME/files.txt ${{github.workspace}}/files.txt
-    
-    - uses: fish9167/clang-format-lint-action@master
+    - uses: DoozyX/clang-format-lint-action@v0.18
       with:
         source: ./native
-        exclude: ./native/cocos/bindings/auto
+        exclude: ./native/cocos/bindings/auto ./native/cocos/base/std ./native/cocos/editor-support/spine-wasm ./native/cocos/editor-support/spine ./native/cocos/gi/light-probe/predicates.cpp ./native/cocos/gi/light-probe/tetgen.cpp ./native/cocos/gi/light-probe/tetgen.h ./native/cocos/platform/openharmony/napi ./native/tools ./native/vendor ./native/cocos/cocos-version.h
         extensions: 'c,h,hpp,cpp,cxx'
         style: file
-        inplace: True
+        inplace: true
         clangFormatVersion: 12
 
     - name: Create Pull Request 

.github/workflows/native-compile-platforms.yml

@@ -483,8 +483,8 @@ jobs:
           echo "set(CC_USE_GLES3 OFF)" >> build-mac/proj/cfg.cmake
           echo "set(CC_USE_METAL ON)" >> build-mac/proj/cfg.cmake
           # Test JSVM v8 backend on macOS.
-          echo "set(USE_SE_V8 OFF)" >> build-mac/proj/cfg.cmake
-          echo "set(USE_SE_JSVM ON)" >> build-mac/proj/cfg.cmake
+          echo "set(USE_SE_V8 ON)" >> build-mac/proj/cfg.cmake
+          echo "set(USE_SE_JSVM OFF)" >> build-mac/proj/cfg.cmake
           echo "set(USE_WEBSOCKET_SERVER OFF)" >> build-mac/proj/cfg.cmake
           echo "set(CMAKE_CXX_STANDARD_REQUIRED ON)" >> build-mac/proj/cfg.cmake
           echo "set(CC_EXECUTABLE_NAME \"\")" >> build-mac/proj/cfg.cmake
@@ -493,7 +493,6 @@ jobs:
           RES_DIR=$GITHUB_WORKSPACE/templates/mac/build-mac
           cd build-mac
           cmake ../ -GXcode -DCMAKE_OSX_ARCHITECTURES=${{ matrix.config.arch }} -DRES_DIR=$RES_DIR -DCOCOS_X_PATH=$NATIVE_ROOT
-          set +e
           cmake --build . --config Release -- -jobs $NUM_OF_CORES -arch ${{ matrix.config.arch }}
           echo "Compile MacOSX Release Done!"
 
@@ -534,7 +533,7 @@ jobs:
           echo "set(CC_USE_VULKAN OFF)" >> build-ios/proj/cfg.cmake
           echo "set(CC_USE_GLES2 OFF)" >> build-ios/proj/cfg.cmake
           echo "set(CC_USE_METAL ON)" >> build-ios/proj/cfg.cmake
-          echo "set(TARGET_IOS_VERSION 12.0)" >> build-ios/proj/cfg.cmake
+          echo "set(TARGET_IOS_VERSION 13.0)" >> build-ios/proj/cfg.cmake
           echo "set(USE_WEBSOCKET_SERVER OFF)" >> build-ios/proj/cfg.cmake
           echo "set(USE_DRAGONBONES OFF)" >> build-ios/proj/cfg.cmake
           echo "set(CMAKE_CXX_STANDARD_REQUIRED OFF)" >> build-ios/proj/cfg.cmake
@@ -548,7 +547,6 @@ jobs:
               -DCMAKE_OSX_ARCHITECTURES=${{ matrix.config.arch }} \
               -DRES_DIR=$RES_DIR \
               -DCOCOS_X_PATH=$NATIVE_ROOT
-          set +e
           #cmake --build . --config Debug -- -quiet -jobs $NUM_OF_CORES -allowProvisioningUpdates CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
           cmake --build . --config Debug -- -jobs $NUM_OF_CORES CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
           echo "Compile iOS Done!"

.github/workflows/native-ts-build.yml

@@ -28,6 +28,7 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm ci --ignore-scripts
+    - run: node scripts/spread-pal.cjs
     - run: npm run build:debug-infos
     - name: Download external
       run: |

.gitignore

@@ -46,3 +46,11 @@ platforms/runtime/platforms/vivo-mini-game/ral.min.js
 @types/consts.d.ts
 
 __TS_ENGINE__/
+
+# pal 由 @cocos/engine-pal 在 postinstall 挂载(软链/复制)，不入库
+/pal
+
+# platforms 源码已抽到 @cocos/engine-platforms；其预打包 adapter 由 postinstall 的
+# spread-adapter.cjs 复制到 bin/adapter(/bin 已忽略)。platforms 源码不再入库。
+/platforms
+

EngineErrorMap.md

@@ -3980,3 +3980,7 @@ Debug bones or slots is invalid in cached mode.
 ### 16419
 
 Spine version not supported.
+
+### 16420
+
+Start time must bigger than end time.

cc.config.json

@@ -382,70 +382,70 @@
             "test": "context.buildTimeConstants && context.buildTimeConstants.HTML5",
             "isVirtualModule": true,
             "overrides": {
-                "pal/minigame": "pal/minigame/non-minigame.ts",
-                "pal/audio": "pal/audio/web/player.ts",
-                "pal/system-info": "pal/system-info/web/system-info.ts",
-                "pal/screen-adapter": "pal/screen-adapter/web/screen-adapter.ts",
-                "pal/input": "pal/input/web/index.ts",
-                "pal/env": "pal/env/web/env.ts",
-                "pal/pacer": "pal/pacer/pacer-web.ts",
-                "pal/wasm": "pal/wasm/wasm-web.ts"
+                "pal/minigame": "pal/minigame/non-minigame.js",
+                "pal/audio": "pal/audio/web/player.js",
+                "pal/system-info": "pal/system-info/web/system-info.js",
+                "pal/screen-adapter": "pal/screen-adapter/web/screen-adapter.js",
+                "pal/input": "pal/input/web/index.js",
+                "pal/env": "pal/env/web/env.js",
+                "pal/pacer": "pal/pacer/pacer-web.js",
+                "pal/wasm": "pal/wasm/wasm-web.js"
             }
         },
         {
             "test": "context.buildTimeConstants && context.buildTimeConstants.NATIVE",
             "isVirtualModule": true,
             "overrides": {
-                "pal/minigame": "pal/minigame/non-minigame.ts",
-                "pal/audio": "pal/audio/native/player.ts",
-                "pal/system-info": "pal/system-info/native/system-info.ts",
-                "pal/screen-adapter": "pal/screen-adapter/native/screen-adapter.ts",
-                "pal/input": "pal/input/native/index.ts",
-                "pal/env": "pal/env/native/env.ts",
-                "pal/pacer": "pal/pacer/pacer-native.ts",
-                "pal/wasm": "pal/wasm/wasm-native.ts"
+                "pal/minigame": "pal/minigame/non-minigame.js",
+                "pal/audio": "pal/audio/native/player.js",
+                "pal/system-info": "pal/system-info/native/system-info.js",
+                "pal/screen-adapter": "pal/screen-adapter/native/screen-adapter.js",
+                "pal/input": "pal/input/native/index.js",
+                "pal/env": "pal/env/native/env.js",
+                "pal/pacer": "pal/pacer/pacer-native.js",
+                "pal/wasm": "pal/wasm/wasm-native.js"
             }
         },
         {
             "test": "context.buildTimeConstants && context.buildTimeConstants.MINIGAME",
             "isVirtualModule": true,
             "overrides": {
-                "pal/minigame": "pal/minigame/{{context.platform.toLowerCase()}}.ts",
-                "pal/audio": "pal/audio/minigame/player.ts",
-                "pal/system-info": "pal/system-info/minigame/system-info.ts",
-                "pal/screen-adapter": "pal/screen-adapter/minigame/screen-adapter.ts",
-                "pal/input": "pal/input/minigame/index.ts",
-                "pal/env": "pal/env/minigame/env.ts",
-                "pal/pacer": "pal/pacer/pacer-minigame.ts",
-                "pal/wasm": "pal/wasm/wasm-minigame.ts"
+                "pal/minigame": "pal/minigame/{{context.platform.toLowerCase()}}.js",
+                "pal/audio": "pal/audio/minigame/player.js",
+                "pal/system-info": "pal/system-info/minigame/system-info.js",
+                "pal/screen-adapter": "pal/screen-adapter/minigame/screen-adapter.js",
+                "pal/input": "pal/input/minigame/index.js",
+                "pal/env": "pal/env/minigame/env.js",
+                "pal/pacer": "pal/pacer/pacer-minigame.js",
+                "pal/wasm": "pal/wasm/wasm-minigame.js"
             }
         },
         {
             "test": "context.buildTimeConstants && context.buildTimeConstants.RUNTIME_BASED",
             "isVirtualModule": true,
             "overrides": {
-                "pal/minigame": "pal/minigame/runtime.ts",
-                "pal/audio": "pal/audio/minigame/player.ts",
-                "pal/system-info": "pal/system-info/minigame/system-info.ts",
-                "pal/screen-adapter": "pal/screen-adapter/minigame/screen-adapter.ts",
-                "pal/input": "pal/input/minigame/index.ts",
-                "pal/env": "pal/env/runtime/env.ts",
-                "pal/pacer": "pal/pacer/pacer-minigame.ts",
-                "pal/wasm": "pal/wasm/wasm-minigame.ts"
+                "pal/minigame": "pal/minigame/runtime.js",
+                "pal/audio": "pal/audio/minigame/player.js",
+                "pal/system-info": "pal/system-info/minigame/system-info.js",
+                "pal/screen-adapter": "pal/screen-adapter/minigame/screen-adapter.js",
+                "pal/input": "pal/input/minigame/index.js",
+                "pal/env": "pal/env/runtime/env.js",
+                "pal/pacer": "pal/pacer/pacer-minigame.js",
+                "pal/wasm": "pal/wasm/wasm-minigame.js"
             }
         },
         {
             "test": "context.buildTimeConstants && context.buildTimeConstants.NODEJS",
             "isVirtualModule": true,
             "overrides": {
-                "pal/minigame": "pal/minigame/non-minigame.ts",
-                "pal/audio": "pal/audio/nodejs/player.ts",
-                "pal/system-info": "pal/system-info/nodejs/system-info.ts",
-                "pal/screen-adapter": "pal/screen-adapter/nodejs/screen-adapter.ts",
-                "pal/input": "pal/input/nodejs/index.ts",
-                "pal/env": "pal/env/nodejs/env.ts",
-                "pal/pacer": "pal/pacer/pacer-nodejs.ts",
-                "pal/wasm": "pal/wasm/wasm-nodejs.ts"
+                "pal/minigame": "pal/minigame/non-minigame.js",
+                "pal/audio": "pal/audio/nodejs/player.js",
+                "pal/system-info": "pal/system-info/nodejs/system-info.js",
+                "pal/screen-adapter": "pal/screen-adapter/nodejs/screen-adapter.js",
+                "pal/input": "pal/input/nodejs/index.js",
+                "pal/env": "pal/env/nodejs/env.js",
+                "pal/pacer": "pal/pacer/pacer-nodejs.js",
+                "pal/wasm": "pal/wasm/wasm-nodejs.js"
             }
         },
         {
@@ -470,15 +470,23 @@
             }
         },
         {
-            "test": "context.buildTimeConstants.SPINE_3_8",
+            "test": "context.buildTimeConstants.SPINE_3_8 && context.buildTimeConstants.SPINE_4_2",
+            "isVirtualModule": false,
+            "overrides": {
+                "cocos/spine/lib/spine-version.ts": "cocos/spine/lib/spine-version-dynamic.ts",
+                "cocos/spine/lib/spine-instantiate.ts": "cocos/spine/lib/spine-instantiate-dynamic.ts"
+            }
+        },
+        {
+            "test": "context.buildTimeConstants.SPINE_3_8 && !context.buildTimeConstants.SPINE_4_2",
             "isVirtualModule": false,
             "overrides": {
                 "cocos/spine/lib/spine-version.ts": "cocos/spine/lib/spine-version-3.8.ts",
                 "cocos/spine/lib/spine-instantiate.ts": "cocos/spine/lib/spine-instantiate-3.8.ts"
             }
         },
         {
-            "test": "context.buildTimeConstants.SPINE_4_2",
+            "test": "context.buildTimeConstants.SPINE_4_2 && !context.buildTimeConstants.SPINE_3_8",
             "isVirtualModule": false,
             "overrides": {
                 "cocos/spine/lib/spine-version.ts": "cocos/spine/lib/spine-version-4.2.ts",
@@ -877,10 +885,10 @@
             "cocos/asset/asset-manager/weak-cache.ts",
             "cocos/2d/framework/ui-skew-utils.ts",
             "cocos/spine/lib/spine-binary.ts",
-            "pal/input/minigame/gamepad-input.ts",
-            "pal/input/minigame/handheld-input.ts",
-            "pal/input/minigame/handle-input.ts",
-            "pal/input/minigame/hmd-input.ts"
+            "pal/input/minigame/gamepad-input.js",
+            "pal/input/minigame/handheld-input.js",
+            "pal/input/minigame/handle-input.js",
+            "pal/input/minigame/hmd-input.js"
         ]
     }
 }

cocos/2d/components/graphics.ts

@@ -266,6 +266,15 @@ export class Graphics extends UIRenderer {
         this._updateMtlForGraphics();
     }
 
+    protected override get _keepRenderData (): boolean {
+        // Graphics is a retained-mode renderer: its MeshRenderData is the result of the
+        // user's previous fill()/stroke() calls. Destroying it here would leave Impl's
+        // render-data list pointing at cleared geometry, so re-enabling the node on native
+        // platforms would require the user to draw the paths again. Keep it attached to the
+        // disabled RenderEntity; clear() and onDestroy() remain the owning release points.
+        return true;
+    }
+
     public onDestroy (): void {
         this._sceneGetter = null;
         if (JSB) {
@@ -637,13 +646,13 @@ export class Graphics extends UIRenderer {
             const vertexBuffer = gfxDevice.createBuffer(new BufferInfo(
                 BufferUsageBit.VERTEX | BufferUsageBit.TRANSFER_DST,
                 MemoryUsageBit.DEVICE,
-                65535 * stride,
+                65536 * stride, // Uint16 can address 65536 vertices (indices 0–65535)
                 stride,
             ));
             const indexBuffer = gfxDevice.createBuffer(new BufferInfo(
                 BufferUsageBit.INDEX | BufferUsageBit.TRANSFER_DST,
                 MemoryUsageBit.DEVICE,
-                65535 * Uint16Array.BYTES_PER_ELEMENT * 2,
+                65536 * Uint16Array.BYTES_PER_ELEMENT * 2,  // Uint16 can address 65536 vertices (indices 0–65535)
                 Uint16Array.BYTES_PER_ELEMENT,
             ));
 

cocos/2d/framework/ui-renderer.ts

@@ -398,12 +398,23 @@ export class UIRenderer extends Renderer {
         this.node.off(NodeEventType.ANCHOR_CHANGED, this._nodeStateChange, this);
         this.node.off(NodeEventType.SIZE_CHANGED, this._nodeStateChange, this);
         this.node.off(NodeEventType.PARENT_CHANGED, this._colorDirty, this);
-        this.destroyRenderData();
+        if (!this._keepRenderData) {
+            this.destroyRenderData();
+        }
         uiRendererManager.removeRenderer(this);
         this._renderFlag = false;
         this._renderEntity.enabled = false;
     }
 
+    /**
+     * Whether to keep render data when the component leaves the active hierarchy.
+     * Retained-mode renderers may override this policy and keep their render data until
+     * the content is explicitly cleared or the component is destroyed.
+     */
+    protected get _keepRenderData (): boolean {
+        return false;
+    }
+
     public onDestroy (): void {
         this._renderEntity.setNode(null);
         if (this.node._uiProps.uiComp === this) {

cocos/2d/renderer/mesh-buffer.ts

@@ -23,7 +23,7 @@
 */
 
 import { JSB } from 'internal:constants';
-import { Device, BufferUsageBit, MemoryUsageBit, Attribute, Buffer, BufferInfo, InputAssembler, InputAssemblerInfo, Feature, API } from '../../gfx';
+import { Device, BufferUsageBit, MemoryUsageBit, Attribute, Buffer, BufferInfo, InputAssembler, InputAssemblerInfo, Feature } from '../../gfx';
 import { getAttributeStride } from './vertex-format';
 import { sys, getError, warnID, assertIsTrue } from '../../core';
 import { NativeUIMeshBuffer } from './native-2d';
@@ -251,11 +251,10 @@ export class MeshBuffer {
 
         this.floatsPerVertex = getAttributeStride(attrs) >> 2;
 
-        var vDataCountLimit = 65536; // 2^16 - 1
-        const glApi = device.gfxAPI;
-        if (glApi === API.WEBGPU || glApi === API.WEBGL2 || glApi === API.WEBGL && device.hasFeature(Feature.ELEMENT_INDEX_UINT)) {
-            vDataCountLimit = 4294967295; // 2^32 - 1
-        }
+        // Use the GPU's actual reported capability to determine max addressable vertex count.
+        // Feature.ELEMENT_INDEX_UINT is set to true in: WebGL2, WebGPU, Vulkan, Metal, GLES3, GLES2+ext.
+        // vDataCountLimit is a vertex COUNT limit (max index value + 1), not the max index value itself.
+        const vDataCountLimit = device.hasFeature(Feature.ELEMENT_INDEX_UINT) ? 4294967296 : 65536; // Uint32 or Uint16 can address 2^32 or 2^16 vertices (indices 0–2^32-1 or 0–2^16-1)
         assertIsTrue(this._initVDataCount / this._floatsPerVertex < vDataCountLimit, getError(9005));
 
         if (!this.vData || !this.iData) {