Merge remote-tracking branch 'origin/master' into new-d3-geo

Author: archmoj

.circleci/config.yml

@@ -15,19 +15,8 @@ jobs:
     steps:
       - checkout
       - run:
-          name: set heap option before very first node.js call
-          command: |
-            export NODE_OPTIONS='--max-old-space-size=4096'
-      - run:
-          name: Install dependencies
-          command: |
-            npm ci
-      - run:
-          name: List dependency versions
-          command: |
-            echo "npm: $(npm --version)"
-            echo "node: $(node --version)"
-            npm ls || true
+          name: set up build environment
+          command: .circleci/env_build.sh
       - run:
           name: Pretest
           command: |
@@ -51,7 +40,7 @@ jobs:
           at: ~/
       - run:
           name: Run jasmine tests (part A)
-          command: ./.circleci/test.sh no-gl-jasmine
+          command: .circleci/test.sh no-gl-jasmine
 
   webgl-jasmine:
     docker:
@@ -64,7 +53,7 @@ jobs:
           at: ~/
       - run:
           name: Run jasmine tests (part B)
-          command: ./.circleci/test.sh webgl-jasmine
+          command: .circleci/test.sh webgl-jasmine
 
   flaky-no-gl-jasmine:
     docker:
@@ -76,7 +65,7 @@ jobs:
           at: ~/
       - run:
           name: Run jasmine tests (part C)
-          command: ./.circleci/test.sh flaky-no-gl-jasmine
+          command: .circleci/test.sh flaky-no-gl-jasmine
 
   make-baselines:
     parallelism: 4
@@ -87,34 +76,11 @@ jobs:
       - attach_workspace:
           at: ~/
       - run:
-          name: which pip3 version
-          command: which pip3 && pip3 --version
-      - run:
-          name: install kaleido v0.2.1
-          command: python3 -m pip install kaleido==0.2.1
-      - run:
-          name: install plotly.io v5.0.0
-          command: python3 -m pip install plotly==5.0.0
-      - run:
-          name: install liberation2 fonts
-          command: sudo apt-get install fonts-liberation2
-      - run:
-          name: install OpenSans fonts
-          command: sudo apt-get install fonts-open-sans
-      - run:
-          name: install NotoSansCJK fonts
-          command: sudo apt install fonts-noto-cjk
-      - run:
-          name: download google fonts e.g. Dosis, GravitasOne, NotoSansMono, NotoSans, NotoSerif, Old_Standard_TT, PT_Sans_Narrow, Raleway and Roboto
-          command: python3 ./.circleci/download_google_fonts.py
-      - run:
-          name: install downloaded google fonts
-          command: |
-            sudo cp -r .circleci/fonts/ /usr/share/
-            sudo fc-cache -f
+          name: install kaleido, plotly.io and required fonts
+          command: .circleci/env_image.sh
       - run:
           name: create all png files
-          command: ./.circleci/test.sh make-baselines
+          command: .circleci/test.sh make-baselines
       - persist_to_workspace:
           root: ~/
           paths:
@@ -129,7 +95,7 @@ jobs:
           at: ~/
       - run:
           name: compare pixels
-          command: ./.circleci/test.sh test-image ; find build -maxdepth 1 -type f -delete
+          command: .circleci/test.sh test-image ; find build -maxdepth 1 -type f -delete
       - store_artifacts:
           path: build
           destination: /
@@ -142,14 +108,8 @@ jobs:
       - attach_workspace:
           at: ~/
       - run:
-          name: which pip3 version
-          command: which pip3 && pip3 --version
-      - run:
-          name: install kaleido v0.2.1
-          command: python3 -m pip install kaleido==0.2.1
-      - run:
-          name: install plotly.io v5.0.0
-          command: python3 -m pip install plotly==5.0.0
+          name: install kaleido, plotly.io and required fonts
+          command: .circleci/env_image.sh
       - run:
           name: install poppler-utils to have pdftops for exporting eps
           command: sudo apt-get install poppler-utils
@@ -198,7 +158,7 @@ jobs:
           at: ~/
       - run:
           name: Run syntax tests on source files
-          command: ./.circleci/test.sh source-syntax
+          command: .circleci/test.sh source-syntax
 
   jasmine-bundle:
     docker:
@@ -210,15 +170,17 @@ jobs:
           at: ~/
       - run:
           name: Run jasmine tests (part D)
-          command: ./.circleci/test.sh jasmine-bundle
+          command: .circleci/test.sh jasmine-bundle
 
   publish-dist:
     docker:
       - image: circleci/node:12.22.1
     working_directory: ~/plotly.js
     steps:
-      - attach_workspace:
-          at: ~/
+      - checkout
+      - run:
+          name: set up build environment
+          command: .circleci/env_build.sh
       - run:
           name: Build dist/
           command: npm run build
