Skip to content

Commit 7994f54

Browse files
emilyklemilykl
committed
Merge branch 'master' into ekl-my-tien-label-spacing
2 parents 930e057 + 79559af commit 7994f54

File tree

198 files changed

+42651
-4810
lines changed

Some content is hidden

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

198 files changed

+42651
-4810
lines changed

‎.circleci/config.yml‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ jobs:
407407
name: Run syntax tests on source files
408408
command: .circleci/test.sh source-syntax
409409

410-
publish-dist:
410+
publish-dist: &publish-dist
411411
docker:
412412
- image: cimg/node:18.20.4
413413
working_directory: ~/plotly.js
@@ -465,6 +465,11 @@ jobs:
465465
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")
466466
command: diff --unified --color dist/plot-schema.json test/plot-schema.json
467467

468+
publish-dist-node-v22:
469+
<<: *publish-dist
470+
docker:
471+
- image: cimg/node:22.14.0
472+
468473
test-stackgl-bundle:
469474
docker:
470475
- image: cimg/node:18.20.4
@@ -478,11 +483,32 @@ jobs:
478483
name: Bundle bundle-stackgl/index.js
479484
command: cd stackgl_modules && cp index.js INDEX.js && npm run bundle-stackgl
480485
- run:
481-
name: Test stackgl_modules/index.js diff - If failed please remember this file in auto generated and you should not modify it directly until a dependeny change. To suggest changes please submit pull request to the relevant dependency.
486+
name: Test stackgl_modules/index.js diff - If failed please remember this file in auto generated and you should not modify it directly until a dependency change. To suggest changes please submit pull request to the relevant dependency.
482487
command: diff --unified --color stackgl_modules/INDEX.js stackgl_modules/index.js
483488
- store_artifacts:
484489
path: stackgl_modules/index.js
485490
destination: stackgl_modules/index.js
491+
492+
test-topojson-build:
493+
docker:
494+
- image: cimg/node:18.20.4
495+
working_directory: ~/plotly.js
496+
steps:
497+
- checkout
498+
- run:
499+
name: Set up build environment
500+
command: cd topojson && npm ci
501+
- run:
502+
name: Build topojson
503+
command: cd topojson && mv dist dist_backup && npm run build
504+
- run:
505+
name: Compare existing files with newly built files. Any difference is a failure. A failure might mean that the source data changed.
506+
command: diff -qr topojson/dist topojson/dist_backup
507+
- run:
508+
name: Compress artifacts
509+
command: tar -cvzf topojson.tar topojson/dist
510+
- store_artifacts:
511+
path: topojson.tar
486512

487513
workflows:
488514
version: 2
@@ -552,4 +578,8 @@ workflows:
552578

553579
- publish-dist
554580

581+
- publish-dist-node-v22
582+
555583
- test-stackgl-bundle
584+
585+
- test-topojson-build

‎.github/workflows/test.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
2+
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
3+
4+
name: No CI Test
5+
6+
on: push
7+
8+
jobs:
9+
build:
10+
11+
runs-on: ubuntu-latest
12+
13+
strategy:
14+
matrix:
15+
node-version: [18.x]
16+
17+
steps:
18+
- uses: browser-actions/setup-chrome@v1
19+
- uses: actions/checkout@v4
20+
- name: Use Node.js ${{ matrix.node-version }}
21+
uses: actions/setup-node@v4
22+
with:
23+
node-version: ${{ matrix.node-version }}
24+
cache: 'npm'
25+
- run: chrome --version
26+
- run: ls
27+
- run: npm run pretest
28+
- run: npm ci
29+
- run: npm run cibuild
30+
- name: Run noCI tests
31+
uses: coactions/setup-xvfb@v1
32+
with:
33+
run: ./tasks/noci_test.sh jasmine

