wasm modularize

paulocoutinhox · Nov 8, 2022 · 6e6db22 · 6e6db22
1 parent f536ebb
commit 6e6db22
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/extras/wasm/template/index.html b/extras/wasm/template/index.html
@@ -25,6 +25,7 @@
         let autoOpenMode = true;
         let doc;
         let FPDF = {};
+        let Module = null;
 
         // pdfium initialization
         Object.assign(FPDF, {
@@ -279,15 +280,17 @@
         }
 
         // runtime initialized
-        Module.onRuntimeInitialized = async _ => {
+        PDFiumModule().then(function (pdfiumModule) {
+            Module = pdfiumModule;
+
             moduleLoaded = true;
 
             if (pageLoaded) {
                 console.log('The module was loaded!');
             }
 
             checkIfEverythingWasLoaded();
-        };
+        });
 
         // functions
         async function loadFile() {

diff --git a/modules/wasm.py b/modules/wasm.py
@@ -524,7 +524,6 @@ def run_task_test():
                 "ASSERTIONS=1",
                 "-s",
                 "ALLOW_MEMORY_GROWTH=1",
-                "-sMODULARIZE",
                 "--embed-file",
                 "assets/web-assembly.pdf",
             ]
@@ -621,16 +620,16 @@ def run_task_generate():
 
             f.recreate_dir(gen_out_dir)
 
-            html_file = os.path.join(
+            output_file = os.path.join(
                 gen_out_dir,
-                "pdfium.html",
+                "pdfium.js",
             )
 
             command = [
                 "em++",
                 "{0}".format("-g" if config == "debug" else "-O3"),
                 "-o",
-                html_file,
+                output_file,
                 "-s",
                 'EXPORTED_FUNCTIONS="$(node function-names ../xml/index.xml)"',
                 "-s",
@@ -651,6 +650,7 @@ def run_task_generate():
                 "-s",
                 "ALLOW_MEMORY_GROWTH=1",
                 "-sMODULARIZE",
+                "-sEXPORT_NAME=PDFiumModule",
                 "-std=c++11",
                 "-Wall",
                 "--no-entry",