Merge pull request #94 from ASIDataScience/update-build-chain

Update build chain for dash 0.32.1

Author: pbugnion

.travis.yml

@@ -3,6 +3,7 @@ cache:
   directories:
     - "node_modules"
 install:
+  - "if [[ \"$GROUP\" == js ]] ; then pip install dash ; fi"
   - "if [[ \"$GROUP\" == js ]] ; then npm -v ; fi"
   - "if [[ \"$GROUP\" == js ]] ; then npm install ; fi"
   - "if [[ \"$GROUP\" == python-linting ]] ; then pip install black flake8 isort ; fi"

MANIFEST.in

@@ -1,2 +1,2 @@
-include dash_bootstrap_components/bundle.js
-include dash_bootstrap_components/metadata.json
+include dash_bootstrap_components/_components/dash_bootstrap_components.min.js
+include dash_bootstrap_components/_components/metadata.json

dash_bootstrap_components/__init__.py

@@ -1,35 +1,29 @@
 import os
-import sys
-
-import dash
 
 from . import themes  # noqa
 from ._version import __version__  # noqa
+from . import _components
 
 _current_path = os.path.dirname(os.path.abspath(__file__))
 
-METADATA_PATH = os.path.join(_current_path, "metadata.json")
-
-# Dash automatic class creation from `metadata.json` file.
+METADATA_PATH = os.path.join(_current_path, "_components", "metadata.json")
 
 _js_dist = [
     {
-        "relative_package_path": "bundle.js",
+        "relative_package_path": (
+            "_components/dash_bootstrap_components.min.js"
+        ),
         "namespace": "dash_bootstrap_components",
     }
 ]
 
 _css_dist = []
 
 
-def _setup_js_components(module, path_to_metadata):
-    components = dash.development.component_loader.load_components(
-        path_to_metadata, "dash_bootstrap_components"
-    )
-    for component in components:
-        setattr(module, component.__name__, component)
-        component._js_dist = _js_dist
-        component._css_dist = _css_dist
+for _component_name in _components.__all__:
+    _component = getattr(_components, _component_name)
+    _component._js_dist = _js_dist
+    _component._css_dist = _css_dist
 
 
-_setup_js_components(sys.modules[__name__], METADATA_PATH)
+from ._components import *  # noqa

demo/index.html

@@ -14,6 +14,6 @@
   <div id="react-demo-entry-point"></div>
 </body>
 
-<script type="text/javascript" src="/lib/bundle.js"></script>
+<script type="text/javascript" src="/demo-lib/bundle.js"></script>
 
 </html>

package.json

@@ -2,16 +2,15 @@
   "name": "dash-bootstrap-components",
   "version": "0.2.3",
   "description": "Bootstrap components for Plotly Dash",
