Introduce more packages

.github/workflows/build.yml

@@ -39,6 +39,7 @@ jobs:
           name: blending-windows-bundle
           path: target/release/bundle/
   build-linux:
+    name: Build (Linux)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

Cargo.toml

@@ -3,6 +3,7 @@ resolver = "2"
 members = [
   "apps/backend",
   "packages/tauri-plugin-ftp",
+  "packages/tauri-plugin-dwm",
 ]
 
 [workspace.package]
@@ -12,3 +13,4 @@ license = "ISC"
 
 [workspace.dependencies]
 tauri-plugin-ftp = { path = "packages/tauri-plugin-ftp" }
+tauri-plugin-dwm = { path = "packages/tauri-plugin-dwm" }

apps/backend/Cargo.toml

@@ -31,6 +31,7 @@ url = "2"
 notify = "6"
 
 tauri-plugin-ftp.workspace = true
+tauri-plugin-dwm.workspace = true
 
 windows-core = "0.54"
 

apps/backend/package.json

@@ -1,5 +1,7 @@
 {
+  "private": true,
   "name": "@blending/backend",
+  "version": "0.0.0",
   "packageManager": "yarn@4.1.1",
   "scripts": {
     "dev": "tauri dev",

apps/backend/src/blender.rs

@@ -15,3 +15,7 @@ impl<R: Runtime, T: Manager<R>> BlenderExt<R> for T {
     self.state::<Blender<R>>().inner()
   }
 }
+
+trait Worker {
+
+}

apps/backend/src/main.rs

@@ -13,6 +13,8 @@ use url::Url;
 
 mod commands;
 mod blender;
+mod scraper;
+mod settings;
 
 const BLENDER_ICON: &[u8] = include_bytes!("../resources/blender/blender_icon_32x32.png");
 const VISIBILITY_ICON: &[u8] = include_bytes!("../resources/icon_visibility.png");
@@ -89,12 +91,12 @@ fn main() {
     .plugin(tauri_plugin_autostart::init(MacosLauncher::LaunchAgent, None))
     .plugin(tauri_plugin_shell::init())
     .plugin(tauri_plugin_window_state::Builder::default().build())
-    .plugin(tauri_plugin_cli::init())
     .plugin(
       tauri_plugin_single_instance::init(|app, args, cwd| {
 
       })
     )
+    .plugin(tauri_plugin_dwm::init())
     .plugin(tauri_plugin_dialog::init())
     .setup(|app| {
       let _ = app.autolaunch().disable();

apps/backend/src/scraper.rs

@@ -0,0 +1,19 @@
+use semver::Version;
+use suppaftp::FtpStream;
+
+pub trait Scraper {
+
+}
+
+pub struct StableScraper {
+
+}
+
+impl StableScraper {
+  pub fn scrape() {
+    let mut stream = FtpStream::connect("mirrors.dotsrc.org:21").unwrap();
+    stream.login("anonymous", "").unwrap();
+    stream.cwd("/blender/blender-release/Blender4.1").unwrap();
+  }
+}
+

apps/backend/tauri.conf.json

@@ -25,11 +25,6 @@
       "csp": null
     }
   },
-  "plugins": {
-    "cli": {
-
-    }
-  },
   "bundle": {
     "copyright": "Copyright (c) deminearchiver 2024",
     "active": true,

apps/docs/package.json

@@ -29,7 +29,7 @@
     "solid-js": "^1.8.16",
     "starlight-blog": "^0.5.1",
     "starlight-image-zoom": "^0.2.0",
-    "typescript": "^5.4.3",
+    "typescript": "^5.4.4",
     "unist-util-visit": "^5.0.0"
   },
   "devDependencies": {

apps/frontend/package.json

@@ -11,7 +11,9 @@
   },
   "dependencies": {
     "@blending/common": "workspace:^",
+    "@blending/css": "workspace:^",
     "@blending/material": "workspace:^",
+    "@blending/tauri-plugin-dwm": "workspace:^",
     "@blending/tauri-plugin-ftp": "workspace:^",
     "@material/material-color-utilities": "^0.2.7",
     "@solid-primitives/context": "^0.2.3",
@@ -31,7 +33,7 @@
     "@solid-primitives/refs": "^1.0.8",
     "@types/node": "^20.12.3",
     "@vanilla-extract/vite-plugin": "^4.0.7",
-    "typescript": "^5.4.3",
+    "typescript": "^5.4.4",
     "vite": "^5.2.7",
     "vite-plugin-solid": "^2.10.2"
   }

apps/frontend/src/global.css.ts

@@ -1,6 +1,6 @@
-import { colorMix, css } from "@blending/common/css";
+import css from "@blending/css";
 import { darkTheme } from "@blending/material/theme/global/dark";
-import { fontFace, globalStyle } from "@vanilla-extract/css";
+import { globalStyle } from "@vanilla-extract/css";
 
 /*
 // <uniquifier>: Use a unique and descriptive class name
@@ -107,7 +107,7 @@ globalStyle(
 globalStyle(
   "body::-webkit-scrollbar-thumb",
   {
-    backgroundColor: colorMix(
+    backgroundColor: css.colorMix(
       "srgb",
       [darkTheme.color.onSurface, "12%"],
       "transparent",
@@ -121,7 +121,7 @@ globalStyle(
 globalStyle(
   "body::-webkit-scrollbar-thumb:hover",
   {
-    backgroundColor: colorMix(
+    backgroundColor: css.colorMix(
       "srgb",
       [darkTheme.color.onSurface, "38%"],
       "transparent",

apps/frontend/src/index.tsx

@@ -5,10 +5,10 @@ import { App } from "./App";
 import { Router, Route } from "@solidjs/router";
 
 import "./global.css";
+import "@blending/material/theme/global/dark";
 
 import "material-symbols/rounded.css";
 import { Test } from "./components/onboarding";
-
 render(
   () => <Test />,
   document.getElementById("root")!,

package.json

@@ -13,12 +13,15 @@
   ],
   "scripts": {
     ":": "yarn workspace",
-    ":docs": "yarn workspace @blending/docs",
-    ":backend": "yarn workspace @blending/backend",
-    ":frontend": "yarn workspace @blending/frontend"
+    ":docs": "yarn : @blending/docs",
+    ":backend": "yarn : @blending/backend",
+    ":frontend": "yarn : @blending/frontend",
+    "app:dev": "yarn :backend dev",
+    "app:build": "yarn :backend build",
+    "docs:dev": "yarn :docs dev",
+    "docs:build": "yarn :docs build"
   },
   "devDependencies": {
-    "typescript": "^5.4.3",
     "wrangler": "^3.44.0"
   }
 }

packages/common/package.json

@@ -9,7 +9,7 @@
   "packageManager": "yarn@4.1.1",
   "devDependencies": {
     "@blending/config": "workspace:^",
-    "typescript": "^5.4.3"
+    "typescript": "^5.4.4"
   },
   "dependencies": {
     "@vanilla-extract/css": "^1.14.2",

packages/common/src/css/index.ts

@@ -1,15 +1,5 @@
 import { svgPathProperties as SVGPathProperties } from "svg-path-properties";
 
-export function fontVariationSettings(values: Record<string, number>) {
-  return Object.entries(values)
-    .map(
-      ([key, value]) => `"${key}" ${value}`
-    )
-    .join(",");
-}
-
-export * from "./functions/color-mix"; 
-
 
 export type LinearPoint = [pos: number, val: number];
 
@@ -40,5 +30,3 @@ export function processSVGData(data: string, pointsLength: number): LinearPoint[
   }
   return points;
 }
-
-export * from "./css";

packages/css/package.json

@@ -0,0 +1,19 @@
+{
+  "private": true,
+  "name": "@blending/css",
+  "version": "0.0.0",
+  "type": "module",
+  "exports": {
+    ".": "./src/index.ts",
+    "./syntax": "./src/syntax/index.ts"
+  },
+  "packageManager": "yarn@4.1.1",
+  "dependencies": {
+    "@vanilla-extract/css": "^1.14.2"
+  },
+  "devDependencies": {
+    "@blending/config": "workspace:^",
+    "@blending/utils": "workspace:^",
+    "typescript": "^5.4.4"
+  }
+}

packages/css/src/color-mix.ts

@@ -0,0 +1,51 @@
+import { syntax } from "./syntax";
+
+const COLOR_MIX = syntax.function`color-mix`;
+
+type RectangularColorSpace =
+  | "srgb"
+  | "srgb-linear"
+  | "display-p3"
+  | "a98-rgb"
+  | "prophoto-rgb"
+  | "rec2020"
+  | "lab"
+  | "oklab"
+  | "xyz"
+  | "xyz-d50"
+  | "xyz-d65";
+type PolarColorSpace =
+  | "hsl"
+  | "hwb"
+  | "lch"
+  | "oklch";
+
+type ColorSpace = RectangularColorSpace | PolarColorSpace;
+
+type HueInterpolationMethod =
+  | "shorter"
+  | "longer"
+  | "decreasing"
+  | "increasing";
+
+type ColorInterpolationMethod = ColorSpace | [ColorSpace, HueInterpolationMethod];
+
+type ColorMixColor = string | [string, `${number}%`];
+
+export const colorMix = (
+  method: ColorInterpolationMethod,
+  color1: ColorMixColor,
+  color2: ColorMixColor,
+) => {
+  let parts: string[] = typeof method === "string" ? [method] : method;
+
+  const processColor = (color: ColorMixColor) => {
+    return typeof color === "string" ? color : color.join(" ");
+  }
+
+  return COLOR_MIX(
+    `in ${parts.join(" ")}`,
+    processColor(color1),
+    processColor(color2),
+  );
+}