Use export (#19)

cocos · Feb 26, 2025 · efe7dc4 · efe7dc4
1 parent d93aa95
commit efe7dc4
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 14 deletions.
diff --git a/cocos/spine/lib/spine-define.ts b/cocos/spine/lib/spine-define.ts
@@ -356,6 +356,3 @@ export function overrideSpineDefine (wasm): void {
     overrideProperty_Animation();
     overrideProperty_Skeleton();
 }
-
-// To avoid cycle dependence: spine-version.ts -> spine-version-4.2.ts -> spine-wasm-utils.ts -> spine-define.ts -> spine-version.ts
-(spine as any)._overrideSpineDefine = overrideSpineDefine;
diff --git a/cocos/spine/lib/spine-instantiate-3.8.ts b/cocos/spine/lib/spine-instantiate-3.8.ts
@@ -25,7 +25,6 @@ import { ensureWasmModuleReady } from 'pal/wasm';
 import { error } from '../../core';
 import { shouldUseWasmModule, initWasm, initAsmJS } from './spine-wasm-utils';
 
-
 export function waitForSpineWasmInstantiation (): Promise<void> {
     const errorReport = (msg: any): void => { error(msg); };
     return ensureWasmModuleReady().then((): Promise<void> => {

diff --git a/cocos/spine/lib/spine-instantiate-4.2.ts b/cocos/spine/lib/spine-instantiate-4.2.ts
@@ -26,7 +26,6 @@ import { ensureWasmModuleReady } from 'pal/wasm';
 import { error } from '../../core';
 import { shouldUseWasmModule, initWasm, initAsmJS } from './spine-wasm-utils';
 
-
 export function waitForSpineWasmInstantiation (): Promise<void> {
     const errorReport = (msg: any): void => { error(msg); };
     return ensureWasmModuleReady().then((): Promise<void> => {

diff --git a/cocos/spine/lib/spine-instantiate.ts b/cocos/spine/lib/spine-instantiate.ts
@@ -22,6 +22,12 @@
  THE SOFTWARE.
 */
 
+// Defining the following import to make ts compiler know these files
+// spine-instantiate.ts will be overriden by spine-instantiate-3.8.ts or spine-instantiate-4.2.ts while building engine.
+// See 'moduleOverrides' section in cc.config.json.
+import './spine-instantiate-3.8';
+import './spine-instantiate-4.2';
+
 export function waitForSpineWasmInstantiation (): Promise<void> {
     return null!;
 }
diff --git a/cocos/spine/lib/spine-version.ts b/cocos/spine/lib/spine-version.ts
@@ -22,11 +22,4 @@
  THE SOFTWARE.
 */
 
-// Defining the following import to make ts compiler know these files
-// spine-version.ts will be overriden by spine-version-3.8.ts or spine-version-4.2.ts while building engine.
-// See 'moduleOverrides' section in cc.config.json.
-// Uncomment the following two lines while trying update the code in spine-version-[3.8 | 4.2].ts.
-// import './spine-version-3.8';
-// import './spine-version-4.2';
-
 export const SPINE_VERSION = '3.8';
diff --git a/cocos/spine/lib/spine-wasm-utils.ts b/cocos/spine/lib/spine-wasm-utils.ts
@@ -1,8 +1,8 @@
-import spine from './spine-core';
 import { instantiateWasm, fetchBuffer } from 'pal/wasm';
 import { NATIVE_CODE_BUNDLE_MODE } from 'internal:constants';
 import { sys } from '../../core';
 import { NativeCodeBundleMode } from '../../misc/webassembly-support';
+import { overrideSpineDefine } from './spine-define';
 
 const PAGESIZE = 65536; // 64KiB
 
@@ -72,4 +72,4 @@ export function shouldUseWasmModule (): boolean {
     }
 }
 
-registerList.push(spine._overrideSpineDefine);
+registerList.push(overrideSpineDefine);