‎CHANGELOG.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,26 @@ 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+
## [3.1.0-rc.0] -- 2025-07-15
13+
14+
### Added
15+
- Add property `zerolinelayer` to cartesian axes to allow drawing zeroline above traces [[#7269](https://github.com/plotly/plotly.js/pull/7269)]
16+
- Add `pattern.path` attribute as an alternative to the preset `pattern.shape` values, so you can use any SVG path string as a pattern fill. [[#7280](https://github.com/plotly/plotly.js/pull/7280)]
17+
- Allow configuration of horizontal legend max height [[#7359](https://github.com/plotly/plotly.js/pull/7359)]
18+
- Add support for ticklabelposition "inside"/"outside" for category axes with `tickson` set to "boundaries" [[#7420](https://github.com/plotly/plotly.js/pull/7420)],
19+
with thanks to @my-tien for the contribution!
20+
21+
### Changed
22+
- Switch to United Nations (coastlines, countries, land, ocean) + Natural Earth (lakes, rivers, subunits) geodata for building topojson used in geo plot
23+
- Make 'png' all caps [[#7400](https://github.com/plotly/plotly.js/pull/7400)]
24+
25+
### Fixed
26+
- Fix installing dependencies in node v22 [[#7381](https://github.com/plotly/plotly.js/pull/7381)], with thanks to @chaigh-uk for the contribution!
27+
- Fix performance warning in scattergl traces, [[#7390](https://github.com/plotly/plotly.js/pull/7390)], with thanks to @MzyzzG for the contribution!
28+
- Move css-loader and other dependencies into devDependencies section [[#7407](https://github.com/plotly/plotly.js/pull/7407)]
29+
- Fix Persian calendar leap year [[#7456](https://github.com/plotly/plotly.js/pull/7456)]
30+
31+
1232
## [3.0.1] -- 2025-02-18
1333

1434
### Changed

‎CITATION.cff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ authors:
99
- family-names: "Samimi"
1010
given-names: "Mojtaba"
1111
title: "Open source Plotly charting library"
12-
version: 3.0.1
12+
version: 3.1.0-rc.0
1313
doi: 10.5281/zenodo.13964707
14-
date-released: 2025-01-27
14+
date-released: 2025-07-15
1515
url: "https://github.com/plotly/plotly.js"

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ You may also consider using [`plotly.js-dist`](https://www.npmjs.com/package/plo
6262
6363
```html
6464
<head>
65-
<script src="https://cdn.plot.ly/plotly-3.0.1.min.js" charset="utf-8"></script>
65+
<script src="https://cdn.plot.ly/plotly-3.1.0-rc.0.min.js" charset="utf-8"></script>
6666
</head>
6767
<body>
6868
<div id="gd"></div>
@@ -79,7 +79,7 @@ You may also consider using [`plotly.js-dist`](https://www.npmjs.com/package/plo
7979
Alternatively you may consider using [native ES6 import](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules) in the script tag.
8080
```html
8181
<script type="module">
82-
import "https://cdn.plot.ly/plotly-3.0.1.min.js"
82+
import "https://cdn.plot.ly/plotly-3.1.0-rc.0.min.js"
8383
Plotly.newPlot("gd", [{ y: [1, 2, 3] }])
8484
</script>
8585
```
@@ -89,7 +89,7 @@ Fastly supports Plotly.js with free CDN service. Read more at <https://www.fastl
8989
### Un-minified versions are also available on CDN
9090
While non-minified source files may contain characters outside UTF-8, it is recommended that you specify the `charset` when loading those bundles.
9191
```html
92-
<script src="https://cdn.plot.ly/plotly-3.0.1.js" charset="utf-8"></script>
92+
<script src="https://cdn.plot.ly/plotly-3.1.0-rc.0.js" charset="utf-8"></script>
9393
```
9494

9595
> 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/regl_codegen/devtools.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,5 +158,3 @@ function handleOnLoad() {
158158
window.close();
159159
});
160160
}
161-
162-
module.exports = Tabs;

‎devtools/test_dashboard/devtools.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ var Tabs = {
1717
Plotly.setPlotConfig({
1818

1919
// use local topojson files
20-
topojsonURL: '../../node_modules/sane-topojson/dist/',
21-
20+
topojsonURL: "../../topojson/dist",
2221
// register mapbox access token
2322
// run `npm run preset` if you haven't yet
2423
mapboxAccessToken: credentials.MAPBOX_ACCESS_TOKEN,
@@ -268,5 +267,3 @@ function handleOnLoad() {
268267
Tabs.setPlotConfig();
269268
plotFromHash();
270269
}
271-
272-
module.exports = Tabs;

‎dist/README.md‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ The main plotly.js bundles weight in at:
4343

4444
| plotly.js | plotly.min.js | plotly.min.js + gzip | plotly-with-meta.js |
4545
|-----------|---------------|----------------------|---------------------|
46-
| 10.3 MB | 4.4 MB | 1.4 MB | 10.6 MB |
46+
| 10.6 MB | 4.5 MB | 1.4 MB | 10.9 MB |
4747

4848
#### CDN links
49-
> https://cdn.plot.ly/plotly-3.0.1.js
49+
> https://cdn.plot.ly/plotly-3.1.0-rc.0.js
5050
51-
> https://cdn.plot.ly/plotly-3.0.1.min.js
51+
> https://cdn.plot.ly/plotly-3.1.0-rc.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.6 MB | 1008.3 kB | 349.2 kB |
94+
| 2.6 MB | 1009 kB | 349.4 kB |
9595

9696
#### CDN links
97-
> https://cdn.plot.ly/plotly-basic-3.0.1.js
97+
> https://cdn.plot.ly/plotly-basic-3.1.0-rc.0.js
9898
99-
> https://cdn.plot.ly/plotly-basic-3.0.1.min.js
99+
> https://cdn.plot.ly/plotly-basic-3.1.0-rc.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.3 MB | 1.3 MB | 446.4 kB |
117+
| 3.3 MB | 1.3 MB | 447.3 kB |
118118

119119
#### CDN links
120-
> https://cdn.plot.ly/plotly-cartesian-3.0.1.js
120+
> https://cdn.plot.ly/plotly-cartesian-3.1.0-rc.0.js
121121
122-
> https://cdn.plot.ly/plotly-cartesian-3.0.1.min.js
122+
> https://cdn.plot.ly/plotly-cartesian-3.1.0-rc.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-
| 2.9 MB | 1.1 MB | 398.7 kB |
140+
| 2.9 MB | 1.1 MB | 398.9 kB |
141141

142142
#### CDN links
143-
> https://cdn.plot.ly/plotly-geo-3.0.1.js
143+
> https://cdn.plot.ly/plotly-geo-3.1.0-rc.0.js
144144
145-
> https://cdn.plot.ly/plotly-geo-3.0.1.min.js
145+
> https://cdn.plot.ly/plotly-geo-3.1.0-rc.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-
| 4.1 MB | 1.5 MB | 513.5 kB |
163+
| 4.1 MB | 1.5 MB | 513.8 kB |
164164

165165
#### CDN links
166-
> https://cdn.plot.ly/plotly-gl3d-3.0.1.js
166+
> https://cdn.plot.ly/plotly-gl3d-3.1.0-rc.0.js
167167
168-
> https://cdn.plot.ly/plotly-gl3d-3.0.1.min.js
168+
> https://cdn.plot.ly/plotly-gl3d-3.1.0-rc.0.min.js
169169
170170

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

184184
| Raw size | Minified size | Minified + gzip size |
185185
|------|-----------------|------------------------|
186-
| 3.4 MB | 1.3 MB | 470.3 kB |
186+
| 3.7 MB | 1.4 MB | 506 kB |
187187

188188
#### CDN links
189-
> https://cdn.plot.ly/plotly-gl2d-3.0.1.js
189+
> https://cdn.plot.ly/plotly-gl2d-3.1.0-rc.0.js
190190
191-
> https://cdn.plot.ly/plotly-gl2d-3.0.1.min.js
191+
> https://cdn.plot.ly/plotly-gl2d-3.1.0-rc.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.4 MB | 1.8 MB | 564.4 kB |
209+
| 4.4 MB | 1.8 MB | 564.6 kB |
210210

211211
#### CDN links
212-
> https://cdn.plot.ly/plotly-mapbox-3.0.1.js
212+
> https://cdn.plot.ly/plotly-mapbox-3.1.0-rc.0.js
213213
214-
> https://cdn.plot.ly/plotly-mapbox-3.0.1.min.js
214+
> https://cdn.plot.ly/plotly-mapbox-3.1.0-rc.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.8 MB | 1.1 MB | 382.9 kB |
232+
| 2.8 MB | 1.1 MB | 383.1 kB |
233233

234234
#### CDN links
235-
> https://cdn.plot.ly/plotly-finance-3.0.1.js
235+
> https://cdn.plot.ly/plotly-finance-3.1.0-rc.0.js
236236
237-
> https://cdn.plot.ly/plotly-finance-3.0.1.min.js
237+
> https://cdn.plot.ly/plotly-finance-3.1.0-rc.0.min.js
238238
239239

240240
#### npm packages
@@ -252,12 +252,12 @@ The `strict` partial bundle contains trace modules `bar`, `barpolar`, `box`, `ca
252252

253253
| Raw size | Minified size | Minified + gzip size |
254254
|------|-----------------|------------------------|
255-
| 11.1 MB | 4.8 MB | 1.5 MB |
255+
| 11.4 MB | 4.9 MB | 1.5 MB |
256256

257257
#### CDN links
258-
> https://cdn.plot.ly/plotly-strict-3.0.1.js
258+
> https://cdn.plot.ly/plotly-strict-3.1.0-rc.0.js
259259
260-
> https://cdn.plot.ly/plotly-strict-3.0.1.min.js
260+
> https://cdn.plot.ly/plotly-strict-3.1.0-rc.0.min.js
261261
262262

263263
#### npm packages

0 commit comments

Comments
 (0)