Test impact

.eslintrc.yaml

@@ -61,6 +61,7 @@ rules:
     quotes: [warn, single, { allowTemplateLiterals: true }] # force single, but allow template literal
     no-else-return: off # else-return is a common pattern which clearly expresses the control flow
     no-unused-expressions: off # taken over by '@typescript-eslint/no-unused-expressions'
+    no-empty-function: off # taken over by '@typescript-eslint/no-empty-function'
 
     ##### AIRBNB-SPECIFIC RULE OVERRIDES #####
 
@@ -70,7 +71,14 @@ rules:
     import/extensions: off # typescript doesn't support this
     import/no-unresolved: off # TODO: fix internal modules
     import/prefer-default-export: off # prefer named exports
-    indent: off # use @typescript-eslint/indent instead for better compatibility
+    indent: [error, 4, {
+      SwitchCase: 0,
+      ignoredNodes: [ # https://stackoverflow.com/a/72897089
+          "FunctionExpression > .params[decorators.length > 0]",
+          "FunctionExpression > .params > :matches(Decorator, :not(:first-child))",
+          "ClassBody.body > PropertyDefinition[decorators.length > 0] > .key",
+      ]
+    }]
 
     lines-between-class-members: off # be more lenient on member declarations
     max-classes-per-file: off # helper classes are common
@@ -94,6 +102,7 @@ rules:
     prefer-destructuring: off # auto-fix is not smart enough to merge different instances
     linebreak-style: off # we don't enforce this on everyone's dev environment for now
     spaced-comment: off # for license declarations
+    default-case-last: off # Place default case clause to first make it more clear that this switch statement has handled all cases
 
     ##### TYPESCRIPT-SPECIFIC RULE OVERRIDES #####
 
@@ -103,9 +112,6 @@ rules:
         'ts-nocheck': true,
         'ts-check': false,
     }]
-    '@typescript-eslint/indent': [warn, 4, {
-        SwitchCase: 0
-    }]
     '@typescript-eslint/no-unused-expressions': warn
 
     # TODO: this is just too much work
@@ -121,7 +127,16 @@ rules:
 
     '@typescript-eslint/unbound-method': off # we exploit prototype methods sometimes to acheive better performace
     '@typescript-eslint/no-explicit-any': off # still relevant for some heavily templated usages
