Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 983e5da

Browse files
emilyklemilykl
committed
Merge branch 'master' into add-text-to-shapes
2 parents b6ae276 + 51e7512 commit 983e5da

Some content is hidden

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

62 files changed

+1637
-782
lines changed

‎.circleci/config.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
install-and-cibuild: # main cibuild using node 16 & npm 7
3030
docker:
31-
- image: cimg/node:16.8.0
31+
- image: cimg/node:16.17.1
3232
working_directory: ~/plotly.js
3333
steps:
3434
- checkout
@@ -52,7 +52,7 @@ jobs:
5252
timezone-jasmine:
5353
docker:
5454
# need '-browsers' version to test in real (xvfb-wrapped) browsers
55-
- image: cimg/node:16.8.0-browsers
55+
- image: cimg/node:16.17.1-browsers
5656
working_directory: ~/plotly.js
5757
steps:
5858
- browser-tools/install-browser-tools: &browser-versions
@@ -85,7 +85,7 @@ jobs:
8585
no-gl-jasmine:
8686
docker:
8787
# need '-browsers' version to test in real (xvfb-wrapped) browsers
88-
- image: cimg/node:16.8.0-browsers
88+
- image: cimg/node:16.17.1-browsers
8989
environment:
9090
# Alaska time (arbitrary timezone to test date logic)
9191
TZ: "America/Anchorage"
@@ -105,7 +105,7 @@ jobs:
105105
webgl-jasmine:
106106
docker:
107107
# need '-browsers' version to test in real (xvfb-wrapped) browsers
108-
- image: cimg/node:16.8.0-browsers
108+
- image: cimg/node:16.17.1-browsers
109109
environment:
110110
# Alaska time (arbitrary timezone to test date logic)
111111
TZ: "America/Anchorage"
@@ -125,7 +125,7 @@ jobs:
125125
flaky-no-gl-jasmine:
126126
docker:
127127
# need '-browsers' version to test in real (xvfb-wrapped) browsers
128-
- image: cimg/node:16.8.0-browsers
128+
- image: cimg/node:16.17.1-browsers
129129
environment:
130130
# Alaska time (arbitrary timezone to test date logic)
131131
TZ: "America/Anchorage"
@@ -144,7 +144,7 @@ jobs:
144144
bundle-jasmine:
145145
docker:
146146
# need '-browsers' version to test in real (xvfb-wrapped) browsers
147-
- image: cimg/node:16.8.0-browsers
147+
- image: cimg/node:16.17.1-browsers
148148
environment:
149149
# Alaska time (arbitrary timezone to test date logic)
150150
TZ: "America/Anchorage"
@@ -163,7 +163,7 @@ jobs:
163163
mathjax-firefox81:
164164
docker:
165165
# need '-browsers' version to test in real (xvfb-wrapped) browsers
166-
- image: cimg/node:16.8.0-browsers
166+
- image: cimg/node:16.17.1-browsers
167167
environment:
168168
# Alaska time (arbitrary timezone to test date logic)
169169
TZ: "America/Anchorage"
@@ -182,7 +182,7 @@ jobs:
182182
mathjax-firefox82:
183183
docker:
184184
# need '-browsers' version to test in real (xvfb-wrapped) browsers
185-
- image: cimg/node:16.8.0-browsers
185+
- image: cimg/node:16.17.1-browsers
186186
environment:
187187
# Alaska time (arbitrary timezone to test date logic)
188188
TZ: "America/Anchorage"
@@ -201,7 +201,7 @@ jobs:
201201
mathjax-firefoxLatest:
202202
docker:
203203
# need '-browsers' version to test in real (xvfb-wrapped) browsers
204-
- image: cimg/node:16.8.0-browsers
204+
- image: cimg/node:16.17.1-browsers
205205
environment:
206206
# Alaska time (arbitrary timezone to test date logic)
207207
TZ: "America/Anchorage"
@@ -255,7 +255,7 @@ jobs:
255255

256256
test-baselines:
257257
docker:
258-
- image: circleci/node:16.8.0
258+
- image: circleci/node:16.9.0
259259
working_directory: ~/plotly.js
260260
steps:
261261
- attach_workspace:
@@ -269,7 +269,7 @@ jobs:
269269

