load marked.cjs

Author: echarles

nbclassic/static/base/js/namespace.js

@@ -73,7 +73,7 @@ define(function(){
     // tree
     jglobal('SessionList','tree/js/sessionlist');
 
-    Jupyter.version = "0.5.3";
+    Jupyter.version = "0.6.0.dev0";
     Jupyter._target = '_blank';
 
     return Jupyter;

setupbase.py

@@ -145,7 +145,7 @@ def find_package_data():
         pjoin(components, "jquery-ui", "dist", "jquery-ui.min.js"),
         pjoin(components, "jquery-ui", "dist", "themes", "smoothness", "jquery-ui.min.css"),
         pjoin(components, "jquery-ui",  "dist", "themes", "smoothness", "images", "*"),
-        pjoin(components, "marked", "lib", "marked.js"),
+        pjoin(components, "marked", "lib", "marked.cjs"),
         pjoin(components, "react", "react.production.min.js"),
         pjoin(components, "react", "react-dom.production.min.js"),
         pjoin(components, "requirejs", "require.js"),
@@ -418,7 +418,7 @@ def run(self):
                 env=env
             )
             # Copy the CommonJS files to their JavaScript equivalent to ensure correct loading.
-            shutil.copyfile(pjoin(self.bower_dir, "marked", "lib", "marked.cjs"), pjoin(self.bower_dir, "marked", "lib", "marked.js"))
+            # shutil.copyfile(pjoin(self.bower_dir, "marked", "lib", "marked.cjs"), pjoin(self.bower_dir, "marked", "lib", "marked.js"))
         except OSError as e:
             print("Failed to run bower: %s" % e, file=sys.stderr)
             print("You can install js dependencies with `npm install`", file=sys.stderr)