Merge branch 'dev' into winnerNick-dev

Author: alexcjohnson

.circleci/config.yml

@@ -106,8 +106,6 @@ jobs:
               cd dash-renderer && renderer build && python setup.py sdist && mv dist/* ../packages/ && cd ..
               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 ..
-              git clone --depth 1 https://github.com/plotly/dash-renderer-test-components
-              cd dash-renderer-test-components && npm ci && npm run build:all && python setup.py sdist && mv dist/* ../packages/ && cd ..
               ls -la packages
       - persist_to_workspace:
           root: ~/dash
@@ -209,8 +207,6 @@ jobs:
               cd dash-renderer && renderer build && python setup.py sdist && mv dist/* ../packages/ && cd ..
               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 ..
-              git clone --depth 1 https://github.com/plotly/dash-renderer-test-components
-              cd dash-renderer-test-components && npm ci && npm run build:all && python setup.py sdist && mv dist/* ../packages/ && cd ..
               ls -la packages
       - persist_to_workspace:
           root: ~/dash

.gitignore

@@ -64,5 +64,19 @@ node_modules/
 npm-debug*
 
 dash_renderer/
+dash_generator_test_component_standard/
+dash_generator_test_component_nested/
+dash_generator_test_component_sub_nested/
+inst/
+man/
+R/
+.Rbuildignore
+.Rdata
+.Rhistory
+DESCRIPTION
+NAMESPACE
 digest.json
 VERSION.txt
+
+# vim
+*.swp

@plotly/dash-generator-test-component-nested/MANIFEST.in

@@ -0,0 +1,3 @@
+include dash_generator_test_component_nested/**
+include dash_generator_test_component_nested/nested/**
+include package.json

@plotly/dash-generator-test-component-nested/README.md

@@ -0,0 +1 @@
+Empty

@plotly/dash-generator-test-component-nested/babel.config.js

@@ -0,0 +1,6 @@
+const presets = [
+    '@babel/preset-env',
+    '@babel/preset-react'
+];
+
+module.exports = { presets };

@plotly/dash-generator-test-component-nested/base/__init__.py

@@ -0,0 +1,23 @@
+import json
+import os as _os
+
+_basepath = _os.path.dirname(__file__)
+_filepath = _os.path.abspath(_os.path.join(_basepath, 'package.json'))
+with open(_filepath) as f:
+    package = json.load(f)
+
+package_name = package['name'].replace(' ', '_').replace('-', '_')
+__version__ = package['version']
+
+from ._imports_ import *  # noqa: F401, F403
+from ._imports_ import __all__  # noqa: E402
+
+_js_dist = [
+    dict(
+        relative_package_path='nested/dash_generator_test_component_nested.js',
+        namespace='dash_generator_test_component_nested'
+    )
+]
+
+for _component in __all__:
+    setattr(locals()[_component], '_js_dist', _js_dist)