Add support for more emsdk versions. (#2946)

Author: jinwuwu001

CMakeLists.txt

@@ -513,12 +513,13 @@ if (WEB)
     add_executable(pag ${PAG_FILES})
     list(APPEND PAG_LINK_OPTIONS --no-entry -lembind -sEXPORT_NAME='PAGInit' -sWASM=1 -sASYNCIFY
             -sMAX_WEBGL_VERSION=2 -sEXPORTED_RUNTIME_METHODS=['GL','Asyncify','HEAPU8'] -sALLOW_MEMORY_GROWTH=1
-            -sMODULARIZE=1 -sENVIRONMENT='web,worker' -sEXPORT_ES6=1)
-    if (${EMSCRIPTEN_VERSION} VERSION_LESS "4.0.4")
-        list(APPEND PAG_LINK_OPTIONS -sUSE_ES6_IMPORT_META=0)
-    elseif (${EMSCRIPTEN_VERSION} VERSION_GREATER_EQUAL "4.0.4" AND ${EMSCRIPTEN_VERSION} VERSION_LESS "4.0.6")
-        message(FATAL_ERROR "Emscripten version ${EMSCRIPTEN_VERSION} is not supported. Please upgrade to 4.0.6 or higher.")
-    endif ()
+            -sMODULARIZE=1 -sENVIRONMENT=web,worker -sEXPORT_ES6=1)
+    set(unsupported_emsdk_versions "4.0.11")
+    foreach (unsupported_version IN LISTS unsupported_emsdk_versions)
+        if (${EMSCRIPTEN_VERSION} VERSION_EQUAL ${unsupported_version})
+            message(FATAL_ERROR "Emscripten version ${EMSCRIPTEN_VERSION} is not supported.")
+        endif ()
+    endforeach ()
     if (CMAKE_BUILD_TYPE STREQUAL "Debug")
         list(APPEND PAG_COMPILE_OPTIONS -O0 -g3)
         list(APPEND PAG_LINK_OPTIONS -O0 -g3 -sSAFE_HEAP=1 -Wno-limited-postlink-optimizations)

web/script/plugin/replace-config.js

@@ -284,9 +284,15 @@ export const replaceFunctionConfig = [
   },
   {
     name: 'replace libpag.wasm name',
-    type: 'string',
-    start: 'libpag.wasm',
-    replaceStr: 'libpag.wasm.br',
+    start: 'var wasmBinaryFile;',
+    end: 'function getBinary(file)',
+    replaceStr:`
+    var wasmBinaryFile;
+    wasmBinaryFile = "libpag.wasm.br";
+    if (!isDataURI(wasmBinaryFile)) {
+      wasmBinaryFile = locateFile(wasmBinaryFile);
+    }
+    `,
   },
   {
     name: 'fix get gl get framebuffer',
@@ -304,4 +310,10 @@ export const replaceFunctionConfig = [
     start: `if (!ext.includes("lose_context") && !ext.includes("debug"))`,
     replaceStr: `if (!ext.includes("lose_context") && !ext.includes("debug") && !ext.includes("WEBGL_webcodecs_video_frame"))`,
   },
+  {
+    name: 'replace _scriptDir',
+    type: 'string',
+    start: `var _scriptDir = import.meta.url;`,
+    replaceStr: `var _scriptDir = typeof document !== "undefined" && document.currentScript ? document.currentScript.src : void 0;`,
+  },
 ];

web/script/rollup.config.dev.js

@@ -17,6 +17,16 @@ const plugins = [
   alias({
     entries: [{ find: '@tgfx', replacement: path.resolve(__dirname, '../../third_party/tgfx/web/src') }],
   }),
+  {
+    name: 'preserve-import-meta-url',
+    resolveImportMeta(property, options) {
+      // Preserve the original behavior of `import.meta.url`.
+      if (property === 'url') {
+        return 'import.meta.url';
+      }
+      return null;
+    },
+  },
 ];
 
 export default [

web/script/rollup.config.js

@@ -19,6 +19,16 @@ const plugins = [
   alias({
     entries: [{ find: '@tgfx', replacement: path.resolve(__dirname, '../../third_party/tgfx/web/src') }],
   }),
+  {
+    name: 'preserve-import-meta-url',
+    resolveImportMeta(property, options) {
+      // Preserve the original behavior of `import.meta.url`.
+      if (property === 'url') {
+        return 'import.meta.url';
+      }
+      return null;
+    },
+  },
 ];
 
 

web/script/rollup.config.wx.dev.js

@@ -23,6 +23,16 @@ export default [
       alias({
         entries: [{ find: '@tgfx', replacement: path.resolve(__dirname, '../../third_party/tgfx/web/src') }],
       }),
+      {
+        name: 'preserve-import-meta-url',
+        resolveImportMeta(property, options) {
+          // Preserve the original behavior of `import.meta.url`.
+          if (property === 'url') {
+            return 'import.meta.url';
+          }
+          return null;
+        },
+      },
     ],
   },
 ];

web/script/rollup.config.wx.js

@@ -21,6 +21,16 @@ export default [
       alias({
         entries: [{ find: '@tgfx', replacement: path.resolve(__dirname, '../../third_party/tgfx/web/src') }],
       }),
+      {
+        name: 'preserve-import-meta-url',
+        resolveImportMeta(property, options) {
+          // Preserve the original behavior of `import.meta.url`.
+          if (property === 'url') {
+            return 'import.meta.url';
+          }
+          return null;
+        },
+      },
     ],
   },
 ];

web/script/setup.emsdk.js

@@ -0,0 +1,23 @@
+const path = require('path');
+const Utils = require("../../third_party/vendor_tools/lib/Utils");
+
+const emsdkPath = path.resolve(__dirname, '../../third_party/emsdk');
+const emscriptenPath = path.resolve(emsdkPath, 'upstream/emscripten');
+process.env.PATH = process.platform === 'win32'
+    ? `${emsdkPath};${emscriptenPath};${process.env.PATH}`
+    : `${emsdkPath}:${emscriptenPath}:${process.env.PATH}`;
+
+Utils.exec("emsdk install latest", emsdkPath);
+Utils.exec("emsdk activate latest", emsdkPath);
+
+const emsdkEnv = process.platform === 'win32' ? "emsdk_env.bat" : "source emsdk_env.sh";
+let result = Utils.execSafe(emsdkEnv, emsdkPath);
+let lines = result.split("\n");
+for (let line of lines) {
+    let values = line.split("=");
+    if (values.length > 1) {
+        process.stdout.write(line);
+        let key = values[0].trim();
+        process.env[key] = values[1].trim();
+    }
+}

web/src/worker/client.ts

@@ -30,7 +30,11 @@ export const createPAGWorker = (pagWorkerOptions: PAGWorkerOptions = {}) => {
   if (pagWorkerOptions.locateFile) {
     option.fileUrl = pagWorkerOptions.locateFile('libpag.wasm');
   }
-  const worker = new Worker(scriptUrl, pagWorkerOptions.workerOptions);
+  const workerOptions = pagWorkerOptions.workerOptions || {};
+  const worker = new Worker(scriptUrl, {
+    ...workerOptions,
+    type: 'module'
+  });
   return postMessage(worker, { name: WorkerMessageType.PAGInit, args: [option] }, () => {
     addGlobalWorkerListener(worker);
     return worker;