Merge remote-tracking branch 'origin/master' into finalist-cluster-scattermapbox

Author: archmoj

.circleci/config.yml

@@ -1,16 +1,18 @@
-version: 2.0
+version: 2.1
+orbs:
+  browser-tools: circleci/browser-tools@1.2.2
 
 # Inspired by:
 # https://github.com/CircleCI-Public/circleci-demo-workflows/blob/workspace-forwarding/.circleci/config.yml
 # https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
 #
 # For list of official CircleCI node.js images, go to:
-# https://hub.docker.com/r/circleci/node/tags/
+# https://hub.docker.com/r/cimg/node/tags/
 
 jobs:
   install-and-cibuild:
     docker:
-      - image: circleci/node:12.22.1
+      - image: cimg/node:16.8.0
     working_directory: ~/plotly.js
     steps:
       - checkout
@@ -34,9 +36,13 @@ jobs:
   timezone-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: circleci/node:12.22.1-browsers
+      - image: cimg/node:16.8.0-browsers
     working_directory: ~/plotly.js
     steps:
+      - browser-tools/install-browser-tools: &browser-versions
+          chrome-version: 93.0.4577.63
+          install-firefox: false
+          install-geckodriver: false
       - attach_workspace:
           at: ~/
       - run:
@@ -63,13 +69,17 @@ jobs:
   no-gl-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: circleci/node:12.22.1-browsers
+      - image: cimg/node:16.8.0-browsers
     environment:
       # Alaska time (arbitrary timezone to test date logic)
       TZ: "America/Anchorage"
     parallelism: 8
     working_directory: ~/plotly.js
     steps:
+      - browser-tools/install-browser-tools: &browser-versions
+          chrome-version: 93.0.4577.63
+          install-firefox: false
+          install-geckodriver: false
       - attach_workspace:
           at: ~/
       - run:
@@ -79,13 +89,17 @@ jobs:
   webgl-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: circleci/node:12.22.1-browsers
+      - image: cimg/node:16.8.0-browsers
     environment:
       # Alaska time (arbitrary timezone to test date logic)
       TZ: "America/Anchorage"
     parallelism: 8
     working_directory: ~/plotly.js
     steps:
+      - browser-tools/install-browser-tools: &browser-versions
+          chrome-version: 93.0.4577.63
+          install-firefox: false
+          install-geckodriver: false
       - attach_workspace:
           at: ~/
       - run:
@@ -95,12 +109,16 @@ jobs:
   flaky-no-gl-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: circleci/node:12.22.1-browsers
+      - image: cimg/node:16.8.0-browsers
     environment:
       # Alaska time (arbitrary timezone to test date logic)
       TZ: "America/Anchorage"
     working_directory: ~/plotly.js
     steps:
+      - browser-tools/install-browser-tools: &browser-versions
+          chrome-version: 93.0.4577.63
+          install-firefox: false
+          install-geckodriver: false
       - attach_workspace:
           at: ~/
       - run:
@@ -110,18 +128,41 @@ jobs:
   bundle-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: circleci/node:12.22.1-browsers
+      - image: cimg/node:16.8.0-browsers
     environment:
       # Alaska time (arbitrary timezone to test date logic)
       TZ: "America/Anchorage"
     working_directory: ~/plotly.js
     steps:
+      - browser-tools/install-browser-tools: &browser-versions
+          chrome-version: 93.0.4577.63
+          install-firefox: false
+          install-geckodriver: false
       - attach_workspace:
           at: ~/
       - run:
           name: Run jasmine tests (part D)
           command: .circleci/test.sh bundle-jasmine
 
+  mathjax-firefox81:
+    docker:
+      # need '-browsers' version to test in real (xvfb-wrapped) browsers
+      - image: cimg/node:16.8.0-browsers
+    environment:
+      # Alaska time (arbitrary timezone to test date logic)
+      TZ: "America/Anchorage"
+    working_directory: ~/plotly.js
+    steps:
+      - browser-tools/install-browser-tools: &browser-versions
+          firefox-version: '81.0'
+          install-chrome: false
+          install-chromedriver: false
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: Test MathJax on firefox-81
+          command: .circleci/test.sh mathjax-firefox
+
   make-baselines:
     parallelism: 4
     docker:
@@ -143,7 +184,7 @@ jobs:
 
   test-baselines:
     docker:
-      - image: circleci/node:12.22.1
+      - image: circleci/node:16.8.0
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -178,7 +219,7 @@ jobs:
 
   test-exports:
     docker:
-      - image: circleci/node:12.22.1
+      - image: circleci/node:16.8.0
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -192,7 +233,7 @@ jobs:
 
   mock-validation:
     docker:
-      - image: circleci/node:12.22.1
+      - image: cimg/node:16.8.0
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -206,7 +247,7 @@ jobs:
 
   source-syntax:
     docker:
-      - image: circleci/node:12.22.1
+      - image: cimg/node:16.8.0
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -217,7 +258,7 @@ jobs:
 
   publish-dist:
     docker:
-      - image: circleci/node:12.22.1
+      - image: cimg/node:16.8.0
     working_directory: ~/plotly.js
     steps:
       - checkout
@@ -299,6 +340,9 @@ workflows:
       - bundle-jasmine:
           requires:
             - install-and-cibuild
+      - mathjax-firefox81:
+          requires:
+            - install-and-cibuild
       - no-gl-jasmine:
           requires:
             - install-and-cibuild

.circleci/env_build.sh

