Fix transform id while checking moduleOverrides. Update version to 2.…

…2.16 (#69)
cocos · Oct 17, 2024 · b62659b · b62659b
1 parent ac2b20a
commit b62659b
Show file tree

Hide file tree

Showing 12 changed files with 98 additions and 12 deletions.
diff --git a/modules/build-engine/src/engine-js/index.ts b/modules/build-engine/src/engine-js/index.ts
@@ -2,6 +2,7 @@ import fs from 'fs-extra';
 import ps from 'path';
 import { babel as Transformer } from '@ccbuild/transformer';
 import { rollup as Bundler } from '@ccbuild/bundler';
+import { ps as pathUtils } from '@ccbuild/utils';
 import realFs from 'fs';
 import tsConfigPaths from './rollup-plugins/ts-paths';
 import moduleQueryPlugin from './rollup-plugins/module-query-plugin';
@@ -49,9 +50,6 @@ const realPath = (function (): (file: string) => Promise<string> {
     });
 })();
 
-function makePathEqualityKey(path: string): string {
-    return process.platform === 'win32' ? path.toLocaleLowerCase() : path;
-}
 
 export async function buildJsEngine(options: Required<buildEngine.Options>): Promise<buildEngine.Result> {
     const doUglify = !!options.compress;
@@ -116,7 +114,7 @@ export async function buildJsEngine(options: Required<buildEngine.Options>): Pro
         platform: options.platform,
         buildTimeConstants,
     })).reduce((result, [k, v]) => {
-        result[makePathEqualityKey(k)] = v;
+        result[pathUtils.makePathEqualityKey(k)] = v;
         return result;
     }, {} as Record<string, string>);
 
