update build step

TillerBurr · Feb 22, 2022 · bb1e89e · bb1e89e
1 parent be104bd
commit bb1e89e
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 41 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,29 +23,25 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: 16
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
-        with:
-          version: 1.1.12
-      - name: Check Version
-        id: check-version
-        run: |
-          [[ "$(poetry version --short)" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] \
-            || echo ::set-output name=prerelease::true
+      - name: Install poetry
+        uses: Gr1N/setup-poetry@v7
+
       - name: Cache poetry
         id: cached-poetry-dependencies
         uses: actions/cache@v2
         with:
           path: ~/.cache/pypoetry/virtualenvs
           key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }}-python-${{matrix.python-version}}
+      - run: poetry --version
       - name: Install Dependencies
         run: poetry install
       - name: Build project and publish
         env:
           POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
         run: |
           npm install
-          npm run build
+          npm run build:js
+          poetry run dash-generate-components ./src/lib/components dash_query_builder -p package-info.json --r-prefix 'R' --jl-prefix ''
           poetry build
           poetry publish
       - name: Create Release

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: dashQueryBuilder
 Title: Plotly Dash Component providing react-awesome-query-builder functionality
-Version: 0.2.0
+Version: 0.2.1
 Description: Plotly Dash Component providing react-awesome-query-builder functionality
 Depends: R (>= 3.0.2)
 Imports: 

diff --git a/Project.toml b/Project.toml
@@ -2,7 +2,7 @@
 name = "DashQueryBuilder"
 uuid = "1b08a953-4be3-4667-9a23-9717610fdc70"
 authors = ["Tyler Baur <[email protected]>"]
-version = "0.2.0"
+version = "0.2.1"
 
 [deps]
 Dash = "1b08a953-4be3-4667-9a23-3db579824955"

