diff --git a/apps/create-kunkun/__tests__/create-template.test.ts b/apps/create-kunkun/__tests__/create-template.test.ts index 7a5839f..8417fce 100644 --- a/apps/create-kunkun/__tests__/create-template.test.ts +++ b/apps/create-kunkun/__tests__/create-template.test.ts @@ -17,16 +17,14 @@ const templateNames = ["template", "react", "vue", "nuxt", "svelte", "sveltekit" fs.rmdirSync(testDir, { recursive: true }) fs.mkdirpSync(testDir) -await Promise.all( - templateNames.map(async (templateName) => { - const folderName = `${templateName}-ext` - await $`node ${indexjsPath} --outdir ${testDir} --name ${folderName} --template ${templateName}` - const templateDir = path.join(testDir, folderName) - await $`rm -rf node_modules`.cwd(templateDir) // this doesn't work within bun test - await $`pnpm install`.cwd(templateDir) // this doesn't work within bun test - await $`pnpm run build`.cwd(templateDir) - }) -) +for (const templateName of templateNames) { + const folderName = `${templateName}-ext` + await $`node ${indexjsPath} --outdir ${testDir} --name ${folderName} --template ${templateName}` + const templateDir = path.join(testDir, folderName) + await $`rm -rf node_modules`.cwd(templateDir) // this doesn't work within bun test + await $`pnpm install`.cwd(templateDir) // this doesn't work within bun test + const out = await $`pnpm run build`.cwd(templateDir) +} test("Build Artifact Existence", () => { templateNames.forEach(async (templateName) => { diff --git a/apps/desktop/src-tauri/src/lib.rs b/apps/desktop/src-tauri/src/lib.rs index dac4f7b..5d7b3be 100644 --- a/apps/desktop/src-tauri/src/lib.rs +++ b/apps/desktop/src-tauri/src/lib.rs @@ -110,7 +110,9 @@ pub fn run() { .plugin(tauri_plugin_keyring::init()) .plugin(tauri_plugin_network::init()) .plugin(tauri_plugin_system_info::init()) - .invoke_handler(tauri::generate_handler![commands::keyring::get_stronghold_key]); + .invoke_handler(tauri::generate_handler![ + commands::keyring::get_stronghold_key + ]); let app = builder .register_uri_scheme_protocol("appicon", |_app, request| { @@ -307,7 +309,29 @@ pub fn run() { app.run(|_app_handle, event| match event { // tauri::RunEvent::Exit => todo!(), // tauri::RunEvent::ExitRequested { code, api, .. } => todo!(), - // tauri::RunEvent::WindowEvent { label, event, .. } => todo!(), + tauri::RunEvent::WindowEvent { label, event, .. } => { + if label == "main" { + match event { + // tauri::WindowEvent::Resized(physical_size) => todo!(), + // tauri::WindowEvent::Moved(physical_position) => todo!(), + tauri::WindowEvent::CloseRequested { api, .. } => { + api.prevent_close(); + log::info!("main window close requested, hiding"); + let window = _app_handle.get_webview_window("main").unwrap(); + window.hide().unwrap(); + } + // tauri::WindowEvent::Destroyed => todo!(), + // tauri::WindowEvent::Focused(_) => todo!(), + // tauri::WindowEvent::ScaleFactorChanged { + // scale_factor, + // new_inner_size, + // } => todo!(), + // tauri::WindowEvent::DragDrop(drag_drop_event) => todo!(), + // tauri::WindowEvent::ThemeChanged(theme) => todo!(), + _ => {} + } + } + } // tauri::RunEvent::WebviewEvent { label, event, .. } => todo!(), // tauri::RunEvent::Ready => todo!(), // tauri::RunEvent::Resumed => todo!(), diff --git a/apps/desktop/src/lib/utils/index.ts b/apps/desktop/src/lib/utils/index.ts new file mode 100644 index 0000000..3f78d30 --- /dev/null +++ b/apps/desktop/src/lib/utils/index.ts @@ -0,0 +1 @@ +export { cn } from "./tailwind" diff --git a/apps/desktop/src/lib/utils/init.ts b/apps/desktop/src/lib/utils/init.ts new file mode 100644 index 0000000..d33bce9 --- /dev/null +++ b/apps/desktop/src/lib/utils/init.ts @@ -0,0 +1,29 @@ +import { getCurrentWindow } from "@tauri-apps/api/window" +import { dev } from "$app/environment" + +/** + * Initialize the app + */ +export function init() { + const window = getCurrentWindow() + if (window.label === "main") { + initMainWindow() + } + + if (!dev) { + document.addEventListener("contextmenu", function (event) { + event.preventDefault() + console.warn("contextmenu disabled in release mode", event) + }) + } +} + +export function initMainWindow() { + // const window = getCurrentWindow() + // if (window.label === "main") { + // window.onCloseRequested((event) => { + // event.preventDefault() + // window.hide() + // }) + // } +} diff --git a/apps/desktop/src/lib/utils.ts b/apps/desktop/src/lib/utils/tailwind.ts similarity index 100% rename from apps/desktop/src/lib/utils.ts rename to apps/desktop/src/lib/utils/tailwind.ts diff --git a/apps/desktop/src/routes/+layout.svelte b/apps/desktop/src/routes/+layout.svelte index 93d3688..e841bfc 100644 --- a/apps/desktop/src/routes/+layout.svelte +++ b/apps/desktop/src/routes/+layout.svelte @@ -1,17 +1,12 @@