Merge branch 'master' into slider-touch-support

Author: keul

.circleci/config.yml

@@ -31,10 +31,42 @@ jobs:
           paths:
             - plotly.js
 
+  timezone-jasmine:
+    docker:
+      # need '-browsers' version to test in real (xvfb-wrapped) browsers
+      - image: circleci/node:12.22.1-browsers
+    working_directory: ~/plotly.js
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: Run hover_label test in UTC timezone
+          environment:
+            TZ: "UTC"
+          command: date && npm run test-jasmine hover_label
+      - run:
+          name: Run hover_label test in Europe/Berlin timezone
+          environment:
+            TZ: "Europe/Berlin"
+          command: date && npm run test-jasmine hover_label
+      - run:
+          name: Run hover_label test in Asia/Tokyo timezone
+          environment:
+            TZ: "Asia/Tokyo"
+          command: date && npm run test-jasmine hover_label
+      - run:
+          name: Run hover_label test in America/Toronto timezone
+          environment:
+            TZ: "America/Toronto"
+          command: date && npm run test-jasmine hover_label
+
   no-gl-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
       - image: circleci/node:12.22.1-browsers
+    environment:
+      # Alaska time (arbitrary timezone to test date logic)
+      TZ: "America/Anchorage"
     parallelism: 8
     working_directory: ~/plotly.js
     steps:
@@ -48,6 +80,9 @@ jobs:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
       - image: circleci/node:12.22.1-browsers
+    environment:
+      # Alaska time (arbitrary timezone to test date logic)
+      TZ: "America/Anchorage"
     parallelism: 8
     working_directory: ~/plotly.js
     steps:
@@ -61,6 +96,9 @@ jobs:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
       - image: circleci/node:12.22.1-browsers
+    environment:
+      # Alaska time (arbitrary timezone to test date logic)
+      TZ: "America/Anchorage"
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -69,6 +107,21 @@ jobs:
           name: Run jasmine tests (part C)
           command: .circleci/test.sh flaky-no-gl-jasmine
 
+  bundle-jasmine:
+    docker:
+      # need '-browsers' version to test in real (xvfb-wrapped) browsers
+      - image: circleci/node:12.22.1-browsers
+    environment:
+      # Alaska time (arbitrary timezone to test date logic)
+      TZ: "America/Anchorage"
+    working_directory: ~/plotly.js
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: Run jasmine tests (part D)
+          command: .circleci/test.sh bundle-jasmine
+
   make-baselines:
     parallelism: 4
     docker:
@@ -162,18 +215,6 @@ jobs:
           name: Run syntax tests on source files
           command: .circleci/test.sh source-syntax
 
-  jasmine-bundle:
-    docker:
-      # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: circleci/node:12.22.1-browsers
-    working_directory: ~/plotly.js
-    steps:
-      - attach_workspace:
-          at: ~/
-      - run:
-          name: Run jasmine tests (part D)
-          command: .circleci/test.sh jasmine-bundle
-
   publish-dist:
     docker:
       - image: circleci/node:12.22.1
@@ -234,6 +275,9 @@ jobs:
       - run:
           name: Test plotly bundles againt unexpected characters
           command: npm run no-bad-char
+      - run:
+          name: Display function constructors in plotly.js bundle
+          command: npm run log-new-func
       - run:
           name: Test certain bundles against function constructors
           command: npm run no-new-func
@@ -246,7 +290,10 @@ workflows:
   build-and-test:
     jobs:
       - install-and-cibuild
-      - jasmine-bundle:
+      - timezone-jasmine:
+          requires:
+            - install-and-cibuild
+      - bundle-jasmine:
           requires:
             - install-and-cibuild
       - no-gl-jasmine:

.circleci/test.sh

@@ -33,17 +33,9 @@ retry () {
     fi
 }
 
-# set timezone to Alaska time (arbitrary timezone to test date logic)
-set_tz () {
-    sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
-    export TZ='America/Anchorage'
-}
-
 case $1 in
 
     no-gl-jasmine)
