Various dependency updates

Author: kMutagene

src/Plotly.NET.CSharp/ChartAPI/ChartMap.cs

@@ -436,6 +436,8 @@ public static GenericChart.GenericChart BubbleGeo<LongitudesType, LatitudesType,
         /// <param name="LineDash">sets the drawing style of the line</param>
         /// <param name="Line">Sets the line (use this for more finegrained control than the other line-associated arguments)</param>
         /// <param name="Below">Determines if this scattermapbox trace's layers are to be inserted before the layer with the specified ID. By default, scattermapbox layers are inserted above all the base layers. To place the scattermapbox layers above every other layer, set `below` to "''".</param>
+        /// <param name="EnableClustering">Wether or not to enable clustering for points</param>
+        /// <param name="Cluster">Sets the clustering options (use this for more finegrained control than the other cluster-associated arguments)</param>
         /// <param name="UseDefaults">If set to false, ignore the global default settings set in `Defaults`</param>
         public static GenericChart.GenericChart ScatterMapbox<LongitudesType, LatitudesType, TextType>(
             IEnumerable<LongitudesType> longitudes,
@@ -461,6 +463,8 @@ public static GenericChart.GenericChart ScatterMapbox<LongitudesType, LatitudesT
             Optional<StyleParam.DrawingStyle> LineDash = default,
             Optional<Line> Line = default,
             Optional<string> Below = default,
+            Optional<bool> EnableClustering = default,
+            Optional<MapboxCluster> Cluster = default,
             Optional<bool> UseDefaults = default
         )
             where LongitudesType : IConvertible
@@ -491,6 +495,8 @@ public static GenericChart.GenericChart ScatterMapbox<LongitudesType, LatitudesT
                     LineDash: LineDash.ToOption(),
                     Line: Line.ToOption(),
                     Below: Below.ToOption(),
+                    EnableClustering: EnableClustering.ToOption(),
+                    Cluster: Cluster.ToOption(),
                     UseDefaults: UseDefaults.ToOption()
                 );
 
@@ -518,6 +524,8 @@ public static GenericChart.GenericChart ScatterMapbox<LongitudesType, LatitudesT
         /// <param name="MultiMarkerSymbol">Sets the marker symbol for each individual datum</param>
         /// <param name="Marker">Sets the marker (use this for more finegrained control than the other marker-associated arguments)</param>
         /// <param name="Below">Determines if this scattermapbox trace's layers are to be inserted before the layer with the specified ID. By default, scattermapbox layers are inserted above all the base layers. To place the scattermapbox layers above every other layer, set `below` to "''".</param>
+        /// <param name="EnableClustering">Wether or not to enable clustering for points</param>
+        /// <param name="Cluster">Sets the clustering options (use this for more finegrained control than the other cluster-associated arguments)</param>
         /// <param name="UseDefaults">If set to false, ignore the global default settings set in `Defaults`</param>
         public static GenericChart.GenericChart PointMapbox<LongitudesType, LatitudesType, TextType>(
             IEnumerable<LongitudesType> longitudes,
@@ -537,6 +545,8 @@ public static GenericChart.GenericChart PointMapbox<LongitudesType, LatitudesTyp
             Optional<IEnumerable<StyleParam.MarkerSymbol>> MultiMarkerSymbol = default,
             Optional<Marker> Marker = default,
             Optional<string> Below = default,
+            Optional<bool> EnableClustering = default,
+            Optional<MapboxCluster> Cluster = default,
             Optional<bool> UseDefaults = default
         )
             where LongitudesType : IConvertible
@@ -561,6 +571,8 @@ public static GenericChart.GenericChart PointMapbox<LongitudesType, LatitudesTyp
                     MultiMarkerSymbol: MultiMarkerSymbol.ToOption(),
                     Marker: Marker.ToOption(),
                     Below: Below.ToOption(),
+                    EnableClustering: EnableClustering.ToOption(),
+                    Cluster: Cluster.ToOption(),
                     UseDefaults: UseDefaults.ToOption()
                 );
 

src/Plotly.NET.CSharp/Plotly.NET.CSharp.csproj

@@ -37,7 +37,7 @@
 
   <ItemGroup>
     <None Include="..\..\docs\img\logo.png" Pack="true" PackagePath="\" />
-    <PackageReference Include="Plotly.NET" Version="3.0.1" />
+    <PackageReference Include="Plotly.NET" Version="4.0.0-preview.2" />
   </ItemGroup>
 
 </Project>

src/Plotly.NET.ImageExport/Plotly.NET.ImageExport.fsproj

@@ -35,9 +35,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Plotly.NET" Version="3.*" />
+    <PackageReference Include="Plotly.NET" Version="4.0.0-preview.2" />
     <PackageReference Include="DynamicObj" Version="2.0.0" />
-    <PackageReference Include="PuppeteerSharp" Version="7.0.0" />
+    <PackageReference Include="PuppeteerSharp" Version="9.0.2" />
   </ItemGroup>
 
 </Project>

src/Plotly.NET.ImageExport/PuppeteerSharpRenderer.fs

@@ -62,7 +62,7 @@ type PuppeteerSharpRenderer() =
     /// adapted from the original C# implementation by @ilyalatt : https://github.com/ilyalatt/Plotly.NET.PuppeteerRenderer
     ///
     /// attempts to render a chart as static image of the given format with the given dimensions from the given html string
-    let tryRenderAsync (browser: Browser) (width: int) (height: int) (format: StyleParam.ImageFormat) (html: string) =
+    let tryRenderAsync (browser: IBrowser) (width: int) (height: int) (format: StyleParam.ImageFormat) (html: string) =
         task {
             let! page = browser.NewPageAsync() |> Async.AwaitTask
 

src/Plotly.NET.Interactive/Formatters.fs

@@ -5,17 +5,6 @@ open Plotly.NET.GenericChart
 
 module Formatters =
 
-    let interactiveDoc =
-        """
-<div>
-    [CHART]
-    [DESCRIPTION]
-</div>    
-"""
-
     /// Converts a GenericChart to it's HTML representation and embeds it in a div element, together with the chart description for display in notebook environments.
     let toInteractiveHTML gChart =
-        let chartMarkup = toChartHTML gChart
-        let displayOpts = getDisplayOptions gChart
-
-        interactiveDoc.Replace("[CHART]", chartMarkup) |> DisplayOptions.replaceHtmlPlaceholders displayOpts
+        toChartHTML gChart

src/Plotly.NET.Interactive/Plotly.NET.Interactive.fsproj

@@ -49,9 +49,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Plotly.NET" Version="3.*" />
-    <PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.22314.1" />
-    <PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.22314.1" />
+    <PackageReference Include="Plotly.NET" Version="4.0.0-preview.2" />
+    <PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.23102.2" />
+    <PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.23102.2" />
   </ItemGroup>
 
 </Project>

tests/Plotly.NET.ImageExport.Tests/Plotly.NET.ImageExport.Tests.fsproj

@@ -20,7 +20,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Plotly.NET\Plotly.NET.fsproj" />
     <ProjectReference Include="..\..\src\Plotly.NET.ImageExport\Plotly.NET.ImageExport.fsproj" />
   </ItemGroup>
 </Project>