Merge branch 'master' of https://github.com/plotly/plotly.js into fix-choropleth-interactions-for-firefox

Author: LucaVazz

.circleci/config.yml

@@ -10,7 +10,7 @@ version: 2.0
 jobs:
   install-and-cibuild:
     docker:
-      - image: circleci/node:12.13.0
+      - image: circleci/node:12.22.1
     working_directory: ~/plotly.js
     steps:
       - checkout
@@ -43,7 +43,7 @@ jobs:
   no-gl-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: circleci/node:12.13.0-browsers
+      - image: circleci/node:12.22.1-browsers
     parallelism: 8
     working_directory: ~/plotly.js
     steps:
@@ -56,7 +56,7 @@ jobs:
   webgl-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: circleci/node:12.13.0-browsers
+      - image: circleci/node:12.22.1-browsers
     parallelism: 8
     working_directory: ~/plotly.js
     steps:
@@ -69,7 +69,7 @@ jobs:
   no-gl-flaky-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: circleci/node:12.13.0-browsers
+      - image: circleci/node:12.22.1-browsers
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -93,7 +93,7 @@ jobs:
             npm run docker -- setup
       - run:
           name: Run image tests (part A)
-          command: ./.circleci/test.sh stable-image
+          command: ./.circleci/test.sh stable-image ; find build -maxdepth 1 -type f -delete
       - store_artifacts:
           path: build
           destination: /
@@ -112,14 +112,28 @@ jobs:
             npm run docker -- setup
       - run:
           name: Run image tests (part B)
-          command: ./.circleci/test.sh flaky-image
+          command: ./.circleci/test.sh flaky-image ; find build -maxdepth 1 -type f -delete
       - store_artifacts:
           path: build
           destination: /
 
+  mock-validation:
+    docker:
+      - image: circleci/node:12.22.1
+    working_directory: ~/plotly.js
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: Test validation using node.js and jsdom
+          command: npm run test-plain-obj
+      - run:
+          name: Validate mocks
+          command: npm run test-mock
+
   source-syntax:
     docker:
-      - image: circleci/node:12.13.0
+      - image: circleci/node:12.22.1
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -131,7 +145,7 @@ jobs:
   jasmine-bundle:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: circleci/node:12.13.0-browsers
+      - image: circleci/node:12.22.1-browsers
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -142,7 +156,7 @@ jobs:
 
   publish-dist:
     docker:
-      - image: circleci/node:12.13.0
+      - image: circleci/node:12.22.1
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -177,14 +191,11 @@ jobs:
 
   test-dist1:
     docker:
-      - image: circleci/node:12.13.0
+      - image: circleci/node:12.22.1
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
           at: ~/
-      - run:
-          name: Test validation using node.js and jsdom
-          command: npm run test-plain-obj
       - run:
           name: Test plotly.min.js import using requirejs
           command: npm run test-requirejs
@@ -197,7 +208,7 @@ jobs:
 
   test-dist2:
     docker:
-      - image: circleci/node:12.13.0
+      - image: circleci/node:12.22.1
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -232,6 +243,9 @@ workflows:
       - flaky-image:
           requires:
             - install-and-cibuild
+      - mock-validation:
+          requires:
+            - install-and-cibuild
       - source-syntax:
           requires:
             - install-and-cibuild

.circleci/test.sh

@@ -45,7 +45,8 @@ case $1 in
         set_tz
 
         SUITE=$(circleci tests glob "$ROOT/test/jasmine/tests/*" | circleci tests split)
-        npm run test-jasmine -- $SUITE --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
+        MAX_AUTO_RETRY=2
+        retry npm run test-jasmine -- $SUITE --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
 
         exit $EXIT_STATE
         ;;
@@ -55,7 +56,7 @@ case $1 in
 
         SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=5 --tag=gl | circleci tests split))
         for s in ${SHARDS[@]}; do
-            MAX_AUTO_RETRY=1
+            MAX_AUTO_RETRY=2
             retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI --doNotFailOnEmptyTestSuite
         done
 

package-lock.json

@@ -39,6 +39,7 @@
     "docker": "node tasks/docker.js",
     "pretest": "node tasks/pretest.js",
     "test-jasmine": "karma start test/jasmine/karma.conf.js",
+    "test-mock": "node tasks/test_mock.js",
     "test-image": "node tasks/test_image.js",
     "test-export": "node tasks/test_export.js",
     "test-syntax": "node tasks/test_syntax.js && npm run find-strings -- --no-output",
@@ -168,7 +169,7 @@
     "mathjax": "2.7.5",
     "minify-stream": "^2.1.0",
     "mkdirp": "^1.0.4",
-    "node-sass": "^5.0.0",
+    "node-sass": "^6.0.0",
     "npm-link-check": "^4.0.0",
     "open": "^8.0.7",
     "prepend-file": "^2.0.0",

package.json

@@ -236,9 +236,11 @@ module.exports = {
         transforms: {
             filter: {
                 valuecalendar: makeAttrs([
+                    'WARNING: All transforms are deprecated and may be removed from the API in next major version.',
                     'Sets the calendar system to use for `value`, if it is a date.'
                 ].join(' ')),
                 targetcalendar: makeAttrs([
+                    'WARNING: All transforms are deprecated and may be removed from the API in next major version.',
                     'Sets the calendar system to use for `target`, if it is an',
                     'array of dates. If `target` is a string (eg *x*) we use the',
                     'corresponding trace attribute (eg `xcalendar`) if it exists,',