Merge branch 'tmp' of https://github.com/bjones1/RunestoneComponents into bjones1-tmp

Author: runestonetest

package.json

@@ -17,20 +17,26 @@
     "author": "",
     "license": "ISC",
     "devDependencies": {
-        "css-loader": "^3.6.0",
-        "eslint": "^7.21.0",
-        "html-loader": "^0.5.5",
-        "style-loader": "^1.2.1",
-        "url-loader": "^3.0.0",
-        "webpack": "^5.24.0",
-        "webpack-bundle-analyzer": "^4.4.0",
-        "webpack-cli": "^4.5.0"
+        "css-minimizer-webpack-plugin": "^3.0.0",
+        "copy-webpack-plugin": "^8.0.0",
+        "css-loader": "^5.0.0",
+        "eslint": "^7.0.0",
+        "html-loader": "^2.0.0",
+        "html-webpack-plugin": "^5.0.0",
+        "mini-css-extract-plugin": "^1.0.0",
+        "style-loader": "^2.0.0",
+        "webpack": "^5.0.0",
+        "webpack-bundle-analyzer": "^4.0.0",
+        "webpack-cli": "^4.0.0"
     },
     "dependencies": {
         "-": "0.0.1",
+        "bootstrap": "3.4.1",
         "codemirror": "^5.59.4",
-        "html-webpack-plugin": "^5.2.0",
+        "handsontable": "7.2.2",
         "jexcel": "^3.9.1",
-        "sql.js": "^1.4.0"
+        "jquery-ui": "1.10.4",
+        "sql.js": "1.5.0",
+        "vega-embed": "3.14.0"
     }
 }

runestone/__init__.py

@@ -40,38 +40,19 @@
 # normally this is just used by the `conf.py` file for building a runestone book
 def runestone_static_dirs():
     basedir = os.path.dirname(__file__)
-    module_paths = [
-        x for x in os.listdir(basedir) if os.path.isdir(os.path.join(basedir, x))
-    ]
     module_static_js = [os.path.join(basedir, "dist")]
-    module_static_js.append(os.path.join(basedir, "common", "js"))
     module_static_js.append(os.path.join(basedir, "animation", "js"))
     module_static_js.append(os.path.join(basedir, "codelens", "js"))
     module_static_js.append(os.path.join(basedir, "webgldemo", "js"))
     module_static_js.append(os.path.join(basedir, "matrixeq", "js"))
-    module_static_css = [os.path.join(basedir, "common", "css")]
-    module_static_css.append(os.path.join(basedir, "codelens", "css"))
+    module_static_css = [os.path.join(basedir, "common", "css", "sphinx")]
     module_static_css.append(os.path.join(basedir, "accessibility", "css"))
     module_static_css.append(os.path.join(basedir, "webgldemo", "css"))
     module_static_css.append(os.path.join(basedir, "matrixeq", "css"))
     module_static_css.append(os.path.join(basedir, "lp", "css"))
-    module_static_image = [
-        "%s/images" % os.path.join(basedir, x)
-        for x in module_paths
-        if os.path.exists("%s/images" % os.path.join(basedir, x))
-    ]
-    module_static_bootstrap = [
-        "%s/bootstrap" % os.path.join(basedir, x)
-        for x in module_paths
-        if os.path.exists("%s/bootstrap" % os.path.join(basedir, x))
-    ]
-
     return (
         module_static_js
         + module_static_css
-        + module_static_image
-        + module_static_bootstrap
-        + [os.path.join(basedir, "common/project_template/_static")]
         + CodeChat.CodeToRest.html_static_path()
     )
 
