[v3.8.5] Support inline enum and mangle private variables to reduce engine size.

EngineErrorMap.md

@@ -655,7 +655,15 @@ should set resolutionPolicy
 
 ### 2300
 
-The touches is more than MAX_TOUCHES, nUnusedIndex = %s
+The touches is more than MAX_TOUCHES.
+
+### 2301
+
+Cannot create the same touch object.
+
+### 2302
+
+The touches is more than MAX_TOUCHES, release touch id %s.
 
 ### 2400
 
@@ -3837,6 +3845,10 @@ ProgressBar non-FILLED mode only works when barSprite's Type is non-FILLED!
 
 CopyTextureToBuffers: not supported texture target.
 
+### 16400
+
+Limit values to be greater than 0
+
 ### 16401
 
 beginRenderPass: Only primary command buffer is supported.
@@ -3856,3 +3868,7 @@ Block '%s' does not bound
 ### 16405
 
 This device does not support WebGL2
+
+### 16406
+
+Can't find the spriteFrame of tilesets %s

cc.config.json

@@ -608,14 +608,14 @@
             "dynamic": true
         },
 
-
         "DEBUG": {
             "comment": "Running debug mode.",
             "type": "boolean",
             "value": true,
             "ccGlobal": true,
             "internal": false
         },
+
         "SERVER_MODE": {
             "comment": "Running in the server mode.",
             "type": "boolean",
@@ -713,5 +713,12 @@
             "readOnly", "displayName", "tooltip", "group", "range", "rangeMin", "rangeMax", "rangeStep", "slide",
             "displayOrder", "unit", "radian", "multiline", "disallowAnimation"
         ]
+    },
+
+    "treeShake": {
+        "noSideEffectFiles": [
+            "cocos/serialization/instantiate-jit.ts",
+            "cocos/game/splash-screen.ts"
+        ]
     }
 }

cc.config.schema.json

@@ -56,6 +56,10 @@
         "optimizeDecorators": {
           "$ref": "#/definitions/IOptimizeDecorators",
           "description": "The decorators to be optimize when build engine."
+        },
+        "treeShake": {
+          "$ref": "#/definitions/ITreeShakeConfig",
+          "description": "The TreeShake config"
         }
       },
       "required": [
@@ -193,6 +197,21 @@
       ],
       "type": "object"
     },