diff --git a/R/internal.R b/R/internal.R
@@ -1,84 +1,84 @@
 .dashQueryBuilder_js_metadata <- function() {
 deps_metadata <- list(`dash_query_builder` = structure(list(name = "dash_query_builder",
-version = "0.2.0", src = list(href = NULL,
+version = "0.2.1", src = list(href = NULL,
 file = "deps"), meta = NULL,
 script = 'async-material.js',
 stylesheet = NULL, head = NULL, attachment = NULL, package = "dashQueryBuilder",
 all_files = FALSE, async = TRUE), class = "html_dependency"),
 `dash_query_builder` = structure(list(name = "dash_query_builder",
-version = "0.2.0", src = list(href = NULL,
+version = "0.2.1", src = list(href = NULL,
 file = "deps"), meta = NULL,
 script = 'async-mui.js',
 stylesheet = NULL, head = NULL, attachment = NULL, package = "dashQueryBuilder",
 all_files = FALSE, async = TRUE), class = "html_dependency"),
 `dash_query_builder` = structure(list(name = "dash_query_builder",
-version = "0.2.0", src = list(href = NULL,
+version = "0.2.1", src = list(href = NULL,
 file = "deps"), meta = NULL,
 script = 'async-antd.js',
 stylesheet = NULL, head = NULL, attachment = NULL, package = "dashQueryBuilder",
 all_files = FALSE, async = TRUE), class = "html_dependency"),
 `dash_query_builder` = structure(list(name = "dash_query_builder",
-version = "0.2.0", src = list(href = NULL,
+version = "0.2.1", src = list(href = NULL,
 file = "deps"), meta = NULL,
 script = 'async-bootstrap.js',
 stylesheet = NULL, head = NULL, attachment = NULL, package = "dashQueryBuilder",
 all_files = FALSE, async = TRUE), class = "html_dependency"),
 `dash_query_builder` = structure(list(name = "dash_query_builder",
-version = "0.2.0", src = list(href = NULL,
+version = "0.2.1", src = list(href = NULL,
 file = "deps"), meta = NULL,
 script = 'async-basic.js',
 stylesheet = NULL, head = NULL, attachment = NULL, package = "dashQueryBuilder",
 all_files = FALSE, async = TRUE), class = "html_dependency"),
 `dash_query_builder` = structure(list(name = "dash_query_builder",
-version = "0.2.0", src = list(href = NULL,
+version = "0.2.1", src = list(href = NULL,
 file = "deps"), meta = NULL,
 script = 'async-material.js.map',
 stylesheet = NULL, head = NULL, attachment = NULL, package = "dashQueryBuilder",
 all_files = FALSE, dynamic = TRUE), class = "html_dependency"),
 `dash_query_builder` = structure(list(name = "dash_query_builder",
-version = "0.2.0", src = list(href = NULL,
+version = "0.2.1", src = list(href = NULL,
 file = "deps"), meta = NULL,
 script = 'async-mui.js.map',
 stylesheet = NULL, head = NULL, attachment = NULL, package = "dashQueryBuilder",
 all_files = FALSE, dynamic = TRUE), class = "html_dependency"),
 `dash_query_builder` = structure(list(name = "dash_query_builder",
-version = "0.2.0", src = list(href = NULL,
+version = "0.2.1", src = list(href = NULL,
 file = "deps"), meta = NULL,
 script = 'async-antd.js.map',
 stylesheet = NULL, head = NULL, attachment = NULL, package = "dashQueryBuilder",
 all_files = FALSE, dynamic = TRUE), class = "html_dependency"),
 `dash_query_builder` = structure(list(name = "dash_query_builder",
-version = "0.2.0", src = list(href = NULL,
+version = "0.2.1", src = list(href = NULL,
 file = "deps"), meta = NULL,
 script = 'async-bootstrap.js.map',
 stylesheet = NULL, head = NULL, attachment = NULL, package = "dashQueryBuilder",
 all_files = FALSE, dynamic = TRUE), class = "html_dependency"),
 `dash_query_builder` = structure(list(name = "dash_query_builder",
-version = "0.2.0", src = list(href = NULL,
+version = "0.2.1", src = list(href = NULL,
 file = "deps"), meta = NULL,
 script = 'async-basic.js.map',
 stylesheet = NULL, head = NULL, attachment = NULL, package = "dashQueryBuilder",
 all_files = FALSE, dynamic = TRUE), class = "html_dependency"),
 `dash_query_builder` = structure(list(name = "dash_query_builder",
-version = "0.2.0", src = list(href = NULL,
+version = "0.2.1", src = list(href = NULL,
 file = "deps"), meta = NULL,
 script = 'dash_query_builder.min.js',
 stylesheet = NULL, head = NULL, attachment = NULL, package = "dashQueryBuilder",
 all_files = FALSE), class = "html_dependency"),
 `dash_query_builder` = structure(list(name = "dash_query_builder",
-version = "0.2.0", src = list(href = NULL,
+version = "0.2.1", src = list(href = NULL,
 file = "deps"), meta = NULL,
 script = 'dash_query_builder.shared.js',
 stylesheet = NULL, head = NULL, attachment = NULL, package = "dashQueryBuilder",
 all_files = FALSE), class = "html_dependency"),
 `dash_query_builder` = structure(list(name = "dash_query_builder",
-version = "0.2.0", src = list(href = NULL,
+version = "0.2.1", src = list(href = NULL,
 file = "deps"), meta = NULL,
 script = 'dash_query_builder.min.js.map',
 stylesheet = NULL, head = NULL, attachment = NULL, package = "dashQueryBuilder",
 all_files = FALSE, dynamic = TRUE), class = "html_dependency"),
 `dash_query_builder` = structure(list(name = "dash_query_builder",
-version = "0.2.0", src = list(href = NULL,
+version = "0.2.1", src = list(href = NULL,
 file = "deps"), meta = NULL,
 script = 'dash_query_builder.shared.js.map',
 stylesheet = NULL, head = NULL, attachment = NULL, package = "dashQueryBuilder",

diff --git a/dash_query_builder/package-info.json b/dash_query_builder/package-info.json
@@ -1,6 +1,6 @@
 {
-    "name": "dash_query_builder",
-    "version": "0.2.0",
+    "name": "dash-query-builder",
+    "version": "0.2.1",
     "description": "Plotly Dash Component providing react-awesome-query-builder functionality",
     "homepage": "https://github.com/baurt/dash_query_builder",
     "bugs": {
@@ -34,6 +34,7 @@
         "@fortawesome/react-fontawesome": "^0.1.17",
         "@material-ui/core": "^4.12.3",
         "@material-ui/icons": "^4.11.2",
+        "@material-ui/lab": "^4.0.0-alpha.60",
         "@material-ui/pickers": "^3.3.10",
         "@mui/icons-material": "^5.4.2",
         "@mui/lab": "^5.0.0-alpha.69",
@@ -59,6 +60,7 @@
         "eslint-config-prettier": "^8.3.0",
         "eslint-plugin-import": "^2.25.4",
         "eslint-plugin-react": "^7.28.0",
+        "karma-chrome-launcher": "^3.1.0",
         "npm": "^8.5.0",
         "prop-types": "^15.8.1",
         "react": "^17.0.2",
@@ -67,8 +69,7 @@
         "style-loader": "^3.3.1",
         "styled-jsx": "^5.0.0",
         "webpack": "^5.69.1",
-        "webpack-cli": "^4.9.2",
-        "webpack-serve": "^4.0.0"
+        "webpack-cli": "^4.9.2"
     },
     "engines": {
         "node": ">=8.11.0",

diff --git a/pyproject.toml b/pyproject.toml
@@ -15,6 +15,8 @@ black = "^21.6b0"
 flake8 = "^3.9.2"
 dash = {version = "^2.0.0", extras = ["dev","testing"]}
 
+[tool.poetry.scripts]
+build_py_dash="dash-generate-components ./src/lib/components dash_query_builder -p package-info.json --r-prefix 'R' --jl-prefix ''"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

diff --git a/src/DashQueryBuilder.jl b/src/DashQueryBuilder.jl
@@ -3,7 +3,7 @@ module DashQueryBuilder
 using Dash
 
 const resources_path = realpath(joinpath( @__DIR__, "..", "deps"))
-const version = "0.2.0"
+const version = "0.2.1"
 
 include("jl/dashquerybuilder.jl")
 
@@ -16,70 +16,70 @@ function __init__()
             [
                 DashBase.Resource(
     relative_package_path = "async-material.js",
-    external_url = "https://unpkg.com/[email protected].0/dash_query_builder/async-material.js",
+    external_url = "https://unpkg.com/[email protected].1/dash_query_builder/async-material.js",
     dynamic = nothing,
     async = :true,
     type = :js
 ),
 DashBase.Resource(
     relative_package_path = "async-mui.js",
-    external_url = "https://unpkg.com/[email protected].0/dash_query_builder/async-mui.js",
+    external_url = "https://unpkg.com/[email protected].1/dash_query_builder/async-mui.js",
     dynamic = nothing,
     async = :true,
     type = :js
 ),
 DashBase.Resource(
     relative_package_path = "async-antd.js",
-    external_url = "https://unpkg.com/[email protected].0/dash_query_builder/async-antd.js",
+    external_url = "https://unpkg.com/[email protected].1/dash_query_builder/async-antd.js",
     dynamic = nothing,
     async = :true,
     type = :js
 ),
 DashBase.Resource(
     relative_package_path = "async-bootstrap.js",
-    external_url = "https://unpkg.com/[email protected].0/dash_query_builder/async-bootstrap.js",
+    external_url = "https://unpkg.com/[email protected].1/dash_query_builder/async-bootstrap.js",
     dynamic = nothing,
     async = :true,
     type = :js
 ),
 DashBase.Resource(
     relative_package_path = "async-basic.js",
-    external_url = "https://unpkg.com/[email protected].0/dash_query_builder/async-basic.js",
+    external_url = "https://unpkg.com/[email protected].1/dash_query_builder/async-basic.js",
     dynamic = nothing,
     async = :true,
     type = :js
 ),
 DashBase.Resource(
     relative_package_path = "async-material.js.map",
-    external_url = "https://unpkg.com/[email protected].0/dash_query_builder/async-material.js.map",
+    external_url = "https://unpkg.com/[email protected].1/dash_query_builder/async-material.js.map",
     dynamic = true,
     async = nothing,
     type = :js
 ),
 DashBase.Resource(
     relative_package_path = "async-mui.js.map",
-    external_url = "https://unpkg.com/[email protected].0/dash_query_builder/async-mui.js.map",
+    external_url = "https://unpkg.com/[email protected].1/dash_query_builder/async-mui.js.map",
     dynamic = true,
     async = nothing,
     type = :js
 ),
 DashBase.Resource(
     relative_package_path = "async-antd.js.map",
-    external_url = "https://unpkg.com/[email protected].0/dash_query_builder/async-antd.js.map",
+    external_url = "https://unpkg.com/[email protected].1/dash_query_builder/async-antd.js.map",
     dynamic = true,
     async = nothing,
     type = :js
 ),
 DashBase.Resource(
     relative_package_path = "async-bootstrap.js.map",
-    external_url = "https://unpkg.com/[email protected].0/dash_query_builder/async-bootstrap.js.map",
+    external_url = "https://unpkg.com/[email protected].1/dash_query_builder/async-bootstrap.js.map",
     dynamic = true,
     async = nothing,
     type = :js
 ),
 DashBase.Resource(
     relative_package_path = "async-basic.js.map",
-    external_url = "https://unpkg.com/[email protected].0/dash_query_builder/async-basic.js.map",
+    external_url = "https://unpkg.com/[email protected].1/dash_query_builder/async-basic.js.map",
     dynamic = true,
     async = nothing,
     type = :js