Revise workaroundCors setting for Emscripten 3.1.58

kleisauke · Apr 27, 2024 · 95310d5 · 95310d5
1 parent c8a8623
commit 95310d5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -65,8 +65,8 @@
     "ignore": [
       "src/closure-externs/wasm-vips.js",
       "src/fixed-threadpool-web.js",
-      "src/locatefile-cors-pre.js",
-      "src/modules-pre.js"
+      "src/modules-pre.js",
+      "src/workaround-cors-pre.js"
     ],
     "env": [
       "browser",

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -166,7 +166,7 @@ endif()
 
 if ("web" IN_LIST ENVIRONMENT)
     set(WEB_CORS_WORKAROUND
-            --pre-js=${CMAKE_CURRENT_SOURCE_DIR}/locatefile-cors-pre.js
+            --pre-js=${CMAKE_CURRENT_SOURCE_DIR}/workaround-cors-pre.js
             )
     set(WEB_FIXED_THREADPOOL
             --js-library=${CMAKE_CURRENT_SOURCE_DIR}/fixed-threadpool-web.js

diff --git a/src/locatefile-cors-pre.js b/src/locatefile-cors-pre.js
diff --git a/src/workaround-cors-pre.js b/src/workaround-cors-pre.js
@@ -0,0 +1,7 @@
+// https://stackoverflow.com/q/25458104
+if (Module['workaroundCors']) {
+  Module['mainScriptUrlOrBlob'] = Module['mainScriptUrlOrBlob'] ||
+    URL.createObjectURL(new Blob(
+      [`importScripts('${_scriptName}');`],
+      {'type': 'application/javascript'}));
+}