270270
test-baselines-mathjax3:
271271
docker:
272-
- image: circleci/node:16.8.0
272+
- image: circleci/node:16.9.0
273273
working_directory: ~/plotly.js
274274
steps:
275275
- attach_workspace:
@@ -306,7 +306,7 @@ jobs:
306306

307307
test-exports:
308308
docker:
309-
- image: circleci/node:16.8.0
309+
- image: circleci/node:16.9.0
310310
working_directory: ~/plotly.js
311311
steps:
312312
- attach_workspace:
@@ -320,7 +320,7 @@ jobs:
320320

321321
mock-validation:
322322
docker:
323-
- image: cimg/node:16.8.0
323+
- image: cimg/node:16.17.1
324324
working_directory: ~/plotly.js
325325
steps:
326326
- attach_workspace:
@@ -334,7 +334,7 @@ jobs:
334334

335335
source-syntax:
336336
docker:
337-
- image: cimg/node:16.8.0
337+
- image: cimg/node:16.17.1
338338
working_directory: ~/plotly.js
339339
steps:
340340
- attach_workspace:
@@ -345,7 +345,7 @@ jobs:
345345

346346
publish-dist:
347347
docker:
348-
- image: cimg/node:16.8.0
348+
- image: cimg/node:16.17.1
349349
working_directory: ~/plotly.js
350350
steps:
351351
- checkout
@@ -400,18 +400,18 @@ jobs:
400400
- run:
401401
name: Test plot-schema.json diff - If failed, after (npm start) you could run (npm run schema && git add test/plot-schema.json && git commit -m "update plot-schema diff")
402402
command: diff --unified --color dist/plot-schema.json test/plot-schema.json
403+
- run:
404+
name: Test plotly.min.js import using amdefine
405+
command: npm run test-amdefine
403406
- run:
404407
name: Test plotly.min.js import using requirejs
405408
command: npm run test-requirejs
406-
- run:
407-
name: Display function constructors in all bundles (only on master)
408-
command: |
409-
if [ $CIRCLE_BRANCH == "master" ]
410-
then npm run no-new-func
411-
fi
412409
- run:
413410
name: Test plotly bundles against es6
414411
command: npm run no-es6-dist
412+
- run:
413+
name: Display function constructors in all bundles
414+
command: npm run no-new-func
415415

416416
workflows:
417417
version: 2

‎.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ node_modules
33
dist
44
build
55

6+
tasks/test_amdefine.js
67
tasks/test_requirejs.js
78
test/jasmine/assets/jquery-1.8.3.min.js

‎CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,25 @@ To see all merged commits on the master branch that will be part of the next plo
99

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

