Fix cargo src rules, publish to crates.io

packages/perspective-jupyterlab/test/results/results.json

@@ -1,5 +1,5 @@
 {
-    "__GIT_COMMIT__": "ef6df703f94bdda20d81b476d8725782904357db",
+    "__GIT_COMMIT__": "82f3e58191f6e05c750e4f3f10977d0b3a14ea4e",
     "resize_Config_should_show_by_default": "f492628efc5ce5c9e1bab910cf2557c9",
     "resize_Resize_the_container_causes_the_widget_to_resize": "96a80143ba27bf42cc22d69c4ff1692a",
     "resize_group_by_traitlet_works": "f86409c2ccbdf3613a4aa20fc24cc543",

packages/perspective-viewer-d3fc/test/results/results.json

@@ -1,5 +1,5 @@
 {
-    "__GIT_COMMIT__": "ef6df703f94bdda20d81b476d8725782904357db",
+    "__GIT_COMMIT__": "82f3e58191f6e05c750e4f3f10977d0b3a14ea4e",
     "area_shows_a_grid_without_any_settings_applied": "67bab9ea6654cc7cf7c7b096824e610a",
     "area_displays_visible_columns_": "9c195f0f7bf184a4cb9e727f1b37b301",
     "area_pivot_by_a_row": "fbae982b73c9cbf91be40a767cbbd3df",

packages/perspective-viewer-datagrid/test/results/results.json

@@ -14,7 +14,7 @@
     "superstore_displays_visible_columns_": "09dd14f0e60da0e8749b7dd514e929f0",
     "superstore_resets_viewable_area_when_the_logical_size_expands_": "e9dd1d275f46f6a0857e0168835d0b38",
     "superstore_resets_viewable_area_when_the_physical_size_expands_": "e469597235cc032619bc095a76f9ad6f",
-    "__GIT_COMMIT__": "ef6df703f94bdda20d81b476d8725782904357db",
+    "__GIT_COMMIT__": "82f3e58191f6e05c750e4f3f10977d0b3a14ea4e",
     "superstore_shows_a_grid_without_any_settings_applied": "192edc6b035af6432c5bd82d295987f1",
     "superstore_pivot_by_a_row": "709a4a6b40153d9bf013f90398ee568d",
     "superstore_pivot_by_two_rows": "23db46ccf9d8327ae992fe3b5f468b3b",
@@ -28,6 +28,6 @@
     "superstore_filters_filters_by_an_alpha_column": "4b9a40c2ffad050ff4cf059e22cb2b68",
     "superstore_filters_filters_with__in__comparator": "5882e2d2694519ba9880d0b2d5b19c44",
     "superstore_perspective-config-update_event_is_fired_when_column_style_is_changed": "3d03b2787f9b903050942052168f755a",
-    "superstore_Column_style_menu_opens_for_numeric_columns": "fc42b6bd729d72974f1f3c91dee18d8b",
-    "superstore_Column_style_menu_opens_for_string_columns": "64ca2b3567212ac3b2a5184b7c033db5"
+    "superstore_Column_style_menu_opens_for_numeric_columns": "bb90da1cce340c8c311850f0b81f0d6a",
+    "superstore_Column_style_menu_opens_for_string_columns": "1c634f208fd1a55ed54a48ccb2c85c14"
 }

packages/perspective-workspace/test/results/results.json

@@ -1,5 +1,5 @@
 {
-    "__GIT_COMMIT__": "ef6df703f94bdda20d81b476d8725782904357db",
+    "__GIT_COMMIT__": "82f3e58191f6e05c750e4f3f10977d0b3a14ea4e",
     "index_restore_workspace_with_detail_only": "d24f601369fbf86c853d4dd2894506e3",
     "index_Light_DOM_restore_workspace_with_detail_only": "e23bd42ed74c5efc2d067301b449027d",
     "index_Shadow_DOM_restore_workspace_with_detail_only": "aa44cdf6689ff93f68d4a4cffe292e09",

rust/perspective-viewer/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "perspective"
-version = "1.7.1"
+version = "1.7.2"
 authors = ["Andrew Stein <steinlink@gmail.com>"]
 edition = "2021"
 description = "A data visualization and analytics component, especially well-suited for large and/or streaming datasets."
@@ -12,7 +12,6 @@ build = "build.rs"
 include = [
     "build.rs",
     "src/**/*",
-    "build/css/**/*",
     "Cargo.toml",
     "package.json",
 ]
@@ -27,7 +26,7 @@ default = []
 
 [build-dependencies]
 serde_json = { version = "1.0.59", features = ["raw_value"] }
-procss = { version = "0.1.4" }
+procss = { version = "0.1.5" }
 glob = "0.3.0"
 anyhow = "1.0.66"
 

rust/perspective-viewer/build.js

@@ -37,7 +37,6 @@ const BUILD = [
         external: ["*.wasm", "*.worker.js"],
         outdir: "dist/esm",
     },
-
     {
         entryPoints: ["src/ts/perspective-viewer.ts"],
         plugins: [
@@ -118,6 +117,7 @@ async function build_all() {
     await Promise.all(POSTBUILD.map(build)).catch(() => process.exit(1));
 
     // legacy compat
+    execSync("cpy target/themes/* dist/css");
     execSync("cpy dist/css/* dist/umd");
 }
 

rust/perspective-viewer/build.rs

@@ -37,7 +37,7 @@ fn main() -> Result<(), anyhow::Error> {
         build.add(&src);
     }
 
-    build.compile()?.write("./build/css")?;
+    build.compile("./target/css")?;
 
     let mut build = BuildCss::new("./src/themes");
     build.add("variables.less");
@@ -49,7 +49,7 @@ fn main() -> Result<(), anyhow::Error> {
     build.add("solarized-dark.less");
     build.add("vaporwave.less");
     build.add("themes.less");
-    build.compile()?.write("./dist/css")?;
+    build.compile("./target/themes")?;
 
     println!(
         "cargo:rustc-env=PKG_VERSION={}",

rust/perspective-viewer/src/rust/components/config_selector.rs

@@ -164,7 +164,7 @@ impl Component for ConfigSelector {
             }
             ConfigSelectorMsg::Close(index, DragTarget::Sort) => {
                 let mut sort = ctx.props().session.get_view_config().sort.clone();
-                sort.remove(index as usize);
+                sort.remove(index);
                 let sort = Some(sort);
                 let config = ViewConfigUpdate {
                     sort,
@@ -176,7 +176,7 @@ impl Component for ConfigSelector {
             }
             ConfigSelectorMsg::Close(index, DragTarget::GroupBy) => {
                 let mut group_by = ctx.props().session.get_view_config().group_by.clone();
-                group_by.remove(index as usize);
+                group_by.remove(index);
                 let config = ViewConfigUpdate {
                     group_by: Some(group_by),
                     ..ViewConfigUpdate::default()
@@ -187,7 +187,7 @@ impl Component for ConfigSelector {
             }
             ConfigSelectorMsg::Close(index, DragTarget::SplitBy) => {
                 let mut split_by = ctx.props().session.get_view_config().split_by.clone();
-                split_by.remove(index as usize);
+                split_by.remove(index);
                 let config = ViewConfigUpdate {
                     split_by: Some(split_by),
                     ..ViewConfigUpdate::default()
@@ -199,7 +199,7 @@ impl Component for ConfigSelector {
             ConfigSelectorMsg::Close(index, DragTarget::Filter) => {
                 self.filter_dropdown.hide().unwrap();
                 let mut filter = ctx.props().session.get_view_config().filter.clone();
-                filter.remove(index as usize);
+                filter.remove(index);
                 let config = ViewConfigUpdate {
                     filter: Some(filter),
                     ..ViewConfigUpdate::default()

rust/perspective-viewer/src/rust/components/containers/dragdrop_list.rs

@@ -197,7 +197,7 @@ where
                 .collect::<Vec<(usize, (bool, Option<yew::virtual_dom::VChild<U>>))>>();
 
             if let Some((x, column)) = &ctx.props().is_dragover {
-                let index = *x as usize;
+                let index = *x;
                 let col_vchild = columns
                     .iter()
                     .map(|z| z.1 .1.as_ref().unwrap())

rust/perspective-viewer/src/rust/components/filter_dropdown.rs

@@ -13,7 +13,7 @@ use super::modal::*;
 use crate::utils::WeakScope;
 use crate::*;
 
-static CSS: &str = include_str!("../../../build/css/filter-dropdown.css");
+static CSS: &str = include_str!("../../../target/css/filter-dropdown.css");
 
 pub enum FilterDropDownMsg {
     SetValues(Vec<String>),

rust/perspective-viewer/src/rust/components/function_dropdown.rs

@@ -14,7 +14,7 @@ use crate::exprtk::CompletionItemSuggestion;
 use crate::utils::WeakScope;
 use crate::*;
 
-static CSS: &str = include_str!("../../../build/css/function-dropdown.css");
+static CSS: &str = include_str!("../../../target/css/function-dropdown.css");
 
 pub enum FunctionDropDownMsg {
     SetValues(Vec<CompletionItemSuggestion>),

rust/perspective-viewer/src/rust/components/style/mod.rs

@@ -36,7 +36,7 @@ macro_rules! css {
             $name,
             include_str!(concat!(
                 env!("CARGO_MANIFEST_DIR"),
-                "/build/css/",
+                "/target/css/",
                 $name,
                 ".css"
             )),