Attempt resolving conflicts in Pull 2911

.circleci/config.yml

@@ -10,18 +10,14 @@ version: 2.0
 jobs:
   build:
     docker:
-      - image: circleci/node:10.9.0
+      - image: circleci/node:12.13.0
     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,51 +29,59 @@ 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
+      - image: circleci/node:12.13.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
 
   test-jasmine2:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: circleci/node:10.9.0-browsers
+      - image: circleci/node:12.13.0-browsers
+    parallelism: 3
     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:12.13.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: |
@@ -88,15 +92,15 @@ jobs:
           command: ./.circleci/test.sh image
       - store_artifacts:
           path: build
+          destination: /
 
   test-image2:
     docker:
       - 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: |
@@ -107,30 +111,79 @@ jobs:
           command: ./.circleci/test.sh image2
       - store_artifacts:
           path: build
+          destination: /
 
   test-syntax:
     docker:
-      - image: circleci/node:10.9.0
+      - image: circleci/node:12.13.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:12.13.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:12.13.0
+    working_directory: ~/plotly.js
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: Build dist/
+          command: npm run build
+      - store_artifacts:
+          path: dist
+          destination: dist
+      - run:
+          name: Pack tarball
+          command: |
+            npm pack
+            version=$(node -e "console.log(require('./package.json').version)")
+            mv plotly.js-$version.tgz plotly.js.tgz
+      - store_artifacts:
+          path: plotly.js.tgz
+          destination: /plotly.js.tgz
+      - run:
+          name: Show URLs to build files
+          command: |
+            PROJECT_NUM=45646037
+            echo https://$CIRCLE_BUILD_NUM-$PROJECT_NUM-gh.circle-artifacts.com/0/plotly.js.tgz
+            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
+
 workflows:
   version: 2
   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
@@ -140,3 +193,6 @@ workflows:
       - test-syntax:
           requires:
             - build
+      - publish:
+          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 || 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 --limit=5 --tag=gl | circleci tests split))
+        for s in ${SHARDS[@]}; do
+            retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI --doNotFailOnEmptyTestSuite
+        done
+
+        exit $EXIT_STATE
+        ;;
+
+    jasmine3)
+        set_tz
+
+        SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=1 --tag=flaky | 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=flaky --skip-tags=noCI
         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 --skip-flaky || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
     image2)
+        retry npm run test-image -- --just-flaky
         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
         ;;
 

.eslintrc

@@ -4,7 +4,7 @@
     "eslint:recommended"
   ],
   "parserOptions": {
-    "ecmaVersion": 5,
+    "ecmaVersion": 5
   },
   "env": {
     "commonjs": true
@@ -31,9 +31,9 @@
     "indent": [0],
     "indent-legacy": [2, 4, {"SwitchCase": 1}],
     "max-len": [0, 80],
-    "brace-style": [0, "stroustrup", {"allowSingleLine": true}],
+    "brace-style": [2, "1tbs", {"allowSingleLine": true}],
     "curly": [2, "multi-line"],
-    "camelcase": [0, {"properties": "never"}],
+    "camelcase": [2, {"properties": "never"}],
     "comma-spacing": [2, {"before": false, "after": true}],
     "comma-style": [2, "last"],
     "semi": [2],
@@ -50,6 +50,7 @@
     "space-in-parens": [2, "never"],
     "space-before-function-paren": [2, "never"],
     "space-before-blocks": [2],
+    "padded-blocks": [2, "never"],
     "spaced-comment": [2, "always"],
     "no-tabs": [2],
     "no-multi-spaces": [2, {"ignoreEOLComments": true}],
@@ -67,11 +68,14 @@
     "no-shadow": [0, {"builtinGlobals": true}],
     "block-scoped-var": [2],
     "no-unused-vars": [2],
+    "one-var": [2, {"initialized": "never"}],
     "no-undef-init": [2],
     "no-use-before-define": [2, "nofunc"],
     "no-loop-func": [2],
     "no-console": [0],
     "no-unused-labels": [2],
-    "no-useless-escape": [0]
+    "no-useless-escape": [0],
+    "func-name-matching": ["error", "always"],
+    "no-prototype-builtins": [0]
   }
 }

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+custom: https://plot.ly/products/consulting-and-oem/

.gitignore

@@ -2,7 +2,6 @@ node_modules
 
 build/*
 !build/plotcss.js
-!build/ploticon.js
 !build/README.md
 
 npm-debug.log*

.npmignore

@@ -1,6 +1,5 @@
 build/*
 !build/plotcss.js
-!build/ploticon.js
 !build/README.md
 
 devtools