Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Async ColorPicker and Slider #70

Merged
merged 6 commits into from
Nov 5, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .babelrc

This file was deleted.

1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ node_modules/
dash_daq/metadata.json
dash_daq/*.js*
inst/deps/*.js*
babel.config.js
webpack.config.js
.npm
vv/
Expand Down
12 changes: 10 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
---
extends: ./node_modules/dash-components-archetype/config/eslint/eslintrc-react.json
{
"extends": [
"./node_modules/dash-components-archetype/config/eslint/eslintrc-react.json"
],
"parser": "babel-eslint",
"plugins": [
"react",
"import"
]
}
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The format is based on [Keep a
Changelog](http://keepachangelog.com/en/1.0.0/) and this project
adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [0.3.0] - 2019-11-05
### Added
* [#70](https://github.com/plotly/dash-daq/pull/70) Async ColorPicker and Slider components

## [0.2.2] - 2019-10-04

### Fixed
Expand Down
26 changes: 25 additions & 1 deletion R/internal.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,30 @@
.dashDaq_js_metadata <- function() {
deps_metadata <- list(`dash_daq` = structure(list(name = "dash_daq",
version = "0.2.2", src = list(href = NULL,
version = "0.3.0", src = list(href = NULL,
file = "deps"), meta = NULL,
script = 'async~colorpicker.js',
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashDaq",
all_files = FALSE), class = "html_dependency"),
`dash_daq` = structure(list(name = "dash_daq",
version = "0.3.0", src = list(href = NULL,
file = "deps"), meta = NULL,
script = 'async~slider.js',
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashDaq",
all_files = FALSE), class = "html_dependency"),
`dash_daq` = structure(list(name = "dash_daq",
version = "0.3.0", src = list(href = NULL,
file = "deps"), meta = NULL,
script = 'async~colorpicker.js.map',
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashDaq",
all_files = FALSE), class = "html_dependency"),
`dash_daq` = structure(list(name = "dash_daq",
version = "0.3.0", src = list(href = NULL,
file = "deps"), meta = NULL,
script = 'async~slider.js.map',
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashDaq",
all_files = FALSE), class = "html_dependency"),
`dash_daq` = structure(list(name = "dash_daq",
version = "0.3.0", src = list(href = NULL,
file = "deps"), meta = NULL,
script = 'dash_daq.min.js',
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashDaq",
Expand Down
15 changes: 15 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
module.exports = {
presets: [
[
'@babel/preset-env',
{
useBuiltIns: 'usage',
corejs: 3
}
],
'@babel/preset-react'
],
plugins: [
'@babel/plugin-syntax-dynamic-import'
]
}
30 changes: 28 additions & 2 deletions dash_daq/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,34 @@

_this_module = _sys.modules[__name__]

async_resources = [
'colorpicker',
'slider'
]

_js_dist = []

_js_dist.extend([{
'relative_package_path': 'async~{}.js'.format(async_resource),
'external_url': (
'https://unpkg.com/dash-daq@{}'
'/dash_daq/async~{}.js'
).format(__version__, async_resource),
'namespace': 'dash_daq',
'async': True
} for async_resource in async_resources])

_js_dist = [
_js_dist.extend([{
'relative_package_path': 'async~{}.js.map'.format(async_resource),
'external_url': (
'https://unpkg.com/dash-daq@{}'
'/dash_daq/async~{}.js.map'
).format(__version__, async_resource),
'namespace': 'dash_daq',
'dynamic': True
} for async_resource in async_resources])

_js_dist.extend([
{
"relative_package_path": "dash_daq.min.js",
"external_url": (
Expand All @@ -28,7 +54,7 @@
).format(__version__),
"namespace": "dash_daq"
}
]
])

_css_dist = []

Expand Down
2 changes: 2 additions & 0 deletions dash_daq/async~colorpicker.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dash_daq/async~colorpicker.js.map

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions dash_daq/async~slider.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dash_daq/async~slider.js.map

Large diffs are not rendered by default.

16 changes: 3 additions & 13 deletions dash_daq/dash_daq.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_daq/dash_daq.min.js.map

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions dash_daq/package-info.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,14 @@
},
"devDependencies": {
"@babel/core": "^7.6.0",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/preset-env": "^7.6.0",
"@babel/preset-react": "^7.0.0",
"@plotly/webpack-dash-dynamic-import": "^1.1.1",
"babel-eslint": "^10.0.3",
"babel-loader": "^8.0.6",
"core-js": "^3.2.1",
"chalk": "^2.3.1",
"core-js": "^3.2.1",
"dash-components-archetype-dev": "^0.2.11",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.14.0",
Expand All @@ -72,7 +75,7 @@
"jest-canvas-mock": "^2.1.1",
"pre-commit": "^1.2.2",
"prettier": "^1.10.2",
"react-docgen": "^2.21.0",
"react-docgen": "^3.0.0",
"react-docgen-markdown-renderer": "^1.0.2",
"react-test-renderer": "^16.8.6",
"sinon": "^4.3.0",
Expand Down Expand Up @@ -102,4 +105,4 @@
"daq",
"components"
]
}
}
2 changes: 2 additions & 0 deletions inst/deps/async~colorpicker.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions inst/deps/async~colorpicker.js.map

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions inst/deps/async~slider.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions inst/deps/async~slider.js.map

Large diffs are not rendered by default.

16 changes: 3 additions & 13 deletions inst/deps/dash_daq.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/deps/dash_daq.min.js.map

Large diffs are not rendered by default.

123 changes: 87 additions & 36 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading