Merge branch 'master' into david-enhancement-modebar-emilykl

Author: emilykl

.circleci/config.yml

@@ -217,11 +217,12 @@ jobs:
   make-baselines-virtual-webgl:
     parallelism: 8
     docker:
-      - image: circleci/python:3.8.9
+      - image: cimg/python:3.12.11
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
           at: ~/
+      - run: sudo apt-get update
       - run:
           name: Install kaleido, plotly.io and required fonts
           command: .circleci/env_image.sh
@@ -235,11 +236,12 @@ jobs:
 
   make-baselines-mathjax3:
     docker:
-      - image: circleci/python:3.8.9
+      - image: cimg/python:3.12.11
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
           at: ~/
+      - run: sudo apt-get update
       - run:
           name: Install kaleido, plotly.io and required fonts
           command: .circleci/env_image.sh
@@ -254,11 +256,12 @@ jobs:
   make-baselines:
     parallelism: 12
     docker:
-      - image: circleci/python:3.8.9
+      - image: cimg/python:3.12.11
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
           at: ~/
+      - run: sudo apt-get update
       - run:
           name: Install kaleido, plotly.io and required fonts
           command: .circleci/env_image.sh
@@ -273,11 +276,12 @@ jobs:
   make-baselines-b64:
     parallelism: 12
     docker:
-      - image: circleci/python:3.8.9
+      - image: cimg/python:3.12.11
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
           at: ~/
+      - run: sudo apt-get update
       - run:
           name: Install kaleido, plotly.io and required fonts
           command: .circleci/env_image.sh
@@ -347,11 +351,12 @@ jobs:
 
   make-exports:
     docker:
-      - image: circleci/python:3.8.9
+      - image: cimg/python:3.12.11
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
           at: ~/
+      - run: sudo apt-get update
       - run:
           name: Install kaleido, plotly.io and required fonts
           command: .circleci/env_image.sh
@@ -362,7 +367,7 @@ jobs:
             sudo apt-get install poppler-utils
       - run:
           name: Create svg, jpg, jpeg, webp, pdf and eps files
-          command: python3 test/image/make_exports.py
+          command: sudo python3 test/image/make_exports.py
       - persist_to_workspace:
           root: ~/
           paths:
@@ -483,12 +488,33 @@ jobs:
           name: Bundle bundle-stackgl/index.js
           command: cd stackgl_modules && cp index.js INDEX.js && npm run bundle-stackgl
       - run:
-          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.
+          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.
           command: diff --unified --color stackgl_modules/INDEX.js stackgl_modules/index.js
       - store_artifacts:
           path: stackgl_modules/index.js
           destination: stackgl_modules/index.js
 
+  test-topojson-build:
+    docker:
+      - image: cimg/node:18.20.4
+    working_directory: ~/plotly.js
+    steps:
+      - checkout
+      - run:
+          name: Set up build environment
+          command: cd topojson && npm ci
+      - run:
+          name: Build topojson
+          command: cd topojson && mv dist dist_backup && npm run build
+      - run:
+          name: Compare existing files with newly built files. Any difference is a failure. A failure might mean that the source data changed.
+          command: diff -qr topojson/dist topojson/dist_backup
+      - run:
+          name: Compress artifacts
+          command: tar -cvzf topojson.tar topojson/dist
+      - store_artifacts:
+          path: topojson.tar
+
 workflows:
   version: 2
   build-and-test:
@@ -560,3 +586,5 @@ workflows:
       - publish-dist-node-v22
 
       - test-stackgl-bundle
+
+      - test-topojson-build

.circleci/env_image.sh

@@ -2,10 +2,20 @@
 set -e
 # install required fonts
 sudo apt-get install fonts-liberation2 fonts-open-sans fonts-noto-cjk fonts-noto-color-emoji
+
+# install pip
+sudo curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+sudo python3 get-pip.py
+
+# install additional fonts
+sudo python3 -m pip install requests
 sudo python3 .circleci/download_google_fonts.py
 sudo cp -r .circleci/fonts/ /usr/share/
+sudo apt install fontconfig
 sudo fc-cache -f
+
 # install kaleido & plotly
-sudo python3 -m pip install kaleido==0.2.1 plotly==5.5.0 --progress-bar off
+sudo python3 -m pip install kaleido==0.2.1 plotly==6.2.0 --progress-bar off
+
 # install numpy i.e. to convert arrays to typed arrays
 sudo python3 -m pip install numpy==1.24.2

.circleci/test.sh

@@ -97,24 +97,24 @@ case $1 in
                   find $ROOT/test/image/mocks/gl*     -type f -printf "%f\n"; \
                   find $ROOT/test/image/mocks/map* -type f -printf "%f\n"; \
                 } | sed 's/\.json$//1' | circleci tests split)
-        python3 test/image/make_baseline.py virtual-webgl $SUITE || EXIT_STATE=$?
+        sudo python3 test/image/make_baseline.py virtual-webgl $SUITE || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
     make-baselines-mathjax3)
-        python3 test/image/make_baseline.py mathjax3    legend_mathjax_title_and_items mathjax parcats_grid_subplots table_latex_multitrace_scatter table_plain_birds table_wrapped_birds ternary-mathjax ternary-mathjax-title-place-subtitle || EXIT_STATE=$?
+        sudo python3 test/image/make_baseline.py mathjax3    legend_mathjax_title_and_items mathjax parcats_grid_subplots table_latex_multitrace_scatter table_plain_birds table_wrapped_birds ternary-mathjax ternary-mathjax-title-place-subtitle || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
     make-baselines-b64)
         SUITE=$(find $ROOT/test/image/mocks/ -type f -printf "%f\n" | sed 's/\.json$//1' | circleci tests split)
