Skip to content

Commit 79545db

Browse files
etpinardetpinard
committed
Merge branch 'master' into sunburst
2 parents 05a0209 + 7e68a2e commit 79545db

Some content is hidden

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

58 files changed

+4465
-4188
lines changed

‎.circleci/config.yml

Lines changed: 26 additions & 25 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,21 @@ 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
5143
working_directory: ~/plotly.js
5244
steps:
53-
- checkout
5445
- attach_workspace:
55-
at: ~/plotly.js
46+
at: ~/
5647
- run:
5748
name: Run jasmine tests (batch 1)
5849
command: ./.circleci/test.sh jasmine
@@ -63,21 +54,31 @@ jobs:
6354
- image: circleci/node:10.9.0-browsers
6455
working_directory: ~/plotly.js
6556
steps:
66-
- checkout
6757
- attach_workspace:
68-
at: ~/plotly.js
58+
at: ~/
6959
- run:
7060
name: Run jasmine tests (batch 2)
7161
command: ./.circleci/test.sh jasmine2
7262

63+
test-jasmine3:
64+
docker:
65+
# need '-browsers' version to test in real (xvfb-wrapped) browsers
66+
- image: circleci/node:10.9.0-browsers
67+
working_directory: ~/plotly.js
68+
steps:
69+
- attach_workspace:
70+
at: ~/
71+
- run:
72+
name: Run jasmine tests (batch 3)
73+
command: ./.circleci/test.sh jasmine3
74+
7375
test-image:
7476
docker:
7577
- image: plotly/testbed:latest
7678
working_directory: /var/www/streambed/image_server/plotly.js/
7779
steps:
78-
- checkout
7980
- attach_workspace:
80-
at: /var/www/streambed/image_server/plotly.js/
81+
at: /var/www/streambed/image_server/
8182
- run:
8283
name: Run and setup container
8384
command: |
@@ -95,9 +96,8 @@ jobs:
9596
- image: plotly/testbed:latest
9697
working_directory: /var/www/streambed/image_server/plotly.js/
9798
steps:
98-
- checkout
9999
- attach_workspace:
100-
at: /var/www/streambed/image_server/plotly.js/
100+
at: /var/www/streambed/image_server/
101101
- run:
102102
name: Run and setup container
103103
command: |
@@ -115,9 +115,8 @@ jobs:
115115
- image: circleci/node:10.9.0
116116
working_directory: ~/plotly.js
117117
steps:
118-
- checkout
119118
- attach_workspace:
120-
at: ~/plotly.js
119+
at: ~/
121120
- run:
122121
name: Run syntax tests
123122
command: ./.circleci/test.sh syntax
@@ -127,9 +126,8 @@ jobs:
127126
- image: circleci/node:10.9.0
128127
working_directory: ~/plotly.js
129128
steps:
130-
- checkout
131129
- attach_workspace:
132-
at: ~/plotly.js
130+
at: ~/
133131
- run:
134132
name: Build dist/
135133
command: npm run build
@@ -165,6 +163,9 @@ workflows:
165163
- test-jasmine2:
166164
requires:
167165
- build
166+
- test-jasmine3:
167+
requires:
168+
- build
168169
- test-image:
169170
requires:
170171
- build

‎.circleci/test.sh

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ case $1 in
4545
set_tz
4646

4747
npm run test-jasmine -- --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
48-
retry npm run test-jasmine -- --tags=flaky --skip-tags=noCI
4948
npm run test-bundle || EXIT_STATE=$?
5049

5150
exit $EXIT_STATE
@@ -63,6 +62,18 @@ case $1 in
6362
exit $EXIT_STATE
6463
;;
6564

65+
jasmine3)
66+
set_tz
67+
68+
SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=flaky))
69+
70+
for s in ${SHARDS[@]}; do
71+
retry npm run test-jasmine -- "$s" --tags=flaky --skip-tags=noCI
72+
done
73+
74+
exit $EXIT_STATE
75+
;;
76+
6677
image)
6778
npm run test-image || EXIT_STATE=$?
6879
exit $EXIT_STATE

‎CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,25 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
99

1010
where X.Y.Z is the semver of most recent plotly.js release.
1111

