Merge dash renderer with DashPy

.circleci/config.yml

@@ -61,6 +61,7 @@ jobs:
           command: |
             . venv/bin/activate
             set -eo pipefail
+            cd dash/dash-renderer && renderer build && cd ../../
             pip install -e . --progress-bar off && pip list | grep dash
             npm install --production && npm run initialize
             npm run lint
@@ -121,7 +122,7 @@ jobs:
           name: ️️🏗️ build core
           command: |
             . venv/bin/activate && pip install --no-cache-dir --upgrade -e . --progress-bar off && mkdir packages
-            cd dash-renderer && renderer build && python setup.py sdist && mv dist/* ../packages/ && cd ..
+            cd dash/dash-renderer && renderer build && cd ../../ && python setup.py sdist && mv dist/* packages/
             git clone --depth 1 https://github.com/plotly/dash-core-components.git
             cd dash-core-components && npm ci && npm run build && python setup.py sdist && mv dist/* ../packages/  && cd ..
             ls -la packages
@@ -223,7 +224,7 @@ jobs:
           name: ️️🏗️ build core
           command: |
             pip install --no-cache-dir --upgrade -e .[dev,testing] --progress-bar off
-            cd dash-renderer && renderer build && python setup.py sdist && mv dist/* ../packages/ && cd ..
+            cd dash/dash-renderer && renderer build && cd ../../ && python setup.py sdist && mv dist/* packages/
             git clone --depth 1 https://github.com/plotly/dash-core-components.git
             cd dash-core-components && npm ci && npm run build && python setup.py sdist && cd ..
 
@@ -256,12 +257,7 @@ jobs:
             cd dash-html-components; npm ci && npm run build; rm -rf !(.|..|DESCRIPTION|LICENSE.txt|LICENSE|NAMESPACE|.Rbuildignore|R|man|inst|vignettes|build)
             cd ../dash-core-components; npm ci && npm run build; rm -rf !(.|..|DESCRIPTION|LICENSE.txt|LICENSE|NAMESPACE|.Rbuildignore|R|man|inst|vignettes|build)
             cd ../dash-table; npm ci && npm run build; rm -rf !(.|..|DESCRIPTION|LICENSE.txt|LICENSE|NAMESPACE|.Rbuildignore|R|man|inst|vignettes|build); cd ..
-
-      - run:
-          name: 🔧 fix up dash metadata
-          command: |
-            sudo Rscript dashR/tests/circleci/fixup_metadata.R
-
+
       - run:
           name: 🎛 set environment variables
           command: |

.gitignore

@@ -42,6 +42,7 @@ coverage.xml
 # Distribution / packaging
 .Python
 build/
+dash/deps/
 develop-eggs/
 dist/
 downloads/
@@ -63,7 +64,6 @@ node_modules/
 .npm
 npm-debug*
 
-dash_renderer/
 dash_generator_test_component_standard/
 dash_generator_test_component_nested/
 dash_test_components/

.pylintrc

@@ -62,7 +62,8 @@ disable=fixme,
         superfluous-parens,
         bad-continuation,
         line-too-long,
-        bad-option-value
+        bad-option-value,
+        assigning-non-slot
 
 
 # Enable the message, report, category or checker with the given id(s). You can

.pylintrc39

@@ -152,7 +152,8 @@ disable=invalid-name,
         line-too-long,
         super-with-arguments,
         raise-missing-from,
-        bad-option-value
+        bad-option-value,
+        assigning-non-slot
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option

CHANGELOG.md

@@ -3,6 +3,11 @@ All notable changes to `dash` will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [UNRELEASED]
+
+## Dash and Dash Renderer
+### Changed
+- [#1611](https://github.com/plotly/dash/pull/1611) Package dash-renderer artifacts and dependencies with Dash, and source renderer resources from within Dash.
+
 ### Fixed
 - [#1640](https://github.com/plotly/dash/pull/1640) Fix [#1475](https://github.com/plotly/dash/issues/1475), missing `timing_information` after certain modifications to Flask behavior
 

MANIFEST.in

@@ -3,3 +3,6 @@ include LICENSE
 include requires-*.txt
 include dash/favicon.ico
 include dash/extract-meta.js
+include dash/deps/*.js
+recursive-include dash/dash-renderer *
+exclude dash/dash-renderer/node_modules/**

dash/__init__.py

@@ -9,3 +9,4 @@
 from . import resources  # noqa: F401,E402
 from .version import __version__  # noqa: F401,E402
 from ._callback_context import callback_context  # noqa: F401,E402
+from ._dash_renderer import _js_dist_dependencies, _js_dist  # noqa: F401,E402

dash/_dash_renderer.py

@@ -0,0 +1,52 @@
+__version__ = "1.9.1"
+
+_js_dist_dependencies = [
+    {
+        "external_url": {
+            "prod": [
+                "https://unpkg.com/@babel/[email protected]/dist/polyfill.min.js",
+                "https://unpkg.com/[email protected]/umd/react.production.min.js",
+                "https://unpkg.com/[email protected]/umd/react-dom.production.min.js",
+                "https://unpkg.com/[email protected]/prop-types.min.js",
+            ],
+            "dev": [
+                "https://unpkg.com/@babel/[email protected]/dist/polyfill.min.js",
+                "https://unpkg.com/[email protected]/umd/react.development.js",
+                "https://unpkg.com/[email protected]/umd/react-dom.development.js",
+                "https://unpkg.com/[email protected]/prop-types.js",
+            ],
+        },
+        "relative_package_path": {
+            "prod": [
+                "deps/[email protected]",
+                "deps/[email protected]",
+                "deps/[email protected]",
+                "deps/[email protected]",
+            ],
+            "dev": [
+                "deps/[email protected]",
+                "deps/[email protected]",
+                "deps/[email protected]",
+                "deps/[email protected]",
+            ],
+        },
+        "namespace": "dash",
+    }
+]
+
+
+_js_dist = [
+    {
+        "relative_package_path": "deps/dash_renderer.min.js",
+        "dev_package_path": "deps/dash_renderer.dev.js",
+        "external_url": "https://unpkg.com/[email protected]"
+        "/dash_renderer/dash_renderer.min.js",
+        "namespace": "dash",
+    },
+    {
+        "relative_package_path": "deps/dash_renderer.min.js.map",
+        "dev_package_path": "deps/dash_renderer.dev.js.map",
+        "namespace": "dash",
+        "dynamic": True,
+    },
+]

dash-renderer/init.template → dash/dash-renderer/init.template

@@ -1,6 +1,3 @@
-import sys
-
-__file__
 __version__ = "$version"
 
 _js_dist_dependencies = [
@@ -21,35 +18,35 @@ _js_dist_dependencies = [
         },
         "relative_package_path": {
             "prod": [
-                "polyfill@$polyfill.min.js",
-                "react@$react.min.js",
-                "react-dom@$reactdom.min.js",
-                "prop-types@$proptypes.min.js",
+                "deps/polyfill@$polyfill.min.js",
+                "deps/react@$react.min.js",
+                "deps/react-dom@$reactdom.min.js",
+                "deps/prop-types@$proptypes.min.js",
             ],
             "dev": [
-                "polyfill@$polyfill.min.js",
-                "react@$react.js",
-                "react-dom@$reactdom.js",
-                "prop-types@$proptypes.js",
+                "deps/polyfill@$polyfill.min.js",
+                "deps/react@$react.js",
+                "deps/react-dom@$reactdom.js",
+                "deps/prop-types@$proptypes.js",
             ],
         },
-        "namespace": "dash_renderer",
+        "namespace": "dash",
     }
 ]
 
 
 _js_dist = [
     {
-        "relative_package_path": "{}.min.js".format(__name__),
-        "dev_package_path": "{}.dev.js".format(__name__),
+        "relative_package_path": "deps/dash_renderer.min.js",
+        "dev_package_path": "deps/dash_renderer.dev.js",
         "external_url": "https://unpkg.com/dash-renderer@$version"
         "/dash_renderer/dash_renderer.min.js",
-        "namespace": "dash_renderer",
+        "namespace": "dash",
     },
     {
-        "relative_package_path": "{}.min.js.map".format(__name__),
-        "dev_package_path": "{}.dev.js.map".format(__name__),
-        "namespace": "dash_renderer",
+        "relative_package_path": "deps/dash_renderer.min.js.map",
+        "dev_package_path": "deps/dash_renderer.dev.js.map",
+        "namespace": "dash",
         "dynamic": True,
     },
 ]

dash-renderer/package.json → dash/dash-renderer/package.json

@@ -2,7 +2,7 @@
   "name": "dash-renderer",
   "version": "1.9.1",
   "description": "render dash components in react",
-  "main": "dash_renderer/dash_renderer.min.js",
+  "main": "../deps/dash_renderer.min.js",
   "scripts": {
     "prepublishOnly": "rm -rf lib && babel src --extensions=\".ts,.tsx,.js,.jsx\" --out-dir lib --copy-files",
     "private::format.eslint": "eslint --quiet --fix src tests",
@@ -13,7 +13,7 @@
     "build:dev": "webpack",
     "build:local": "renderer build local",
     "build": "renderer build && npm run prepublishOnly",
-    "postbuild": "es-check es5 dash_renderer/*.js",
+    "postbuild": "es-check es5 ../deps/*.js",
     "start": "webpack-serve ./webpack.serve.config.js",
     "test": "karma start karma.conf.js --single-run",
     "format": "run-s private::format.*",

dash-renderer/webpack.base.config.js → dash/dash-renderer/webpack.base.config.js

@@ -40,7 +40,7 @@ const rendererOptions = {
         main: ['whatwg-fetch', './src/index.js'],
     },
     output: {
-        path: path.resolve(__dirname, dashLibraryName),
+        path: path.resolve(__dirname, "..", "deps"),
         filename: `${dashLibraryName}.dev.js`,
         library: dashLibraryName,
         libraryTarget: 'window',
@@ -64,7 +64,7 @@ module.exports = options => [
         {
             mode: 'production',
             output: {
-                path: path.resolve(__dirname, dashLibraryName),
+                path: path.resolve(__dirname, "..", "deps"),
                 filename: `${dashLibraryName}.min.js`,
                 library: dashLibraryName,
                 libraryTarget: 'window',

dash-renderer/webpack.config.js → dash/dash-renderer/webpack.config.js

@@ -2,4 +2,4 @@ const config = require('./webpack.base.config');
 
 module.exports = config({
     target: ['web', 'es5']
-});
+});

dash/dash.py

@@ -23,7 +23,6 @@
 from pkg_resources import get_distribution, parse_version
 
 import plotly
-import dash_renderer
 
 from .fingerprint import build_fingerprint, check_fingerprint
 from .resources import Scripts, Css
@@ -47,6 +46,7 @@
     stringify_id,
     strip_relative_path,
 )
+from . import _dash_renderer
 from . import _validate
 from . import _watch
 
@@ -655,7 +655,7 @@ def _generate_scripts_html(self):
         mode = "dev" if self._dev_tools["props_check"] is True else "prod"
 
         deps = []
-        for js_dist_dependency in dash_renderer._js_dist_dependencies:
+        for js_dist_dependency in _dash_renderer._js_dist_dependencies:
             dep = {}
             for key, value in js_dist_dependency.items():
                 dep[key] = value[mode] if isinstance(value, dict) else value
@@ -671,7 +671,7 @@ def _generate_scripts_html(self):
             + self._collect_and_register_resources(
                 self.scripts.get_all_scripts(dev_bundles=dev)
                 + self.scripts._resources._filter_resources(
-                    dash_renderer._js_dist, dev_bundles=dev
+                    _dash_renderer._js_dist, dev_bundles=dev
                 )
             )
         )
@@ -1423,7 +1423,7 @@ def enable_dev_tools(
             # on some Python versions https://bugs.python.org/issue14710
             packages = [
                 pkgutil.find_loader(x)
-                for x in list(ComponentRegistry.registry) + ["dash_renderer"]
+                for x in list(ComponentRegistry.registry)
                 if x != "__main__"
             ]