Merge branch 'master' into dev-tooltip

Author: kb-

.circleci/config.yml

@@ -75,7 +75,7 @@ jobs:
     environment:
       # Alaska time (arbitrary timezone to test date logic)
       TZ: "America/Anchorage"
-    parallelism: 12
+    parallelism: 4
     working_directory: ~/plotly.js
     steps:
       - run: sudo apt-get update
@@ -134,6 +134,26 @@ jobs:
           name: Run jasmine tests (part B)
           command: .circleci/test.sh virtual-webgl-jasmine
 
+  webgl-jasmine-chromeLatest:
+    docker:
+      # need '-browsers' version to test in real (xvfb-wrapped) browsers
+      - image: cimg/node:18.20.4-browsers
+    environment:
+      # Alaska time (arbitrary timezone to test date logic)
+      TZ: "America/Anchorage"
+    parallelism: 8
+    working_directory: ~/plotly.js
+    steps:
+      - browser-tools/install-browser-tools: &browser-versions
+          install-firefox: false
+          install-geckodriver: false
+          install-chrome: true
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: Run jasmine tests (part B)
+          command: .circleci/test.sh webgl-jasmine
+
   flaky-no-gl-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
@@ -493,6 +513,9 @@ workflows:
       - virtual-webgl-jasmine:
           requires:
             - install-and-cibuild
+      - webgl-jasmine-chromeLatest:
+          requires:
+            - install-and-cibuild
       - flaky-no-gl-jasmine:
           requires:
             - install-and-cibuild

.github/dependabot.yml

@@ -0,0 +1,19 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 1
+    versioning-strategy: increase
+  - package-ecosystem: "npm"
+    directory: "/stackgl_modules"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 1
+    versioning-strategy: increase

.gitignore

@@ -12,6 +12,7 @@ npm-debug.log*
 tags
 
 .*
+!.github
 !.circleci
 !.gitignore
 !.npmignore

CHANGELOG.md

@@ -9,6 +9,42 @@ To see all merged commits on the master branch that will be part of the next plo
 
 where X.Y.Z is the semver of most recent plotly.js release.
 