-        set_tz
-
         SUITE=$(circleci tests glob "$ROOT/test/jasmine/tests/*" | circleci tests split)
         MAX_AUTO_RETRY=2
         retry npm run test-jasmine -- $SUITE --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
@@ -52,8 +44,6 @@ case $1 in
         ;;
 
     webgl-jasmine)
-        set_tz
-
         SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=5 --tag=gl | circleci tests split))
         for s in ${SHARDS[@]}; do
             MAX_AUTO_RETRY=2
@@ -64,8 +54,6 @@ case $1 in
         ;;
 
     flaky-no-gl-jasmine)
-        set_tz
-
         SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=1 --tag=flaky | circleci tests split))
 
         for s in ${SHARDS[@]}; do
@@ -76,6 +64,11 @@ case $1 in
         exit $EXIT_STATE
         ;;
 
+    bundle-jasmine)
+        npm run test-bundle || 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=$?
@@ -87,12 +80,6 @@ case $1 in
         exit $EXIT_STATE
         ;;
 
-    jasmine-bundle)
-        set_tz
-        npm run test-bundle || EXIT_STATE=$?
-        exit $EXIT_STATE
-        ;;
-
     source-syntax)
         npm run lint        || EXIT_STATE=$?
         npm run test-syntax || EXIT_STATE=$?

CHANGELOG.md

