Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "vmark",
"private": true,
"version": "0.9.28",
"version": "0.9.29",
"license": "ISC",
"description": "The plain-text workspace where humans and AI collaborate",
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion server/mcp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vmark/mcp-server",
"version": "0.9.28",
"version": "0.9.29",
"description": "MCP server for VMark — the plain-text workspace where humans and AI collaborate",
"type": "module",
"main": "dist/index.js",
Expand Down
2 changes: 1 addition & 1 deletion server/mcp/src/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* lockstep with the app is the five-file `sed` in the bump procedure
* (`.claude/rules/40-version-bump.md`). Edit it only through that procedure.
*/
const VERSION = '0.9.28';
const VERSION = '0.9.29';

/**
* Handle --version flag.
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "vmark"
version = "0.9.28"
version = "0.9.29"
description = "The plain-text workspace where humans and AI collaborate"
authors = ["Xiaolai"]
license = "ISC"
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2",
"productName": "VMark",
"version": "0.9.28",
"version": "0.9.29",
"identifier": "app.vmark",
"build": {
"beforeDevCommand": "pnpm dev",
Expand Down
10 changes: 2 additions & 8 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { FeatureErrorBoundary } from "@/components/FeatureErrorBoundary";
import { useTranslation, withTranslation, type WithTranslation } from "react-i18next";
import { Routes, Route } from "react-router-dom";
import { Toaster } from "sonner";
import { CheckCircle, XCircle, Info, AlertTriangle, Loader2 } from "lucide-react";
import { TOAST_ICONS } from "@/components/toastIcons";
import { DocumentSplitContainer } from "@/components/Editor";
import { Sidebar } from "@/components/Sidebar";
import { SidebarResizeHandle } from "@/components/Sidebar/SidebarResizeHandle";
Expand Down Expand Up @@ -282,13 +282,7 @@ function App() {
<Toaster
position="top-center"
closeButton
icons={{
success: <CheckCircle size={16} />,
error: <XCircle size={16} />,
info: <Info size={16} />,
warning: <AlertTriangle size={16} />,
loading: <Loader2 size={16} className="animate-spin" />,
}}
icons={TOAST_ICONS}
/>
</WindowProvider>
</ErrorBoundary>
Expand Down
26 changes: 26 additions & 0 deletions src/components/toastIcons.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/**
* Purpose: the icon set sonner's `<Toaster>` renders per toast severity.
*
* Extracted from `App.tsx`, which is the document window's composition root and
* sits at the 300-line limit — an explanatory comment on one icon was enough to
* push it over. A severity→icon map is data, not composition, so it does not
* belong in the root anyway.
*
* @coordinates-with src/App.tsx — the sole consumer, passed as `<Toaster icons>`
* @module components/toastIcons
*/

import { CheckCircle, AlertCircle, Info, AlertTriangle, Loader2 } from "lucide-react";

const SIZE = 16;

export const TOAST_ICONS = {
success: <CheckCircle size={SIZE} />,
// AlertCircle, not XCircle: an X-in-a-circle reads as a second (and larger)
// close button beside sonner's own `closeButton`. Keeping the severity ramp
// as i / ! / ⚠ leaves the X shape unique to dismissal.
error: <AlertCircle size={SIZE} />,
info: <Info size={SIZE} />,
warning: <AlertTriangle size={SIZE} />,
loading: <Loader2 size={SIZE} className="animate-spin" />,
};
Loading