Merge remote-tracking branch 'origin/master' into waterfall-new-trace

Author: archmoj

.circleci/config.yml

@@ -14,14 +14,10 @@ jobs:
     working_directory: ~/plotly.js
     steps:
       - checkout
-      - restore_cache:
-          keys:
-            - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package-lock.json" }}
-            - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package-lock.json" }}
       - run:
           name: Install dependencies
           command: |
-            npm install
+            npm ci
       - run:
           name: List dependency versions
           command: |
@@ -33,26 +29,22 @@ jobs:
           command: |
             npm run pretest
             npm run cibuild
-      - save_cache:
-          paths:
-            - node_modules
-          key: v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package.json" }}
+      - run:
+          command: rm -rf .git
       - persist_to_workspace:
-          root: .
+          root: /home/circleci
           paths:
-            - node_modules
-            - build
-            - dist
+            - plotly.js
 
   test-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
       - image: circleci/node:10.9.0-browsers
+    parallelism: 2
     working_directory: ~/plotly.js
     steps:
-      - checkout
       - attach_workspace:
-          at: ~/plotly.js
+          at: ~/
       - run:
           name: Run jasmine tests (batch 1)
           command: ./.circleci/test.sh jasmine
@@ -61,23 +53,35 @@ jobs:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
       - image: circleci/node:10.9.0-browsers
+    parallelism: 2
     working_directory: ~/plotly.js
     steps:
-      - checkout
       - attach_workspace:
-          at: ~/plotly.js
+          at: ~/
       - run:
           name: Run jasmine tests (batch 2)
           command: ./.circleci/test.sh jasmine2
 
+  test-jasmine3:
+    docker:
+      # need '-browsers' version to test in real (xvfb-wrapped) browsers
+      - image: circleci/node:10.9.0-browsers
+    working_directory: ~/plotly.js
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: Run jasmine tests (batch 3)
+          command: ./.circleci/test.sh jasmine3
+
   test-image:
     docker:
       - image: plotly/testbed:latest
+    parallelism: 4
     working_directory: /var/www/streambed/image_server/plotly.js/
     steps:
-      - checkout
       - attach_workspace:
-          at: /var/www/streambed/image_server/plotly.js/
+          at: /var/www/streambed/image_server/
       - run:
           name: Run and setup container
           command: |
@@ -95,9 +99,8 @@ jobs:
       - image: plotly/testbed:latest
     working_directory: /var/www/streambed/image_server/plotly.js/
     steps:
-      - checkout
       - attach_workspace:
-          at: /var/www/streambed/image_server/plotly.js/
+          at: /var/www/streambed/image_server/
       - run:
           name: Run and setup container
           command: |
@@ -115,21 +118,31 @@ jobs:
       - image: circleci/node:10.9.0
     working_directory: ~/plotly.js
     steps:
-      - checkout
       - attach_workspace:
-          at: ~/plotly.js
+          at: ~/
       - run:
           name: Run syntax tests
           command: ./.circleci/test.sh syntax
 
+  test-bundle:
+    docker:
+      # need '-browsers' version to test in real (xvfb-wrapped) browsers
+      - image: circleci/node:10.9.0-browsers
+    working_directory: ~/plotly.js
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: Run test-bundle
+          command: ./.circleci/test.sh bundle
+
   publish:
     docker:
       - image: circleci/node:10.9.0
     working_directory: ~/plotly.js
     steps:
-      - checkout
       - attach_workspace:
-          at: ~/plotly.js
+          at: ~/
       - run:
           name: Build dist/
           command: npm run build
@@ -159,12 +172,18 @@ workflows:
   build-and-test:
     jobs:
       - build
+      - test-bundle:
+          requires:
+            - build
       - test-jasmine:
           requires:
             - build
       - test-jasmine2:
           requires:
             - build
+      - test-jasmine3:
+          requires:
+            - build
       - test-image:
           requires:
             - build

.circleci/test.sh

@@ -44,33 +44,50 @@ case $1 in
     jasmine)
         set_tz
 
-        npm run test-jasmine -- --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
-        retry npm run test-jasmine -- --tags=flaky --skip-tags=noCI
-        npm run test-bundle || EXIT_STATE=$?
+        SUITE=$(circleci tests glob "$ROOT/test/jasmine/tests/*" | circleci tests split)
+        npm run test-jasmine -- $SUITE --skip-tags=gl,noCI,flaky --showSkipped || EXIT_STATE=$?
 
         exit $EXIT_STATE
         ;;
 
     jasmine2)
         set_tz
 
