Skip to content
This repository has been archived by the owner on Jun 4, 2024. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Marc-André Rivet committed Nov 14, 2019
2 parents 2f8dbfe + 40dccd3 commit 9435701
Show file tree
Hide file tree
Showing 43 changed files with 814 additions and 308 deletions.
27 changes: 15 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
jobs:
"server-test":
docker:
- image: circleci/python:3.6.7-node-browsers
- image: circleci/python:3.6-node-browsers
- image: cypress/base:10

steps:
Expand All @@ -12,7 +12,7 @@ jobs:
key: deps1-{{ .Branch }}-{{ checksum "package-lock.json" }}-{{ checksum "package.json" }}-{{ checksum ".circleci/config.yml" }}
- run:
name: Install npm packages
command: npm install
command: npm ci
- run:
name: Cypress Install
command: |
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
key: deps1-{{ .Branch }}-{{ checksum "package-lock.json" }}-{{ checksum "package.json" }}-{{ checksum ".circleci/config.yml" }}
- run:
name: Install npm packages
command: npm install
command: npm ci
- run:
name: Cypress Install
command: |
Expand All @@ -74,12 +74,15 @@ jobs:

- run:
name: Run tests
command: npm run test.standalone
command: |
rm -rf node_modules/cypress
npm i cypress@3.4.1
npm run test.standalone
"unit-test":
docker:
- image: circleci/python:3.6.7-node-browsers
- image: circleci/python:3.6-node-browsers
- image: cypress/base:10

steps:
Expand All @@ -88,7 +91,7 @@ jobs:
key: deps1-{{ .Branch }}-{{ checksum "package-lock.json" }}-{{ checksum "package.json" }}-{{ checksum ".circleci/config.yml" }}
- run:
name: Install npm packages
command: npm install
command: npm ci
- run:
name: Cypress Install
command: |
Expand Down Expand Up @@ -120,7 +123,7 @@ jobs:
"visual-test":
docker:
- image: circleci/node:8.11.3-browsers
- image: circleci/node:10-browsers

steps:
- checkout
Expand All @@ -130,7 +133,7 @@ jobs:

- run:
name: Install package.json
command: npm i
command: npm ci

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

"node":
docker:
- image: circleci/python:3.6.7-node
- image: circleci/python:3.6-node

steps:
- checkout
Expand All @@ -162,7 +165,7 @@ jobs:

- run:
name: Install package.json
command: npm i
command: npm ci

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

"python-3.6":
docker:
- image: circleci/python:3.6.7-stretch-node-browsers
- image: circleci/python:3.6-stretch-node-browsers

environment:
PERCY_ENABLED: True
Expand All @@ -206,7 +209,7 @@ jobs:
python -m venv venv || virtualenv venv
. venv/bin/activate
pip install -r dev-requirements.txt --quiet
npm install
npm ci
- run:
name: Install dependencies (dash)
Expand Down
10 changes: 4 additions & 6 deletions .config/webpack/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,18 @@ const dashLibraryName = packagejson.name.replace(/-/g, '_');

