Skip to content

Commit 401e390

Browse files
archmojarchmoj
committed
Merge remote-tracking branch 'origin/master'
2 parents 3511f6c + 978303e commit 401e390

File tree

182 files changed

+11232
-1509
lines changed

Some content is hidden

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

182 files changed

+11232
-1509
lines changed

‎.circleci/config.yml

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,10 @@ jobs:
1414
working_directory: ~/plotly.js
1515
steps:
1616
- checkout
17-
- restore_cache:
18-
keys:
19-
- v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package-lock.json" }}
20-
- v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package-lock.json" }}
2117
- run:
2218
name: Install dependencies
2319
command: |
24-
npm install
20+
npm ci
2521
- run:
2622
name: List dependency versions
2723
command: |
@@ -33,26 +29,22 @@ jobs:
3329
command: |
3430
npm run pretest
3531
npm run cibuild
36-
- save_cache:
37-
paths:
38-
- node_modules
39-
key: v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package.json" }}
32+
- run:
33+
command: rm -rf .git
4034
- persist_to_workspace:
41-
root: .
35+
root: /home/circleci
4236
paths:
43-
- node_modules
44-
- build
45-
- dist
37+
- plotly.js
4638

4739
test-jasmine:
4840
docker:
4941
# need '-browsers' version to test in real (xvfb-wrapped) browsers
5042
- image: circleci/node:10.9.0-browsers
43+
parallelism: 2
5144
working_directory: ~/plotly.js
5245
steps:
53-
- checkout
5446
- attach_workspace:
55-
at: ~/plotly.js
47+
at: ~/
5648
- run:
5749
name: Run jasmine tests (batch 1)
5850
command: ./.circleci/test.sh jasmine
@@ -61,11 +53,11 @@ jobs:
6153
docker:
6254
# need '-browsers' version to test in real (xvfb-wrapped) browsers
6355
- image: circleci/node:10.9.0-browsers
56+
parallelism: 2
6457
working_directory: ~/plotly.js
6558
steps:
66-
- checkout
6759
- attach_workspace:
68-
at: ~/plotly.js
60+
at: ~/
6961
- run:
7062
name: Run jasmine tests (batch 2)
7163
command: ./.circleci/test.sh jasmine2
@@ -76,21 +68,20 @@ jobs:
7668
- image: circleci/node:10.9.0-browsers
7769
working_directory: ~/plotly.js
7870
steps:
79-
- checkout
8071
- attach_workspace:
81-
at: ~/plotly.js
72+
at: ~/
8273
- run:
8374
name: Run jasmine tests (batch 3)
8475
command: ./.circleci/test.sh jasmine3
8576

8677
test-image:
8778
docker:
8879
- image: plotly/testbed:latest
80+
parallelism: 4
8981
working_directory: /var/www/streambed/image_server/plotly.js/
9082
steps:
91-
- checkout
9283
- attach_workspace:
93-
at: /var/www/streambed/image_server/plotly.js/
84+
at: /var/www/streambed/image_server/
9485
- run:
9586
name: Run and setup container
9687
command: |
@@ -108,9 +99,8 @@ jobs:
10899
- image: plotly/testbed:latest
109100
working_directory: /var/www/streambed/image_server/plotly.js/
110101
steps:
111-
- checkout
112102
- attach_workspace:
113-
at: /var/www/streambed/image_server/plotly.js/
103+
at: /var/www/streambed/image_server/
114104
- run:
115105
name: Run and setup container
116106
command: |
@@ -128,21 +118,31 @@ jobs:
128118
- image: circleci/node:10.9.0
129119
working_directory: ~/plotly.js
130120
steps:
131-
- checkout
132121
- attach_workspace:
133-
at: ~/plotly.js
122+
at: ~/
134123
- run:
135124
name: Run syntax tests
136125
command: ./.circleci/test.sh syntax
137126

127+
test-bundle:
128+
docker:
129+
# need '-browsers' version to test in real (xvfb-wrapped) browsers
130+
- image: circleci/node:10.9.0-browsers
131+
working_directory: ~/plotly.js
132+
steps:
133+
- attach_workspace:
134+
at: ~/
135+
- run:
136+
name: Run test-bundle
137+
command: ./.circleci/test.sh bundle
138+
138139
publish:
139140
docker:
140141
- image: circleci/node:10.9.0
141142
working_directory: ~/plotly.js
142143
steps:
143-
- checkout
144144
- attach_workspace:
145-
at: ~/plotly.js
145+
at: ~/
146146
- run:
147147
name: Build dist/
148148
command: npm run build
@@ -172,6 +172,9 @@ workflows:
172172
build-and-test:
173173
jobs:
174174
- build
175+
- test-bundle:
176+
requires:
177+
- build
175178
- test-jasmine:
176179
requires:
177180
- build

