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

Commit 570fbd9

Browse files
Issue 840 - Fix proptypes & syntax highlighting, and improve tests (#841)
1 parent 0fd6f61 commit 570fbd9

29 files changed

+272
-734
lines changed

.circleci/config.yml

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -183,68 +183,10 @@ jobs:
183183
npm run lint
184184
when: always
185185

186-
187-
"python-3.6":
188-
docker:
189-
- image: circleci/python:3.7.5-stretch-node-browsers
190-
191-
environment:
192-
PERCY_ENABLED: True
193-
PERCY_PROJECT: plotly/dash-table-python-v0
194-
195-
steps:
196-
- checkout
197-
198-
- run:
199-
name: Inject Percy Environment variables
200-
command: |
201-
echo 'export PERCY_TOKEN="$PERCY_PYTHON_TOKEN_V0"' >> $BASH_ENV
202-
203-
- run:
204-
name: Install requirements
205-
command: |
206-
sudo pip install --upgrade virtualenv
207-
python -m venv venv || virtualenv venv
208-
. venv/bin/activate
209-
pip install -r dev-requirements.txt --quiet
210-
npm ci
211-
212-
- run:
213-
name: Install dependencies (dash)
214-
command: |
215-
. venv/bin/activate
216-
git clone --depth 1 git@github.com:plotly/dash.git dash-main
217-
pip install -e ./dash-main[dev,testing] --quiet
218-
cd dash-main/dash-renderer && npm ci && npm run build && pip install -e . && cd ../..
219-
220-
- run:
221-
name: Install test requirements
222-
command: |
223-
. venv/bin/activate
224-
npm run build
225-
python setup.py sdist
226-
cd dist
227-
find . -name "*.gz" | xargs pip install --no-cache-dir --ignore-installed && cd ..
228-
229-
- run:
230-
name: ⚙️ run integration test
231-
command: |
232-
. venv/bin/activate
233-
pytest --junitxml=test-reports/dash.xml tests/integration
234-
- store_artifacts:
235-
path: test-reports
236-
- store_test_results:
237-
path: test-reports
238-
- store_artifacts:
239-
path: /tmp/dash_artifacts
240-
241-
242-
243186
workflows:
244187
version: 2
245188
build:
246189
jobs:
247-
- "python-3.6"
248190
- "node"
249191
- "server-test"
250192
- "standalone-test"

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
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+
## [Unreleased]
6+
### Fixed
7+
- [#841](https://github.com/plotly/dash-table/pull/841)
8+
- Fix prop-types regression causing console errors in browser devtools
9+
- Fix syntax highlighting regression for Markdown cells
10+
11+
### Added
12+
- [#841](https://github.com/plotly/dash-table/pull/841) Add Julia syntax highlighting support for Markdown cells
13+
514
## [4.10.1] - 2020-09-03
615
-Dash.jl Julia component generation
716

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"es-check": "^5.1.0",
8484
"fast-isnumeric": "^1.1.4",
8585
"file-loader": "^6.0.0",
86-
"highlight.js": "^10.1.2",
86+
"highlight.js": "^10.3.1",
8787
"http-server": "^0.12.3",
8888
"husky": "^4.2.5",
8989
"less": "^3.12.2",

src/dash-table/dash/DataTable.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ export const propTypes = {
996996
}),
997997
PropTypes.arrayOf(
998998
PropTypes.oneOfType([
999-
PropTypes.nully,
999+
PropTypes.oneOf([null]),
10001000
PropTypes.string,
10011001
PropTypes.exact({
10021002
delay: PropTypes.number,

src/third-party/highlight.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
import highlightjs from 'highlight.js/lib/highlight';
1+
import highlightjs from 'highlight.js/lib/core';
22
import 'highlight.js/styles/github.css';
33

44
import bash from 'highlight.js/lib/languages/bash';
55
import css from 'highlight.js/lib/languages/css';
66
import http from 'highlight.js/lib/languages/http';
77
import javascript from 'highlight.js/lib/languages/javascript';
88
import json from 'highlight.js/lib/languages/json';
9+
import julia from 'highlight.js/lib/languages/julia';
910
import markdown from 'highlight.js/lib/languages/markdown';
11+
import plaintext from 'highlight.js/lib/languages/plaintext';
1012
import python from 'highlight.js/lib/languages/python';
1113
import r from 'highlight.js/lib/languages/r';
1214
import ruby from 'highlight.js/lib/languages/ruby';
@@ -20,7 +22,9 @@ highlightjs.registerLanguage('css', css);
2022
highlightjs.registerLanguage('http', http);
2123
highlightjs.registerLanguage('javascript', javascript);
2224
highlightjs.registerLanguage('json', json);
25+
highlightjs.registerLanguage('julia', julia);
2326
highlightjs.registerLanguage('markdown', markdown);
27+
highlightjs.registerLanguage('plaintext', plaintext);
2428
highlightjs.registerLanguage('python', python);
2529
highlightjs.registerLanguage('r', r);
2630
highlightjs.registerLanguage('ruby', ruby);

tests/integration/IntegrationTests.py

Lines changed: 0 additions & 91 deletions
This file was deleted.

tests/integration/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)