+## [2.35.2] -- 2024-09-10
+
+### Fixed
+- Fix require path to maplibre-gl.css (regression introduced in 2.35.1) [[#7146](https://github.com/plotly/plotly.js/pull/7146)],
+  with thanks to @birkskyum for the contribution!
+
+
+## [2.35.1] -- 2024-09-09
+
+### Fixed
+ - Fix rendering traces with `zorder` on overlayed subplots case of multiple traces in each subplot [[#7141](https://github.com/plotly/plotly.js/pull/7141)]
+ - Fix missing CSS for map(maplibre) subplots when used offline [[#7140](https://github.com/plotly/plotly.js/pull/7140)],
+   with thanks to @birkskyum for the contribution!
+
+
+## [2.35.0] -- 2024-08-29
+
+### Added
+ - Add new traces: scattermap, choroplethmap and densitymap and map subplots which use maplibre to render maps [[#7015](https://github.com/plotly/plotly.js/pull/7015), [#7060](https://github.com/plotly/plotly.js/pull/7060), [#7085](https://github.com/plotly/plotly.js/pull/7085), [#7088](https://github.com/plotly/plotly.js/pull/7088), [#7090](https://github.com/plotly/plotly.js/pull/7090), [#7092](https://github.com/plotly/plotly.js/pull/7092), [#7094](https://github.com/plotly/plotly.js/pull/7094), [#7134](https://github.com/plotly/plotly.js/pull/7134)],
+ with thanks to @birkskyum for the contribution!
+
+### Changed
+ - Deprecate mapbox traces and mapbox subplot [[#7087](https://github.com/plotly/plotly.js/pull/7087)]
+ - Drop obsolete `npm v6` installation [[#7095](https://github.com/plotly/plotly.js/pull/7095)]
+ - Use `Node.js v18` and `npm v10` in development [[#7078](https://github.com/plotly/plotly.js/pull/7078)]
+ - Update npm lockfile to v3 [[#7099](https://github.com/plotly/plotly.js/pull/7099)]
+ - Update turf to v7 [[#7116](https://github.com/plotly/plotly.js/pull/7116)]
+
+### Fixed
+ - Fix centroid calculation in turf [[#7115](https://github.com/plotly/plotly.js/pull/7115)],
+   with thanks to @birkskyum for the contribution!
+ - Fix missing cursor for Ternary Plot[[#7057](https://github.com/plotly/plotly.js/pull/7057)],
+   with thanks to @Lexachoc for the contribution!
+ - Elaborate on the Custom Bundle guide [[#7101](https://github.com/plotly/plotly.js/pull/7101)]
+
+
 ## [2.34.0] -- 2024-07-18
 
 ### Added

LICENSE

@@ -1,6 +1,6 @@
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2021 Plotly, Inc
+Copyright (c) 2016-2024 Plotly Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -62,7 +62,7 @@ You may also consider using [`plotly.js-dist`](https://www.npmjs.com/package/plo
 
 ```html
 <head>
-    <script src="https://cdn.plot.ly/plotly-2.34.0.min.js" charset="utf-8"></script>
+    <script src="https://cdn.plot.ly/plotly-2.35.2.min.js" charset="utf-8"></script>
 </head>
 <body>
     <div id="gd"></div>
@@ -79,7 +79,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 type="module">
-    import "https://cdn.plot.ly/plotly-2.34.0.min.js"
+    import "https://cdn.plot.ly/plotly-2.35.2.min.js"
     Plotly.newPlot("gd", [{ y: [1, 2, 3] }])
 </script>
 ```
@@ -89,7 +89,7 @@ Fastly supports Plotly.js with free CDN service. Read more at <https://www.fastl
 ### Un-minified versions are also available on CDN
 While non-minified source files may contain characters outside UTF-8, it is recommended that you specify the `charset` when loading those bundles.
 ```html
-<script src="https://cdn.plot.ly/plotly-2.34.0.js" charset="utf-8"></script>
+<script src="https://cdn.plot.ly/plotly-2.35.2.js" charset="utf-8"></script>
 ```
 
 > Please note that as of v2 the "plotly-latest" outputs (e.g. https://cdn.plot.ly/plotly-latest.min.js) will no longer be updated on the CDN, and will stay at the last v1 patch v1.58.5. Therefore, to use the CDN with plotly.js v2 and higher, you must specify an exact plotly.js version.

devtools/regl_codegen/server.js renamed to devtools/regl_codegen/server.mjs

@@ -1,14 +1,13 @@
-var fs = require('fs');
-var path = require('path');
-var http = require('http');
-var ecstatic = require('ecstatic');
-var open = require('open');
-var webpack = require('webpack');
-var minimist = require('minimist');
-
-var constants = require('../../tasks/util/constants');
-var config = require('../../webpack.config.js');
-config.optimization = { minimize: false };
+import fs from 'fs';
+import path from 'path';
+import http from 'http';
+import ecstatic from 'ecstatic';
+import open from 'open';
+import minimist from 'minimist';
+
+import constants from '../../tasks/util/constants.js';
+import { build } from 'esbuild';
+import config from '../../esbuild-config.js';
 
 var args = minimist(process.argv.slice(2), {});
 var PORT = args.port || 3000;
@@ -21,6 +20,8 @@ var reglTraceList = [
     'splom'
 ];
 
+
+
 // Create server
 var _static = ecstatic({
     root: constants.pathToRoot,
@@ -57,55 +58,25 @@ var server = http.createServer(function(req, res) {
     }
 });
 
-
-// Start the server up!
-server.listen(PORT);
-
-// open up browser window
-open('http://localhost:' + PORT + '/devtools/regl_codegen/index' + (strict ? '-strict' : '') + '.html');
-
 // Build and bundle all the things!
-getMockFiles()
+await getMockFiles()
     .then(readFiles)
     .then(createMocksList)
     .then(saveMockListToFile)
     .then(saveReglTracesToFile.bind(null, reglTraceList));
 
-// Devtools config
-var devtoolsConfig = {};
-
-var devtoolsPath = path.join(constants.pathToRoot, 'devtools/regl_codegen');
-devtoolsConfig.entry = path.join(devtoolsPath, 'devtools.js');
-
-devtoolsConfig.output = {
-    path: config.output.path,
-    filename: 'regl_codegen-bundle.js',
-    library: {
-        name: 'Tabs',
-        type: 'umd'
-    }
-};
-
-devtoolsConfig.target = config.target;
-devtoolsConfig.plugins = config.plugins;
-devtoolsConfig.optimization = config.optimization;
-devtoolsConfig.mode = 'production';
-
-var compiler;
-
-compiler = webpack(devtoolsConfig);
-compiler.run(function(devtoolsErr, devtoolsStats) {
-    if(devtoolsErr) {
-        console.log('err:', devtoolsErr);
-    } else if(devtoolsStats.errors && devtoolsStats.errors.length) {
-        console.log('stats.errors:', devtoolsStats.errors);
-    } else {
-        console.log('success:', devtoolsConfig.output.path + '/' + devtoolsConfig.output.filename);
+// Start the server up!
+server.listen(PORT);
 
-        purgeGeneratedCode(reglTraceList);
-    }
-});
+// open up browser window
+open('http://localhost:' + PORT + '/devtools/regl_codegen/index' + (strict ? '-strict' : '') + '.html');
 
+var devtoolsPath = path.join(constants.pathToRoot, 'devtools/regl_codegen');
+config.entryPoints = [path.join(devtoolsPath, 'devtools.js')];
+config.outfile = './build/regl_codegen-bundle.js';
+config.sourcemap = false;
+config.minify = false;
+await build(config);
 
 function getMockFiles() {
     return new Promise(function(resolve, reject) {
@@ -240,18 +211,3 @@ function handleCodegen(data) {
     var precompiled = header + imports + exports;
     fs.writeFileSync(pathToReglPrecompiledSrc, precompiled);
 }
-
-
-function purgeGeneratedCode(traces) {
-    var pathToReglCodegenSrc = constants.pathToReglCodegenSrc;
-
-    var files = fs.readdirSync(pathToReglCodegenSrc);
-    files.forEach(function(file) {
-        fs.unlinkSync(path.join(pathToReglCodegenSrc, file));
-    });
-
-    traces.forEach(function(trace) {
-        var pathToReglPrecompiledSrc = path.join(constants.pathToSrc, 'traces', trace, 'regl_precompiled.js');
-        fs.writeFileSync(pathToReglPrecompiledSrc, 'module.exports = {};\n');
-    });
-}

devtools/test_dashboard/index.html

@@ -22,7 +22,7 @@
   <div id="snapshot"></div>
 
   <script src="../../node_modules/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG"></script>
-  <script charset="utf-8" id="source" src="../../build/plotly.js" type="module"></script>
+  <script charset="utf-8" id="source" src="../../build/plotly.js"></script>
   <script charset="utf-8" src="../../build/test_dashboard-bundle.js"></script>
 </body>
 </html>