‎.circleci/test.sh

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@ case $1 in
4444
jasmine)
4545
set_tz
4646

47-
npm run test-jasmine -- --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
48-
npm run test-bundle || EXIT_STATE=$?
47+
SUITE=$(circleci tests glob "$ROOT/test/jasmine/tests/*" | circleci tests split)
48+
npm run test-jasmine -- $SUITE --skip-tags=gl,noCI,flaky --showSkipped || EXIT_STATE=$?
4949

5050
exit $EXIT_STATE
5151
;;
5252

5353
jasmine2)
5454
set_tz
5555

56-
SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=gl))
56+
SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=gl | circleci tests split))
5757

5858
for s in ${SHARDS[@]}; do
59-
retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI
59+
retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI --showSkipped
6060
done
6161

6262
exit $EXIT_STATE
@@ -65,23 +65,29 @@ case $1 in
6565
jasmine3)
6666
set_tz
6767

68-
SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=flaky))
68+
SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=flaky | circleci tests split))
6969

7070
for s in ${SHARDS[@]}; do
71-
retry npm run test-jasmine -- "$s" --tags=flaky --skip-tags=noCI
71+
retry npm run test-jasmine -- "$s" --tags=flaky --skip-tags=noCI --showSkipped
7272
done
7373

7474
exit $EXIT_STATE
7575
;;
7676

7777
image)
78-
npm run test-image || EXIT_STATE=$?
78+
SUITE=$(find $ROOT/test/image/mocks/ -type f -printf "%f\n" | circleci tests split)
79+
npm run test-image -- $SUITE --filter || EXIT_STATE=$?
7980
exit $EXIT_STATE
8081
;;
8182

8283
image2)
8384
npm run test-export || EXIT_STATE=$?
84-
npm run test-image-gl2d || EXIT_STATE=$?
85+
exit $EXIT_STATE
86+
;;
87+
88+
bundle)
89+
set_tz
90+
npm run test-bundle || EXIT_STATE=$?
8591
exit $EXIT_STATE
8692
;;
8793

‎CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,24 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
1010
where X.Y.Z is the semver of most recent plotly.js release.
1111

1212