module.exports = (options = {}) => {
const babel = options.babel || undefined;
const entry = options.entry || [];
const preprocessor = basePreprocessing(options.preprocessor);
const mode = options.mode || 'development';
const ts = options.ts || {};

console.log('********** Webpack Environment Overrides **********');
console.log('Preprocessor', JSON.stringify(preprocessor));
console.log('mode', mode);
console.log('babel', JSON.stringify(babel));
console.log('ts', JSON.stringify(ts));
console.log('options', JSON.stringify(options));

return {
entry: {
bundle: './src/dash-table/index.ts',
demo: ['./demo/index.html', './demo/index.js']
bundle: entry.concat(['./src/dash-table/index.ts']),
demo: entry.concat(['./demo/index.html', './demo/index.js'])
},
mode: mode,
output: {
Expand Down
6 changes: 5 additions & 1 deletion .storybook/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@ const presets = [
'@babel/preset-react'
];

module.exports = { presets };
const plugins = [
'@babel/plugin-transform-regenerator'
];

module.exports = { presets, plugins };
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [4.5.1] - 2019-11-14
### Fixed
- [#637](https://github.com/plotly/dash-table/pull/637) Fix multiple issues
- Fix IE11 compatibility issues and add ES5 compatibility and validation
- Fix a bug with `loading_state` being handled incorrectly, causing the table to steal focus

## [4.5.0] - 2019-10-29
### Changed
- [#554](https://github.com/plotly/dash-table/pull/554) Async loading of `xlsx` library on export
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: dashTable
Title: Core Interactive Table Component for Dash
Version: 4.5.0
Version: 4.5.1
Authors @R: as.person(c(Chris Parmer <chris@plot.ly>))
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.
Depends: R (>= 3.0.2)
Expand Down
12 changes: 6 additions & 6 deletions R/internal.R
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
.dashTable_js_metadata <- function() {
deps_metadata <- list(`dash_table` = structure(list(name = "dash_table",
version = "4.5.0", src = list(href = NULL,
version = "4.5.1", src = list(href = NULL,
file = "deps"), meta = NULL,
script = 'bundle.js',
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashTable",
all_files = FALSE), class = "html_dependency"),
`dash_table` = structure(list(name = "dash_table",
version = "4.5.0", src = list(href = NULL,
version = "4.5.1", src = list(href = NULL,
file = "deps"), meta = NULL,
script = 'bundle.js.map',
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashTable",
all_files = FALSE), class = "html_dependency"),
`dash_table` = structure(list(name = "dash_table",
version = "4.5.0", src = list(href = NULL,
version = "4.5.1", src = list(href = NULL,
file = "deps"), meta = NULL,
script = 'async~export.js',
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashTable",
all_files = FALSE), class = "html_dependency"),
`dash_table` = structure(list(name = "dash_table",
version = "4.5.0", src = list(href = NULL,
version = "4.5.1", src = list(href = NULL,
file = "deps"), meta = NULL,
script = 'async~export.js.map',
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashTable",
all_files = FALSE), class = "html_dependency"),
`dash_table` = structure(list(name = "dash_table",
version = "4.5.0", src = list(href = NULL,
version = "4.5.1", src = list(href = NULL,
file = "deps"), meta = NULL,
script = 'async~table.js',
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashTable",
all_files = FALSE), class = "html_dependency"),
`dash_table` = structure(list(name = "dash_table",
version = "4.5.0", src = list(href = NULL,
version = "4.5.1", src = list(href = NULL,
file = "deps"), meta = NULL,
script = 'async~table.js.map',
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashTable",
Expand Down
16 changes: 2 additions & 14 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
const presets = [
['@babel/env', {
targets: {
browsers: [
'last 2 Chrome versions',
'last 2 Firefox versions',
'last 2 Safari versions',
'last 2 Edge versions',
'Explorer 11'
]
},
useBuiltIns: 'usage',
corejs: 3
}],
'@babel/preset-env',
'@babel/preset-react'
];

const plugins = [
'@babel/plugin-syntax-dynamic-import'
];

module.exports = { presets };
module.exports = { presets, plugins };
4 changes: 2 additions & 2 deletions dash_table/async~export.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_table/async~export.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dash_table/async~table.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_table/async~table.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_table/bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_table/bundle.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_table/demo.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_table/demo.js.map

Large diffs are not rendered by default.

17 changes: 10 additions & 7 deletions dash_table/package-info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dash-table",
"version": "4.5.0",
"version": "4.5.1",
"description": "Dash table",
"repository": {
"type": "git",
Expand Down Expand Up @@ -45,6 +45,7 @@
"private::test.standalone": "cypress run --browser chrome --spec 'tests/cypress/tests/standalone/**/*'",
"build.watch": "webpack-dev-server --content-base dash_table --mode development --config webpack.dev.config.js",
"build": "run-s private::build:js private::build:py",
"postbuild": "es-check es5 dash_table/*.js",
"format": "run-s \"private::lint:ts -- --fix\"",
"lint": "run-s private::lint:*",
"test.server": "run-p --race private::host* private::test.server",
Expand All @@ -62,7 +63,8 @@
"@babel/cli": "^7.6.2",
"@babel/core": "^7.6.2",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/polyfill": "^7.6.0",
"@babel/plugin-transform-regenerator": "^7.7.0",
"@babel/polyfill": "^7.7.0",
"@babel/preset-env": "^7.6.2",
"@babel/preset-react": "^7.0.0",
"@cypress/webpack-preprocessor": "^4.1.0",
Expand All @@ -71,8 +73,8 @@
"@fortawesome/free-solid-svg-icons": "^5.11.2",
"@fortawesome/react-fontawesome": "^0.1.4",
"@percy/storybook": "^3.2.0",
"@plotly/dash-component-plugins": "^1.0.1",
"@plotly/webpack-dash-dynamic-import": "^1.1.1",
"@plotly/dash-component-plugins": "^1.0.2",
"@plotly/webpack-dash-dynamic-import": "^1.1.4",
"@storybook/cli": "^5.1.11",
"@storybook/react": "^5.1.11",
"@types/d3-format": "^1.3.1",
Expand All @@ -82,10 +84,10 @@
"@types/react-dom": "^16.9.0",
"@types/react-select": "^1.3.4",
"babel-loader": "^8.0.6",
"core-js": "^3.2.1",
"css-loader": "^3.2.0",
"cypress": "^3.4.1",
"cypress": "^3.6.1",
"d3-format": "^1.4.1",
"es-check": "^5.0.0",
"fast-isnumeric": "^1.1.3",
"file-loader": "^4.2.0",
"http-server": "^0.11.1",
Expand Down Expand Up @@ -114,6 +116,7 @@
"xlsx": "^0.15.1"
},
"files": [
"/dash_table/async~*{.js,.map}",
"/dash_table/bundle*{.js,.map}"
],
"peerDependencies": {
Expand All @@ -125,4 +128,4 @@
"node": ">=8.11.0",
"npm": ">=6.1.0"
}
}
}
3 changes: 2 additions & 1 deletion demo/App.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint no-magic-numbers: 0 */
import '@babel/polyfill/noConflict';
import * as R from 'ramda';
import React, {Component} from 'react';
import React, { Component } from 'react';
import { DataTable } from 'dash-table/index';
import Environment from 'core/environment';
import { memoizeOne } from 'core/memoizer';
Expand Down
4 changes: 2 additions & 2 deletions inst/deps/async~export.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/deps/async~export.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions inst/deps/async~table.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/deps/async~table.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/deps/bundle.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/deps/demo.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

Loading

0 comments on commit 9435701

Please sign in to comment.