12+
## [1.45.2] -- 2019-03-07
13+
14+
### Fixed
15+
- Fix webpack builds that include `sankey` by upgrading d3-sankey-circular to 0.33.0 (bug introduced in 1.45.0) [#3611]
16+
17+
## [1.45.1] -- 2019-03-05
18+
19+
### Fixed
20+
- Fix axis automargin pushes for rotated tick labels [#3605]
21+
- Fix automargin logic on (very) small graphs [#3605]
22+
- Fix locales support in `hovertemplate` strings [#3586]
23+
- Fix gl3d reset camera buttons for scenes with orthographic projection [#3597]
24+
- Fix typed array support for `parcoords` dimensions values and `line.color` [#3598]
25+
- Fix `cone` rendering on some older browsers [#3591]
26+
- Fix `lightposition` behavior for `cone` traces [#3591]
27+
- Fix `lightposition` behavior for `streamtube` trace [#3593]
28+
- Remove unused files from `gl-cone3d` dependency [#3591]
29+
- Remove unused files from `gl-streamtube3d` dependency [#3593]
30+
1231

1332
## [1.45.0] -- 2019-02-26
1433

‎dist/README.md

Lines changed: 25 additions & 25 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.0.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.2.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.0.min.js
77+
- using CDN URL https://cdn.plot.ly/plotly-latest.min.js OR https://cdn.plot.ly/plotly-1.45.2.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.0.js
82+
- using CDN URL https://cdn.plot.ly/plotly-latest.js OR https://cdn.plot.ly/plotly-1.45.2.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`
@@ -88,7 +88,7 @@ The main plotly.js bundle weights in at:
8888

8989
| plotly.js | plotly.min.js | plotly.min.js + gzip | plotly-with-meta.js |
9090
|-----------|---------------|----------------------|---------------------|
91-
| 6.2 MB | 2.9 MB | 866.6 kB | 6.5 MB |
91+
| 6.2 MB | 2.9 MB | 865.3 kB | 6.5 MB |
9292

9393
## Partial bundles
9494

@@ -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 | 816.8 kB | 266.8 kB |
114+
| 2.3 MB | 817.1 kB | 267 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.0.js |
123-
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.45.0.min.js |
122+
| Tagged | https://cdn.plot.ly/plotly-basic-1.45.2.js |
123+
| Tagged minified | https://cdn.plot.ly/plotly-basic-1.45.2.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.3 kB | 303.2 kB |
160+
| 2.6 MB | 932.7 kB | 303.4 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.0.js |
169-
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.45.0.min.js |
168+
| Tagged | https://cdn.plot.ly/plotly-cartesian-1.45.2.js |
169+
| Tagged minified | https://cdn.plot.ly/plotly-cartesian-1.45.2.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 kB | 274.5 kB |
206+
| 2.3 MB | 834.4 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.0.js |
215-
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.45.0.min.js |
214+
| Tagged | https://cdn.plot.ly/plotly-geo-1.45.2.js |
215+
| Tagged minified | https://cdn.plot.ly/plotly-geo-1.45.2.min.js |
216216

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

@@ -249,16 +249,16 @@ The `gl3d` partial bundle contains trace modules `scatter`, `scatter3d`, `surfac
249249

250250
| Raw size | Minified size | Minified + gzip size |
251251
|------|-----------------|------------------------|
252-
| 3.4 MB | 1.3 MB | 426.8 kB |
252+
| 3.4 MB | 1.3 MB | 425.5 kB |
253253

254254
#### CDN links
255255

256256
| Flavor | URL |
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.0.js |
261-
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.45.0.min.js |
260+
| Tagged | https://cdn.plot.ly/plotly-gl3d-1.45.2.js |
261+
| Tagged minified | https://cdn.plot.ly/plotly-gl3d-1.45.2.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.3 kB |
298+
| 3.4 MB | 1.4 MB | 444.6 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.0.js |
307-
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.45.0.min.js |
306+
| Tagged | https://cdn.plot.ly/plotly-gl2d-1.45.2.js |
307+
| Tagged minified | https://cdn.plot.ly/plotly-gl2d-1.45.2.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.5 kB |
344+
| 2.8 MB | 1.4 MB | 412.7 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.0.js |
353-
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.45.0.min.js |
352+
| Tagged | https://cdn.plot.ly/plotly-mapbox-1.45.2.js |
353+
| Tagged minified | https://cdn.plot.ly/plotly-mapbox-1.45.2.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.3 kB | 277.1 kB |
390+
| 2.4 MB | 850.7 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.0.js |
399-
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.45.0.min.js |
398+
| Tagged | https://cdn.plot.ly/plotly-finance-1.45.2.js |
399+
| Tagged minified | https://cdn.plot.ly/plotly-finance-1.45.2.min.js |
400400

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

0 commit comments

Comments
 (0)