Rework wasm feature and make it work with getrandom 0.3 (#277)

* update rand requirement from 0.8 to 0.9
* update rand_distr requirement from 0.4 to 0.5
* update getrandom requirement from 0.2 to 0.3
* update code to work with rand=0.9 and rand_distr=0.5 crates
* fix issues with latest getrandom 0.3 and wasm target
 - reworked the wasm use case and removed the wasm feature flag, putting
  everything behind the target specific dependencies

Signed-off-by: Andrei Gherghescu <8067229+andrei-ng@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Author: andrei-ng

.cargo/config.toml

@@ -0,0 +1,2 @@
+[target.wasm32-unknown-unknown]
+rustflags = ['--cfg', 'getrandom_backend="wasm_js"']

.github/workflows/ci.yml

@@ -37,12 +37,12 @@ jobs:
         with:
           components: clippy
           targets: wasm32-unknown-unknown
-      # lint the main library workspace excluding the wasm feature
-      - run: cargo clippy --features plotly_ndarray,plotly_image,kaleido -- -D warnings
-      # lint the plotly library with wasm enabled
-      - run: cargo clippy --package plotly --features wasm --target wasm32-unknown-unknown -- -D warnings
+      # lint the main library workspace for non-wasm target
+      - run: cargo clippy --all-features -- -D warnings
       # lint the non-wasm examples
       - run: cd ${{ github.workspace }}/examples && cargo clippy --workspace --exclude "wasm*" -- -D warnings
+      # lint the plotly library for wasm target
+      - run: cargo clippy --package plotly --target wasm32-unknown-unknown -- -D warnings
       # lint the wasm examples
       - run: cd ${{ github.workspace }}/examples && cargo clippy --target wasm32-unknown-unknown --package "wasm*"
 
@@ -83,8 +83,6 @@ jobs:
         with:
           components: llvm-tools-preview
       - uses: taiki-e/install-action@cargo-llvm-cov
-      # we are skipping anything to do with wasm here
-      - run: cargo llvm-cov --workspace --features plotly_ndarray,plotly_image,kaleido --lcov --output-path lcov.info
       - uses: codecov/codecov-action@v3
 
   build_examples:

CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.13.0] - 2025-02-xx
+### Changed
+- [[#277](https://github.com/plotly/plotly.rs/pull/277)] Removed `wasm` feature flag and put evrything behind target specific dependencies. Added `.cargo/config.toml` for configuration flags needed by `getrandom` version 0.3 on `wasm` targets.
+
 ## [0.12.1] - 2025-01-02
 ### Fixed
 - [[#269](https://github.com/plotly/plotly.rs/pull/269)] Fix publishing to crates.io issue

docs/book/src/fundamentals/shapes.md

@@ -12,7 +12,7 @@ use plotly::layout::{
     ShapeType,
 };
 use plotly::{Bar, color::NamedColor, Plot, Scatter};
-use rand::thread_rng;
+use rand::rng;
 use rand_distr::{Distribution, Normal};
 ```
 

examples/3d_charts/Cargo.toml

@@ -6,5 +6,5 @@ edition = "2021"
 
 [dependencies]
 ndarray = "0.16"
-rand = "0.8"
+rand = "0.9"
 plotly = { path = "../../plotly" }

examples/3d_charts/src/main.rs

@@ -218,8 +218,8 @@ fn colorscale_plot(show: bool) -> Plot {
     let _color: Vec<usize> = (0..z.len()).collect();
     let _color: Vec<u8> = (0..z.len()).map(|x| x as u8).collect();
     let _color: Vec<i16> = {
-        let mut rng = rand::thread_rng();
-        (0..z.len()).map(|_| rng.gen_range(0..100)).collect()
+        let mut rng = rand::rng();
+        (0..z.len()).map(|_| rng.random_range(0..100)).collect()
     };
 
     let color_max = color.iter().fold(f64::MIN, |acc, x| acc.max(*x as f64));

examples/basic_charts/Cargo.toml

@@ -7,5 +7,5 @@ edition = "2021"
 [dependencies]
 ndarray = "0.16"
 plotly = { path = "../../plotly" }
-rand = "0.8"
-rand_distr = "0.4"
+rand = "0.9"
+rand_distr = "0.5"

examples/basic_charts/src/main.rs

@@ -38,7 +38,7 @@ fn simple_scatter_plot(show: bool) -> Plot {
 // ANCHOR: line_and_scatter_plots
 fn line_and_scatter_plots(show: bool) -> Plot {
     let n: usize = 100;
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
     let random_x: Vec<f64> = Array::linspace(0., 1., n).into_raw_vec_and_offset().0;
     let random_y0: Vec<f64> = Normal::new(5., 1.)
         .unwrap()
@@ -273,8 +273,12 @@ fn colored_and_styled_scatter_plot(show: bool) -> Plot {
 // ANCHOR: large_data_sets
 fn large_data_sets(show: bool) -> Plot {
     let n: usize = 100_000;
-    let mut rng = rand::thread_rng();
-    let r: Vec<f64> = Uniform::new(0., 1.).sample_iter(&mut rng).take(n).collect();
+    let mut rng = rand::rng();
+    let r: Vec<f64> = Uniform::new(0., 1.)
+        .unwrap()
+        .sample_iter(&mut rng)
+        .take(n)
+        .collect();
     let theta: Vec<f64> = Normal::new(0., 2. * std::f64::consts::PI)
         .unwrap()
         .sample_iter(&mut rng)

examples/customization/Cargo.toml

@@ -6,6 +6,6 @@ edition = "2021"
 
 [dependencies]
 build_html = "2.5.0"
-rand = "0.8"
+rand = "0.9"
 ndarray = "0.16"
 plotly = { path = "../../plotly" }

examples/customization/src/main.rs

@@ -121,14 +121,11 @@ fn write_html(html_data: &str) -> String {
     use std::env;
     use std::{fs::File, io::Write};
 
-    use rand::{
-        distributions::{Alphanumeric, DistString},
-        thread_rng,
-    };
+    use rand::distr::{Alphanumeric, SampleString};
 
     // Set up the temp file with a unique filename.
     let mut temp = env::temp_dir();
-    let mut plot_name = Alphanumeric.sample_string(&mut thread_rng(), 22);
+    let mut plot_name = Alphanumeric.sample_string(&mut rand::rng(), 22);
     plot_name.push_str(".html");
     plot_name = format!("plotly_{}", plot_name);
     temp.push(plot_name);