core component integrations

Author: waralex

Artifacts.toml

@@ -1,6 +1,6 @@
 [dash_resources]
-git-tree-sha1 = "5221819aa12c212904a1922411cf8bbc9b787901"
+git-tree-sha1 = "c857e355d2c21dfc458fb315371431dda2506109"
 
     [[dash_resources.download]]
-    sha256 = "0f129069bed005e92a8061c4a3b71ba0aedf54911e01103b3261d586995836a6"
-    url = "https://github.com/waralex/DashCoreResources/releases/download/v1.20.0+0/DashCoreResources.v1.20.0.tar.gz"
+    sha256 = "4ff3910a8ff1f5420784397cfc6ad80341bbe03f1010eab38dcb9b8ce2423310"
+    url = "https://github.com/waralex/DashCoreResources/releases/download/v2.0.0+0/DashCoreResources.v2.0.0.tar.gz"

Project.toml

@@ -1,7 +1,7 @@
 name = "Dash"
 uuid = "1b08a953-4be3-4667-9a23-3db579824955"
 authors = ["Chris Parmer <[email protected]>", "Alexandr Romanenko <[email protected]>"]
-version = "0.1.6"
+version = "1.0.0"
 
 [deps]
 CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"

gen_resources/Project.toml

@@ -7,6 +7,7 @@ JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
 LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
+PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
 Tar = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
 YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6"
 ghr_jll = "07c12ed4-43bc-5495-8a2a-d5838ef8d533"

gen_resources/Sources.toml

@@ -2,23 +2,23 @@
     repo = "waralex/DashCoreResources"
 [dash]
     url = "https://github.com/plotly/dash.git"
-    tag = "v1.20.0"
+    tag = "v2.0.0"
 [dash_renderer]
     module = "dash_renderer"
     resources_path = "."
 [components]
     [components.dash_html_components]
-        module = "dash_html_components"
+        module = "dash.html"
         prefix = "html"
-        resources_path = "."
+        resources_path = ".."
         metadata_file = "metadata.json"
     [components.dash_core_components]
-        module = "dash_core_components"
+        module = "dash.dcc"
         prefix = "dcc"
-        resources_path = "."
+        resources_path = ".."
         metadata_file = "metadata.json"
     [components.dash_table]
-        module = "dash_table"
+        module = "dash.dash_table"
         prefix = "dash"
-        resources_path = "."
+        resources_path = ".."
         metadata_file = "metadata.json"

gen_resources/generator/dash.jl

@@ -22,10 +22,12 @@ function install_dash(url, tag)
         Conda.pip("install", "./")
     end
     dashmodule = pyimport("dash")
+    println(dashmodule)
     return dashmodule.__version__
 end
 
 dash_version() = VersionNumber(pyimport("dash").__version__)
+dash_module_dir() = dirname(pyimport("dash").__file__)
 
 function convert_deps_part(relative, external)
     result = Dict{Symbol, String}[]
@@ -108,6 +110,8 @@ end
 function copy_files(resource_dir, files, dest_dir)
     for f in files
         full_path = joinpath(resource_dir, f)
+        path_dir = dirname(f)
+        mkpath(joinpath(dest_dir, path_dir))
         if isfile(full_path)
             cp(full_path, joinpath(dest_dir, f); force = true)
         else
@@ -125,10 +129,18 @@ function renderer_resources(module_name)
         :deps => convert_resources(m._js_dist, hasproperty(m, :_css_dist) ? m._css_dist : [])
     )
     files = vcat(deps_files(m._js_dist_dependencies[1]), resources_files(m._js_dist))
-
     return (dirname(m.__file__), meta, files)
 end
 
