diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml index c495d038..e72165f1 100644 --- a/.github/workflows/artifacts.yml +++ b/.github/workflows/artifacts.yml @@ -42,7 +42,10 @@ jobs: - name: Install dependencies run: | cargo install rsw wasm-pack - npm install + npm ci + + - name: Run tests + run: npm test - name: Build artifacts working-directory: ./src-tauri diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 3953ab82..4f9be643 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -12,6 +12,10 @@ edition = "2021" [build-dependencies] tauri-build = { version = "1.2", features = [] } +[target.'cfg(target_os = "macos")'.dependencies] +objc = { version = "0.2.7" } +cocoa = { version = "0.24.1" } + [dependencies] serde_json = { version = "1.0", features = ["raw_value"] } serde = { version = "1.0", features = ["derive"] } @@ -22,8 +26,6 @@ tokio = { version = "1.25.0", features = ["sync"] } futures = { version = "0.3.26" } deno_core = { version = "0.173.0" } deno_ast = { version = "0.24.0", features = ["transpiling"] } -objc = { version = "0.2.7" } -cocoa = { version = "0.24.1" } sqlx = { version = "0.6.2", features = ["sqlite", "runtime-tokio-rustls", "json", "chrono", "time", "offline"] } uuid = { version = "1.3.0" } rand = { version = "0.8.5" } diff --git a/src-web/lib/theme/theme.test.ts b/src-web/lib/theme/theme.test.ts index 48a81088..5b77d21a 100644 --- a/src-web/lib/theme/theme.test.ts +++ b/src-web/lib/theme/theme.test.ts @@ -9,9 +9,9 @@ describe('Generate colors', () => { expect(generateColorVariant('hsl(0,0%,50%)', 950, 'dark', 0.4, 0.6)).toBe('hsl(0,0%,59.0%)'); }); it('Generates light colors', () => { - expect(generateColorVariant('hsl(0,0%,50%)', 50, 'light', 0.2, 0.8)).toBe('hsl(0,0%,77.0%)'); + expect(generateColorVariant('hsl(0,0%,50%)', 50, 'light', 0.2, 0.8)).toBe('hsl(0,0%,80.0%)'); expect(generateColorVariant('hsl(0,0%,50%)', 950, 'light', 0.2, 0.8)).toBe('hsl(0,0%,14.0%)'); - expect(generateColorVariant('hsl(0,0%,50%)', 50, 'light', 0.4, 0.6)).toBe('hsl(0,0%,59.0%)'); + expect(generateColorVariant('hsl(0,0%,50%)', 50, 'light', 0.4, 0.6)).toBe('hsl(0,0%,60.0%)'); expect(generateColorVariant('hsl(0,0%,50%)', 950, 'light', 0.4, 0.6)).toBe('hsl(0,0%,23.0%)'); }); });