]> git.proxmox.com Git - mirror_novnc.git/commitdiff
Load support scripts first
authorPierre Ossman <ossman@cendio.se>
Tue, 12 Nov 2019 09:24:40 +0000 (10:24 +0100)
committerPierre Ossman <ossman@cendio.se>
Tue, 12 Nov 2019 13:05:55 +0000 (14:05 +0100)
E.g. SystemJS requires the Promise polyfill, so make sure all our
support files are loaded first.

utils/use_require.js

index e7ee045e8bfa966079333744e4a5baf3289160bf..a410a192d7abd29c5b5fe3441a2e857069412d9a 100755 (executable)
@@ -272,13 +272,15 @@ function make_lib_files(import_format, source_maps, with_app_dir, only_legacy) {
             console.log(`Writing ${out_app_path}`);
             return helper.appWriter(out_path_base, legacy_path_base, out_app_path)
                 .then((extra_scripts) => {
-                    let legacy_scripts = extra_scripts;
+                    let legacy_scripts = [];
 
                     legacyFiles.forEach((file) => {
                         let rel_file_path = path.relative(out_path_base, file);
                         legacy_scripts.push(rel_file_path);
                     });
 
+                    legacy_scripts = legacy_scripts.concat(extra_scripts);
+
                     let rel_app_path = path.relative(out_path_base, out_app_path);
                     legacy_scripts.push(rel_app_path);