@@ -105,16 +86,18 @@ def setup(app):
     This could be expanded if there is additional initialization or customization
     we wanted to do for all projects.
     """
-    # Include JS produced by webpack. See `webpack static imports <webpack_static_imports>`_.
+    # Include JS and CSS produced by webpack. See `webpack static imports <webpack_static_imports>`_.
     with open(pkg_resources.resource_filename("runestone", "dist/webpack_static_imports.json"), "r", encoding="utf-8") as f:
-        _script_files = script_files + json.load(f)
+        wb_imports = json.load(f)
+        script_files = wb_imports["js"]
+        _css_files = css_files + wb_imports["css"]
 
-    for jsfile in _script_files:
+    for jsfile in script_files:
         try:
             app.add_autoversioned_javascript(jsfile)
         except ExtensionError:
             app.add_js_file(jsfile)
-    for cssfile in css_files:
+    for cssfile in _css_files:
         try:
             app.add_autoversioned_stylesheet(cssfile)
         except ExtensionError:
@@ -190,33 +173,10 @@ def build(options):
 # ----------------
 runestone_version = version = pkg_resources.get_distribution("runestone").version
 
-script_files = [
-    "https://cdnjs.cloudflare.com/ajax/libs/jquery.i18n/1.0.5/jquery.i18n.js",
-    "https://cdnjs.cloudflare.com/ajax/libs/jquery.i18n/1.0.5/jquery.i18n.emitter.bidi.js",
-    "https://cdnjs.cloudflare.com/ajax/libs/jquery.i18n/1.0.5/jquery.i18n.emitter.js",
-    "https://cdnjs.cloudflare.com/ajax/libs/jquery.i18n/1.0.5/jquery.i18n.fallbacks.js",
-    "https://cdnjs.cloudflare.com/ajax/libs/jquery.i18n/1.0.5/jquery.i18n.messagestore.js",
-    "https://cdnjs.cloudflare.com/ajax/libs/jquery.i18n/1.0.5/jquery.i18n.parser.js",
-    "https://cdnjs.cloudflare.com/ajax/libs/jquery.i18n/1.0.5/jquery.i18n.language.js",
-    "https://cdn.jsdelivr.net/npm/vega@4.0.0-rc.2/build/vega.js",
-    "https://cdn.jsdelivr.net/npm/vega-lite@2.5.0/build/vega-lite.js",
-    "https://cdn.jsdelivr.net/npm/vega-embed@3.14.0/build/vega-embed.js",
-
-    "jquery-ui-1.10.3.custom.min.js",
-    "bootstrap-3.4.1/js/bootstrap.min.js",
-    "jquery-fix.js",  # required by bootstrap theme
-    "bootstrap-sphinx.js",
-    "jquery.idle-timer.js",
-    "presenter_mode.js",
-    "theme.js",
-]
-
 css_files = [
-    "bootstrap-3.4.1/css/bootstrap.min.css",
-    "presenter_mode.css",
-    "jquery-ui-1.10.3.custom.min.css",
+    # Generated from a template, so it can't be directly included in the webpack.
     "bootstrap-sphinx.css",
-    "runestone-custom-sphinx-bootstrap.css?v=" + runestone_version,
+    # Deliberately excluded, so it can be overridden by a user-supplied CSs file.
     "theme-overrides.css",
 ]
 

runestone/activecode/activecode.py

@@ -53,15 +53,6 @@ def setup(app):
     app.add_config_value("activecode_hide_load_history", False, "html")
     app.add_config_value("wasm_uri", "/_static", "html")
 
-    app.add_autoversioned_javascript("jquery.highlight.js")
-    app.add_autoversioned_javascript("sql-wasm.js")  # todo: only load if we need it
-    app.add_js_file(
-        "https://cdn.jsdelivr.net/npm/handsontable@7.2.2/dist/handsontable.full.js"
-    )
-    app.add_css_file(
-        "https://cdn.jsdelivr.net/npm/handsontable@7.2.2/dist/handsontable.full.min.css"
-    )
-
     app.add_node(ActivcodeNode, html=(visit_ac_node, depart_ac_node))
 
     app.connect("doctree-resolved", process_activcode_nodes)
@@ -79,7 +70,7 @@ def setup(app):
 <textarea data-lang="%(language)s" id="%(divid)s_editor" %(autorun)s
     %(hidecode)s %(include)s %(timelimit)s %(coach)s %(codelens)s %(enabledownload)s %(chatcodes)s %(optional)s
     data-audio='%(ctext)s' %(sourcefile)s %(datafile)s %(stdin)s %(tie)s %(dburl)s %(nopair)s
-    %(cargs)s %(largs)s %(rargs)s %(iargs)s %(gradebutton)s %(caption)s %(hidehistory)s %(wasmuri)s 
+    %(cargs)s %(largs)s %(rargs)s %(iargs)s %(gradebutton)s %(caption)s %(hidehistory)s %(wasmuri)s
     %(showlastsql)s style="visibility: hidden;">
 %(initialcode)s
 </textarea>

runestone/activecode/js/acfactory.js

@@ -10,6 +10,7 @@ import {
     TimedHTMLActiveCode,
     TimedSQLActiveCode,
 } from "./timed_activecode";
+import "../../common/js/jquery.highlight.js";
 
 export default class ACFactory {
     constructor() {

runestone/activecode/js/activecode_js.js

@@ -1,6 +1,10 @@
 import { ActiveCode } from "./activecode.js";
-require("./skulpt.min.js");
-require("./skulpt-stdlib.js");
+import "./skulpt.min.js";
+import "./skulpt-stdlib.js";
+// Used by Skulpt.
+import embed from 'vega-embed';
+// Adapt for use outside webpack -- see https://github.com/vega/vega-embed.
+window.vegaEmbed = embed;
 
 export default class JSActiveCode extends ActiveCode {
     constructor(opts) {

runestone/activecode/js/activecode_sql.js

@@ -1,5 +1,7 @@
 import { ActiveCode } from "./activecode.js";
-//require("sql.js");
+import Handsontable from "handsontable";
+import 'handsontable/dist/handsontable.full.css';
+import initSqlJs from "sql.js/dist/sql-wasm.js";
 
 var allDburls = {};