Skip to content

Commit 86f4cfb

Browse files
committed
Merge branch 'dev' into master-2.4.0
2 parents b8cfc29 + 45e35aa commit 86f4cfb

File tree

154 files changed

+42749
-21037
lines changed

Some content is hidden

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

154 files changed

+42749
-21037
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
set -eo pipefail
5454
pip install -e .[ci,dev,testing,celery,diskcache] --progress-bar off
5555
pip list | grep dash
56-
npm i
56+
npm ci
5757
npm run build.sequential
5858
python setup.py sdist
5959
mkdir dash-package && cp dist/*.tar.gz dash-package/dash-package.tar.gz
@@ -119,7 +119,7 @@ jobs:
119119
. venv/bin/activate
120120
set -eo pipefail
121121
pip install -e . --progress-bar off && pip list | grep dash
122-
npm install npm run initialize
122+
npm ci npm run initialize
123123
npm run build.sequential
124124
npm run lint
125125
- run:
@@ -189,7 +189,7 @@ jobs:
189189
name: ️️🏗️ Install package
190190
command: |
191191
. venv/bin/activate
192-
npm install
192+
npm ci
193193
pip install dash-package/dash-package.tar.gz[ci,dev,testing,celery,diskcache] --progress-bar off
194194
pip list | grep dash
195195
- run:
@@ -294,7 +294,7 @@ jobs:
294294
. venv/bin/activate && rm -rf components/dash-core-components/dash_core_components
295295
cd components/dash-core-components
296296
TESTFILES=$(circleci tests glob "tests/integration/**/test_*.py" | circleci tests split --split-by=timings)
297-
pytest --headless --nopercyfinalize --junitxml=test-reports/junit_intg.xml --junitprefix="components.dash-core-components" ${TESTFILES}
297+
pytest --headless --nopercyfinalize --junitxml=test-reports/junit_intg.xml --junitprefix="components.dash-core-components" ${TESTFILES} --reruns 3
298298
- store_artifacts:
299299
path: ~/dash/components/dash-core-components/test-reports
300300
- store_test_results:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ npm-debug*
6767
dash_generator_test_component_standard/
6868
dash_generator_test_component_nested/
6969
dash_test_components/
70+
dash_generator_test_component_typescript/
7071
inst/
7172
man/
7273
R/

@plotly/dash-component-plugins/package-lock.json

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

@plotly/dash-component-plugins/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@plotly/dash-component-plugins",
3-
"version": "1.2.2",
3+
"version": "1.2.3",
44
"description": "Plugins for Dash Components",
55
"repository": {
66
"type": "git",
@@ -17,13 +17,13 @@
1717
"author": "Marc-André Rivet",
1818
"license": "MIT",
1919
"devDependencies": {
20-
"@babel/core": "^7.16.0",
21-
"@babel/preset-env": "^7.16.4",
22-
"@babel/preset-react": "^7.16.0",
23-
"babel-loader": "^8.2.3",
20+
"@babel/core": "^7.17.9",
21+
"@babel/preset-env": "^7.16.11",
22+
"@babel/preset-react": "^7.16.7",
23+
"babel-loader": "^8.2.4",
2424
"react": "^16.8.6",
2525
"webpack": "^4.44.2",
26-
"webpack-cli": "^4.9.1"
26+
"webpack-cli": "^4.9.2"
2727
},
2828
"files": [
2929
"dist/index.js"

0 commit comments

Comments
 (0)