Update plotly js (#80)

mfreeborn · web-flow · commit de013e9c6258 · 2022-05-11T13:41:42.000+01:00
* update plotly and mathjax deps

* fix imports + typo

* update changelog
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `askama` to `0.11.0`.
 - `rand` to `0.8.4`.
 - `rand_distr` to `0.4.2`.
+- `plotly.js` to `2.12.1`
 
 ## [0.7.0] - 2022-01-01
 ### Added
diff --git a/docs/book/book.toml b/docs/book/book.toml
@@ -14,7 +14,7 @@ create-missing = false
 default-theme = "Ayu"
 mathjax-support = true
 additional-css = ["ferris.css"]
-additional-js = ["ferris.js", "plotly-2.2.1.min.js"]
+additional-js = ["ferris.js", "plotly.min.js"]
 
 
 [output.html.fold]
diff --git a/docs/book/plotly-2.2.1.min.js b/docs/book/plotly-2.2.1.min.js
diff --git a/docs/book/plotly.min.js b/docs/book/plotly.min.js
diff --git a/docs/book/theme/header.hbs b/docs/book/theme/header.hbs
@@ -1 +1 @@
-<script src="https://cdn.plot.ly/plotly-2.2.1.min.js"></script>
+<script src="https://cdn.plot.ly/plotly-2.12.1.min.js"></script>
diff --git a/plotly/examples/jupyter_notebook_examples.ipynb b/plotly/examples/jupyter_notebook_examples.ipynb
@@ -52,7 +52,7 @@
        "<div>\n",
        "    <div id=\"LbkgUVmz2gqtoB3MWoay\" class=\"plotly-graph-div\" style=\"height:100%; width:100%;\"></div>\n",
        "    <script type=\"text/javascript\">\n",
-       "        require(['https://cdn.plot.ly/plotly-2.2.1.min.js'], function(Plotly) {\n",
+       "        require(['https://cdn.plot.ly/plotly-2.12.1.min.js'], function(Plotly) {\n",
        "            window.PLOTLYENV=window.PLOTLYENV || {};\n",
        "\n",
        "            if (document.getElementById(\"LbkgUVmz2gqtoB3MWoay\")) {\n",
diff --git a/plotly/src/plot.rs b/plotly/src/plot.rs
@@ -9,15 +9,13 @@ use serde::Serialize;
 use std::env;
 use std::fs::File;
 use std::io::Write;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 
 use crate::{Configuration, Layout};
 use rand_distr::Alphanumeric;
 
-const PLOTLY_JS: &str = "plotly-2.8.3.min.js";
-
 #[derive(Template)]
-#[template(path = "plotly-2.8.3.min.js", escape = "none")]
+#[template(path = "plotly.min.js", escape = "none")]
 struct PlotlyJs;
 
 #[derive(Template)]
@@ -430,12 +428,6 @@ impl Plot {
             .unwrap_or_else(|_| panic!("failed to export plot to {:?}", filename.as_ref()));
     }
 
-    fn plotly_js_path() -> PathBuf {
-        let root = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
-        let templates = root.join("templates");
-        templates.join(PLOTLY_JS)
-    }
-
     fn render(
         &self,
         export_image: bool,
@@ -477,7 +469,7 @@ impl Plot {
         js_sys::JSON::parse(&self.to_json())
             .expect("Invalid JSON")
             .dyn_into::<js_sys::Object>()
-            .expect("Invalid JSON structure - expected an top-level Object")
+            .expect("Invalid JSON structure - expected a top-level Object")
     }
 
     #[cfg(target_os = "linux")]
@@ -518,6 +510,7 @@ impl PartialEq for Plot {
 #[cfg(test)]
 mod tests {
     use serde_json::{json, to_value};
+    use std::path::PathBuf;
 
     use super::*;
     use crate::Scatter;
diff --git a/plotly/templates/jupyter_notebook_plot.html b/plotly/templates/jupyter_notebook_plot.html
@@ -1,7 +1,7 @@
 <div>
     <div id="{{ plot_div_id }}" class="plotly-graph-div" style="height:100%; width:100%;"></div>
     <script type="text/javascript">
-        require(['https://cdn.plot.ly/plotly-2.8.3.min.js'], function(Plotly) {
+        require(['https://cdn.plot.ly/plotly-2.12.1.min.js'], function(Plotly) {
             window.PLOTLYENV=window.PLOTLYENV || {};
 
             if (document.getElementById("{{ plot_div_id }}")) {
diff --git a/plotly/templates/plot.html b/plotly/templates/plot.html
@@ -7,12 +7,12 @@
 
 <body>
     <div>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_SVG"></script>
+        <script src="https://cdn.jsdelivr.net/npm/mathjax@3.2.0/es5/tex-mml-chtml.js"></script>
         <script
             type="text/javascript">if (window.MathJax) { MathJax.Hub.Config({ SVG: { font: "STIX-Web" } }); }</script>
         <script type="text/javascript">window.PlotlyConfig = { MathJaxConfig: 'local' };</script>
         {% if remote_plotly_js -%}
-        <script src="https://cdn.plot.ly/plotly-2.8.3.min.js"></script>
+        <script src="https://cdn.plot.ly/plotly-2.12.1.min.js"></script>
         {% else -%}
         <script type="text/javascript">{{ plotly_javascript }}</script>
         {% endif -%}
diff --git a/plotly/templates/plotly.min.js b/plotly/templates/plotly.min.js

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<script src="https://cdn.plot.ly/plotly-2.2.1.min.js"></script>`
	`1`	`+<script src="https://cdn.plot.ly/plotly-2.12.1.min.js"></script>`