Lint

Author: Caleb-T-Owens

apps/buzz/dev.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-const { spawn } = require('child_process');
-const path = require('path');
-const net = require('net');
+import { spawn } from 'child_process';
+import net from 'net';
+import path from 'path';
 
 // Colors for console output
 const colors = {
@@ -25,6 +25,7 @@ let electronProcess = null;
 let butProcess = null;
 
 function log(message, color = colors.reset) {
+	// eslint-disable-next-line no-console
 	console.log(`${color}${message}${colors.reset}`);
 }
 
@@ -42,8 +43,8 @@ function spawnProcess(command, args, cwd = process.cwd(), options = {}) {
 	});
 }
 
-function runCommand(command, args, cwd = process.cwd()) {
-	return new Promise((resolve, reject) => {
+async function runCommand(command, args, cwd = process.cwd()) {
+	return await new Promise((resolve, reject) => {
 		log(`Running: ${command} ${args.join(' ')}`, colors.cyan);
 
 		const child = spawnProcess(command, args, cwd);
@@ -62,8 +63,8 @@ function runCommand(command, args, cwd = process.cwd()) {
 	});
 }
 
-function checkPort(port, host = 'localhost') {
-	return new Promise((resolve) => {
+async function checkPort(port, host = 'localhost') {
+	return await new Promise((resolve) => {
 		const socket = new net.Socket();
 
 		socket.setTimeout(500);
@@ -129,9 +130,9 @@ async function main() {
 		log('🚀 Starting GitButler Buzz Development Server', colors.bright + colors.green);
 
 		// Get paths
-		const rootDir = path.resolve(__dirname, '../..');
+		const rootDir = path.resolve(import.meta.dirname, '../..');
 		const desktopDir = path.resolve(rootDir, 'apps/desktop');
-		const buzzDir = __dirname;
+		const buzzDir = import.meta.dirname;
 
 		log('\n🔧 Building TypeScript for Buzz...', colors.yellow);
 

apps/buzz/package.json

@@ -6,8 +6,7 @@
 	"scripts": {
 		"dev": "node dev.js",
 		"dev:simple": "pnpm build-ts && electron .",
-		"build-ts": "tsc",
-		"test": "echo \"Error: no test specified\" && exit 1"
+		"build-ts": "tsc"
 	},
 	"keywords": [],
 	"author": "",

crates/but-server/src/cli.rs

@@ -1,5 +1,5 @@
 use crate::RequestContext;
-use anyhow::{anyhow, bail, Context};
+use anyhow::{Context, anyhow, bail};
 use std::path::Path;
 
 pub fn install_cli(
@@ -14,7 +14,8 @@ fn do_install_cli() -> anyhow::Result<()> {
     let cli_path = get_cli_path()?;
     if cfg!(windows) {
         bail!(
-            "CLI installation is not supported on Windows. Please install manually by placing '{}' in PATH.", cli_path.display()
+            "CLI installation is not supported on Windows. Please install manually by placing '{}' in PATH.",
+            cli_path.display()
         );
     }
 
@@ -94,10 +95,12 @@ pub fn cli_path(
             cli_path.display()
         ));
     }
-    Ok(serde_json::to_value(cli_path.to_string_lossy().to_string())?)
+    Ok(serde_json::to_value(
+        cli_path.to_string_lossy().to_string(),
+    )?)
 }
 
 fn get_cli_path() -> anyhow::Result<std::path::PathBuf> {
     let cli_path = std::env::current_exe()?;
     Ok(cli_path.with_file_name(if cfg!(windows) { "but.exe" } else { "but" }))
-}
+}

crates/but-server/src/commands.rs

@@ -4,7 +4,7 @@ use gitbutler_project::ProjectId;
 use gitbutler_repo::RepositoryExt;
 use gitbutler_repo_actions::RepoActionsExt;
 use serde::Deserialize;
-use serde_json::{json, Value};
+use serde_json::{Value, json};
 
 use crate::RequestContext;
 
@@ -63,7 +63,7 @@ struct GitGetGlobalConfigParams {
 
 pub fn git_remote_branches(ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
     let params: GitRemoteBranchesParams = serde_json::from_value(params)?;
-    
+
     let project = ctx.project_controller.get(params.project_id)?;
     let command_ctx = CommandContext::open(&project, ctx.app_settings.get()?.clone())?;
     let branches = command_ctx.repo().remote_branches()?;
@@ -72,7 +72,7 @@ pub fn git_remote_branches(ctx: &RequestContext, params: Value) -> anyhow::Resul
 
 pub fn git_test_push(ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
     let params: GitTestPushParams = serde_json::from_value(params)?;
-    
+
     let project = ctx.project_controller.get(params.project_id)?;
     let command_ctx = CommandContext::open(&project, ctx.app_settings.get()?.clone())?;
     command_ctx.git_test_push(&params.remote_name, &params.branch_name, Some(None))?;
@@ -81,16 +81,19 @@ pub fn git_test_push(ctx: &RequestContext, params: Value) -> anyhow::Result<Valu
 
 pub fn git_test_fetch(ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
     let params: GitTestFetchParams = serde_json::from_value(params)?;
-    
+
     let project = ctx.project_controller.get(params.project_id)?;
     let command_ctx = CommandContext::open(&project, ctx.app_settings.get()?.clone())?;
-    command_ctx.fetch(&params.remote_name, Some(params.action.unwrap_or_else(|| "test".to_string())))?;
+    command_ctx.fetch(
+        &params.remote_name,
+        Some(params.action.unwrap_or_else(|| "test".to_string())),
+    )?;
     Ok(json!({}))
 }
 
 pub fn git_index_size(ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
     let params: GitIndexSizeParams = serde_json::from_value(params)?;
-    
+
     let project = ctx.project_controller.get(params.project_id)?;
     let command_ctx = CommandContext::open(&project, ctx.app_settings.get()?.clone())?;
     let size = command_ctx
@@ -103,15 +106,22 @@ pub fn git_index_size(ctx: &RequestContext, params: Value) -> anyhow::Result<Val
 
 pub fn git_head(ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
     let params: GitHeadParams = serde_json::from_value(params)?;
-    
+
     let project = ctx.project_controller.get(params.project_id)?;
     let command_ctx = CommandContext::open(&project, ctx.app_settings.get()?.clone())?;
-    let head = command_ctx.repo().head().context("failed to get repository head")?;
+    let head = command_ctx
+        .repo()
+        .head()
+        .context("failed to get repository head")?;
     Ok(json!(head.name().unwrap().to_string()))
 }
 
 pub fn delete_all_data(ctx: &RequestContext, _params: Value) -> anyhow::Result<Value> {
-    for project in ctx.project_controller.list().context("failed to list projects")? {
+    for project in ctx
+        .project_controller
+        .list()
+        .context("failed to list projects")?
+    {
         ctx.project_controller
             .delete(project.id)
             .map_err(|err| err.context("failed to delete project"))?;
@@ -121,23 +131,23 @@ pub fn delete_all_data(ctx: &RequestContext, _params: Value) -> anyhow::Result<V
 
 pub fn git_set_global_config(_ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
     let params: GitSetGlobalConfigParams = serde_json::from_value(params)?;
-    
+
     let mut config = git2::Config::open_default()?;
     config.set_str(&params.key, &params.value)?;
     Ok(json!(params.value))
 }
 
 pub fn git_remove_global_config(_ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
     let params: GitRemoveGlobalConfigParams = serde_json::from_value(params)?;
-    
+
     let mut config = git2::Config::open_default()?;
     config.remove(&params.key)?;
     Ok(json!({}))
 }
 
 pub fn git_get_global_config(_ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
     let params: GitGetGlobalConfigParams = serde_json::from_value(params)?;
-    
+
     let config = git2::Config::open_default()?;
     let value = config.get_string(&params.key);
     match value {
@@ -150,4 +160,4 @@ pub fn git_get_global_config(_ctx: &RequestContext, params: Value) -> anyhow::Re
             }
         }
     }
-}
+}

crates/but-server/src/modes.rs

@@ -4,7 +4,7 @@ use gitbutler_command_context::CommandContext;
 use gitbutler_project::ProjectId;
 use gitbutler_stack::VirtualBranchesHandle;
 use serde::Deserialize;
-use serde_json::{json, Value};
+use serde_json::{Value, json};
 
 use crate::RequestContext;
 
@@ -30,7 +30,7 @@ struct ProjectOnlyParams {
 
 pub fn operating_mode(ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
     let params: OperatingModeParams = serde_json::from_value(params)?;
-    
+
     let project = ctx.project_controller.get(params.project_id)?;
     let command_ctx = CommandContext::open(&project, ctx.app_settings.get()?.clone())?;
     let mode = gitbutler_operating_modes::operating_mode(&command_ctx);
@@ -39,7 +39,7 @@ pub fn operating_mode(ctx: &RequestContext, params: Value) -> anyhow::Result<Val
 
 pub fn enter_edit_mode(ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
     let params: EnterEditModeParams = serde_json::from_value(params)?;
-    
+
     let project = ctx.project_controller.get(params.project_id)?;
     let command_ctx = CommandContext::open(&project, ctx.app_settings.get()?.clone())?;
     let handle = VirtualBranchesHandle::new(project.gb_dir());
@@ -52,13 +52,16 @@ pub fn enter_edit_mode(ctx: &RequestContext, params: Value) -> anyhow::Result<Va
         commit,
         stack.refname()?.to_string().into(),
     )?;
-    
+
     Ok(serde_json::to_value(metadata)?)
 }
 
-pub fn abort_edit_and_return_to_workspace(ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
+pub fn abort_edit_and_return_to_workspace(
+    ctx: &RequestContext,
+    params: Value,
+) -> anyhow::Result<Value> {
     let params: ProjectOnlyParams = serde_json::from_value(params)?;
-    
+
     let project = ctx.project_controller.get(params.project_id)?;
     let command_ctx = CommandContext::open(&project, ctx.app_settings.get()?.clone())?;
 
@@ -67,9 +70,12 @@ pub fn abort_edit_and_return_to_workspace(ctx: &RequestContext, params: Value) -
     Ok(json!({}))
 }
 
-pub fn save_edit_and_return_to_workspace(ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
+pub fn save_edit_and_return_to_workspace(
+    ctx: &RequestContext,
+    params: Value,
+) -> anyhow::Result<Value> {
     let params: ProjectOnlyParams = serde_json::from_value(params)?;
-    
+
     let project = ctx.project_controller.get(params.project_id)?;
     let command_ctx = CommandContext::open(&project, ctx.app_settings.get()?.clone())?;
 
@@ -80,10 +86,10 @@ pub fn save_edit_and_return_to_workspace(ctx: &RequestContext, params: Value) ->
 
 pub fn edit_initial_index_state(ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
     let params: ProjectOnlyParams = serde_json::from_value(params)?;
-    
+
     let project = ctx.project_controller.get(params.project_id)?;
     let command_ctx = CommandContext::open(&project, ctx.app_settings.get()?.clone())?;
 
     let state = gitbutler_edit_mode::commands::starting_index_state(&command_ctx)?;
     Ok(serde_json::to_value(state)?)
-}
+}

crates/but-server/src/stack.rs

@@ -4,7 +4,7 @@ use gitbutler_project::ProjectId;
 use gitbutler_stack::StackId;
 use gitbutler_user::User;
 use serde::Deserialize;
-use serde_json::{json, Value};
+use serde_json::{Value, json};
 
 use crate::RequestContext;
 
@@ -71,7 +71,7 @@ struct PushStackToReviewParams {
 
 pub fn create_branch(ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
     let params: CreateBranchParams = serde_json::from_value(params)?;
-    
+
     let project = ctx.project_controller.get(params.project_id)?;
     let command_ctx = CommandContext::open(&project, ctx.app_settings.get()?.clone())?;
     gitbutler_branch_actions::stack::create_branch(&command_ctx, params.stack_id, params.request)?;
@@ -80,25 +80,34 @@ pub fn create_branch(ctx: &RequestContext, params: Value) -> anyhow::Result<Valu
 
 pub fn remove_branch(ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
     let params: RemoveBranchParams = serde_json::from_value(params)?;
-    
+
     let project = ctx.project_controller.get(params.project_id)?;
     let command_ctx = CommandContext::open(&project, ctx.app_settings.get()?.clone())?;
-    gitbutler_branch_actions::stack::remove_branch(&command_ctx, params.stack_id, params.branch_name)?;
+    gitbutler_branch_actions::stack::remove_branch(
+        &command_ctx,
+        params.stack_id,
+        params.branch_name,
+    )?;
     Ok(json!({}))
 }
 
 pub fn update_branch_name(ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
     let params: UpdateBranchNameParams = serde_json::from_value(params)?;
-    
+
     let project = ctx.project_controller.get(params.project_id)?;
     let command_ctx = CommandContext::open(&project, ctx.app_settings.get()?.clone())?;
-    gitbutler_branch_actions::stack::update_branch_name(&command_ctx, params.stack_id, params.branch_name, params.new_name)?;
+    gitbutler_branch_actions::stack::update_branch_name(
+        &command_ctx,
+        params.stack_id,
+        params.branch_name,
+        params.new_name,
+    )?;
     Ok(json!({}))
 }
 
 pub fn update_branch_description(ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
     let params: UpdateBranchDescriptionParams = serde_json::from_value(params)?;
-    
+
     let project = ctx.project_controller.get(params.project_id)?;
     let command_ctx = CommandContext::open(&project, ctx.app_settings.get()?.clone())?;
     gitbutler_branch_actions::stack::update_branch_description(
@@ -112,7 +121,7 @@ pub fn update_branch_description(ctx: &RequestContext, params: Value) -> anyhow:
 
 pub fn update_branch_pr_number(ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
     let params: UpdateBranchPrNumberParams = serde_json::from_value(params)?;
-    
+
     let project = ctx.project_controller.get(params.project_id)?;
     let command_ctx = CommandContext::open(&project, ctx.app_settings.get()?.clone())?;
     gitbutler_branch_actions::stack::update_branch_pr_number(
@@ -126,19 +135,29 @@ pub fn update_branch_pr_number(ctx: &RequestContext, params: Value) -> anyhow::R
 
 pub fn push_stack(ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
     let params: PushStackParams = serde_json::from_value(params)?;
-    
+
     let project = ctx.project_controller.get(params.project_id)?;
     let command_ctx = CommandContext::open(&project, ctx.app_settings.get()?.clone())?;
-    gitbutler_branch_actions::stack::push_stack(&command_ctx, params.stack_id, params.with_force, params.branch)?;
+    gitbutler_branch_actions::stack::push_stack(
+        &command_ctx,
+        params.stack_id,
+        params.with_force,
+        params.branch,
+    )?;
     Ok(json!({}))
 }
 
 pub fn push_stack_to_review(ctx: &RequestContext, params: Value) -> anyhow::Result<Value> {
     let params: PushStackToReviewParams = serde_json::from_value(params)?;
-    
+
     let project = ctx.project_controller.get(params.project_id)?;
     let command_ctx = CommandContext::open(&project, ctx.app_settings.get()?.clone())?;
-    let review_id = gitbutler_sync::stack_upload::push_stack_to_review(&command_ctx, &params.user, params.stack_id, params.top_branch)?;
+    let review_id = gitbutler_sync::stack_upload::push_stack_to_review(
+        &command_ctx,
+        &params.user,
+        params.stack_id,
+        params.top_branch,
+    )?;
 
     Ok(json!(review_id))
-}
+}