Merge branch 'dev' into feature/layout-hooks

Author: alexcjohnson

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to `dash` will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
+## [UNRELEASED]
+## Changed
+
+- [#2610](https://github.com/plotly/dash/pull/2610) Load plotly.js bundle/version from plotly.py
 
 ## UNRELEASED
 

components/dash-core-components/dash_core_components_base/__init__.py

@@ -1,6 +1,7 @@
 import json
 import os as _os
 import sys as _sys
+
 import dash as _dash
 
 from ._imports_ import *  # noqa: F401, F403, E402
@@ -121,33 +122,6 @@
             "namespace": "dash",
             "dynamic": True,
         },
-        {
-            "relative_package_path": "dcc/plotly.min.js",
-            "external_url": (
-                "https://unpkg.com/dash-core-components@{}"
-                "/dash_core_components/plotly.min.js"
-            ).format(__version__),
-            "namespace": "dash",
-            "async": "eager",
-        },
-        {
-            "relative_package_path": "dcc/async-plotlyjs.js",
-            "external_url": (
-                "https://unpkg.com/dash-core-components@{}"
-                "/dash_core_components/async-plotlyjs.js"
-            ).format(__version__),
-            "namespace": "dash",
-            "async": "lazy",
-        },
-        {
-            "relative_package_path": "dcc/async-plotlyjs.js.map",
-            "external_url": (
-                "https://unpkg.com/dash-core-components@{}"
-                "/dash_core_components/async-plotlyjs.js.map"
-            ).format(__version__),
-            "namespace": "dash",
-            "dynamic": True,
-        },
     ]
 )
 

components/dash-core-components/package-lock.json

@@ -23,7 +23,6 @@
     "test": "run-s -c lint test:intg test:pyimport",
     "test:intg": "pytest --nopercyfinalize --headless tests/integration ",
     "test:pyimport": "python -m unittest tests/test_dash_import.py",
-    "prebuild:js": "cp node_modules/plotly.js-dist-min/plotly.min.js dash_core_components_base/plotly.min.js",
     "build:js": "webpack --mode production",
     "build:backends": "dash-generate-components ./src/components dash_core_components -p package-info.json  && cp dash_core_components_base/** dash_core_components/ && dash-generate-components ./src/components dash_core_components -p package-info.json -k RangeSlider,Slider,Dropdown,RadioItems,Checklist,DatePickerSingle,DatePickerRange,Input,Link --r-prefix 'dcc' --r-suggests 'dash,dashHtmlComponents,jsonlite,plotly' --jl-prefix 'dcc' && black dash_core_components",
     "build": "run-s prepublishOnly build:js build:backends",
@@ -49,7 +48,6 @@
     "mathjax": "^3.2.2",
     "moment": "^2.29.4",
     "node-polyfill-webpack-plugin": "^2.0.1",
-    "plotly.js-dist-min": "2.25.2",
     "prop-types": "^15.8.1",
     "ramda": "^0.29.0",
     "rc-slider": "^9.7.5",

components/dash-core-components/package.json

@@ -1,6 +1,25 @@
-export default () => Promise.resolve(window.Plotly ||
-    import(/* webpackChunkName: "plotlyjs" */ 'plotly.js-dist-min').then(({ default: Plotly }) => {
-        window.Plotly = Plotly;
-        return Plotly;
-    }));
+export default () => {
+    return Promise.resolve(window.Plotly || new Promise((resolve, reject) => {
+        /* eslint-disable prefer-const */
+        let timeoutId;
+
+        const element = document.createElement('script');
+        element.src = window._dashPlotlyJSURL;
+        element.async = true;
+        element.onload = () => {
+            clearTimeout(timeoutId);
+            resolve();
+        };
+        element.onerror = (error) => {
+            clearTimeout(timeoutId);
+            reject(error);
+        };
 
+        timeoutId = setTimeout(() => {
+            element.src = '';
+            reject(new Error(`plotly.js did not load after 30 seconds`));
+        }, 3 * 10 * 1000);
+
+        document.querySelector('body').appendChild(element);
+    }));
+}

components/dash-core-components/src/utils/LazyLoader/plotly.js

@@ -128,6 +128,8 @@ def show_relayout_data(data):
 
     dash_dcc.start_server(app)
 
+    time.sleep(1)
+
     # use this opportunity to test restyleData, since there are multiple
     # traces on this graph
     legendToggle = dash_dcc.find_element(

components/dash-core-components/tests/integration/graph/test_graph_varia.py

@@ -80,6 +80,8 @@ def update_tooltip_content(hoverData):
     assert 175 < coords[0] < 185, "x0 is about 200 minus half a marker size"
     assert 175 < coords[1] < 185, "y0 is about 200 minus half a marker size"
 
+    elem = dash_dcc.find_element("#graph .nsewdrag")
+
     ActionChains(dash_dcc.driver).move_to_element_with_offset(
         elem, 5, elem.size["height"] - 5
     ).perform()

components/dash-core-components/tests/integration/tooltip/test_tooltip.py

@@ -72,6 +72,14 @@ const UnconnectedContainer = props => {
         }
     });
 
+    useEffect(() => {
+        if (config.serve_locally) {
+            window._dashPlotlyJSURL = `${config.requests_pathname_prefix}_dash-component-suites/plotly/package_data/plotly.min.js`;
+        } else {
+            window._dashPlotlyJSURL = config.plotlyjs_url;
+        }
+    }, []);
+
     let content;
     if (
         layoutRequest.status &&

dash/dash-renderer/src/APIController.react.js

@@ -19,6 +19,8 @@ type Config = {
             'Content-Type': string;
         };
     };
+    serve_locally?: boolean;
+    plotlyjs_url?: string;
 };
 
 export default function getConfigFromDOM(): Config {

dash/dash-renderer/src/config.ts

@@ -347,6 +347,8 @@ class Dash:
     "layout_post". To hook into the callbacks, use keys "request_pre" and "request_post"
     """
 
+    _plotlyjs_url: str
+
     def __init__(  # pylint: disable=too-many-statements
         self,
         name=None,
@@ -595,6 +597,8 @@ def _handle_error(_):
         _get_app.APP = self
         self.enable_pages()
 
+        self._setup_plotlyjs()
+
     def _add_url(self, name, view_func, methods=("GET",)):
         full_name = self.config.routes_pathname_prefix + name
 
@@ -626,6 +630,25 @@ def _setup_routes(self):
         # catch-all for front-end routes, used by dcc.Location
         self._add_url("<path:path>", self.index)
 
+    def _setup_plotlyjs(self):
+        # pylint: disable=import-outside-toplevel
+        from plotly.offline import get_plotlyjs_version
+
+        url = f"https://cdn.plot.ly/plotly-{get_plotlyjs_version()}.min.js"
+
+        # pylint: disable=protected-access
+        dcc._js_dist.extend(
+            [
+                {
+                    "relative_package_path": "package_data/plotly.min.js",
+                    "external_url": url,
+                    "namespace": "plotly",
+                    "async": "eager",
+                }
+            ]
+        )
+        self._plotlyjs_url = url
+
     @property
     def layout(self):
         return self._layout
@@ -709,7 +732,10 @@ def _config(self):
             "suppress_callback_exceptions": self.config.suppress_callback_exceptions,
             "update_title": self.config.update_title,
             "children_props": ComponentRegistry.children_props,
+            "serve_locally": self.config.serve_locally,
         }
+        if not self.config.serve_locally:
+            config["plotlyjs_url"] = self._plotlyjs_url
         if self._dev_tools.hot_reload:
             config["hot_reload"] = {
                 # convert from seconds to msec as used by js `setInterval`