Merge branch 'master' into building-docs

Author: gvwilson

.circleci/config.yml

@@ -518,6 +518,7 @@ jobs:
 workflows:
   version: 2
   build-and-test:
+    max_auto_reruns: 1
     jobs:
       - install-and-cibuild
       - timezone-jasmine:

draftlogs/7475_fix.md

@@ -0,0 +1 @@
+ - Update plot with all config changes during call to `Plotly.react` [#7475](https://github.com/plotly/plotly.js/pull/7475)

draftlogs/7542_fix.md

@@ -0,0 +1 @@
+- Fix some typos (and a conditional check) [[#7542](https://github.com/plotly/plotly.js/pull/7542)], with thanks to @musvaage for the contribution!

esbuild-config.js

@@ -1,6 +1,6 @@
 var glsl = require('esbuild-plugin-glsl').glsl;
 var environmentPlugin = require('esbuild-plugin-environment').environmentPlugin;
-const stylePlugin = require('esbuild-style-plugin');
+const InlineCSSPlugin = require('esbuild-plugin-inline-css');
 
 module.exports = {
     entryPoints: ['./lib/index.js'],
@@ -10,7 +10,7 @@ module.exports = {
     minify: false,
     sourcemap: false,
     plugins: [
-        stylePlugin(),
+        InlineCSSPlugin(),
         glsl({
             minify: true,
         }),

package-lock.json

@@ -136,7 +136,7 @@
     "esbuild-plugin-browserify-adapter": "^0.1.4",
     "esbuild-plugin-environment": "^0.4.0",
     "esbuild-plugin-glsl": "^1.2.2",
-    "esbuild-style-plugin": "^1.6.3",
+    "esbuild-plugin-inline-css": "^0.0.1",
     "extra-iterable": "^2.5.22",
     "falafel": "^2.2.5",
     "fs-extra": "^10.1.0",

package.json

@@ -401,7 +401,7 @@ function drawColorBar(g, opts, gd) {
                             ax.tickfont.size :
                             0
                     ) + (
-                        ax.ticks !== 'intside' ?
+                        ax.ticks !== 'inside' ?
                             opts.ticklen || 0 :
                             0
                     );