Merge remote-tracking branch 'origin/master' into dummy-anchor-href

Author: archmoj

.circleci/config.yml

@@ -15,19 +15,8 @@ jobs:
     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: |
-            npm ci
-      - run:
-          name: List dependency versions
-          command: |
-            echo "npm: $(npm --version)"
-            echo "node: $(node --version)"
-            npm ls || true
+          name: set up build environment
+          command: .circleci/env_build.sh
       - run:
           name: Pretest
           command: |
@@ -87,31 +76,8 @@ jobs:
       - attach_workspace:
           at: ~/
       - run:
-          name: which pip3 version
-          command: which pip3 && pip3 --version
-      - run:
-          name: install kaleido v0.2.1
-          command: python3 -m pip install kaleido==0.2.1
-      - run:
-          name: install plotly.io v5.0.0
-          command: python3 -m pip install plotly==5.0.0
-      - run:
-          name: install liberation2 fonts
-          command: sudo apt-get install fonts-liberation2
-      - run:
-          name: install OpenSans fonts
-          command: sudo apt-get install fonts-open-sans
-      - run:
-          name: install NotoSansCJK fonts
-          command: sudo apt install fonts-noto-cjk
-      - run:
-          name: download google fonts e.g. Dosis, GravitasOne, NotoSansMono, NotoSans, NotoSerif, Old_Standard_TT, PT_Sans_Narrow, Raleway and Roboto
-          command: python3 .circleci/download_google_fonts.py
-      - run:
-          name: install downloaded google fonts
-          command: |
-            sudo cp -r .circleci/fonts/ /usr/share/
-            sudo fc-cache -f
+          name: install kaleido, plotly.io and required fonts
+          command: .circleci/env_image.sh
       - run:
           name: create all png files
           command: .circleci/test.sh make-baselines
@@ -142,14 +108,8 @@ jobs:
       - attach_workspace:
           at: ~/
       - run:
-          name: which pip3 version
-          command: which pip3 && pip3 --version
-      - run:
-          name: install kaleido v0.2.1
-          command: python3 -m pip install kaleido==0.2.1
-      - run:
-          name: install plotly.io v5.0.0
-          command: python3 -m pip install plotly==5.0.0
+          name: install kaleido, plotly.io and required fonts
+          command: .circleci/env_image.sh
       - run:
           name: install poppler-utils to have pdftops for exporting eps
           command: sudo apt-get install poppler-utils
@@ -217,8 +177,10 @@ jobs:
       - image: circleci/node:12.22.1
     working_directory: ~/plotly.js
     steps:
-      - attach_workspace:
-          at: ~/
+      - checkout
+      - run:
+          name: set up build environment
+          command: .circleci/env_build.sh
       - run:
           name: Build dist/
           command: npm run build
@@ -242,18 +204,6 @@ 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 plotly.min.js import using requirejs
           command: npm run test-requirejs
@@ -263,20 +213,9 @@ jobs:
       - 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
@@ -313,12 +252,5 @@ workflows:
       - source-syntax:
           requires:
             - install-and-cibuild
-      - publish-dist:
-          requires:
-            - install-and-cibuild
-      - test-dist1:
-          requires:
-            - publish-dist
-      - test-dist2:
-          requires:
-            - publish-dist
+
+      - publish-dist

.circleci/env_build.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+export NODE_OPTIONS='--max-old-space-size=4096' && \
+echo "node version: $(node --version)" && \
+echo "npm version: $(npm --version)" && \
+npm ci && \
+npm ls || true

.circleci/env_image.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+sudo apt-get install fonts-liberation2 fonts-open-sans fonts-noto-cjk fonts-noto-color-emoji && \
+sudo python3 .circleci/download_google_fonts.py && \
+sudo cp -r .circleci/fonts/ /usr/share/ && \
+sudo fc-cache -f && \
+sudo python3 -m pip install kaleido==0.2.1 plotly==5.1.0 --progress-bar off

README.md

@@ -71,7 +71,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>
+<script type="module">
     import "https://cdn.plot.ly/plotly-2.2.0.min.js"
     Plotly.newPlot("gd", [{ y: [1, 2, 3] }])
 </script>

package-lock.json

@@ -62,7 +62,7 @@
     ]
   },
   "dependencies": {
-    "@plotly/d3": "3.6.1",
+    "@plotly/d3": "3.7.0",
     "@plotly/d3-sankey": "0.7.2",
     "@plotly/d3-sankey-circular": "0.33.1",
     "@plotly/point-cluster": "^3.1.9",
@@ -78,6 +78,8 @@
     "convex-hull": "^1.0.3",
     "country-regex": "^1.1.0",
     "d3-force": "^1.2.1",
+    "d3-geo": "^1.12.1",
+    "d3-geo-projection": "^2.9.0",
     "d3-hierarchy": "^1.1.9",
     "d3-interpolate": "^1.4.0",
     "d3-time-format": "^2.2.3",
@@ -114,9 +116,9 @@
     "polybooljs": "^1.2.0",
     "probe-image-size": "^7.2.1",
     "regl": "^1.6.1",
-    "regl-error2d": "^2.0.11",
-    "regl-line2d": "^3.1.0",
-    "regl-scatter2d": "^3.2.3",
+    "regl-error2d": "^2.0.12",
+    "regl-line2d": "^3.1.1",
+    "regl-scatter2d": "^3.2.6",
     "regl-splom": "^1.0.14",
     "right-now": "^1.0.0",
     "robust-orientation": "^1.1.3",