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

Author: archmoj

.circleci/config.yml

@@ -8,12 +8,16 @@ version: 2.0
 # https://hub.docker.com/r/circleci/node/tags/
 
 jobs:
-  build:
+  install-and-cibuild:
     docker:
-      - image: circleci/node:12.13.0
+      - image: circleci/node:12.22.1
     working_directory: ~/plotly.js
     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: |
@@ -36,45 +40,45 @@ jobs:
           paths:
             - plotly.js
 
-  test-jasmine:
+  no-gl-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: circleci/node:12.13.0-browsers
-    parallelism: 2
+      - image: circleci/node:12.22.1-browsers
+    parallelism: 8
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
           at: ~/
       - run:
-          name: Run jasmine tests (batch 1)
-          command: ./.circleci/test.sh jasmine
+          name: Run jasmine tests (part A)
+          command: ./.circleci/test.sh no-gl-jasmine
 
-  test-jasmine2:
+  webgl-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: circleci/node:12.13.0-browsers
-    parallelism: 3
+      - image: circleci/node:12.22.1-browsers
+    parallelism: 8
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
           at: ~/
       - run:
-          name: Run jasmine tests (batch 2)
-          command: ./.circleci/test.sh jasmine2
+          name: Run jasmine tests (part B)
+          command: ./.circleci/test.sh webgl-jasmine
 
-  test-jasmine3:
+  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:
           at: ~/
       - run:
-          name: Run jasmine tests (batch 3)
-          command: ./.circleci/test.sh jasmine3
+          name: Run jasmine tests (part C)
+          command: ./.circleci/test.sh no-gl-flaky-jasmine
 
-  test-image:
+  stable-image:
     docker:
       - image: plotly/testbed:latest
     parallelism: 4
@@ -88,13 +92,13 @@ jobs:
             supervisord &
             npm run docker -- setup
       - run:
-          name: Run image tests
-          command: ./.circleci/test.sh image
+          name: Run image tests (part A)
+          command: ./.circleci/test.sh stable-image ; find build -maxdepth 1 -type f -delete
       - store_artifacts:
           path: build
           destination: /
 
-  test-image2:
+  flaky-image:
     docker:
       - image: plotly/testbed:latest
     working_directory: /var/www/streambed/image_server/plotly.js/
@@ -107,38 +111,52 @@ jobs:
             supervisord &
             npm run docker -- setup
       - run:
-          name: Run image tests
-          command: ./.circleci/test.sh image2
+          name: Run image tests (part B)
+          command: ./.circleci/test.sh flaky-image ; find build -maxdepth 1 -type f -delete
       - store_artifacts:
           path: build
           destination: /
 
-  test-syntax:
+  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:
           at: ~/
       - run:
-          name: Run syntax tests
-          command: ./.circleci/test.sh syntax
+          name: Run syntax tests on source files
+          command: ./.circleci/test.sh source-syntax
 
-  test-bundle:
+  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:
           at: ~/
       - run:
-          name: Run test-bundle
-          command: ./.circleci/test.sh bundle
+          name: Run jasmine tests (part D)
+          command: ./.circleci/test.sh jasmine-bundle
 
-  publish:
+  publish-dist:
     docker:
-      - image: circleci/node:12.13.0
+      - image: circleci/node:12.22.1
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -166,39 +184,77 @@ 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 certain bundles against function constructors
-          command: npm run no-new-func
+          name: Test plotly.min.js import using requirejs
+          command: npm run test-requirejs
       - run:
           name: Test plotly bundles againt unexpected characters
           command: npm run no-bad-char
+      - 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
   build-and-test:
     jobs:
-      - build
-      - test-bundle:
+      - install-and-cibuild
+      - jasmine-bundle:
+          requires:
+            - install-and-cibuild
+      - no-gl-jasmine:
+          requires:
+            - install-and-cibuild
+      - webgl-jasmine:
+          requires:
+            - install-and-cibuild
+      - no-gl-flaky-jasmine:
           requires:
-            - build
-      - test-jasmine:
+            - install-and-cibuild
+      - stable-image:
           requires:
-            - build
-      - test-jasmine2:
+            - install-and-cibuild
+      - flaky-image:
           requires:
-            - build
-      - test-jasmine3:
+            - install-and-cibuild
+      - mock-validation:
           requires:
-            - build
-      - test-image:
+            - install-and-cibuild
+      - source-syntax:
           requires:
-            - build
-      - test-image2:
+            - install-and-cibuild
+      - publish-dist:
           requires:
-            - build
-      - test-syntax:
+            - install-and-cibuild
+      - test-dist1:
           requires:
-            - build
-      - publish:
+            - publish-dist
+      - test-dist2:
           requires:
-            - build
+            - publish-dist

.circleci/test.sh

@@ -41,28 +41,29 @@ set_tz () {
 
 case $1 in
 
-    jasmine)
+    no-gl-jasmine)
         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
         ;;
 
-    jasmine2)
+    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=1
+            MAX_AUTO_RETRY=2
             retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI --doNotFailOnEmptyTestSuite
         done
 
         exit $EXIT_STATE
         ;;
 
-    jasmine3)
+    no-gl-flaky-jasmine)
         set_tz
 
         SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=1 --tag=flaky | circleci tests split))
@@ -75,26 +76,26 @@ case $1 in
         exit $EXIT_STATE
         ;;
 
-    image)
+    stable-image)
         SUITE=$(find $ROOT/test/image/mocks/ -type f -printf "%f\n" | circleci tests split)
         npm run test-image -- $SUITE --filter --skip-flaky || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
-    image2)
+    flaky-image)
         MAX_AUTO_RETRY=5
         retry npm run test-image -- --just-flaky
         npm run test-export     || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
-    bundle)
+    jasmine-bundle)
         set_tz
         npm run test-bundle || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
-    syntax)
+    source-syntax)
         npm run lint        || EXIT_STATE=$?
         npm run test-syntax || EXIT_STATE=$?
         exit $EXIT_STATE

.eslintignore

@@ -2,5 +2,5 @@ node_modules
 dist
 build
 
+tasks/test_requirejs.js
 test/jasmine/assets/jquery-1.8.3.min.js
-src/plots/polar/legacy/micropolar.js