@@ -9,6 +9,14 @@ 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.3.1] -- 2021-07-30
+
+### Fixed
+ - Fix period positioned hover to work in different time zones as well as on grouped bars [[#5864](https://github.com/plotly/plotly.js/pull/5864)]
+ - Use ids from axes when making hover data keys [[#5852](https://github.com/plotly/plotly.js/pull/5852)]
+ - Do not include regl based traces `parcoords`, `splom`, `scattergl` and `scatterpolargl` in the "strict" bundle so that it could be used with CSP without WebGL warning [[#5865](https://github.com/plotly/plotly.js/pull/5865)]
+
+
 ## [2.3.0] -- 2021-07-23
 
 ### Added
@@ -28,7 +36,8 @@ where X.Y.Z is the semver of most recent plotly.js release.
  - Preview plot-schema changes between releases when building dist on master [[#5814](https://github.com/plotly/plotly.js/pull/5814)]
  - Display changes made to package.json between versions and add identical tags to draft bundles created by `publish-dist` job on CircleCI [[#5815](https://github.com/plotly/plotly.js/pull/5815)]
  - Simplify devtool by relying on `XMLHttpRequest` instead of `d3.json` [[#5832](https://github.com/plotly/plotly.js/pull/5832)]
- - Update CONTRIBUTING guidelines on how to submit pull requests and generate new baseline [[#5791](https://github.com/plotly/plotly.js/pull/5791), [[#5792](https://github.com/plotly/plotly.js/pull/5792)]]
+ - Update CONTRIBUTING guidelines on how to submit pull requests and generate new baseline [[#5791](https://github.com/plotly/plotly.js/pull/5791), [#5792](https://github.com/plotly/plotly.js/pull/5792)]
+ - More maintenance work listed under [the v2.3.0 milestone](https://github.com/plotly/plotly.js/milestone/63?closed=1)
 
 ### Fixed
  - Fix unknown filename when exporting charts using new versions of Safari [[#5609](https://github.com/plotly/plotly.js/pull/5609), [5838](https://github.com/plotly/plotly.js/pull/5838)],
@@ -68,6 +77,7 @@ where X.Y.Z is the semver of most recent plotly.js release.
  - 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)]
+ - More maintenance work listed under [the v2.2.0 milestone](https://github.com/plotly/plotly.js/milestone/62?closed=1)
 
 ### Fixed
  - Cache values and patterns in set_convert for axes with `rangebreaks` to improve performance [[#5659](https://github.com/plotly/plotly.js/pull/5659)],
@@ -88,7 +98,7 @@ where X.Y.Z is the semver of most recent plotly.js release.
 ### Changed
  - Replace deprecated [node-sass](https://www.npmjs.com/package/node-sass) modules with [Sass](https://www.npmjs.com/package/sass) and update plot CSS [[#5729](https://github.com/plotly/plotly.js/pull/5729)]
  - Bump `probe-image-size` to v7.2.1 [[#5739](https://github.com/plotly/plotly.js/pull/5739)]
- - More maintenance work listed under [the v2.1.0 milestone](https://github.com/plotly/plotly.js/milestone/61)
+ - More maintenance work listed under [the v2.1.0 milestone](https://github.com/plotly/plotly.js/milestone/61?closed=1)
 
 ### Fixed
  - Fix setting the width of categorical bars & boxes to unit [[#5732](https://github.com/plotly/plotly.js/pull/5732)]
@@ -157,7 +167,7 @@ where X.Y.Z is the semver of most recent plotly.js release.
    dist files at build time [[#5436](https://github.com/plotly/plotly.js/pull/5436), [#5446](https://github.com/plotly/plotly.js/pull/5446)]
  - Guard against unexpected characters at build time [[#5424](https://github.com/plotly/plotly.js/pull/5424)]
  - Minimize indentation in plot-schema [[#5663](https://github.com/plotly/plotly.js/pull/5663)]
- - More maintenance work listed under [the 60th milestone](https://github.com/plotly/plotly.js/milestone/60)!
+ - More maintenance work listed under [the 60th milestone](https://github.com/plotly/plotly.js/milestone/60?closed=1)!
 
 ### Fixed
  - Fix "toself" `fill` for `scattergl` traces to handle multiple polygons [[#5355](https://github.com/plotly/plotly.js/pull/5355)],

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.3.0.min.js"></script>
+    <script src="https://cdn.plot.ly/plotly-2.3.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.3.0.min.js"
+    import "https://cdn.plot.ly/plotly-2.3.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.3.0.js" charset="utf-8"></script>
+<script src="https://cdn.plot.ly/plotly-2.3.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.

devtools/test_dashboard/index-strict.html

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="Content-Security-Policy" content="script-src 'self'; worker-src blob:; ">
+  <title>Plotly.js "strict" Devtools</title>
+
+  <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans:600,400,300,200|Droid+Sans|PT+Sans+Narrow|Gravitas+One|Droid+Sans+Mono|Droid+Serif|Raleway|Old+Standard+TT"/>
+  <link rel="stylesheet" type="text/css" href="./style.css">
+</head>
+<body>
+  <header>
+    <img src="http://images.plot.ly/logo/[email protected]" onClick="Tabs.reload();" />
+    <span id="reload-time"></span>
+
+    <input id="mocks-search" type="text" placeholder="mocks search" />
+  </header>
+
+  <section id="mocks-list"></section>
+  <div id="plots">
+    <div id="graph"></div>
+  </div>
+  <div id="snapshot"></div>
+
+  <script src="../../node_modules/mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
+  <script charset="utf-8" id="source" src="../../build/plotly.js"></script>
+  <script charset="utf-8" src="../../build/test_dashboard-bundle.js"></script>
+</body>
+</html>

devtools/test_dashboard/server.js

@@ -4,13 +4,15 @@ var http = require('http');
 var ecstatic = require('ecstatic');
 var open = require('open');
 var browserify = require('browserify');
+var minimist = require('minimist');
 
 var constants = require('../../tasks/util/constants');
 var makeWatchifiedBundle = require('../../tasks/util/watchified_bundle');
 var shortcutPaths = require('../../tasks/util/shortcut_paths');
 
-var PORT = process.argv[2] || 3000;
-
+var args = minimist(process.argv.slice(2), {});
+var PORT = args.port || 3000;
+var strict = args.strict;
 
 // Create server
 var server = http.createServer(ecstatic({
@@ -21,9 +23,9 @@ var server = http.createServer(ecstatic({
 }));
 
 // Make watchified bundle for plotly.js
-var bundlePlotly = makeWatchifiedBundle(function() {
+var bundlePlotly = makeWatchifiedBundle(strict, function() {
     // open up browser window on first bundle callback
-    open('http://localhost:' + PORT + '/devtools/test_dashboard/index.html');
+    open('http://localhost:' + PORT + '/devtools/test_dashboard/index' + (strict ? '-strict' : '') + '.html');
 });
 
 // Bundle devtools code