Skip to content

Commit

Permalink
Improve build (plotly#473)
Browse files Browse the repository at this point in the history
  • Loading branch information
Marc-Andre-Rivet committed Mar 4, 2019
1 parent 2898786 commit 1cb0752
Show file tree
Hide file tree
Showing 19 changed files with 57 additions and 24 deletions.
1 change: 0 additions & 1 deletion packages/dash-core-components/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
"no-sequences": ["error"],
"no-shadow": ["off"],
"no-throw-literal": ["error"],
"no-undefined": ["error"],
"no-unused-expressions": ["error"],
"no-use-before-define": ["error", "nofunc"],
"no-useless-call": ["error"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"homepage": "https://github.com/plotly/dash-core-components",
"main": "src/index.js",
"scripts": {
"prepare": "npm run build:all",
"prepare": "npm run build",
"publish-all": "node scripts/publish.js",
"start": "webpack-serve ./webpack.serve.config.js --open",
"lint": "eslint src test",
Expand All @@ -28,9 +28,9 @@
"build:js-dev": "webpack --mode development",
"build:py": "node ./extract-meta src/components > dash_core_components/metadata.json && cp package.json dash_core_components && dash-generate-components ./src/components dash_core_components",
"build:r": "node ./extract-meta src/components > dash_core_components/metadata.json && cp package.json dash_core_components && dash-generate-components ./src/components dash_core_components --r-prefix 'core'",
"build:all": "npm run build:js && npm run build:js-dev && npm run build:py",
"build:all-dev": "npm run build:js-dev && npm run build:py",
"build:watch": "watch 'npm run build:all' src"
"build": "npm run build:js && npm run build:js-dev && npm run build:py",
"build-dev": "npm run build:js-dev && npm run build:py",
"build:watch": "watch 'npm run build' src"
},
"author": "Chris Parmer <chris@plot.ly>",
"license": "MIT",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ export default class Checklist extends Component {

return (
<div
data-dash-is-loading={loading_state && loading_state.is_loading}
data-dash-is-loading={
(loading_state && loading_state.is_loading) || undefined
}
id={id}
style={style}
className={className}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ export default class ConfirmDialogProvider extends React.Component {
return (
<div
id={id}
data-dash-is-loading={loading_state && loading_state.is_loading}
data-dash-is-loading={
(loading_state && loading_state.is_loading) || undefined
}
>
{realChild && realChild.length
? realChild.map(wrapClick)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,9 @@ export default class DatePickerRange extends Component {
id={id}
style={DatePickerWrapperStyles}
className={className}
data-dash-is-loading={loading_state && loading_state.is_loading}
data-dash-is-loading={
(loading_state && loading_state.is_loading) || undefined
}
>
<DateRangePicker
daySize={day_size}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@ export default class DatePickerSingle extends Component {
id={id}
style={DatePickerWrapperStyles}
className={className}
data-dash-is-loading={loading_state && loading_state.is_loading}
data-dash-is-loading={
(loading_state && loading_state.is_loading) || undefined
}
>
<SingleDatePicker
date={date}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ export default class Dropdown extends Component {
<div
id={id}
style={style}
data-dash-is-loading={loading_state && loading_state.is_loading}
data-dash-is-loading={
(loading_state && loading_state.is_loading) || undefined
}
>
<ReactDropdown
filterOptions={filterOptions}
Expand Down
4 changes: 3 additions & 1 deletion packages/dash-core-components/src/components/Graph.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,9 @@ class PlotlyGraph extends Component {
<div
key={id}
id={id}
data-dash-is-loading={loading_state && loading_state.is_loading}
data-dash-is-loading={
(loading_state && loading_state.is_loading) || undefined
}
style={style}
className={className}
/>
Expand Down
4 changes: 3 additions & 1 deletion packages/dash-core-components/src/components/Input.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ export default class Input extends Component {
: this.state;
return (
<input
data-dash-is-loading={loading_state && loading_state.is_loading}
data-dash-is-loading={
(loading_state && loading_state.is_loading) || undefined
}
onChange={e => {
const newValue = e.target.value;
if (
Expand Down
4 changes: 3 additions & 1 deletion packages/dash-core-components/src/components/Link.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ export default class Link extends Component {
*/
return (
<a
data-dash-is-loading={loading_state && loading_state.is_loading}
data-dash-is-loading={
(loading_state && loading_state.is_loading) || undefined
}
id={id}
className={className}
style={style}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ export default class LogoutButton extends React.Component {

return (
<form
data-dash-is-loading={loading_state && loading_state.is_loading}
data-dash-is-loading={
(loading_state && loading_state.is_loading) || undefined
}
action={url}
method={submitMethod}
className="dash-logout-frame"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ function DashMarkdown(props) {
<div
id={props.id}
data-dash-is-loading={
props.loading_state && props.loading_state.is_loading
(props.loading_state && props.loading_state.is_loading) ||
undefined
}
>
<Markdown
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ export default class RadioItems extends Component {
}
return (
<div
data-dash-is-loading={loading_state && loading_state.is_loading}
data-dash-is-loading={
(loading_state && loading_state.is_loading) || undefined
}
{...ids}
className={className}
style={style}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ export default class RangeSlider extends Component {
const {value} = this.state;
return (
<Range
data-dash-is-loading={loading_state && loading_state.is_loading}
data-dash-is-loading={
(loading_state && loading_state.is_loading) || undefined
}
onChange={value => {
this.setState({value});
if (updatemode === 'drag') {
Expand Down
4 changes: 3 additions & 1 deletion packages/dash-core-components/src/components/Slider.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ export default class Slider extends Component {
return (
<div
id={id}
data-dash-is-loading={loading_state && loading_state.is_loading}
data-dash-is-loading={
(loading_state && loading_state.is_loading) || undefined
}
>
<ReactSlider
onChange={value => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ export default function SyntaxHighlighter(props) {
return (
<div
id={id}
data-dash-is-loading={loading_state && loading_state.is_loading}
data-dash-is-loading={
(loading_state && loading_state.is_loading) || undefined
}
>
<ReactSyntaxHighlighter style={style} {...omit(['theme'], props)} />
</div>
Expand Down
9 changes: 6 additions & 3 deletions packages/dash-core-components/src/components/Tabs.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ const EnhancedTab = ({
}
return (
<div
data-dash-is-loading={loading_state && loading_state.is_loading}
data-dash-is-loading={
(loading_state && loading_state.is_loading) || undefined
}
className={tabClassName}
id={id}
style={tabStyle}
Expand Down Expand Up @@ -264,8 +266,9 @@ export default class Tabs extends Component {
return (
<div
data-dash-is-loading={
this.props.loading_state &&
this.props.loading_state.is_loading
(this.props.loading_state &&
this.props.loading_state.is_loading) ||
undefined
}
className={`${tabParentClass} ${this.props.parent_className ||
''}`}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ export default class Textarea extends Component {

return (
<textarea
data-dash-is-loading={loading_state && loading_state.is_loading}
data-dash-is-loading={
(loading_state && loading_state.is_loading) || undefined
}
value={value}
onChange={e => {
this.setState({value: e.target.value});
Expand Down
4 changes: 3 additions & 1 deletion packages/dash-core-components/src/components/Upload.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ export default class Upload extends Component {
return (
<div
id={id}
data-dash-is-loading={loading_state && loading_state.is_loading}
data-dash-is-loading={
(loading_state && loading_state.is_loading) || undefined
}
>
<Dropzone
onDrop={this.onDrop}
Expand Down

0 comments on commit 1cb0752

Please # to comment.