Skip to content
This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Commit 9435701

Browse files
author
Marc-André Rivet
committed
Merge remote-tracking branch 'origin/dev'
2 parents 2f8dbfe + 40dccd3 commit 9435701

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+814
-308
lines changed

.circleci/config.yml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2
33
jobs:
44
"server-test":
55
docker:
6-
- image: circleci/python:3.6.7-node-browsers
6+
- image: circleci/python:3.6-node-browsers
77
- image: cypress/base:10
88

99
steps:
@@ -12,7 +12,7 @@ jobs:
1212
key: deps1-{{ .Branch }}-{{ checksum "package-lock.json" }}-{{ checksum "package.json" }}-{{ checksum ".circleci/config.yml" }}
1313
- run:
1414
name: Install npm packages
15-
command: npm install
15+
command: npm ci
1616
- run:
1717
name: Cypress Install
1818
command: |
@@ -60,7 +60,7 @@ jobs:
6060
key: deps1-{{ .Branch }}-{{ checksum "package-lock.json" }}-{{ checksum "package.json" }}-{{ checksum ".circleci/config.yml" }}
6161
- run:
6262
name: Install npm packages
63-
command: npm install
63+
command: npm ci
6464
- run:
6565
name: Cypress Install
6666
command: |
@@ -74,12 +74,15 @@ jobs:
7474

7575
- run:
7676
name: Run tests
77-
command: npm run test.standalone
77+
command: |
78+
rm -rf node_modules/cypress
79+
npm i cypress@3.4.1
80+
npm run test.standalone
7881
7982
8083
"unit-test":
8184
docker:
82-
- image: circleci/python:3.6.7-node-browsers
85+
- image: circleci/python:3.6-node-browsers
8386
- image: cypress/base:10
8487

8588
steps:
@@ -88,7 +91,7 @@ jobs:
8891
key: deps1-{{ .Branch }}-{{ checksum "package-lock.json" }}-{{ checksum "package.json" }}-{{ checksum ".circleci/config.yml" }}
8992
- run:
9093
name: Install npm packages
91-
command: npm install
94+
command: npm ci
9295
- run:
9396
name: Cypress Install
9497
command: |
@@ -120,7 +123,7 @@ jobs:
120123
121124
"visual-test":
122125
docker:
123-
- image: circleci/node:8.11.3-browsers
126+
- image: circleci/node:10-browsers
124127

125128
steps:
126129
- checkout
@@ -130,7 +133,7 @@ jobs:
130133

131134
- run:
132135
name: Install package.json
133-
command: npm i
136+
command: npm ci
134137

135138
- save_cache:
136139
key: deps1-{{ .Branch }}-{{ checksum "package-lock.json" }}-{{ checksum "package.json" }}
@@ -148,7 +151,7 @@ jobs:
148151

149152
"node":
150153
docker:
151-
- image: circleci/python:3.6.7-node
154+
- image: circleci/python:3.6-node
152155

153156
steps:
154157
- checkout
@@ -162,7 +165,7 @@ jobs:
162165

163166
- run:
164167
name: Install package.json
165-
command: npm i
168+
command: npm ci
166169

167170
- save_cache:
168171
key: deps1-{{ .Branch }}-{{ checksum "package-lock.json" }}-{{ checksum "package.json" }}
@@ -185,7 +188,7 @@ jobs:
185188

186189
"python-3.6":
187190
docker:
188-
- image: circleci/python:3.6.7-stretch-node-browsers
191+
- image: circleci/python:3.6-stretch-node-browsers
189192

190193
environment:
191194
PERCY_ENABLED: True
@@ -206,7 +209,7 @@ jobs:
206209
python -m venv venv || virtualenv venv
207210
. venv/bin/activate
208211
pip install -r dev-requirements.txt --quiet
209-
npm install
212+
npm ci
210213
211214
- run:
212215
name: Install dependencies (dash)

.config/webpack/base.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,18 @@ const dashLibraryName = packagejson.name.replace(/-/g, '_');
99

