Flattening package structure and sourcing deps within Dash

Author: HammadTheOne

.gitignore

@@ -63,7 +63,7 @@ node_modules/
 .npm
 npm-debug*
 
-dash_renderer/
+dash/dash-renderer
 dash_generator_test_component_standard/
 dash_generator_test_component_nested/
 dash_test_components/

MANIFEST.in

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

dash-renderer/gulpfile.js

@@ -1,55 +1,33 @@
-versions = {
-    "dash_renderer": "1.9.1",
-    "polyfill": "7.8.7",
-    "react": "16.14.0",
-    "react_dom": "16.14.0",
-    "prop_types": "15.7.2",
-}
+__version__ = "1.9.1"
 
 _js_dist_dependencies = [
     {
         "external_url": {
             "prod": [
-                "https://unpkg.com/@babel/polyfill@{}/dist/polyfill.min.js".format(
-                    versions["polyfill"]
-                ),
-                "https://unpkg.com/react@{}/umd/react.production.min.js".format(
-                    versions["react"]
-                ),
-                "https://unpkg.com/react-dom@{}/umd/react-dom.production.min.js".format(
-                    versions["react_dom"]
-                ),
-                "https://unpkg.com/prop-types@{}/prop-types.min.js".format(
-                    versions["prop_types"]
-                ),
+                "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/polyfill@{}/dist/polyfill.min.js".format(
-                    versions["polyfill"]
-                ),
-                "https://unpkg.com/react@{}/umd/react.development.js".format(
-                    versions["react"]
-                ),
-                "https://unpkg.com/react-dom@{}/umd/react-dom.development.js".format(
-                    versions["react_dom"]
-                ),
-                "https://unpkg.com/prop-types@{}/prop-types.js".format(
-                    versions["prop_types"]
-                ),
+                "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/polyfill@{}.min.js".format(versions["polyfill"]),
-                "deps/react@{}.min.js".format(versions["react"]),
-                "deps/react-dom@{}.min.js".format(versions["react_dom"]),
-                "deps/prop-types@{}.min.js".format(versions["prop_types"]),
+                "deps/polyfill@7.8.7.min.js",
+                "deps/react@16.14.0.min.js",
+                "deps/react-dom@16.14.0.min.js",
+                "deps/prop-types@15.7.2.min.js",
             ],
             "dev": [
-                "deps/polyfill@{}.min.js".format(versions["polyfill"]),
-                "deps/react@{}.js".format(versions["react"]),
-                "deps/react-dom@{}.js".format(versions["react_dom"]),
-                "deps/prop-types@{}.js".format(versions["prop_types"]),
+                "deps/polyfill@7.8.7.min.js",
+                "deps/react@16.14.0.js",
+                "deps/react-dom@16.14.0.js",
+                "deps/prop-types@15.7.2.js",
             ],
         },
         "namespace": "dash",
@@ -61,8 +39,8 @@
     {
         "relative_package_path": "deps/dash_renderer.min.js",
         "dev_package_path": "deps/dash_renderer.dev.js",
-        "external_url": "https://unpkg.com/dash-renderer@{}"
-        "/dash_renderer/dash_renderer.min.js".format(versions["dash_renderer"]),
+        "external_url": "https://unpkg.com/dash-renderer@1.9.1"
+        "/dash_renderer/dash_renderer.min.js",
         "namespace": "dash",
     },
     {

dash/_dash_renderer.py

@@ -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/.eslintignore renamed to dash/dash-renderer/.eslintignore

@@ -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.js-eslint": "eslint --quiet --fix .",
@@ -15,12 +15,11 @@
     "build:dev": "webpack --build local",
     "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": "jest",
     "format": "run-s private::format.*",
-    "lint": "run-s private::lint.*",
-    "update": "gulp merge_renderer && black ../dash/_dash_renderer.py"
+    "lint": "run-s private::lint.*"
   },
   "author": "chriddyp",
   "license": "MIT",
@@ -70,11 +69,6 @@
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-prettier": "^3.1.2",
     "eslint-plugin-react": "^7.18.3",
-    "fancy-log": "^1.3.3",
-    "fs-extra": "^9.0.1",
-    "gulp": "^4.0.2",
-    "gulp-print": "^5.0.2",
-    "gulp-replace": "^1.1.2",
     "jest": "^25.1.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^1.19.1",

dash-renderer/.eslintrc.json renamed to dash/dash-renderer/.eslintrc.json

@@ -41,7 +41,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',

dash-renderer/.npmignore renamed to dash/dash-renderer/.npmignore

@@ -33,7 +33,7 @@ def _parse_package(self, path):
             package = json.load(fp)
             self.version = package["version"]
             self.name = package["name"]
-            self.build_folder = self._concat(self.main, self.name.replace("-", "_"))
+            self.build_folder = self._concat(self.main, os.pardir, "deps")
             self.deps = package["dependencies"]
 
     @staticmethod
@@ -141,17 +141,17 @@ def bundles(self, build=None):
         with open(self._concat(self.main, "init.template")) as fp:
             t = string.Template(fp.read())
 
-        with open(self._concat(self.build_folder, "__init__.py"), "w") as fp:
+        with open(
+            self._concat(self.build_folder, os.pardir, "_dash_renderer.py"), "w"
+        ) as fp:
             fp.write(t.safe_substitute(versions))
 
 
 class Renderer(BuildProcess):
     def __init__(self):
         """dash-renderer's path is binding with the dash folder hierarchy."""
         super(Renderer, self).__init__(
-            self._concat(
-                os.path.dirname(__file__), os.pardir, os.pardir, "dash-renderer"
-            ),
+            self._concat(os.path.dirname(__file__), os.pardir, "dash-renderer"),
             (
                 ("@babel", "polyfill", "dist", "polyfill.min.js", None),
                 (None, "react", "umd", "react.production.min.js", None),