-        python3 test/image/make_baseline.py b64 $SUITE || EXIT_STATE=$?
+        sudo python3 test/image/make_baseline.py b64 $SUITE || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
     make-baselines)
         SUITE=$(find $ROOT/test/image/mocks/ -type f -printf "%f\n" | sed 's/\.json$//1' | circleci tests split)
-        python3 test/image/make_baseline.py $SUITE || EXIT_STATE=$?
+        sudo python3 test/image/make_baseline.py $SUITE || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 

.github/workflows/test.yml

@@ -27,7 +27,7 @@ jobs:
     - run: npm run pretest
     - run: npm ci
     - run: npm run cibuild
-    - name: Run headless test
+    - name: Run noCI tests
       uses: coactions/setup-xvfb@v1
       with:
         run: ./tasks/noci_test.sh jasmine

CHANGELOG.md

@@ -9,6 +9,37 @@ To see all merged commits on the master branch that will be part of the next plo
 
 where X.Y.Z is the semver of most recent plotly.js release.
 
+
+## [3.0.2] -- 2025-07-22
+
+### Fixed
+ - Fix installing dependencies in node v22 [[#7381](https://github.com/plotly/plotly.js/pull/7381)], with thanks to @chaigh-uk for the contribution!
+ - Fix Persian calendar leap year [[#7456](https://github.com/plotly/plotly.js/pull/7456)]
+ - Fix scroll wheel zoom for geo subplots in Safari [#7474](https://github.com/plotly/plotly.js/pull/7474)
+ - Add method to check for WebKit WebView user agent string [[#7479](https://github.com/plotly/plotly.js/pull/7479)]
+ - Fix edit colorbar title [7487](https://github.com/plotly/plotly.js/pull/7487)
+
+
+## [3.1.0-rc.0] -- 2025-07-15
+
+### Added
+ - Add property `zerolinelayer` to cartesian axes to allow drawing zeroline above traces [[#7269](https://github.com/plotly/plotly.js/pull/7269)]
+ - 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)]
+ - Allow configuration of horizontal legend max height [[#7359](https://github.com/plotly/plotly.js/pull/7359)]
+ - Add support for ticklabelposition "inside"/"outside" for category axes with `tickson` set to "boundaries" [[#7420](https://github.com/plotly/plotly.js/pull/7420)],
+ with thanks to @my-tien for the contribution!
+
+### Changed
+ - Switch to United Nations (coastlines, countries, land, ocean) + Natural Earth (lakes, rivers, subunits) geodata for building topojson used in geo plot [[#7393](https://github.com/plotly/plotly.js/pull/7393)]
+ - Make 'png' all caps [[#7400](https://github.com/plotly/plotly.js/pull/7400)]
+
+### Fixed
+ - Fix installing dependencies in node v22 [[#7381](https://github.com/plotly/plotly.js/pull/7381)], with thanks to @chaigh-uk for the contribution!
+ - Fix performance warning in scattergl traces, [[#7390](https://github.com/plotly/plotly.js/pull/7390)], with thanks to @MzyzzG for the contribution!
+ - Move css-loader and other dependencies into devDependencies section [[#7407](https://github.com/plotly/plotly.js/pull/7407)]
+ - Fix Persian calendar leap year [[#7456](https://github.com/plotly/plotly.js/pull/7456)]
+
+
 ## [3.0.1] -- 2025-02-18
 
 ### Changed

CITATION.cff

@@ -9,7 +9,7 @@ authors:
 - family-names: "Samimi"
   given-names: "Mojtaba"
 title: "Open source Plotly charting library"
-version: 3.0.1
+version: 3.1.0-rc.0
 doi: 10.5281/zenodo.13964707
-date-released: 2025-01-27
+date-released: 2025-07-15
 url: "https://github.com/plotly/plotly.js"

README.md

@@ -62,7 +62,7 @@ You may also consider using [`plotly.js-dist`](https://www.npmjs.com/package/plo
 
 ```html
 <head>
-    <script src="https://cdn.plot.ly/plotly-3.0.1.min.js" charset="utf-8"></script>
+    <script src="https://cdn.plot.ly/plotly-3.1.0-rc.0.min.js" charset="utf-8"></script>
 </head>
 <body>
     <div id="gd"></div>
@@ -79,7 +79,7 @@ You may also consider using [`plotly.js-dist`](https://www.npmjs.com/package/plo
 Alternatively you may consider using [native ES6 import](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules) in the script tag.
 ```html
 <script type="module">
-    import "https://cdn.plot.ly/plotly-3.0.1.min.js"
+    import "https://cdn.plot.ly/plotly-3.1.0-rc.0.min.js"
     Plotly.newPlot("gd", [{ y: [1, 2, 3] }])
 </script>
 ```
@@ -89,7 +89,7 @@ Fastly supports Plotly.js with free CDN service. Read more at <https://www.fastl
 ### Un-minified versions are also available on CDN
 While non-minified source files may contain characters outside UTF-8, it is recommended that you specify the `charset` when loading those bundles.
 ```html
-<script src="https://cdn.plot.ly/plotly-3.0.1.js" charset="utf-8"></script>
+<script src="https://cdn.plot.ly/plotly-3.1.0-rc.0.js" charset="utf-8"></script>
 ```
 
 > 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/devtools.js

@@ -17,8 +17,7 @@ var Tabs = {
         Plotly.setPlotConfig({
 
             // use local topojson files
-            topojsonURL: '../../node_modules/sane-topojson/dist/',
-
+            topojsonURL: "../../topojson/dist",
             // register mapbox access token
             // run `npm run preset` if you haven't yet
             mapboxAccessToken: credentials.MAPBOX_ACCESS_TOKEN,
@@ -268,4 +267,3 @@ function handleOnLoad() {
     Tabs.setPlotConfig();
     plotFromHash();
 }
-