timonweb · timonweb · Nov 10, 2023 · Aug 24, 2023 · Nov 13, 2023 · Nov 13, 2023
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.circleci/download_google_fonts.py b/.circleci/download_google_fonts.py
@@ -0,0 +1,90 @@
+import requests
+
+dirOut = '.circleci/fonts/truetype/googleFonts/'
+
+def download(repo, family, types) :
+    for t in types :
+        name = family + t + '.ttf'
+        url = repo + name + '?raw=true'
+        print(url)
+        req = requests.get(url, allow_redirects=True)
+        open(dirOut + name, 'wb').write(req.content)
+
+download(
+    'https://github.com/googlefonts/noto-fonts/blob/main/hinted/ttf/NotoSansMono/',
+    'NotoSansMono',
+    [
+        '-Regular',
+        '-Bold'
+    ]
+)
+
+download(
+    'https://github.com/googlefonts/noto-fonts/blob/main/hinted/ttf/NotoSans/',
+    'NotoSans',
+    [
+        '-Regular',
+        '-Italic',
+        '-Bold'
+    ]
+)
+
+download(
+    'https://github.com/googlefonts/noto-fonts/blob/main/hinted/ttf/NotoSerif/',
+    'NotoSerif',
+    [
+        '-Regular',
+        '-Italic',
+        '-Bold',
+        '-BoldItalic',
+    ]
+)
+
+download(
+    'https://github.com/google/fonts/blob/main/ofl/oldstandardtt/',
+    'OldStandard',
+    [
+        '-Regular',
+        '-Italic',
+        '-Bold'
+    ]
+)
+
+download(
+    'https://github.com/google/fonts/blob/main/ofl/ptsansnarrow/',
+    'PT_Sans-Narrow-Web',
+    [
+        '-Regular',
+        '-Bold'
+    ]
+)
+
+download(
+    'https://github.com/impallari/Raleway/blob/master/fonts/v3.000%20Fontlab/TTF/',
+    'Raleway',
+    [
+        '-Regular',
+        '-Regular-Italic',
+        '-Bold',
+        '-Bold-Italic'
+    ]
+)
+
+download(
+    'https://github.com/googlefonts/roboto/blob/main/src/hinted/',
+    'Roboto',
+    [
+        '-Regular',
+        '-Italic',
+        '-Bold',
+        '-BoldItalic'
+    ]
+)
+
+download(
+    'https://github.com/expo/google-fonts/blob/master/font-packages/gravitas-one/',
+    'GravitasOne',
+    [
+        '_400Regular'
+    ]
+)
diff --git a/.circleci/env_build.sh b/.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 --prod --all
diff --git a/.circleci/env_image.sh b/.circleci/env_image.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# install required fonts
+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 && \
+# install kaleido & plotly
+sudo python3 -m pip install kaleido==0.2.1 plotly==5.5.0 --progress-bar off
+# install numpy i.e. to convert arrays to typed arrays
+sudo python3 -m pip install numpy==1.24.2
diff --git a/.circleci/fonts/truetype/googleFonts/.gitignore b/.circleci/fonts/truetype/googleFonts/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/.circleci/test.sh b/.circleci/test.sh
@@ -6,7 +6,7 @@ set +o pipefail
 
 ROOT=$(dirname $0)/..
 EXIT_STATE=0
-MAX_AUTO_RETRY=5
+MAX_AUTO_RETRY=0
 
 log () {
     echo -e "\n$1"
@@ -33,65 +33,107 @@ retry () {
     fi
 }
 
-# set timezone to Alaska time (arbitrary timezone to test date logic)
-set_tz () {
-    sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
-    export TZ='America/Anchorage'
-}
-
 case $1 in
 
-    jasmine)
-        set_tz
-
+    no-gl-jasmine)
         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)
-        set_tz
-
+    webgl-jasmine)
         SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=5 --tag=gl | circleci tests split))
         for s in ${SHARDS[@]}; do
+            MAX_AUTO_RETRY=2
             retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI --doNotFailOnEmptyTestSuite
         done
 
         exit $EXIT_STATE
         ;;
 
