Merge pull request #6580 from datalayer-externals/fix/custom-preload

Ensure custom preload is correctly handled

Author: RRosio

docs/environment.yml

@@ -13,7 +13,7 @@ dependencies:
 - sphinx
 - terminado
 - myst-parser
-- nbclassic==0.4.5
+- nbclassic==0.4.6
 - pip:
   - nbsphinx
   - Send2Trash

notebook/templates/page.html

@@ -98,6 +98,18 @@
           }
       })
 
+      // error-catching custom-preload.js shim.
+      define("custom-preload", function (require, exports, module) {
+          try {
+              var custom = require('custom/custom-preload');
+              console.debug('loaded custom-preload.js');
+              return custom;
+          } catch (e) {
+              console.error("error loading custom-preload.js", e);
+              return {};
+          }
+      })
+
     document.nbjs_translations = {{ nbjs_translations|safe }};
     document.documentElement.lang = navigator.language.toLowerCase();
     </script>

setup.py

@@ -122,7 +122,7 @@
         'Send2Trash>=1.8.0',
         'terminado>=0.8.3',
         'prometheus_client',
-        'nbclassic==0.4.5',
+        'nbclassic==0.4.6',
     ],
     extras_require = {
         'test': ['pytest', 'coverage', 'requests', 'testpath',

tools/build-main.js

@@ -60,6 +60,7 @@ var rjs_config = {
 
   exclude: [
     "custom/custom",
+    "custom/custom-preload",
   ]
 };