Merge branch 'emscripten-core:main' into file_packager_modularize

Author: lkwinta

test/code_size/test_minimal_runtime_code_size_hello_embind.json

@@ -3,8 +3,8 @@
   "a.html.gz": 373,
   "a.js": 7255,
   "a.js.gz": 3313,
-  "a.wasm": 7294,
-  "a.wasm.gz": 3339,
-  "total": 15101,
-  "total_gz": 7025
+  "a.wasm": 7305,
+  "a.wasm.gz": 3352,
+  "total": 15112,
+  "total_gz": 7038
 }

test/code_size/test_minimal_runtime_code_size_hello_embind_val.json

@@ -3,8 +3,8 @@
   "a.html.gz": 373,
   "a.js": 5356,
   "a.js.gz": 2526,
-  "a.wasm": 5831,
-  "a.wasm.gz": 2713,
-  "total": 11739,
-  "total_gz": 5612
+  "a.wasm": 5842,
+  "a.wasm.gz": 2726,
+  "total": 11750,
+  "total_gz": 5625
 }

test/code_size/test_minimal_runtime_code_size_hello_wasm_worker.json

@@ -3,8 +3,8 @@
   "a.html.gz": 357,
   "a.js": 855,
   "a.js.gz": 543,
-  "a.wasm": 1885,
-  "a.wasm.gz": 1072,
-  "total": 3259,
-  "total_gz": 1972
+  "a.wasm": 1829,
+  "a.wasm.gz": 1051,
+  "total": 3203,
+  "total_gz": 1951
 }

test/test_browser.py

@@ -617,7 +617,7 @@ def test_preload_caching(self, extra_size):
 
   def test_preload_caching_indexeddb_name(self):
     self.set_setting('EXIT_RUNTIME')
-    create_file('somefile.txt', '''load me right before running the code please''')
+    create_file('somefile.txt', 'load me right before running the code please')
 
     def make_main(path):
       print(path)
@@ -640,20 +640,21 @@ def make_main(path):
           int result = 0;
 
           assert(strcmp("load me right before", buf) == 0);
-          return checkPreloadResults();
+          int num_cached = checkPreloadResults();
+          printf("got %%d preloadResults from cache\n", num_cached);
+          return num_cached;
         }
       ''' % path)
 
     create_file('test.js', '''
       addToLibrary({
-        checkPreloadResults: function() {
+        checkPreloadResults: () => {
           var cached = 0;
-          var packages = Object.keys(Module['preloadResults']);
-          packages.forEach(function(package) {
-            var fromCache = Module['preloadResults'][package]['fromCache'];
-            if (fromCache)
-              ++ cached;
-          });
+          for (var result of Object.values(Module['preloadResults'])) {
+            if (result['fromCache']) {
+              cached++;
+            }
+          }
           return cached;
         }
       });
@@ -663,6 +664,7 @@ def make_main(path):
     self.run_process([FILE_PACKAGER, 'somefile.data', '--use-preload-cache', '--indexedDB-name=testdb', '--preload', 'somefile.txt', '--js-output=' + 'somefile.js'])
     self.compile_btest('main.c', ['--js-library', 'test.js', '--pre-js', 'somefile.js', '-o', 'page.html', '-sFORCE_FILESYSTEM'], reporting=Reporting.JS_ONLY)
     self.run_browser('page.html', '/report_result?exit:0')
+    print("Re-running ..")
     self.run_browser('page.html', '/report_result?exit:1')
 
   def test_multifile(self):

tools/file_packager.py

@@ -838,7 +838,7 @@ def generate_js(data_target, data_files, metadata):
         var PACKAGE_STORE_NAME = 'PACKAGES';
         async function openDatabase() {
           if (typeof indexedDB == 'undefined') {
-            return errback('using IndexedDB to cache data can only be done on a web page or in a web worker');
+            throw 'using IndexedDB to cache data can only be done on a web page or in a web worker';
           }
           return new Promise((resolve, reject) => {
             var openRequest = indexedDB.open(DB_NAME, DB_VERSION);