-    jasmine3)
-        set_tz
+    virtual-webgl-jasmine)
+        SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=5 --tag=gl | circleci tests split))
+        for s in ${SHARDS[@]}; do
+            MAX_AUTO_RETRY=2
+            retry ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --virtualWebgl --tags=gl --skip-tags=noCI,noVirtualWebgl --doNotFailOnEmptyTestSuite -- "$s"
+        done
 
+        exit $EXIT_STATE
+        ;;
+
+    flaky-no-gl-jasmine)
         SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=1 --tag=flaky | circleci tests split))
 
         for s in ${SHARDS[@]}; do
+            MAX_AUTO_RETRY=5
             retry npm run test-jasmine -- "$s" --tags=flaky --skip-tags=noCI
         done
 
         exit $EXIT_STATE
         ;;
 
-    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=$?
+    bundle-jasmine)
+        npm run test-bundle || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
-    image2)
-        retry npm run test-image -- --just-flaky
-        npm run test-export     || EXIT_STATE=$?
+    mathjax-firefox)
+        ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --nowatch || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
-    bundle)
-        set_tz
-        npm run test-bundle || EXIT_STATE=$?
+    mathjax-firefox82+)
+        ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --skip-tags=noFF82 --nowatch &&
+        ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --mathjax3 --skip-tags=noFF82 --nowatch &&
+        ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_config --mathjax3 --nowatch &&
+        ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_config --nowatch || EXIT_STATE=$?
+        exit $EXIT_STATE
+        ;;
+
+    make-baselines-virtual-webgl)
+        SUITE=$({\
+                  find $ROOT/test/image/mocks/gl*     -type f -printf "%f\n"; \
+                  find $ROOT/test/image/mocks/mapbox* -type f -printf "%f\n"; \
+                } | sed 's/\.json$//1' | circleci tests split)
+        python3 test/image/make_baseline.py virtual-webgl $SUITE || EXIT_STATE=$?
+        exit $EXIT_STATE
+        ;;
+
+    make-baselines-mathjax3)
+        python3 test/image/make_baseline.py mathjax3    legend_mathjax_title_and_items mathjax parcats_grid_subplots table_latex_multitrace_scatter table_plain_birds table_wrapped_birds ternary-mathjax || EXIT_STATE=$?
+        exit $EXIT_STATE
+        ;;
+
+    make-baselines-b64)
+        SUITE=$(find $ROOT/test/image/mocks/ -type f -printf "%f\n" | sed 's/\.json$//1' | circleci tests split)
+        python3 test/image/make_baseline.py b64 $SUITE || EXIT_STATE=$?
+        exit $EXIT_STATE
+        ;;
+
+    make-baselines)
+        SUITE=$(find $ROOT/test/image/mocks/ -type f -printf "%f\n" | sed 's/\.json$//1' | circleci tests split)
+        python3 test/image/make_baseline.py $SUITE || EXIT_STATE=$?
+        exit $EXIT_STATE
+        ;;
+
+    test-image)
+        node test/image/compare_pixels_test.js || { tar -cvf build/baselines.tar build/test_images/*.png ; exit 1 ; } || EXIT_STATE=$?
+        exit $EXIT_STATE
+        ;;
+
+    test-image-mathjax3)
+        node test/image/compare_pixels_test.js mathjax3 || { tar -cvf build/baselines.tar build/test_images/*.png ; exit 1 ; } || EXIT_STATE=$?
+        exit $EXIT_STATE
+        ;;
+
+    test-image-virtual-webgl)
+        node test/image/compare_pixels_test.js virtual-webgl || { tar -cvf build/baselines.tar build/test_images/*.png ; exit 1 ; } || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
-    syntax)
+    source-syntax)
         npm run lint        || EXIT_STATE=$?
         npm run test-syntax || EXIT_STATE=$?
         exit $EXIT_STATE

diff --git a/.eslintignore b/.eslintignore
@@ -1,6 +1,8 @@
+stackgl_modules
 node_modules
 dist
 build
 
+tasks/test_amdefine.js
+tasks/test_requirejs.js
 test/jasmine/assets/jquery-1.8.3.min.js
-src/plots/polar/legacy/micropolar.js
diff --git a/.eslintrc b/.eslintrc
@@ -14,8 +14,12 @@
     "Float32Array": true,
     "Float64Array": true,
     "Uint8Array": true,
+    "Int8Array": true,
+    "Uint8ClampedArray": true,
     "Int16Array": true,
+    "Uint16Array": true,
     "Int32Array": true,
+    "Uint32Array": true,
     "ArrayBuffer": true,
     "DataView": true,
     "SVGElement": false
@@ -55,6 +59,7 @@
     "no-floating-decimal": [2],
     "space-infix-ops": [2, {"int32Hint": true}],
     "quotes": [2, "single"],
+    "quote-props": ["error", "as-needed"],
     "dot-notation": [2],
     "dot-location": [2, "property"],
     "operator-linebreak": [2, "after"],

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,3 +1,3 @@
 # These are supported funding model platforms
-
+github: plotly
 custom: https://plot.ly/products/consulting-and-oem/
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,21 +2,21 @@ Thanks for your interest in plotly.js!
 
 ### Translations:
 
-- Make a PR directly to the main repository
 - Please @ mention a few other speakers of this language who can help review your translations.
 - If you've omitted any keys from [dist/translation_keys.txt](https://github.com/plotly/plotly.js/blob/master/dist/translation-keys.txt) - which means they will fall back on the US English text - just make a short comment about why in the PR description: the English text works fine in your language, or you would like someone else to help translating those, or whatever the reason.
 - You should only update files in `lib/locales/`, not those in `dist/`
 
 ### Features, Bug fixes, and others:
 
-Developers are strongly encouraged to first make a PR to their own plotly.js fork and ask one of the maintainers to review the modifications there. Once the pull request is deemed satisfactory, the developer will be asked to make a pull request to the main plotly.js repo and may be asked to squash some commits before doing so.
+Before opening a pull request, developer should:
+1. make sure they are not on the `master` branch of their fork as using `master` for a pull request would make it difficult to fetch `upstream` changes.
+2. fetch latest changes from `upstream/master` into your fork i.e. `origin/master` then pull `origin/master` from you local `master`.
+3. then `git rebase master` their local dev branch off the latest `master` which should be sync with `upstream/master` at this time.
+4. make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on version bumps).
+5. make sure to commit changes to the `package-lock.json` file (if any new dependency required).
+6. provide a title and write an overview of what the PR attempts to do with a link to the issue they are trying to address.
+7. select the _Allow edits from maintainers_ option (see this [article](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) for more details).
 
-Before opening a pull request, developer should: 
-
-- `git rebase` their local branch off the latest `master`,
-- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on version bumps),
-- make sure to commit changes to the `package-lock.json` file (if any),
-- write an overview of what the PR attempts to do,
-- select the _Allow edits from maintainers_ option (see this [article](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) for more details).
-
-Note that it is forbidden to force push (i.e. `git push -f`) to remote branches associated with opened pull requests. Force pushes make it hard for maintainers to keep track of updates. Therefore, if required, please `git merge master` into your PR branch instead of `git rebase master`.
+After opening a pull request, developer:
+ - should create a new small markdown log file using the PR number e.g. `1010_fix.md` or `1010_add.md` inside `draftlogs` folder as described in this [README](https://github.com/plotly/plotly.js/blob/master/draftlogs/README.md), commit it and push.
+ - should **not** force push (i.e. `git push -f`) to remote branches associated with opened pull requests. Force pushes make it hard for maintainers to keep track of updates. Therefore, if required, please fetch `upstream/master` and "merge" with master instead of "rebase".
diff --git a/.gitignore b/.gitignore
@@ -4,8 +4,12 @@ build/*
 !build/plotcss.js
 !build/README.md
 
+dist/*.LICENSE.txt
+
 npm-debug.log*
 *.sublime*
+*~
+tags
 
 .*
 !.circleci

diff --git a/.npmignore b/.npmignore
@@ -2,8 +2,11 @@ build/*
 !build/plotcss.js
 !build/README.md
 
+stackgl_modules/node_modules
+
 devtools
 test
+draftlogs
 dist/extras
 
 circle.yml