fix: wasm loading in editor native engine && fix gulp build (cocos#…

…15012)

* fix: wasm loading in editor native engine

* fix: gulp build workflow

package.json

@@ -37,7 +37,7 @@
     "@babel/core": "^7.13.10",
     "@babel/preset-env": "7.8.7",
     "@cocos/babel-preset-cc": "2.2.0",
-    "@cocos/build-engine": "4.4.1-alpha.10",
+    "@cocos/build-engine": "4.4.1",
     "@types/fs-extra": "^5.0.4",
     "@types/jest": "^24.9.1",
     "@types/yargs": "^12.0.14",

pal/wasm/wasm-native.ts

@@ -21,9 +21,19 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 */
+import { EDITOR } from 'internal:constants';
 import { native } from '../../cocos/native-binding/index';
 
 export function instantiateWasm (wasmUrl: string, importObject: WebAssembly.Imports): Promise<any> {
+    // NOTE: when it's in EDITOR, wasmUrl is a url with `external:` protocol.
+    if (EDITOR) {
+        return Editor.Message.request('engine', 'query-engine-info').then((info) => {
+            const externalRoot = `${info.native.path}/external/`;
+            wasmUrl = wasmUrl.replace('external:', externalRoot);
+            const arrayBuffer = native.fileUtils.getDataFromFile(wasmUrl);
+            return WebAssembly.instantiate(arrayBuffer, importObject);
+        }) as Promise<any>;
+    }
     wasmUrl = `/src/cocos-js/${wasmUrl}`;
     const arrayBuffer = native.fileUtils.getDataFromFile(wasmUrl);
     return WebAssembly.instantiate(arrayBuffer, importObject);

platforms/native/builtin/wasm.js

@@ -33,13 +33,16 @@
     console.info('injectWebAssembly ...');
 
     const oldWebAssemblyInstantiate = WebAssembly.instantiate;
+    const oldWebAssemblyCompile = WebAssembly.compile;
 
     WebAssembly.compile = function(bufferSource) {
         return new Promise((resolve, reject)=>{
             if (!bufferSource) {
                 reject('WebAssembly.compile: Invalid buffer source!');
-            }
-            else {
+            } else if (CC_EDITOR) {
+                // FIX EDITOR ERROR: WebAssembly.Compile is disallowed on the main thread, if the buffer size is larger than 4KB. Use WebAssembly.compile, or compile on a worker thread.
+                resolve(oldWebAssemblyCompile.call(WebAssembly, bufferSource));
+            } else {
                 resolve(new WebAssembly.Module(bufferSource));
             }
         });

scripts/build-engine/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocos/build-engine",
-  "version": "4.4.1-oh.3",
+  "version": "4.4.1",
   "description": "",
   "repository": {
     "type": "git",

scripts/build-engine/src/index.ts

@@ -591,36 +591,6 @@ async function doBuild({
         rollupOptions.perf = true;
     }
 
-    const bulletAsmJsModule = await nodeResolveAsync('@cocos/bullet/bullet.cocos.js');
-    const wasmBinaryPath = ps.join(bulletAsmJsModule, '..', 'bullet.wasm.wasm');
-    if (ammoJsWasm === true) {
-        rpVirtualOptions['@cocos/bullet'] = `
-import wasmBinaryURL from '${pathToAssetRefURL(wasmBinaryPath)}';
-export const bulletType = 'wasm';
-export default wasmBinaryURL;
-`;
-    } else if (ammoJsWasm === 'fallback') {
-        rpVirtualOptions['@cocos/bullet'] = `
-export async function initialize(isWasm) {
-    let ammo;
-    if (isWasm) {
-        ammo = await import('${pathToAssetRefURL(wasmBinaryPath)}');
-    } else {
-        ammo = await import('${filePathToModuleRequest(bulletAsmJsModule)}');
-    }
-    return ammo.default;
-}
-export const bulletType = 'fallback';
-export default initialize;
-        `;
-    } else {
-        rpVirtualOptions['@cocos/bullet'] = `
-import Bullet from '${filePathToModuleRequest(bulletAsmJsModule)}';
-export const bulletType = 'asmjs';
-export default Bullet;
-`;
-    }
-
     const rollupBuild = await rollup.rollup(rollupOptions);
 
     const timing = rollupBuild.getTimings?.();