-        SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=gl))
+        SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=gl | circleci tests split))
 
         for s in ${SHARDS[@]}; do
-            retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI
+            retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI --showSkipped
+        done
+
+        exit $EXIT_STATE
+        ;;
+
+    jasmine3)
+        set_tz
+
+        SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=flaky | circleci tests split))
+
+        for s in ${SHARDS[@]}; do
+            retry npm run test-jasmine -- "$s" --tags=flaky --skip-tags=noCI --showSkipped
         done
 
         exit $EXIT_STATE
         ;;
 
     image)
-        npm run test-image      || EXIT_STATE=$?
+        SUITE=$(find $ROOT/test/image/mocks/ -type f -printf "%f\n" | circleci tests split)
+        npm run test-image -- $SUITE --filter || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
     image2)
         npm run test-export     || EXIT_STATE=$?
-        npm run test-image-gl2d || EXIT_STATE=$?
+        exit $EXIT_STATE
+        ;;
+
+    bundle)
+        set_tz
+        npm run test-bundle || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 

CHANGELOG.md

@@ -10,6 +10,39 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
 where X.Y.Z is the semver of most recent plotly.js release.
 
 
+## [1.45.3] -- 2019-03-19
+
+### Fixed
+- Fix legend click dispatch on legend item symbols (bug introduced in 1.44.0) [#3635]
+- Fix overlapping of "very close" hover labels [#3645]
+- Fix `hovermode` default logic for stacked `scatter` traces [#3646]
+- Fix `glPixelRatio` handling in `surface` contour lines [#3641]
+- Fix `gl2d` subplot zoombox appearance (bug introduced in 1.32.0) [#3647]
+- Fix axis label updates on `gl2d` subplots on scroll (bug introduced in 1.32.0) [#3647]
+- Fix `dragmode` relayout calls on `gl2d` subplots [#3647]
+- Improve info about `<extra>` in `hovertemplate` description [#3623]
+
+
+## [1.45.2] -- 2019-03-07
+
+### Fixed
+- Fix webpack builds that include `sankey` by upgrading d3-sankey-circular to 0.33.0 (bug introduced in 1.45.0) [#3611]
+
+## [1.45.1] -- 2019-03-05
+
+### Fixed
+- Fix axis automargin pushes for rotated tick labels [#3605]
+- Fix automargin logic on (very) small graphs [#3605]
+- Fix locales support in `hovertemplate` strings [#3586]
+- Fix gl3d reset camera buttons for scenes with orthographic projection [#3597]
+- Fix typed array support for `parcoords` dimensions values and `line.color` [#3598]
+- Fix `cone` rendering on some older browsers [#3591]
+- Fix `lightposition` behavior for `cone` traces [#3591]
+- Fix `lightposition` behavior for `streamtube` trace [#3593]
+- Remove unused files from `gl-cone3d` dependency [#3591]
+- Remove unused files from `gl-streamtube3d` dependency [#3593]
+
+
 ## [1.45.0] -- 2019-02-26
 
 ### Added

build/plotcss.js

@@ -31,7 +31,7 @@ var rules = {
     "X .cursor-n-resize": "cursor:n-resize;",
     "X .cursor-ne-resize": "cursor:ne-resize;",
     "X .cursor-grab": "cursor:-webkit-grab;cursor:grab;",
-    "X .modebar": "position:absolute;top:2px;right:2px;z-index:1001;",
+    "X .modebar": "position:absolute;top:2px;right:2px;",
     "X .ease-bg": "-webkit-transition:background-color 0.3s ease 0s;-moz-transition:background-color 0.3s ease 0s;-ms-transition:background-color 0.3s ease 0s;-o-transition:background-color 0.3s ease 0s;transition:background-color 0.3s ease 0s;",
     "X .modebar--hover>:not(.watermark)": "opacity:0;-webkit-transition:opacity 0.3s ease 0s;-moz-transition:opacity 0.3s ease 0s;-ms-transition:opacity 0.3s ease 0s;-o-transition:opacity 0.3s ease 0s;transition:opacity 0.3s ease 0s;",
     "X:hover .modebar--hover .modebar-group": "opacity:1;",