diff --git a/.oxfmtignore b/.oxfmtignore deleted file mode 100644 index 7d38738a..00000000 --- a/.oxfmtignore +++ /dev/null @@ -1,2 +0,0 @@ -**/bindings/** -crates/yaak-templates/pkg/** diff --git a/.oxfmtrc.json b/.oxfmtrc.json new file mode 100644 index 00000000..389ff9b4 --- /dev/null +++ b/.oxfmtrc.json @@ -0,0 +1,4 @@ +{ + "printWidth": 100, + "ignorePatterns": ["**/bindings/**", "crates/yaak-templates/pkg/**", "src-web/routeTree.gen.ts"] +} diff --git a/crates-tauri/yaak-mac-window/src/lib.rs b/crates-tauri/yaak-mac-window/src/lib.rs index 9c629eab..e55524ac 100644 --- a/crates-tauri/yaak-mac-window/src/lib.rs +++ b/crates-tauri/yaak-mac-window/src/lib.rs @@ -25,6 +25,7 @@ pub(crate) struct PluginState { } pub fn init() -> TauriPlugin { + #[cfg_attr(not(target_os = "macos"), allow(unused_mut))] let mut builder = plugin::Builder::new("yaak-mac-window") .setup(move |app, _| { app.manage(PluginState { native_titlebar: AtomicBool::new(false) }); diff --git a/package.json b/package.json index dc967498..955a28e2 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "vendor:vendor-plugins": "node scripts/vendor-plugins.cjs", "vendor:vendor-protoc": "node scripts/vendor-protoc.cjs", "vendor:vendor-node": "node scripts/vendor-node.cjs", - "format": "vp fmt --ignore-path .oxfmtignore", + "format": "vp fmt", "lint": "run-p lint:*", "lint:vp": "vp lint", "lint:workspaces": "npm run --workspaces --if-present lint", diff --git a/src-web/tsconfig.json b/src-web/tsconfig.json index 3a78662c..f19dc503 100644 --- a/src-web/tsconfig.json +++ b/src-web/tsconfig.json @@ -5,7 +5,6 @@ "useDefineForClassFields": true, "allowJs": false, "skipLibCheck": true, - "esModuleInterop": false, "allowSyntheticDefaultImports": true, "strict": true, "noUncheckedIndexedAccess": true, @@ -15,9 +14,9 @@ "resolveJsonModule": true, "isolatedModules": true, "noEmit": true, - "jsx": "react-jsx" + "jsx": "react-jsx", }, "include": ["."], "exclude": ["vite.config.ts"], - "references": [{ "path": "./tsconfig.node.json" }] + "references": [{ "path": "./tsconfig.node.json" }], } diff --git a/tsconfig.json b/tsconfig.json index 8880a7df..077d0a81 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,7 +5,6 @@ "useDefineForClassFields": true, "allowJs": false, "skipLibCheck": true, - "esModuleInterop": false, "allowSyntheticDefaultImports": true, "strict": true, "noUncheckedIndexedAccess": true,