@@ -3,4 +3,4 @@ export NODE_OPTIONS='--max-old-space-size=4096' && \
 echo "node version: $(node --version)" && \
 echo "npm version: $(npm --version)" && \
 npm ci && \
-npm ls || true
+npm ls --prod --all

.circleci/test.sh

@@ -69,6 +69,11 @@ case $1 in
         exit $EXIT_STATE
         ;;
 
+    mathjax-firefox)
+        ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --nowatch || 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=$?

CHANGELOG.md

@@ -9,6 +9,34 @@ 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.5.1] -- 2021-09-16
+
+### Fixed
+ - Reduce bundle sizes by updating `surface-nets`, `robust-determinant`, `robust-linear-solve` modules [[#5934](https://github.com/plotly/plotly.js/pull/5934), [#5935](https://github.com/plotly/plotly.js/pull/5935), [#5936](https://github.com/plotly/plotly.js/pull/5936)]
+ - Update CONTRIBUTING guidelines to use `npm v7` and `node.js v16` [[#5933](https://github.com/plotly/plotly.js/pull/5933)],
+   with thanks to @sleighsoft for the contribution!
+
+
+## [2.5.0] -- 2021-09-03
+
+### Added
+ - Include `surface`, `isosurface`, `volume`, `streamtube`, `cone`, `mesh3d`, `scatter3d`, `pointcloud`
+   and `heatmapgl` in the "strict" bundle by avoid function generation for these traces at runtime [[#5888](https://github.com/plotly/plotly.js/pull/5888)]
+
+### Changed
+ - Use `node.js v16` and `npm v7` in development and upgrade the version of `package-lock.json` [[#5922](https://github.com/plotly/plotly.js/pull/5922), [#5919](https://github.com/plotly/plotly.js/pull/5919)]
+
+### Fixed
+ - Adjust position of hover in respect to CSS transform [[#5916](https://github.com/plotly/plotly.js/pull/5916)]
+
+
+## [2.4.2] -- 2021-08-31
+
+### Fixed
+ - Fix positioning unified hover box when div has zero height
+   (regression introduced in 2.3.0) [[#5913](https://github.com/plotly/plotly.js/pull/5913)]
+
+
 ## [2.4.1] -- 2021-08-27
 
 ### Fixed

CONTRIBUTING.md

@@ -77,10 +77,10 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
 #### Prerequisites
 
 - git
-- [node.js](https://nodejs.org/en/). We recommend using node.js v12.x (LTS).
+- [node.js](https://nodejs.org/en/). We recommend using node.js v16.x.
   Upgrading and managing node versions can be easily done using
   [`nvm`](https://github.com/creationix/nvm) or its Windows alternatives.
-- [`npm`](https://www.npmjs.com/) v6.x and up to ensure that the
+- [`npm`](https://www.npmjs.com/) v7.x and up to ensure that the
   [`package-lock.json`](https://docs.npmjs.com/files/package-lock.json) file is
   used and updated correctly.
 

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.4.1.min.js"></script>
+    <script src="https://cdn.plot.ly/plotly-2.5.1.min.js"></script>
 </head>
 <body>
     <div id="gd"></div>
@@ -72,7 +72,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-2.4.1.min.js"
+    import "https://cdn.plot.ly/plotly-2.5.1.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.4.1.js" charset="utf-8"></script>
+<script src="https://cdn.plot.ly/plotly-2.5.1.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.

appveyor.yml

@@ -1,5 +1,5 @@
 environment:
-  nodejs_version: "12"
+  nodejs_version: "16"
 
 install:
   - ps: Install-Product node $env:nodejs_version

devtools/test_dashboard/devtools.js

@@ -178,11 +178,16 @@ var fuse = new Fuse(mocks, {
     }]
 });
 
-var searchBar = document.getElementById('mocks-search');
+var transformInput = document.getElementById('css-transform');
+var mockInput = document.getElementById('mocks-search');
 var mocksList = document.getElementById('mocks-list');
 var plotArea = document.getElementById('plots');
 
-searchBar.addEventListener('keyup', debounce(searchMocks, 250));
+mockInput.addEventListener('keyup', debounce(searchMocks, 250));
+
+transformInput.addEventListener('keyup', function(e) {
+    plotArea.style.transform = e.target.value;
+});
 
 function debounce(func, wait, immediate) {
     var timeout;
@@ -230,7 +235,16 @@ function searchMocks(e) {
 
         var listWidth = mocksList.getBoundingClientRect().width;
         var plotAreaWidth = Math.floor(window.innerWidth - listWidth);
-        plotArea.setAttribute('style', 'width: ' + plotAreaWidth + 'px;');
+
+        var allStyles = [
+            'width: ' + plotAreaWidth + 'px;'
+        ];
+
+        if(transformInput.value !== '') {
+            allStyles.push('transform: ' + transformInput.value + ';');
+        }
+
+        plotArea.setAttribute('style', allStyles.join(' '));
     });
 }
 

devtools/test_dashboard/index-strict.html

@@ -13,6 +13,7 @@
     <span id="reload-time"></span>
 
     <input id="mocks-search" type="text" placeholder="mocks search" />
+    <input id="css-transform" type="text" placeholder="css transform" />
   </header>
 
   <section id="mocks-list"></section>

devtools/test_dashboard/index.html

@@ -11,6 +11,7 @@
     <span id="reload-time"></span>
 
     <input id="mocks-search" type="text" placeholder="mocks search" />
+    <input id="css-transform" type="text" placeholder="css transform" />
   </header>
 
   <section id="mocks-list"></section>