@@ -242,18 +204,6 @@ jobs:
             echo https://$CIRCLE_BUILD_NUM-$PROJECT_NUM-gh.circle-artifacts.com/0/dist/plotly.js
             echo https://$CIRCLE_BUILD_NUM-$PROJECT_NUM-gh.circle-artifacts.com/0/dist/plotly.min.js
             echo https://$CIRCLE_BUILD_NUM-$PROJECT_NUM-gh.circle-artifacts.com/0/dist/plot-schema.json
-      - persist_to_workspace:
-          root: ~/
-          paths:
-            - plotly.js
-
-  test-dist1:
-    docker:
-      - image: circleci/node:12.22.1
-    working_directory: ~/plotly.js
-    steps:
-      - attach_workspace:
-          at: ~/
       - run:
           name: Test plotly.min.js import using requirejs
           command: npm run test-requirejs
@@ -263,20 +213,9 @@ jobs:
       - run:
           name: Test certain bundles against function constructors
           command: npm run no-new-func
-
-  test-dist2:
-    docker:
-      - image: circleci/node:12.22.1
-    working_directory: ~/plotly.js
-    steps:
-      - attach_workspace:
-          at: ~/
       - run:
           name: Test plotly bundles against es6
           command: npm run no-es6-dist
-      - run:
-          name: Test plotly bundles againt duplicate keys
-          command: npm run no-dup-keys
 
 workflows:
   version: 2
@@ -313,12 +252,5 @@ workflows:
       - source-syntax:
           requires:
             - install-and-cibuild
-      - publish-dist:
-          requires:
-            - install-and-cibuild
-      - test-dist1:
-          requires:
-            - publish-dist
-      - test-dist2:
-          requires:
-            - publish-dist
+
+      - publish-dist

.circleci/env_build.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+export NODE_OPTIONS='--max-old-space-size=4096' && \
+echo "node version: $(node --version)" && \
+echo "npm version: $(npm --version)" && \
+npm ci && \
+npm ls || true

.circleci/env_image.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+sudo apt-get install fonts-liberation2 fonts-open-sans fonts-noto-cjk fonts-noto-color-emoji && \
+sudo python3 .circleci/download_google_fonts.py && \
+sudo cp -r .circleci/fonts/ /usr/share/ && \
+sudo fc-cache -f && \
+sudo python3 -m pip install kaleido==0.2.1 plotly==5.1.0 --progress-bar off

CHANGELOG.md

@@ -9,6 +9,27 @@ 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.
 
+## [2.2.0] -- 2021-06-28
+
+### Added
+ - Legend group titles [[#5752](https://github.com/plotly/plotly.js/pull/5752)],
+   this feature was anonymously sponsored: thank you to our sponsor!
+ - Add half-year directive (%h) for formatting dates and improve descriptions to include extra date formatting options [[#5762](https://github.com/plotly/plotly.js/pull/5762)],
+   this feature was anonymously sponsored: thank you to our sponsor!
+
+### Changed
+ - Modernize the process of creating baselines using [Kaleido](https://github.com/plotly/Kaleido) and improve image & other export test systems [[#5724](https://github.com/plotly/plotly.js/pull/5724)]
+ - Centralize jsdom utility to return Plotly object in node.js test scripts and use it in generating plot-schema [[#5755](https://github.com/plotly/plotly.js/pull/5755)]
+ - Bump turf bbox dependency to v6.4.0 [[#5747](https://github.com/plotly/plotly.js/pull/5747)]
+ - Bump turf area dependency to v6.4.0 [[#5748](https://github.com/plotly/plotly.js/pull/5748)]
+
+### Fixed
+ - Cache values and patterns in set_convert for axes with `rangebreaks` to improve performance [[#5659](https://github.com/plotly/plotly.js/pull/5659)],
+   with thanks to @spasovski for the contribution!
+ - Fix fetching geojson when ES6 import is used to load the library [[#5763](https://github.com/plotly/plotly.js/pull/5763)]
+ - Correct readme links [[#5746](https://github.com/plotly/plotly.js/pull/5746)]
+
+
 ## [2.1.0] -- 2021-06-18
 
 ### Added

README.md

@@ -55,7 +55,7 @@ You may also consider using [`plotly.js-dist`](https://www.npmjs.com/package/plo
 
 ```html
 <head>
-    <script src="https://cdn.plot.ly/plotly-2.1.0.min.js"></script>
+    <script src="https://cdn.plot.ly/plotly-2.2.0.min.js"></script>
 </head>
 <body>
     <div id="gd"></div>
@@ -71,8 +71,8 @@ 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>
-    import "https://cdn.plot.ly/plotly-2.1.0.min.js"
+<script type="module">
+    import "https://cdn.plot.ly/plotly-2.2.0.min.js"
     Plotly.newPlot("gd", [{ y: [1, 2, 3] }])
 </script>
 ```
@@ -82,7 +82,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-2.1.0.js" charset="utf-8"></script>
+<script src="https://cdn.plot.ly/plotly-2.2.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.4. Therefore, to use the CDN with plotly.js v2 and higher, you must specify an exact plotly.js version.