-    '@typescript-eslint/no-empty-function': off # may become useful in some parent classes
+
+    '@typescript-eslint/no-empty-function': [error, {
+      allow: [
+        private-constructors,
+        protected-constructors,
+        decoratedFunctions,
+        overrideMethods,
+      ]
+    }]
+
     '@typescript-eslint/no-unused-vars': off # may become useful in some parent classes
     '@typescript-eslint/no-non-null-assertion': off # sometimes we just know better than the compiler
     '@typescript-eslint/no-namespace': [warn, { # we need to declare static properties

.github/workflows/run_test_cases.yml

@@ -1,12 +1,10 @@
 name: run test cases
 
 on:
-  pull_request:
+  pull_request_target:
   issue_comment:
     types: [created, edited]
 
-permissions: read-all
-
 # github.head_ref is only defined on pull_request events
 concurrency:
   group: ${{ github.workflow }}-${{ github.actor }}-${{ github.head_ref || github.run_id }}
@@ -281,38 +279,16 @@ jobs:
           JOBID=`cat  /usr/local/lib/node_modules/@cctest/scheduler/logs/PR-TEST/nowJobId.log`
           cd ..
           python3 -u ./python/main.py --target=job_editor --jobid=$JOBID
-      - name: Write comment body and issue number to file
-        uses: actions/github-script@v5
-        env:
-          PR_AUTHOR: ${{ steps.parse_pr.outputs.pr_author }}
-          EDITOR_VERSION: ${{ steps.run_test_cases.outputs.editor }}
-          TASK_STATUS: ${{ steps.run_test_cases.outputs.status }}
-          TASK_REPORT: ${{ steps.run_test_cases.outputs.report }}
-          JOB_ID: ${{ steps.run_test_cases.outputs.jobid }}
-          GITHUB_RUN_ID: ${{ github.run_id }}
-          PR_NUMBER: ${{ steps.get_pr.outputs.pr_number }}
+      - name: Update Comment
+        uses: peter-evans/create-or-update-comment@v1
         with:
-          script: |
-            const fs = require('fs');
-            fs.writeFileSync('pr.txt', process.env.PR_NUMBER);
-            fs.writeFileSync('comment.txt', `@${process.env.PR_AUTHOR}, Please check the result of \`run test cases\`:
+          issue-number: ${{ steps.get_pr.outputs.pr_number }}
+          body: |
+            @${{ steps.parse_pr.outputs.pr_author }}, Please check the result of `run test cases`:
             - Test Platform: PR-Test
-            - Editor Version: ${process.env.EDITOR_VERSION}
-            - Task Result: ${process.env.TASK_STATUS}
-            - Task URL: http://cctest.cocos.org/#/reportview/PR-TEST/${process.env.JOB_ID}/-1
-            - GitHub Action: https://github.com/cocos/cocos-engine/actions/runs/${process.env.GITHUB_RUN_ID}
+            - Editor Version: ${{ steps.run_test_cases.outputs.editor }}
+            - Task Result: ${{ steps.run_test_cases.outputs.status }}
+            - Task URL: http://cctest.cocos.org/#/reportview/PR-TEST/${{ steps.run_test_cases.outputs.jobid }}/-1
+            - GitHub Action: https://github.com/cocos/cocos-engine/actions/runs/${{ github.run_id }}
             ## Task Details
-            ${process.env.TASK_REPORT}`);
-      - name: Upload artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: pr.txt
-          path: |
-            pr.txt
-      - name: Upload artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: comment.txt
-          path: |
-            comment.txt
-
+            ${{ steps.run_test_cases.outputs.report }}

.github/workflows/web-interface-check.yml

@@ -1,15 +1,13 @@
 name: <Web> Interface check
 
 #on: push
-on: [pull_request]
+on: [pull_request_target]
 
 # github.head_ref is only defined on pull_request events
 concurrency:
   group: ${{ github.workflow }}-${{ github.actor }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
-permissions: read-all
-
 jobs:
   interface_check:
     if: 
@@ -81,9 +79,6 @@ jobs:
           cat ./interface-diff.txt
           node ./.github/workflows/interface-check-report.js
 
-      - name: Upload interface-diff.txt artifact
-        uses: actions/upload-artifact@v2
+      - uses: marocchino/sticky-pull-request-comment@v2
         with:
-          name: interface-diff.txt
           path: ./engine/interface-diff.txt
-

.gitignore

@@ -46,6 +46,7 @@ native/external/
 
 scripts/typedoc-plugin/lib/
 !templates/**/*
+templates/**/.DS_Store
 
 @types/consts.d.ts
 

EngineErrorMap.md

@@ -3267,6 +3267,10 @@ PassUtils: illegal uniform handle, accessing uniform at offset %d
 
 Pass: setUniform is invoked with incompatible uniform data type for binding %d, expected type is %s
 
+### 12012
+
+Can't set a material instance to a sharedMaterial slot
+
 ### 12100
 
 The font size is too big to be fitted into texture atlas. Please switch to other label cache modes or choose a smaller font size.
@@ -3339,6 +3343,18 @@ Can not update a static mesh.
 
 The primitiveIndex is out of range.
 
+### 14202
+
+meshopt asm decoder initialized
+
+### 14203
+
+meshopt wasm decoder initialized
+
+### 14204
+
+meshopt decoder error: %d
+
 ### 14300
 
 Can not keep world transform due to the zero scaling of parent node

cc.config.json

@@ -98,6 +98,9 @@
         "physics-2d-builtin": {
             "modules": ["physics-2d-builtin", "physics-2d-framework"]
         },
+        "physics-2d-box2d-wasm": {
+            "modules": ["physics-2d-box2d-wasm", "physics-2d-framework"]
+        },
         "intersection-2d": {
             "modules": ["intersection-2d"]
         },
@@ -663,6 +666,12 @@
             "value": false,
             "internal": true
         },
+        "WASM_FALLBACK": {
+            "comment": "An internal constant to indicate whether need a fallback of wasm.\nIf true, we build a wasm fallback module for the compatibility of wasm files compiled by different version of emscripten.\nThis is useful when we use wasm on different version of Safari browsers.",
+            "type": "boolean",
+            "value": "$HTML5",
+            "internal": true
+        },
         "WASM_SUBPACKAGE": {
             "comment": "An internal constant to indicate whether we use wasm assets as minigame subpackage.\nThis is useful when we need to reduce code size.",
             "type": "boolean",

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

@@ -60,8 +60,6 @@ export const ttf: IAssembler = {
             Color.toArray(vData, WHITE, offset);
             offset += 9;
         }
-        renderData.vertexRow = 2;
-        renderData.vertexCol = 2;
         renderData.chunk.setIndexBuffer(QUAD_INDICES);
         return renderData;
     },
@@ -149,7 +147,7 @@ export const ttf: IAssembler = {
     },
 
     updateColor (comp: Label) {
-
+        // no needs to update color
     },
 };
 

cocos/2d/assembler/sprite/bar-filled.ts

@@ -196,8 +196,6 @@ export const barFilled: IAssembler = {
         // 0-4 for local vertex
         renderData.dataLength = 4;
         renderData.resize(4, 6);
-        renderData.vertexRow = 2;
-        renderData.vertexCol = 2;
         renderData.chunk.setIndexBuffer(QUAD_INDICES);
 
         // not need
@@ -236,9 +234,10 @@ export const barFilled: IAssembler = {
     fillBuffers (sprite: Sprite, renderer: IBatcher) {
         const renderData: RenderData = sprite.renderData!;
         const chunk = renderData.chunk;
-        if (sprite.node.hasChangedFlags || renderData.vertDirty) {
+        if (sprite._flagChangedVersion !== sprite.node.flagChangedVersion || renderData.vertDirty) {
             this.updateWorldVertexData(sprite, chunk);
             renderData.vertDirty = false;
+            sprite._flagChangedVersion = sprite.node.flagChangedVersion;
         }
 
         const bid = chunk.bufferId;