diff --git a/package.json b/package.json index 718a67e9..236cc27e 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "react-hook-form": "^7.46.1", "react-hotkeys-hook": "^4.4.1", "react-markdown": "^8.0.7", - "react-player": "^2.12.0", + "react-player": "^2.13.0", "react-router-dom": "^6.15.0", "react-textarea-autosize": "^8.5.3", "react-virtuoso": "^4.5.0", @@ -67,7 +67,7 @@ "zustand": "^4.4.1" }, "devDependencies": { - "@tailwindcss/typography": "^0.5.9", + "@tailwindcss/typography": "^0.5.10", "@tauri-apps/cli": "^1.4.0", "@trivago/prettier-plugin-sort-imports": "^4.2.0", "@types/html-to-text": "^9.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0249318b..b71b9e1d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -110,8 +110,8 @@ dependencies: specifier: ^8.0.7 version: 8.0.7(@types/react@18.2.21)(react@18.2.0) react-player: - specifier: ^2.12.0 - version: 2.12.0(react@18.2.0) + specifier: ^2.13.0 + version: 2.13.0(react@18.2.0) react-router-dom: specifier: ^6.15.0 version: 6.15.0(react-dom@18.2.0)(react@18.2.0) @@ -145,8 +145,8 @@ dependencies: devDependencies: '@tailwindcss/typography': - specifier: ^0.5.9 - version: 0.5.9(tailwindcss@3.3.3) + specifier: ^0.5.10 + version: 0.5.10(tailwindcss@3.3.3) '@tauri-apps/cli': specifier: ^1.4.0 version: 1.4.0 @@ -1695,15 +1695,15 @@ packages: resolution: {integrity: sha512-osvveYtyzdEVbt3OfwwXFr4P2iVBL5u1Q3q4ONBfDY/UpOuXmOlbgwc1xECEboY8wIays8Yt6onaWMUdUbfl0A==} dependencies: '@noble/curves': 1.1.0 - '@noble/hashes': 1.3.2 - '@scure/base': 1.1.3 + '@noble/hashes': 1.3.1 + '@scure/base': 1.1.1 dev: false /@scure/bip39@1.2.1: resolution: {integrity: sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg==} dependencies: - '@noble/hashes': 1.3.2 - '@scure/base': 1.1.3 + '@noble/hashes': 1.3.1 + '@scure/base': 1.1.1 dev: false /@selderee/plugin-htmlparser2@0.11.0: @@ -1835,8 +1835,8 @@ packages: resolution: {integrity: sha512-z/G02d+59gyyUb7KYhKi9jOhicek6QD2oMaotUyG+lUkybpXoV49dY9bj7Ah5Q+y7knK2jU67UTX9FyfGzaxQg==} dev: true - /@tailwindcss/typography@0.5.9(tailwindcss@3.3.3): - resolution: {integrity: sha512-t8Sg3DyynFysV9f4JDOVISGsjazNb48AeIYQwcL+Bsq5uf4RYL75C1giZ43KISjeDGBaTN3Kxh7Xj/vRSMJUUg==} + /@tailwindcss/typography@0.5.10(tailwindcss@3.3.3): + resolution: {integrity: sha512-Pe8BuPJQJd3FfRnm6H0ulKIGoMEQS+Vq01R6M5aCrFB/ccR/shT+0kXLjouGC1gFLm9hopTFN+DMP0pfwRWzPw==} peerDependencies: tailwindcss: '>=3.0.0 || insiders' dependencies: @@ -2872,7 +2872,7 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.21.10 - caniuse-lite: 1.0.30001525 + caniuse-lite: 1.0.30001527 fraction.js: 4.3.6 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -2924,7 +2924,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001525 + caniuse-lite: 1.0.30001527 electron-to-chromium: 1.4.508 node-releases: 2.0.13 update-browserslist-db: 1.0.11(browserslist@4.21.10) @@ -2959,8 +2959,8 @@ packages: engines: {node: '>=6'} dev: false - /caniuse-lite@1.0.30001525: - resolution: {integrity: sha512-/3z+wB4icFt3r0USMwxujAqRvaD/B7rvGTsKhbhSQErVrJvkZCLhgNLJxU8MevahQVH6hCU9FsHdNUFbiwmE7Q==} + /caniuse-lite@1.0.30001527: + resolution: {integrity: sha512-YkJi7RwPgWtXVSgK4lG9AHH57nSzvvOp9MesgXmw4Q7n0C3H04L0foHqfxcmSAm5AcWb8dW9AYj2tR7/5GnddQ==} dev: true /case-anything@2.1.13: @@ -3354,7 +3354,7 @@ packages: safe-regex-test: 1.0.0 string.prototype.trim: 1.2.7 string.prototype.trimend: 1.0.6 - string.prototype.trimstart: 1.0.6 + string.prototype.trimstart: 1.0.7 typed-array-buffer: 1.0.0 typed-array-byte-length: 1.0.0 typed-array-byte-offset: 1.0.0 @@ -5255,7 +5255,7 @@ packages: pidtree: 0.3.1 read-pkg: 3.0.0 shell-quote: 1.8.1 - string.prototype.padend: 3.1.4 + string.prototype.padend: 3.1.5 dev: false /npm-run-path@5.1.0: @@ -5917,8 +5917,8 @@ packages: - supports-color dev: false - /react-player@2.12.0(react@18.2.0): - resolution: {integrity: sha512-rymLRz/2GJJD+Wc01S7S+i9pGMFYnNmQibR2gVE3KmHJCBNN8BhPAlOPTGZtn1uKpJ6p4RPLlzPQ1OLreXd8gw==} + /react-player@2.13.0(react@18.2.0): + resolution: {integrity: sha512-gkY7ZdbVFztlKFFhCPcnDrFQm+L399b8fhWsKatZ+b2wpKJwfUHBXQFMRxqYQGT0ic1/wQ7D7EZEWy7ZBqk2pw==} peerDependencies: react: '>=16.6.0' dependencies: @@ -6379,8 +6379,8 @@ packages: side-channel: 1.0.4 dev: true - /string.prototype.padend@3.1.4: - resolution: {integrity: sha512-67otBXoksdjsnXXRUq+KMVTdlVRZ2af422Y0aTyTjVaoQkGr3mxl2Bc5emi7dOQ3OGVVQQskmLEWwFXwommpNw==} + /string.prototype.padend@3.1.5: + resolution: {integrity: sha512-DOB27b/2UTTD+4myKUFh+/fXWcu/UDyASIXfg+7VzoCNNGOfWvoyU/x5pvVHr++ztyt/oSYI1BcWBBG/hmlNjA==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.2 @@ -6403,8 +6403,8 @@ packages: define-properties: 1.2.0 es-abstract: 1.22.1 - /string.prototype.trimstart@1.0.6: - resolution: {integrity: sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==} + /string.prototype.trimstart@1.0.7: + resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==} dependencies: call-bind: 1.0.2 define-properties: 1.2.0 diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 32ae6435..61455c4d 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -533,9 +533,9 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" @@ -695,9 +695,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f" +checksum = "d87d9d13be47a5b7c3907137f1290b0459a7f80efb26be8c52afb11963bccb02" dependencies = [ "android-tzdata", "iana-time-zone", @@ -2642,7 +2642,6 @@ dependencies = [ "tauri-plugin-stronghold", "tauri-plugin-upload", "webpage", - "window-shadows", "window-vibrancy", ] @@ -5709,9 +5708,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -5971,17 +5970,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "window-shadows" -version = "0.2.1" -source = "git+https://github.com/tauri-apps/window-shadows?branch=dev#a9f5f1f7725609c71404539befca1f1a98095cd2" -dependencies = [ - "cocoa 0.25.0", - "objc", - "raw-window-handle", - "windows-sys 0.48.0", -] - [[package]] name = "window-vibrancy" version = "0.4.0" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 1fa01a64..78b728fe 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -6,17 +6,17 @@ authors = ["Ren Amamiya"] license = "GPL-3.0" repository = "https://github.com/luminous-devs/lume" edition = "2021" -rust-version = "1.71" +rust-version = "1.66" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -tauri-build = { version = "1.4.0", features = [] } +tauri-build = { version = "1.4", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.4.0", features = [ +tauri = { version = "1.4", features = [ "fs-read-dir", "fs-read-file", "window-start-dragging", @@ -46,7 +46,6 @@ tauri-plugin-stronghold = { git = "https://github.com/tauri-apps/plugins-workspa tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } window-vibrancy = { git = "https://github.com/tauri-apps/window-vibrancy", branch = "dev" } -window-shadows = { git = "https://github.com/tauri-apps/window-shadows", branch = "dev" } sqlx-cli = { version = "0.7.0", default-features = false, features = [ "sqlite", ] } @@ -54,8 +53,11 @@ rust-argon2 = "1.0" webpage = { version = "1.6.0", features = ["serde"] } [features] -# this feature is used for production builds or when `devPath` points to the filesystem -# DO NOT REMOVE!! +# by default Tauri runs in production mode +# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL +default = ["custom-protocol"] +# this feature is used used for production builds where `devPath` points to the filesystem +# DO NOT remove this custom-protocol = ["tauri/custom-protocol"] # Optimized for bundle size. If you want faster builds comment out/delete this section. diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 6b3af0b6..a8ca4f67 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -6,7 +6,6 @@ use tauri::Manager; use tauri_plugin_autostart::MacosLauncher; use tauri_plugin_sql::{Migration, MigrationKind}; -use window_shadows::set_shadow; use webpage::{Webpage, WebpageOptions}; use std::time::Duration; @@ -103,9 +102,6 @@ fn main() { apply_vibrancy(&window, NSVisualEffectMaterial::HudWindow, None, None) .expect("Unsupported platform! 'apply_vibrancy' is only supported on macOS"); - // set native shadow - set_shadow(&window, true).expect("Unsupported platform!"); - Ok(()) }) .plugin( diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index fbff5201..78d1966a 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,4 +1,5 @@ { + "$schema": "../node_modules/@tauri-apps/cli/schema.json", "build": { "beforeBuildCommand": "pnpm build", "beforeDevCommand": "pnpm dev", diff --git a/src-tauri/tauri.linux.conf.json b/src-tauri/tauri.linux.conf.json index 319abf8d..2408a078 100644 --- a/src-tauri/tauri.linux.conf.json +++ b/src-tauri/tauri.linux.conf.json @@ -1,4 +1,5 @@ { + "$schema": "../node_modules/@tauri-apps/cli/schema.json", "tauri": { "windows": [ { diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json index 15667f23..1386b524 100644 --- a/src-tauri/tauri.macos.conf.json +++ b/src-tauri/tauri.macos.conf.json @@ -1,4 +1,5 @@ { + "$schema": "../node_modules/@tauri-apps/cli/schema.json", "tauri": { "macOSPrivateApi": true, "windows": [ diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json index 319abf8d..2408a078 100644 --- a/src-tauri/tauri.windows.conf.json +++ b/src-tauri/tauri.windows.conf.json @@ -1,4 +1,5 @@ { + "$schema": "../node_modules/@tauri-apps/cli/schema.json", "tauri": { "windows": [ {