-  "main": "lib/index.js",
+  "main": "demo-lib/index.js",
   "scripts": {
-    "build-dist": "npm run clean-lib && npm run extract-metadata && webpack --config=webpack.config.dist.js",
-    "clean-lib": "mkdirp lib && rimraf lib/*",
-    "copy-lib": "copyfiles -u 1 lib/* dash_bootstrap_components",
-    "demo": "webpack-dev-server --hot --inline --port=8888 --content-base=demo --config=webpack.config.demo.js",
-    "extract-metadata": "mkdirp lib && react-docgen --pretty -o lib/metadata.json src/components && node -e \"const fs = require('fs'); const path = require('path'); const m = JSON.parse(fs.readFileSync('./lib/metadata.json')); const r = {}; Object.keys(m).forEach(k => r[k.split(path.sep).join('/')] = m[k]); fs.writeFileSync('./lib/metadata.json', JSON.stringify(r, '\t', 2));\"",
+    "build-dist": "npm run clean:py && npm run build:py && webpack --config=webpack.config.dist.js",
+    "clean:py": "mkdirp dash_bootstrap_components/_components && rimraf dash_bootstrap_components/_components",
+    "demo": "webpack-dev-server --hot --inline --port=8888 --config=webpack.config.demo.js",
+    "build:py": "mkdirp dash_bootstrap_components/_components && dash-generate-components ./src/components dash_bootstrap_components/_components && move-cli dash_bootstrap_components/_components/_imports_.py dash_bootstrap_components/_components/__init__.py",
     "format": "prettier src/**/*.js --write",
     "lint": "prettier src/**/*.js --list-different",
-    "prepublish": "NODE_ENV=production npm run build-dist && npm run copy-lib",
+    "prepublish": "NODE_ENV=production npm run build-dist",
     "test": "jest",
     "test:demo": "webpack --content-base=demo --config=webpack.config.demo.js",
     "test:watch": "jest --watch"
@@ -32,6 +31,7 @@
     "jest": "^23.6.0",
     "jest-environment-jsdom-global": "^1.1.0",
     "jsdom": "^12.0.0",
+    "move-cli": "^1.2.0",
     "prettier": "^1.14.3",
     "react-docgen": "^2.21.0",
     "style-loader": "^0.23.1",

setup.py

@@ -32,6 +32,6 @@ def _get_long_description():
     author_email="[email protected]",
     url="https://github.com/ASIDataScience/dash-bootstrap-components",
     packages=find_packages(),
-    install_requires=["dash"],
+    install_requires=["dash>=0.32.1"],
     include_package_data=True,
 )

webpack.config.demo.js

@@ -11,7 +11,7 @@ var NODE_ENV = process.env.NODE_ENV || 'development';
 var environment = JSON.stringify(NODE_ENV);
 
 var LIBRARY_NAME = 'dash_bootstrap_components';
-var BUILD_PATH = path.join(ROOT, 'lib');
+var BUILD_PATH = path.join(ROOT, 'demo-lib');
 
 var publicHost = process.env.DEMO_PUBLIC_HOST || undefined;
 
@@ -62,13 +62,14 @@ module.exports = {
   },
   devServer: {
     public: publicHost,
+    contentBase: 'demo'
   },
   output: {
     library: LIBRARY_NAME,
     libraryTarget: 'this', // Could be 'umd'
     path: BUILD_PATH,
     pathinfo: true,
-    publicPath: '/lib/', // For loading from webpack dev server
+    publicPath: '/demo-lib/', // For loading from webpack dev server
     filename: '[name].js'
   }
 };

webpack.config.dist.js

@@ -13,7 +13,7 @@ var NODE_ENV = process.env.NODE_ENV || 'development';
 var environment = JSON.stringify(NODE_ENV);
 
 var LIBRARY_NAME = 'dash_bootstrap_components';
-var BUILD_PATH = path.join(ROOT, 'lib');
+var BUILD_PATH = path.join(ROOT, LIBRARY_NAME, '_components');
 
 /* eslint-disable no-console */
 console.log('Current environment: ' + environment);
@@ -25,7 +25,7 @@ module.exports = {
   mode: NODE_ENV,
   externals: {
     react: 'React',
-    'react-dom': 'ReactDOM'
+    'react-dom': 'ReactDOM',
   },
   module: {
     noParse: /node_modules\/json-schema\/lib\/validate\.js/, // used to get `request` to work: https://github.com/request/request/issues/1920#issuecomment-171246043
@@ -49,7 +49,14 @@ module.exports = {
       },
       {
         test: /\.css$/,
-        use: [{loader: 'style-loader'}, {loader: 'css-loader'}]
+        use: [
+          {
+            loader: 'style-loader'
+          },
+          {
+            loader: 'css-loader'
+          }
+        ]
       }
     ]
   },
@@ -58,12 +65,12 @@ module.exports = {
     minimize: true
   },
   entry: {
-    bundle: ['./index.js']
+    main: './index.js'
   },
   output: {
-    library: LIBRARY_NAME,
-    libraryTarget: 'this', // Could be 'umd'
+    library: LIBRARY_NAME + '/_components',
+    libraryTarget: 'window',
     path: BUILD_PATH,
-    filename: '[name].js'
+    filename: LIBRARY_NAME + '.min.js'
   }
 };