13+
## [1.45.3] -- 2019-03-19
14+
15+
### Fixed
16+
- Fix legend click dispatch on legend item symbols (bug introduced in 1.44.0) [#3635]
17+
- Fix overlapping of "very close" hover labels [#3645]
18+
- Fix `hovermode` default logic for stacked `scatter` traces [#3646]
19+
- Fix `glPixelRatio` handling in `surface` contour lines [#3641]
20+
- Fix `gl2d` subplot zoombox appearance (bug introduced in 1.32.0) [#3647]
21+
- Fix axis label updates on `gl2d` subplots on scroll (bug introduced in 1.32.0) [#3647]
22+
- Fix `dragmode` relayout calls on `gl2d` subplots [#3647]
23+
- Improve info about `<extra>` in `hovertemplate` description [#3623]
24+
25+
26+
## [1.45.2] -- 2019-03-07
27+
28+
### Fixed
29+
- Fix webpack builds that include `sankey` by upgrading d3-sankey-circular to 0.33.0 (bug introduced in 1.45.0) [#3611]
30+
1331
## [1.45.1] -- 2019-03-05
1432

1533
### Fixed

‎build/plotcss.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var rules = {
3131
"X .cursor-n-resize": "cursor:n-resize;",
3232
"X .cursor-ne-resize": "cursor:ne-resize;",
3333
"X .cursor-grab": "cursor:-webkit-grab;cursor:grab;",
34-
"X .modebar": "position:absolute;top:2px;right:2px;z-index:1001;",
34+
"X .modebar": "position:absolute;top:2px;right:2px;",
3535
"X .ease-bg": "-webkit-transition:background-color 0.3s ease 0s;-moz-transition:background-color 0.3s ease 0s;-ms-transition:background-color 0.3s ease 0s;-o-transition:background-color 0.3s ease 0s;transition:background-color 0.3s ease 0s;",
3636
"X .modebar--hover>:not(.watermark)": "opacity:0;-webkit-transition:opacity 0.3s ease 0s;-moz-transition:opacity 0.3s ease 0s;-ms-transition:opacity 0.3s ease 0s;-o-transition:opacity 0.3s ease 0s;transition:opacity 0.3s ease 0s;",
3737
"X:hover .modebar--hover .modebar-group": "opacity:1;",

‎dist/README.md

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ object. This property must be set before the plotly.js script tag, for example:
5151
Plotly.js defaults to US English (en-US) and includes British English (en) in the standard bundle.
5252
Many other localizations are available - here is an example using Swiss-German (de-CH),
5353
see the contents of this directory for the full list.
54-
They are also available on our CDN as https://cdn.plot.ly/plotly-locale-de-ch-latest.js OR https://cdn.plot.ly/plotly-locale-de-ch-1.45.1.js
54+
They are also available on our CDN as https://cdn.plot.ly/plotly-locale-de-ch-latest.js OR https://cdn.plot.ly/plotly-locale-de-ch-1.45.3.js
5555
Note that the file names are all lowercase, even though the region is uppercase when you apply a locale.
5656

5757
*After* the plotly.js script tag, add:
@@ -74,12 +74,12 @@ The main plotly.js bundle includes all the official (non-beta) trace modules.
7474

7575
It be can imported as minified javascript
7676
- using dist file `dist/plotly.min.js`
77-
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.45.1.min.js
77+
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.45.3.min.js
7878

7979
or as raw javascript:
8080
- using the `plotly.js-dist` npm package (starting in `v1.39.0`)
8181
- using dist file `dist/plotly.js`
82-
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.45.1.js
82+
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.45.3.js
8383
- using CommonJS with `require('plotly.js')`
8484

8585
If you would like to have access to the attribute meta information (including attribute descriptions as on the [schema reference page](https://plot.ly/javascript/reference/)), use dist file `dist/plotly-with-meta.js`
@@ -111,16 +111,16 @@ The `basic` partial bundle contains trace modules `scatter`, `bar` and `pie`.
111111

112112
| Raw size | Minified size | Minified + gzip size |
113113
|------|-----------------|------------------------|
114-
| 2.3 MB | 817.1 kB | 267 kB |
114+
| 2.3 MB | 817.3 kB | 267.1 kB |
115115

116116
#### CDN links
117117

118118
| Flavor | URL |
119119
| ------ | --- |
120120
| Latest | https://cdn.plot.ly/plotly-basic-latest.js |
121121
| Latest minified | https://cdn.plot.ly/plotly-basic-latest.min.js |
122-
| Tagged | https://cdn.plot.ly/plotly-basic-1.45.1.js |
123-
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.45.1.min.js |
122+
| Tagged | https://cdn.plot.ly/plotly-basic-1.45.3.js |
123+
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.45.3.min.js |
124124

125125
#### npm package (starting in `v1.39.0`)
126126

@@ -157,16 +157,16 @@ The `cartesian` partial bundle contains trace modules `scatter`, `bar`, `box`, `
157157

158158
| Raw size | Minified size | Minified + gzip size |
159159
|------|-----------------|------------------------|
160-
| 2.6 MB | 932.7 kB | 303.4 kB |
160+
| 2.6 MB | 932.8 kB | 303.5 kB |
161161

162162
#### CDN links
163163

164164
| Flavor | URL |
165165
| ------ | --- |
166166
| Latest | https://cdn.plot.ly/plotly-cartesian-latest.js |
167167
| Latest minified | https://cdn.plot.ly/plotly-cartesian-latest.min.js |
168-
| Tagged | https://cdn.plot.ly/plotly-cartesian-1.45.1.js |
169-
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.45.1.min.js |
168+
| Tagged | https://cdn.plot.ly/plotly-cartesian-1.45.3.js |
169+
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.45.3.min.js |
170170

171171
#### npm package (starting in `v1.39.0`)
172172

@@ -203,16 +203,16 @@ The `geo` partial bundle contains trace modules `scatter`, `scattergeo` and `cho
203203

204204
| Raw size | Minified size | Minified + gzip size |
205205
|------|-----------------|------------------------|
206-
| 2.3 MB | 834.4 kB | 274.8 kB |
206+
| 2.3 MB | 834.5 kB | 274.8 kB |
207207

208208
#### CDN links
209209

210210
| Flavor | URL |
211211
| ------ | --- |
212212
| Latest | https://cdn.plot.ly/plotly-geo-latest.js |
213213
| Latest minified | https://cdn.plot.ly/plotly-geo-latest.min.js |
214-
| Tagged | https://cdn.plot.ly/plotly-geo-1.45.1.js |
215-
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.45.1.min.js |
214+
| Tagged | https://cdn.plot.ly/plotly-geo-1.45.3.js |
215+
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.45.3.min.js |
216216

217217
#### npm package (starting in `v1.39.0`)
218218

@@ -257,8 +257,8 @@ The `gl3d` partial bundle contains trace modules `scatter`, `scatter3d`, `surfac
257257
| ------ | --- |
258258
| Latest | https://cdn.plot.ly/plotly-gl3d-latest.js |
259259
| Latest minified | https://cdn.plot.ly/plotly-gl3d-latest.min.js |
260-
| Tagged | https://cdn.plot.ly/plotly-gl3d-1.45.1.js |
261-
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.45.1.min.js |
260+
| Tagged | https://cdn.plot.ly/plotly-gl3d-1.45.3.js |
261+
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.45.3.min.js |
262262

263263
#### npm package (starting in `v1.39.0`)
264264

@@ -295,16 +295,16 @@ The `gl2d` partial bundle contains trace modules `scatter`, `scattergl`, `splom`
295295

296296
| Raw size | Minified size | Minified + gzip size |
297297
|------|-----------------|------------------------|
298-
| 3.4 MB | 1.4 MB | 444.6 kB |
298+
| 3.4 MB | 1.4 MB | 444.7 kB |
299299

300300
#### CDN links
301301

302302
| Flavor | URL |
303303
| ------ | --- |
304304
| Latest | https://cdn.plot.ly/plotly-gl2d-latest.js |
305305
| Latest minified | https://cdn.plot.ly/plotly-gl2d-latest.min.js |
306-
| Tagged | https://cdn.plot.ly/plotly-gl2d-1.45.1.js |
307-
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.45.1.min.js |
306+
| Tagged | https://cdn.plot.ly/plotly-gl2d-1.45.3.js |
307+
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.45.3.min.js |
308308

309309
#### npm package (starting in `v1.39.0`)
310310

@@ -341,16 +341,16 @@ The `mapbox` partial bundle contains trace modules `scatter` and `scattermapbox`
341341

342342
| Raw size | Minified size | Minified + gzip size |
343343
|------|-----------------|------------------------|
344-
| 2.8 MB | 1.4 MB | 412.7 kB |
344+
| 2.8 MB | 1.4 MB | 412.8 kB |
345345

346346
#### CDN links
347347

348348
| Flavor | URL |
349349
| ------ | --- |
350350
| Latest | https://cdn.plot.ly/plotly-mapbox-latest.js |
351351
| Latest minified | https://cdn.plot.ly/plotly-mapbox-latest.min.js |
352-
| Tagged | https://cdn.plot.ly/plotly-mapbox-1.45.1.js |
353-
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.45.1.min.js |
352+
| Tagged | https://cdn.plot.ly/plotly-mapbox-1.45.3.js |
353+
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.45.3.min.js |
354354

355355
#### npm package (starting in `v1.39.0`)
356356

@@ -387,16 +387,16 @@ The `finance` partial bundle contains trace modules `scatter`, `bar`, `histogram
387387

388388
| Raw size | Minified size | Minified + gzip size |
389389
|------|-----------------|------------------------|
390-
| 2.4 MB | 850.7 kB | 277.3 kB |
390+
| 2.4 MB | 850.8 kB | 277.3 kB |
391391

392392
#### CDN links
393393

394394
| Flavor | URL |
395395
| ------ | --- |
396396
| Latest | https://cdn.plot.ly/plotly-finance-latest.js |
397397
| Latest minified | https://cdn.plot.ly/plotly-finance-latest.min.js |
398-
| Tagged | https://cdn.plot.ly/plotly-finance-1.45.1.js |
399-
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.45.1.min.js |
398+
| Tagged | https://cdn.plot.ly/plotly-finance-1.45.3.js |
399+
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.45.3.min.js |
400400

401401
#### npm package (starting in `v1.39.0`)
402402

0 commit comments

Comments
 (0)