+function fill_components_deps!(deps::OrderedDict, files::Vector, module_name)
+    m = pyimport(module_name)
+    js_dist = hasproperty(m, :_js_dist) ? m._js_dist : []
+    css_dist = hasproperty(m, :_css_dist) ? m._css_dist : []
+    _process_dist_part!.(Ref(deps), js_dist, :js)
+    _process_dist_part!.(Ref(deps), css_dist, :css)
+    append!(files, vcat(resources_files(js_dist), resources_files(css_dist)))
+end
+
 function components_module_resources(module_name; name, prefix, metadata_file)
     m = pyimport(module_name)
     moduledir = dirname(m.__file__)
@@ -137,16 +149,12 @@ function components_module_resources(module_name; name, prefix, metadata_file)
         error("meta file $(metadata_file) don't exists for module $(name)")
     end
     components = process_components_meta(metafile)
-    js_dist = hasproperty(m, :_js_dist) ? m._js_dist : []
-    css_dist = hasproperty(m, :_css_dist) ? m._css_dist : []
     meta = OrderedDict(
         :version => m.__version__,
         :name => name,
-        :deps => convert_resources(js_dist, css_dist),
         :prefix => prefix,
         :components => components
     )
-    files = vcat(resources_files(js_dist), resources_files(css_dist))
 
-    return (dirname(m.__file__), meta, files)
+    return meta
 end

gen_resources/generator/deploy.jl

@@ -56,8 +56,20 @@ function fill_deploy_resources(sources, deploy_dir, info)
             :build => info.build,
             :embedded_components => Symbol.(collect(keys(sources["components"])))
         )
+
+        dash_deps = OrderedDict{Symbol, Any}()
+        dash_deps_files = Vector{String}()
+
+        for (name, props) in sources["components"]
+            fill_components_deps!(dash_deps, dash_deps_files, props["module"])
+        end
+        dash_meta[:deps] = collect(values(dash_deps))
+
         YAML.write_file("dash.yaml", dash_meta)
 
+        mkdir("dash_deps")
+        copy_files(dash_module_dir(), dash_deps_files, "dash_deps")
+
         @info "creating dash-renderer meta..."
         module_src, meta, files = renderer_resources(
                 sources["dash_renderer"]["module"]
@@ -78,24 +90,13 @@ function fill_deploy_resources(sources, deploy_dir, info)
         @info "processing components modules..."
         for (name, props) in sources["components"]
             @info "processing $name meta..."
-            (module_src, meta, files) = components_module_resources(
+            meta = components_module_resources(
                     props["module"];
                     name = name,
                     prefix = props["prefix"],
                     metadata_file = props["metadata_file"],
                 )
             YAML.write_file("$(name).yaml", meta)
-
-            resources_path = realpath(
-                joinpath(
-                    module_src,
-                    get(props, "resources_path", ".")
-                )
-            )
-            @info "copying $name files..."
-            deps_dir = name * "_deps"
-            mkdir(deps_dir)
-            copy_files(resources_path, files, deps_dir)
         end
     end
 end

gen_resources/generator/generator.jl

@@ -5,7 +5,7 @@ include("components.jl")
 include("deploy.jl")
 
 const HELP = """
-Usage: build_tarballs.jl [--deploy] [--help]
+Usage: generate.jl [--deploy] [--help]
 
 Options:
 

src/Dash.jl

@@ -103,7 +103,7 @@ end
 const _metadata = load_all_metadata()
 function __init__()
    setup_renderer_resources()
-   setup_embeded_components_resources()
+   setup_dash_resources()
 end
 
 

src/init/resources.jl

@@ -66,8 +66,9 @@ function load_all_metadata()
     )
 end
 
-function setup_module_resources(name, meta)
-    path = deps_path(name)
+function setup_dash_resources()
+    meta = _metadata.dash
+    path = deps_path("dash")
     version = meta["version"]
     for dep in meta["deps"]
         DashBase.register_package(
@@ -78,10 +79,4 @@ function setup_module_resources(name, meta)
             )
         )
     end
-end
-function setup_embeded_components_resources()
-    dash_meta = _metadata.dash
-    for c in dash_meta["embedded_components"]
-        setup_module_resources(c, _metadata.embedded_components[Symbol(c)])
-    end
 end