Skip to content

Commit 42b06f1

Browse files
feat: consolidate export, frontmatter, folder plugins into unified fs-sync plugin (#2815)
Co-authored-by: yujonglee <[email protected]> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
1 parent 3c445bd commit 42b06f1

File tree

103 files changed

+552
-2201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+552
-2201
lines changed

Cargo.lock

Lines changed: 33 additions & 58 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ hypr-tcc = { path = "crates/tcc", package = "tcc" }
8686
hypr-template-app = { path = "crates/template-app", package = "template-app" }
8787
hypr-template-app-legacy = { path = "crates/template-app-legacy", package = "template-app-legacy" }
8888
hypr-template-eval = { path = "crates/template-eval", package = "template-eval" }
89+
hypr-tiptap = { path = "crates/tiptap", package = "tiptap" }
8990
hypr-transcribe-aws = { path = "crates/transcribe-aws", package = "transcribe-aws" }
9091
hypr-transcribe-azure = { path = "crates/transcribe-azure", package = "transcribe-azure" }
9192
hypr-transcribe-deepgram = { path = "crates/transcribe-deepgram", package = "transcribe-deepgram" }
@@ -138,10 +139,8 @@ tauri-plugin-cli2 = { path = "plugins/cli2" }
138139
tauri-plugin-db2 = { path = "plugins/db2" }
139140
tauri-plugin-deeplink2 = { path = "plugins/deeplink2" }
140141
tauri-plugin-detect = { path = "plugins/detect" }
141-
tauri-plugin-export = { path = "plugins/export" }
142142
tauri-plugin-extensions = { path = "plugins/extensions" }
143-
tauri-plugin-folder = { path = "plugins/folder" }
144-
tauri-plugin-frontmatter = { path = "plugins/frontmatter" }
143+
tauri-plugin-fs-sync = { path = "plugins/fs-sync" }
145144
tauri-plugin-hooks = { path = "plugins/hooks" }
146145
tauri-plugin-icon = { path = "plugins/icon" }
147146
tauri-plugin-importer = { path = "plugins/importer" }

apps/desktop/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@
3636
"@hypr/plugin-db2": "workspace:*",
3737
"@hypr/plugin-deeplink2": "workspace:*",
3838
"@hypr/plugin-detect": "workspace:*",
39-
"@hypr/plugin-export": "workspace:*",
4039
"@hypr/plugin-extensions": "workspace:*",
41-
"@hypr/plugin-folder": "workspace:*",
42-
"@hypr/plugin-frontmatter": "workspace:*",
40+
"@hypr/plugin-fs-sync": "workspace:*",
4341
"@hypr/plugin-hooks": "workspace:*",
4442
"@hypr/plugin-icon": "workspace:*",
4543
"@hypr/plugin-importer": "workspace:*",

apps/desktop/src-tauri/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,9 @@ tauri-plugin-deep-link = { workspace = true }
3434
tauri-plugin-deeplink2 = { workspace = true }
3535
tauri-plugin-detect = { workspace = true }
3636
tauri-plugin-dialog = { workspace = true }
37-
tauri-plugin-export = { workspace = true }
3837
tauri-plugin-extensions = { workspace = true }
39-
tauri-plugin-folder = { workspace = true }
40-
tauri-plugin-frontmatter = { workspace = true }
4138
tauri-plugin-fs = { workspace = true }
39+
tauri-plugin-fs-sync = { workspace = true }
4240
tauri-plugin-hooks = { workspace = true }
4341
tauri-plugin-http = { workspace = true }
4442
tauri-plugin-icon = { workspace = true }

apps/desktop/src-tauri/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,7 @@ pub async fn main() {
9595
.plugin(tauri_plugin_updater::Builder::new().build())
9696
.plugin(tauri_plugin_deep_link::init())
9797
.plugin(tauri_plugin_deeplink2::init())
98-
.plugin(tauri_plugin_export::init())
99-
.plugin(tauri_plugin_folder::init())
100-
.plugin(tauri_plugin_frontmatter::init())
98+
.plugin(tauri_plugin_fs_sync::init())
10199
.plugin(tauri_plugin_os::init())
102100
.plugin(tauri_plugin_fs::init())
103101
.plugin(tauri_plugin_path2::init())

apps/desktop/src/store/tinybase/persister/folder/ops.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { commands as folderCommands } from "@hypr/plugin-folder";
1+
import { commands as fsSyncCommands } from "@hypr/plugin-fs-sync";
22

33
import type { Store } from "../../store/main";
44

@@ -28,7 +28,7 @@ export async function moveSessionToFolder(
2828

2929
store.setCell("sessions", sessionId, "folder_id", targetFolderId);
3030

31-
const result = await folderCommands.moveSession(sessionId, targetFolderId);
31+
const result = await fsSyncCommands.moveSession(sessionId, targetFolderId);
3232

3333
if (result.status === "error") {
3434
console.error("[FolderOps] moveSession failed:", result.error);
@@ -44,7 +44,7 @@ export async function createFolder(
4444
): Promise<{ status: "ok" } | { status: "error"; error: string }> {
4545
const { reloadFolders } = getConfig();
4646

47-
const result = await folderCommands.createFolder(folderPath);
47+
const result = await fsSyncCommands.createFolder(folderPath);
4848

4949
if (result.status === "error") {
5050
console.error("[FolderOps] createFolder failed:", result.error);
@@ -61,7 +61,7 @@ export async function renameFolder(
6161
): Promise<{ status: "ok" } | { status: "error"; error: string }> {
6262
const { reloadFolders } = getConfig();
6363

64-
const result = await folderCommands.renameFolder(oldPath, newPath);
64+
const result = await fsSyncCommands.renameFolder(oldPath, newPath);
6565

6666
if (result.status === "error") {
6767
console.error("[FolderOps] renameFolder failed:", result.error);
@@ -77,7 +77,7 @@ export async function deleteFolder(
7777
): Promise<{ status: "ok" } | { status: "error"; error: string }> {
7878
const { reloadFolders } = getConfig();
7979

80-
const result = await folderCommands.deleteFolder(folderPath);
80+
const result = await fsSyncCommands.deleteFolder(folderPath);
8181

8282
if (result.status === "error") {
8383
console.error("[FolderOps] deleteFolder failed:", result.error);

apps/desktop/src/store/tinybase/persister/folder/persister.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { createCustomPersister } from "tinybase/persisters/with-schemas";
22
import type { MergeableStore, OptionalSchemas } from "tinybase/with-schemas";
33

4-
import { commands as folderCommands } from "@hypr/plugin-folder";
4+
import { commands as fsSyncCommands } from "@hypr/plugin-fs-sync";
55
import {
66
commands as notifyCommands,
77
events as notifyEvents,
@@ -16,7 +16,7 @@ export function createFolderPersister<Schemas extends OptionalSchemas>(
1616
) {
1717
const loadFn = async () => {
1818
try {
19-
const result = await folderCommands.listFolders();
19+
const result = await fsSyncCommands.listFolders();
2020
if (result.status === "error") {
2121
console.error("[FolderPersister] list error:", result.error);
2222
return undefined;

apps/desktop/src/store/tinybase/persister/human/collect.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { MergeableStore, OptionalSchemas } from "tinybase/with-schemas";
22

3-
import type { ParsedDocument } from "@hypr/plugin-frontmatter";
3+
import type { ParsedDocument } from "@hypr/plugin-fs-sync";
44
import type { HumanStorage } from "@hypr/store";
55

66
import type { CollectorResult, TablesContent } from "../utils";

0 commit comments

Comments
 (0)