1010
module.exports = (options = {}) => {
1111
const babel = options.babel || undefined;
12+
const entry = options.entry || [];
1213
const preprocessor = basePreprocessing(options.preprocessor);
1314
const mode = options.mode || 'development';
1415
const ts = options.ts || {};
1516

1617
console.log('********** Webpack Environment Overrides **********');
17-
console.log('Preprocessor', JSON.stringify(preprocessor));
18-
console.log('mode', mode);
19-
console.log('babel', JSON.stringify(babel));
20-
console.log('ts', JSON.stringify(ts));
18+
console.log('options', JSON.stringify(options));
2119

2220
return {
2321
entry: {
24-
bundle: './src/dash-table/index.ts',
25-
demo: ['./demo/index.html', './demo/index.js']
22+
bundle: entry.concat(['./src/dash-table/index.ts']),
23+
demo: entry.concat(['./demo/index.html', './demo/index.js'])
2624
},
2725
mode: mode,
2826
output: {

.storybook/babel.config.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,8 @@ const presets = [
66
'@babel/preset-react'
77
];
88

9-
module.exports = { presets };
9+
const plugins = [
10+
'@babel/plugin-transform-regenerator'
11+
];
12+
13+
module.exports = { presets, plugins };

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5+
## [4.5.1] - 2019-11-14
6+
### Fixed
7+
- [#637](https://github.com/plotly/dash-table/pull/637) Fix multiple issues
8+
- Fix IE11 compatibility issues and add ES5 compatibility and validation
9+
- Fix a bug with `loading_state` being handled incorrectly, causing the table to steal focus
10+
511
## [4.5.0] - 2019-10-29
612
### Changed
713
- [#554](https://github.com/plotly/dash-table/pull/554) Async loading of `xlsx` library on export

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: dashTable
22
Title: Core Interactive Table Component for Dash
3-
Version: 4.5.0
3+
Version: 4.5.1
44
Authors @R: as.person(c(Chris Parmer <chris@plot.ly>))
55
Description: Dash DataTable is an interactive table component designed for designed for viewing, editing, and exploring large datasets. DataTable is rendered with standard, semantic HTML <table/> markup, which makes it accessible, responsive, and easy to style. This component was written from scratch in React.js specifically for the Dash community. Its API was designed to be ergonomic and its behavior is completely customizable through its properties.
66
Depends: R (>= 3.0.2)

R/internal.R

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
.dashTable_js_metadata <- function() {
22
deps_metadata <- list(`dash_table` = structure(list(name = "dash_table",
3-
version = "4.5.0", src = list(href = NULL,
3+
version = "4.5.1", src = list(href = NULL,
44
file = "deps"), meta = NULL,
55
script = 'bundle.js',
66
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashTable",
77
all_files = FALSE), class = "html_dependency"),
88
`dash_table` = structure(list(name = "dash_table",
9-
version = "4.5.0", src = list(href = NULL,
9+
version = "4.5.1", src = list(href = NULL,
1010
file = "deps"), meta = NULL,
1111
script = 'bundle.js.map',
1212
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashTable",
1313
all_files = FALSE), class = "html_dependency"),
1414
`dash_table` = structure(list(name = "dash_table",
15-
version = "4.5.0", src = list(href = NULL,
15+
version = "4.5.1", src = list(href = NULL,
1616
file = "deps"), meta = NULL,
1717
script = 'async~export.js',
1818
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashTable",
1919
all_files = FALSE), class = "html_dependency"),
2020
`dash_table` = structure(list(name = "dash_table",
21-
version = "4.5.0", src = list(href = NULL,
21+
version = "4.5.1", src = list(href = NULL,
2222
file = "deps"), meta = NULL,
2323
script = 'async~export.js.map',
2424
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashTable",
2525
all_files = FALSE), class = "html_dependency"),
2626
`dash_table` = structure(list(name = "dash_table",
27-
version = "4.5.0", src = list(href = NULL,
27+
version = "4.5.1", src = list(href = NULL,
2828
file = "deps"), meta = NULL,
2929
script = 'async~table.js',
3030
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashTable",
3131
all_files = FALSE), class = "html_dependency"),
3232
`dash_table` = structure(list(name = "dash_table",
33-
version = "4.5.0", src = list(href = NULL,
33+
version = "4.5.1", src = list(href = NULL,
3434
file = "deps"), meta = NULL,
3535
script = 'async~table.js.map',
3636
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashTable",

babel.config.js

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,10 @@
11
const presets = [
2-
['@babel/env', {
3-
targets: {
4-
browsers: [
5-
'last 2 Chrome versions',
6-
'last 2 Firefox versions',
7-
'last 2 Safari versions',
8-
'last 2 Edge versions',
9-
'Explorer 11'
10-
]
11-
},
12-
useBuiltIns: 'usage',
13-
corejs: 3
14-
}],
2+
'@babel/preset-env',
153
'@babel/preset-react'
164
];
175

186
const plugins = [
197
'@babel/plugin-syntax-dynamic-import'
208
];
219

22-
module.exports = { presets };
10+
module.exports = { presets, plugins };

dash_table/async~export.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dash_table/async~export.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dash_table/async~table.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)