@@ -269,7 +267,7 @@ export async function buildJsEngine(options: Required<buildEngine.Options>): Pro
                 }
             },
             load(this, id: string): string | null {
-                const key = makePathEqualityKey(id);
+                const key = pathUtils.makePathEqualityKey(id);
                 if (!(key in moduleOverrides)) {
                     return null;
                 }
@@ -406,6 +404,13 @@ export async function buildJsEngine(options: Required<buildEngine.Options>): Pro
     const treeshakeConfig = statsQuery.getTreeShakeConfig();
     const noSideEffectFiles = treeshakeConfig?.noSideEffectFiles;
     if (noSideEffectFiles && noSideEffectFiles.length > 0) {
+        for (const noSideEffectFile of noSideEffectFiles) {
+            const absolutePath = ps.join(engineRoot, noSideEffectFile);
+            if (!fs.pathExistsSync(absolutePath)) {
+                console.error(`>>> ERROR: noSideEffectFile: ( ${noSideEffectFile} ) doesn't exist!`);
+            }
+        }
+
         rollupOptions.treeshake = {
             moduleSideEffects: (id: string): boolean => {
                 const relativePath = formatPath(ps.relative(engineRoot, id));

diff --git a/modules/build-engine/src/engine-js/rollup-plugins/inline-enum/index.ts b/modules/build-engine/src/engine-js/rollup-plugins/inline-enum/index.ts
@@ -6,6 +6,7 @@ import ReplacePlugin from '@rollup/plugin-replace';
 import { type Options, resolveOptions } from './core/options';
 import { IDefines, scanEnums } from './core/enum';
 import { rollup as Bundler } from '@ccbuild/bundler';
+import { ps as pathUtils } from '@ccbuild/utils';
 import rollup = Bundler.core;
 
 
@@ -55,6 +56,7 @@ export async function rpInlineEnum(rawOptions: Options, meta?: any): Promise<rol
     );
 
     const name = 'cc-inline-enum';
+
     return [
         {
             name,
@@ -66,7 +68,8 @@ export async function rpInlineEnum(rawOptions: Options, meta?: any): Promise<rol
 
             transform(this, code: string, moduleId: string): rollup.TransformResult {
                 // Don't transform a module that is overrode
-                if (options.moduleOverrides && (moduleId in options.moduleOverrides)) {
+                const cacheKey = pathUtils.makePathEqualityKey(moduleId);
+                if (options.moduleOverrides && (cacheKey in options.moduleOverrides)) {
                     return;
                 }
 

diff --git a/modules/utils/src/path.ts b/modules/utils/src/path.ts
@@ -59,3 +59,7 @@ export async function readdirR (item: string, reduceOutput: string[]): Promise<v
         reduceOutput.push(item);
     }
 }
+
+export function makePathEqualityKey(path: string): string {
+    return process.platform === 'win32' ? path.toLocaleLowerCase() : path;
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cocos/ccbuild",
-  "version": "2.2.15",
+  "version": "2.2.16",
   "description": "The next generation of build tool for Cocos engine.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",

diff --git a/test/build-engine/__snapshots__/engine-js.test.ts.snap b/test/build-engine/__snapshots__/engine-js.test.ts.snap
@@ -1940,6 +1940,28 @@ exports[`engine-js inline enum 2`] = `
             console.log(4026531840);
             console.log(268435455);
 
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            var TestOverrideEnum;
+            (function (TestOverrideEnum) {
+              TestOverrideEnum["HAHA"] = "hello_haha";
+              TestOverrideEnum["WOWO"] = "hello_wowo";
+              TestOverrideEnum["HEIHEI"] = "hello_heihei";
+            })(TestOverrideEnum || (TestOverrideEnum = {}));
+
+            console.log(2);
+            console.log(0);
+            console.log(1);
+
             var MyEnum2 = exports("MyEnum2", {
               "AAABBB": 0,
               "Haha": 0,

diff --git a/test/test-engine-source/cc.config.json b/test/test-engine-source/cc.config.json
@@ -53,10 +53,19 @@
                 "internal:native": "./audio/internal-native.ts"
             }
         },
+        {
+            "test": "true",
+            "isVirtualModule": false,
+            "overrides": {
+                "./cocos/enums/TestOverride.ts": "./cocos/enums/TestOverride.jsb.ts",
+                "./cocos/enums/test-override-entry.ts": "./cocos/enums/test-override-entry.jsb.ts"
+            }
+        },
         {
             "test": "context.mode === 'BUILD'",
             "isVirtualModule": false,
-            "overrides": {}
+            "overrides": {
+            }
         },
         {
             "test": "context.buildTimeConstants.NATIVE",
@@ -428,8 +437,7 @@
 
     "treeShake": {
         "noSideEffectFiles": [
-            "cocos/serialization/instantiate-jit.ts",
-            "cocos/game/splash-screen.ts"
+            "cocos/serialization/instantiate-jit.ts"
         ]
     }
 }
diff --git a/test/test-engine-source/cocos/enums/TestOverride.jsb.ts b/test/test-engine-source/cocos/enums/TestOverride.jsb.ts
@@ -0,0 +1,17 @@
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+export enum TestOverrideEnum {
+    HAHA = 'hello_haha',
+    WOWO = 'hello_wowo',
+    HEIHEI = 'hello_heihei'
+}
+
diff --git a/test/test-engine-source/cocos/enums/TestOverride.ts b/test/test-engine-source/cocos/enums/TestOverride.ts
@@ -0,0 +1,14 @@
+import { MyEnum4 } from './my-enum-4';
+
+export enum TestOverrideEnum {
+    HAHA,
+    WOWO,
+    HEIHEI
+}
+
+console.log(TestOverrideEnum.WOWO);
+console.log(TestOverrideEnum.HAHA);
+console.log(TestOverrideEnum.HEIHEI);
+
+
+console.log(MyEnum4.AAABBB, MyEnum4.Haha, MyEnum4.Hi);
diff --git a/test/test-engine-source/cocos/enums/index.ts b/test/test-engine-source/cocos/enums/index.ts
@@ -4,6 +4,7 @@ import * as gfx from './define';
 
 import { PixelFormat } from './define';
 
+import './test-override-entry';
 
 export enum MyEnum2 {
     AAABBB,

diff --git a/test/test-engine-source/cocos/enums/test-override-entry.jsb.ts b/test/test-engine-source/cocos/enums/test-override-entry.jsb.ts
@@ -0,0 +1,4 @@
+import * as Override from './TestOverride';
+console.log(Override.TestOverrideEnum.HEIHEI);
+console.log(Override.TestOverrideEnum.HAHA);
+console.log(Override.TestOverrideEnum.WOWO);
diff --git a/test/test-engine-source/cocos/enums/test-override-entry.ts b/test/test-engine-source/cocos/enums/test-override-entry.ts
@@ -0,0 +1,8 @@
+
+
+import * as Override from './TestOverride';
+
+console.log(Override.TestOverrideEnum.WOWO);
+console.log(Override.TestOverrideEnum.HAHA);
+console.log(Override.TestOverrideEnum.HEIHEI);
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ import * as gfx from './define'; @@
     import { PixelFormat } from './define';
+    import './test-override-entry';
     export enum MyEnum2 {
         AAABBB,
@@ Expand Down @@