+    "ITreeShakeConfig": {
+      "additionalProperties": false,
+      "properties": {
+        "noSideEffectFiles": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
+        }
+      },
+      "required": [
+        "noSideEffectFiles"
+      ],
+      "type": "object"
+    },
     "IndexConfig": {
       "additionalProperties": false,
       "properties": {

cocos/2d/assembler/label/font-utils.ts

@@ -28,7 +28,7 @@ import { ImageAsset, Texture2D } from '../../../asset/assets';
 import { PixelFormat } from '../../../asset/assets/asset-enum';
 import { BufferTextureCopy } from '../../../gfx';
 import { safeMeasureText, BASELINE_RATIO, MIDDLE_RATIO, getBaselineOffset, getSymbolCodeAt } from '../../utils/text-utils';
-import { director, Director } from '../../../game/director';
+import { director, DirectorEvent } from '../../../game/director';
 import { ccwindow } from '../../../core/global-exports';
 
 export interface ISharedLabelData {
@@ -278,7 +278,7 @@ export class LetterAtlas {
         this._halfBleed = bleed / 2;
         this._width = width;
         this._height = height;
-        director.on(Director.EVENT_BEFORE_SCENE_LAUNCH, this.beforeSceneLoad, this);
+        director.on(DirectorEvent.BEFORE_SCENE_LAUNCH, this.beforeSceneLoad, this);
     }
 
     public insertLetterTexture (letterTexture: LetterTexture): FontLetterDefinition | null {

cocos/2d/assembler/label/index.ts

@@ -23,7 +23,7 @@
 */
 
 import { BitmapFont } from '../../assets';
-import { Label } from '../../components';
+import { CacheMode, Label } from '../../components';
 import { IAssemblerManager } from '../../renderer/base';
 import { bmfont } from './bmfont';
 import { letter } from './letter';
@@ -36,7 +36,7 @@ const labelAssembler: IAssemblerManager = {
 
         if (comp.font instanceof BitmapFont) {
             assembler = bmfont;
-        } else if (comp.cacheMode === Label.CacheMode.CHAR) {
+        } else if (comp.cacheMode === CacheMode.CHAR) {
             assembler = letter;
         }
 

cocos/2d/assembler/label/ttfUtils.ts

@@ -21,7 +21,7 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 */
-import { Label } from '../../components';
+import { CacheMode, Label } from '../../components';
 import { ISharedLabelData } from './font-utils';
 import { UITransform } from '../../framework/ui-transform';
 import { dynamicAtlasManager } from '../../utils/dynamic-atlas/atlas-manager';
@@ -207,14 +207,14 @@ export const ttfUtils =  {
     },
 
     _calDynamicAtlas (comp: Label, outputLayoutData: TextOutputLayoutData): void {
-        if (comp.cacheMode !== Label.CacheMode.BITMAP || outputLayoutData.canvasSize.width <= 0 || outputLayoutData.canvasSize.height <= 0) return;
+        if (comp.cacheMode !== CacheMode.BITMAP || outputLayoutData.canvasSize.width <= 0 || outputLayoutData.canvasSize.height <= 0) return;
         const frame = comp.ttfSpriteFrame!;
         dynamicAtlasManager.packToDynamicAtlas(comp, frame);
         // TODO update material and uv
     },
 
     _resetDynamicAtlas (comp: Label): void {
-        if (comp.cacheMode !== Label.CacheMode.BITMAP) return;
+        if (comp.cacheMode !== CacheMode.BITMAP) return;
         const frame = comp.ttfSpriteFrame!;
         dynamicAtlasManager.deleteAtlasSpriteFrame(frame);
         frame._resetDynamicAtlasFrame();

cocos/2d/assets/sprite-frame.ts

@@ -167,6 +167,10 @@ export interface ISpriteFrameInitInfo {
 
 const temp_uvs: IUV[] = [{ u: 0, v: 0 }, { u: 0, v: 0 }, { u: 0, v: 0 }, { u: 0, v: 0 }];
 
+export enum SpriteFrameEvent {
+    UV_UPDATED = 'uv_updated',
+}
+
 /**
  * @en
  * A `SpriteFrame` support several types.
@@ -262,7 +266,7 @@ export class SpriteFrame extends Asset {
      * @en uv update event.
      * @zh uv 更新事件。
      */
-    public static EVENT_UV_UPDATED = 'uv_updated';
+    public static EVENT_UV_UPDATED = SpriteFrameEvent.UV_UPDATED;
     public static MeshType = MeshType;
 
     /**
@@ -999,7 +1003,7 @@ export class SpriteFrame extends Asset {
 
         // UV update event for components to update uv buffer
         // CalculateUV will trigger _calculateSlicedUV so it's enough to emit here
-        this.emit(SpriteFrame.EVENT_UV_UPDATED, this);
+        this.emit(SpriteFrameEvent.UV_UPDATED, this);
     }
 
     /**

cocos/2d/components/sprite.ts

@@ -26,7 +26,7 @@
 import { ccclass, help, executionOrder, menu, tooltip, displayOrder, type, range, editable, serializable, visible } from 'cc.decorator';
 import { BUILD, EDITOR } from 'internal:constants';
 import { SpriteAtlas } from '../assets/sprite-atlas';
-import { SpriteFrame } from '../assets/sprite-frame';
+import { SpriteFrame, SpriteFrameEvent } from '../assets/sprite-frame';
 import { Vec2, cclegacy, ccenum, clamp, warnID } from '../../core';
 import { IBatcher } from '../renderer/i-batcher';
 import { UIRenderer, InstanceMaterialType } from '../framework/ui-renderer';
@@ -151,7 +151,7 @@
 }
 ccenum(SizeMode);
 
-enum EventType {
+export enum SpriteEventType {
     SPRITE_FRAME_CHANGED = 'spriteframe-changed',
 }
 
@@ -214,7 +214,7 @@
         this.markForUpdateRenderData();
         this._applySpriteFrame(lastSprite);
         if (EDITOR) {
-            this.node.emit(EventType.SPRITE_FRAME_CHANGED, this);
+            this.node.emit(SpriteEventType.SPRITE_FRAME_CHANGED, this);
         }
     }
 
@@ -369,7 +369,7 @@
      * sprite.trim = true;
      * ```
      */
     @visible(function (this: Sprite) {
         return this._type === SpriteType.SIMPLE;
     })
     @displayOrder(8)
@@ -458,7 +458,7 @@
      * @en Event types for sprite.
      * @zh sprite 的事件类型。
      */
-    public static EventType = EventType;
+    public static EventType = SpriteEventType;
 
     @serializable
     protected _spriteFrame: SpriteFrame | null = null;
@@ -500,15 +500,15 @@
         if (spriteFrame) {
             this._updateUVs();
             if (this._type === SpriteType.SLICED) {
-                spriteFrame.on(SpriteFrame.EVENT_UV_UPDATED, this._updateUVs, this);
+                spriteFrame.on(SpriteFrameEvent.UV_UPDATED, this._updateUVs, this);
             }
         }
     }
 
     public onDisable (): void {
         super.onDisable();
         if (this._spriteFrame && this._type === SpriteType.SLICED) {
-            this._spriteFrame.off(SpriteFrame.EVENT_UV_UPDATED, this._updateUVs, this);
+            this._spriteFrame.off(SpriteFrameEvent.UV_UPDATED, this._updateUVs, this);
         }
     }
 
@@ -616,9 +616,9 @@
         // Only Sliced type need update uv when sprite frame insets changed
         if (this._spriteFrame) {
             if (this._type === SpriteType.SLICED) {
-                this._spriteFrame.on(SpriteFrame.EVENT_UV_UPDATED, this._updateUVs, this);
+                this._spriteFrame.on(SpriteFrameEvent.UV_UPDATED, this._updateUVs, this);
             } else {
-                this._spriteFrame.off(SpriteFrame.EVENT_UV_UPDATED, this._updateUVs, this);
+                this._spriteFrame.off(SpriteFrameEvent.UV_UPDATED, this._updateUVs, this);
             }
         }
     }
@@ -686,7 +686,7 @@
         const spriteFrame = this._spriteFrame;
 
         if (oldFrame && this._type === SpriteType.SLICED) {
-            oldFrame.off(SpriteFrame.EVENT_UV_UPDATED, this._updateUVs, this);
+            oldFrame.off(SpriteFrameEvent.UV_UPDATED, this._updateUVs, this);
         }
 
         let textureChanged = false;
@@ -706,7 +706,7 @@
             }
             this._applySpriteSize();
             if (this._type === SpriteType.SLICED) {
-                spriteFrame.on(SpriteFrame.EVENT_UV_UPDATED, this._updateUVs, this);
+                spriteFrame.on(SpriteFrameEvent.UV_UPDATED, this._updateUVs, this);
             }
         }
     }

cocos/2d/event/pointer-event-dispatcher.ts

@@ -31,18 +31,18 @@ import { InputEventType } from '../../input/types/event-enum';
 import { EventDispatcherPriority, IEventDispatcher } from '../../input/input';
 
 const mouseEvents = [
-    Input.EventType.MOUSE_DOWN,
-    Input.EventType.MOUSE_MOVE,
-    Input.EventType.MOUSE_UP,
-    Input.EventType.MOUSE_WHEEL,
-    Input.EventType.MOUSE_LEAVE,
-    Input.EventType.MOUSE_ENTER,
+    InputEventType.MOUSE_DOWN,
+    InputEventType.MOUSE_MOVE,
+    InputEventType.MOUSE_UP,
+    InputEventType.MOUSE_WHEEL,
+    InputEventType.MOUSE_LEAVE,
+    InputEventType.MOUSE_ENTER,
 ];
 const touchEvents = [
-    Input.EventType.TOUCH_START,
-    Input.EventType.TOUCH_MOVE,
-    Input.EventType.TOUCH_END,
-    Input.EventType.TOUCH_CANCEL,
+    InputEventType.TOUCH_START,
+    InputEventType.TOUCH_MOVE,
+    InputEventType.TOUCH_END,
+    InputEventType.TOUCH_CANCEL,
 ];
 
 class PointerEventDispatcher implements IEventDispatcher {

cocos/2d/framework/canvas.ts

@@ -26,7 +26,7 @@
 import { ccclass, help, disallowMultiple, executeInEditMode,
     executionOrder, menu, tooltip, type, serializable } from 'cc.decorator';
 import { EDITOR } from 'internal:constants';
-import { Camera } from '../../misc/camera-component';
+import { Camera, CameraEvent } from '../../misc/camera-component';
 import { Widget } from '../../ui/widget';
 import { Vec3, screen, Enum, cclegacy, visibleRect } from '../../core';
 import { view } from '../../ui/view';
@@ -182,7 +182,7 @@ export class Canvas extends RenderRoot2D {
         if (!EDITOR) {
             if (this._cameraComponent) {
                 this._cameraComponent._createCamera();
-                this._cameraComponent.node.on(Camera.TARGET_TEXTURE_CHANGE, this._thisOnCameraResized);
+                this._cameraComponent.node.on(CameraEvent.TARGET_TEXTURE_CHANGE, this._thisOnCameraResized);
             }
         }
 
@@ -203,14 +203,14 @@ export class Canvas extends RenderRoot2D {
     public onEnable (): void {
         super.onEnable();
         if (!EDITOR && this._cameraComponent) {
-            this._cameraComponent.node.on(Camera.TARGET_TEXTURE_CHANGE, this._thisOnCameraResized);
+            this._cameraComponent.node.on(CameraEvent.TARGET_TEXTURE_CHANGE, this._thisOnCameraResized);
         }
     }
 
     public onDisable (): void {
         super.onDisable();
         if (this._cameraComponent) {
-            this._cameraComponent.node.off(Camera.TARGET_TEXTURE_CHANGE, this._thisOnCameraResized);
+            this._cameraComponent.node.off(CameraEvent.TARGET_TEXTURE_CHANGE, this._thisOnCameraResized);
         }
     }
 

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

@@ -26,7 +26,7 @@ import { ccclass, help, executeInEditMode, executionOrder, menu, tooltip, displa
 import { EDITOR } from 'internal:constants';
 import { Component, Node } from '../../scene-graph';
 import { Mat4, Rect, Size, Vec2, Vec3, geometry, warnID, visibleRect, approx, EPSILON } from '../../core';
-import { Director, director } from '../../game/director';
+import { director, DirectorEvent } from '../../game/director';
 import { NodeEventType } from '../../scene-graph/node-event';
 import { IMask } from '../../scene-graph/node-event-processor';
 import { Mask } from '../components/mask';
@@ -815,5 +815,5 @@ export class UITransform extends Component {
 }
 
 // HACK
-director.on(Director.EVENT_AFTER_UPDATE, UITransform._sortSiblings);
-director.on(Director.EVENT_BEFORE_SCENE_LAUNCH, UITransform._cleanChangeMap);
+director.on(DirectorEvent.AFTER_UPDATE, UITransform._sortSiblings);
+director.on(DirectorEvent.BEFORE_SCENE_LAUNCH, UITransform._cleanChangeMap);