12+
## [2.18.0] -- 2023-01-19
13+
14+
### Added
15+
- Add `sync` tickmode option [[#6356](https://github.com/plotly/plotly.js/pull/6356), [#6443](https://github.com/plotly/plotly.js/pull/6443)],
16+
with thanks to @filipesantiagoAM and @VictorBezak for the contribution!
17+
18+
### Changed
19+
- Improve detection of mobile & tablet devices for WebGL rendering by upgrading `is-mobile` [[#6432](https://github.com/plotly/plotly.js/pull/6432)]
20+
21+
### Fixed
22+
- Fix library's imported name using `requirejs` AMD loader (regression introduced in 2.17.0) [[#6440](https://github.com/plotly/plotly.js/pull/6440)]
23+
24+
25+
## [2.17.1] -- 2023-01-09
26+
27+
### Fixed
28+
- Fix line redraw (regression introduced in 2.15.0) [[#6429](https://github.com/plotly/plotly.js/pull/6429)]
29+
30+
1231
## [2.17.0] -- 2022-12-22
1332

1433
### Added

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ You may also consider using [`plotly.js-dist`](https://www.npmjs.com/package/plo
5555
5656
```html
5757
<head>
58-
<script src="https://cdn.plot.ly/plotly-2.17.0.min.js"></script>
58+
<script src="https://cdn.plot.ly/plotly-2.18.0.min.js"></script>
5959
</head>
6060
<body>
6161
<div id="gd"></div>
@@ -72,7 +72,7 @@ You may also consider using [`plotly.js-dist`](https://www.npmjs.com/package/plo
7272
Alternatively you may consider using [native ES6 import](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules) in the script tag.
7373
```html
7474
<script type="module">
75-
import "https://cdn.plot.ly/plotly-2.17.0.min.js"
75+
import "https://cdn.plot.ly/plotly-2.18.0.min.js"
7676
Plotly.newPlot("gd", [{ y: [1, 2, 3] }])
7777
</script>
7878
```
@@ -82,7 +82,7 @@ Fastly supports Plotly.js with free CDN service. Read more at <https://www.fastl
8282
### Un-minified versions are also available on CDN
8383
While non-minified source files may contain characters outside UTF-8, it is recommended that you specify the `charset` when loading those bundles.
8484
```html
85-
<script src="https://cdn.plot.ly/plotly-2.17.0.js" charset="utf-8"></script>
85+
<script src="https://cdn.plot.ly/plotly-2.18.0.js" charset="utf-8"></script>
8686
```
8787

8888
> Please note that as of v2 the "plotly-latest" outputs (e.g. https://cdn.plot.ly/plotly-latest.min.js) will no longer be updated on the CDN, and will stay at the last v1 patch v1.58.5. Therefore, to use the CDN with plotly.js v2 and higher, you must specify an exact plotly.js version.

‎devtools/test_dashboard/server.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ devtoolsConfig.output = {
3737
filename: 'test_dashboard-bundle.js',
3838
library: {
3939
name: 'Tabs',
40-
type: 'umd',
41-
umdNamedDefine: true
40+
type: 'umd'
4241
}
4342
};
4443

‎dist/README.md

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ The main plotly.js bundles weight in at:
4646
| 8.1 MB | 3.4 MB | 1 MB | 8.4 MB |
4747

4848
#### CDN links
49-
> https://cdn.plot.ly/plotly-2.17.0.js
49+
> https://cdn.plot.ly/plotly-2.18.0.js
5050
51-
> https://cdn.plot.ly/plotly-2.17.0.min.js
51+
> https://cdn.plot.ly/plotly-2.18.0.min.js
5252
5353

5454
#### npm packages
@@ -91,12 +91,12 @@ The `basic` partial bundle contains trace modules `bar`, `pie` and `scatter`.
9191

9292
| Raw size | Minified size | Minified + gzip size |
9393
|------|-----------------|------------------------|
94-
| 2.5 MB | 952.9 kB | 318.4 kB |
94+
| 2.5 MB | 953.4 kB | 318.6 kB |
9595

9696
#### CDN links
97-
> https://cdn.plot.ly/plotly-basic-2.17.0.js
97+
> https://cdn.plot.ly/plotly-basic-2.18.0.js
9898
99-
> https://cdn.plot.ly/plotly-basic-2.17.0.min.js
99+
> https://cdn.plot.ly/plotly-basic-2.18.0.min.js
100100
101101

102102
#### npm packages
@@ -114,12 +114,12 @@ The `cartesian` partial bundle contains trace modules `bar`, `box`, `contour`, `
114114

115115
| Raw size | Minified size | Minified + gzip size |
116116
|------|-----------------|------------------------|
117-
| 3.2 MB | 1.2 MB | 404.6 kB |
117+
| 3.2 MB | 1.2 MB | 404.8 kB |
118118

119119
#### CDN links
120-
> https://cdn.plot.ly/plotly-cartesian-2.17.0.js
120+
> https://cdn.plot.ly/plotly-cartesian-2.18.0.js
121121
122-
> https://cdn.plot.ly/plotly-cartesian-2.17.0.min.js
122+
> https://cdn.plot.ly/plotly-cartesian-2.18.0.min.js
123123
124124

125125
#### npm packages
@@ -137,12 +137,12 @@ The `geo` partial bundle contains trace modules `choropleth`, `scatter` and `sca
137137

138138
| Raw size | Minified size | Minified + gzip size |
139139
|------|-----------------|------------------------|
140-
| 3.1 MB | 1.1 MB | 362.4 kB |
140+
| 3.1 MB | 1.1 MB | 362.6 kB |
141141

142142
#### CDN links
143-
> https://cdn.plot.ly/plotly-geo-2.17.0.js
143+
> https://cdn.plot.ly/plotly-geo-2.18.0.js
144144
145-
> https://cdn.plot.ly/plotly-geo-2.17.0.min.js
145+
> https://cdn.plot.ly/plotly-geo-2.18.0.min.js
146146
147147

148148
#### npm packages
@@ -160,12 +160,12 @@ The `gl3d` partial bundle contains trace modules `cone`, `isosurface`, `mesh3d`,
160160

161161
| Raw size | Minified size | Minified + gzip size |
162162
|------|-----------------|------------------------|
163-
| 3.5 MB | 1.5 MB | 482.7 kB |
163+
| 3.5 MB | 1.5 MB | 482.9 kB |
164164

165165
#### CDN links
166-
> https://cdn.plot.ly/plotly-gl3d-2.17.0.js
166+
> https://cdn.plot.ly/plotly-gl3d-2.18.0.js
167167
168-
> https://cdn.plot.ly/plotly-gl3d-2.17.0.min.js
168+
> https://cdn.plot.ly/plotly-gl3d-2.18.0.min.js
169169
170170

171171
#### npm packages
@@ -183,12 +183,12 @@ The `gl2d` partial bundle contains trace modules `heatmapgl`, `parcoords`, `poin
183183

184184
| Raw size | Minified size | Minified + gzip size |
185185
|------|-----------------|------------------------|
186-
| 4.3 MB | 1.8 MB | 589.6 kB |
186+
| 4.3 MB | 1.8 MB | 589.8 kB |
187187

188188
#### CDN links
189-
> https://cdn.plot.ly/plotly-gl2d-2.17.0.js
189+
> https://cdn.plot.ly/plotly-gl2d-2.18.0.js
190190
191-
> https://cdn.plot.ly/plotly-gl2d-2.17.0.min.js
191+
> https://cdn.plot.ly/plotly-gl2d-2.18.0.min.js
192192
193193

194194
#### npm packages
@@ -206,12 +206,12 @@ The `mapbox` partial bundle contains trace modules `choroplethmapbox`, `densitym
206206

207207
| Raw size | Minified size | Minified + gzip size |
208208
|------|-----------------|------------------------|
209-
| 4.3 MB | 1.7 MB | 519.2 kB |
209+
| 4.3 MB | 1.7 MB | 519.5 kB |
210210

211211
#### CDN links
212-
> https://cdn.plot.ly/plotly-mapbox-2.17.0.js
212+
> https://cdn.plot.ly/plotly-mapbox-2.18.0.js
213213
214-
> https://cdn.plot.ly/plotly-mapbox-2.17.0.min.js
214+
> https://cdn.plot.ly/plotly-mapbox-2.18.0.min.js
215215
216216

217217
#### npm packages
@@ -229,12 +229,12 @@ The `finance` partial bundle contains trace modules `bar`, `candlestick`, `funne
229229

230230
| Raw size | Minified size | Minified + gzip size |
231231
|------|-----------------|------------------------|
232-
| 2.7 MB | 1 MB | 346.8 kB |
232+
| 2.7 MB | 1 MB | 347.1 kB |
233233

234234
#### CDN links
235-
> https://cdn.plot.ly/plotly-finance-2.17.0.js
235+
> https://cdn.plot.ly/plotly-finance-2.18.0.js
236236
237-
> https://cdn.plot.ly/plotly-finance-2.17.0.min.js
237+
> https://cdn.plot.ly/plotly-finance-2.18.0.min.js
238238
239239

240240
#### npm packages
@@ -255,9 +255,9 @@ The `strict` partial bundle contains trace modules `bar`, `barpolar`, `box`, `ca
255255
| 8.5 MB | 3.7 MB | 1.1 MB |
256256

257257
#### CDN links
258-
> https://cdn.plot.ly/plotly-strict-2.17.0.js
258+
> https://cdn.plot.ly/plotly-strict-2.18.0.js
259259
260-
> https://cdn.plot.ly/plotly-strict-2.17.0.min.js
260+
> https://cdn.plot.ly/plotly-strict-2.18.0.min.js
261261
262262

263263
#### npm packages

0 commit comments

Comments
 (0)