diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 3c310b6e..7abb5162 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -5026,8 +5026,9 @@ } }, "node_modules/reconcile-text": { - "version": "0.4.10", - "dev": true, + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/reconcile-text/-/reconcile-text-0.5.0.tgz", + "integrity": "sha512-zki3lqw9Oxdhm9ZvDN17VyYoL1Isc8BEL07ILVDE2yGfNEI7thrkczoNCUr+hkFU2rzZtfxECTG0b7p61AJ6wg==", "license": "MIT" }, "node_modules/regex-parser": { @@ -6393,13 +6394,13 @@ "byte-base64": "^1.1.0", "minimatch": "^10.0.1", "p-queue": "^8.1.0", + "reconcile-text": "^0.5.0", "uuid": "^11.1.0" }, "devDependencies": { "@types/jest": "^29.5.14", "@types/node": "^22.15.30", "jest": "^29.7.0", - "reconcile-text": "^0.4.10", "ts-jest": "^29.3.4", "ts-loader": "^9.5.2", "tslib": "2.8.1", diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json index 08f6543c..82b5dfbe 100644 --- a/frontend/sync-client/package.json +++ b/frontend/sync-client/package.json @@ -16,13 +16,13 @@ "byte-base64": "^1.1.0", "minimatch": "^10.0.1", "p-queue": "^8.1.0", - "uuid": "^11.1.0" + "uuid": "^11.1.0", + "reconcile-text": "^0.5.0" }, "devDependencies": { "@types/jest": "^29.5.14", "@types/node": "^22.15.30", "jest": "^29.7.0", - "reconcile-text": "^0.4.10", "ts-jest": "^29.3.4", "ts-loader": "^9.5.2", "tslib": "2.8.1", diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts index 3711c1f9..e984794d 100644 --- a/frontend/sync-client/src/index.ts +++ b/frontend/sync-client/src/index.ts @@ -20,6 +20,3 @@ export type { ClientCursors } from "./services/types/ClientCursors"; export type { NetworkConnectionStatus } from "./types/network-connection-status"; export { DocumentUpdateStatus } from "./types/document-update-status"; export { SyncClient } from "./sync-client"; - -// re-export reconcile-text types as they're part of the public API -export type { TextWithCursors, CursorPosition } from "reconcile-text"; diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock index dfe18212..c6f607be 100644 --- a/sync-server/Cargo.lock +++ b/sync-server/Cargo.lock @@ -1623,12 +1623,9 @@ dependencies = [ [[package]] name = "reconcile-text" -version = "0.4.10" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb6c98d553dd72cd0e863f7cc1c610abd2cc7fe33e24f14262daf1420941cb3d" -dependencies = [ - "cfg-if", -] +checksum = "c8d690c19b0bf6574cd3591d10f20df5aa52d2af95b8dcaacbc86893292ac8c5" [[package]] name = "redox_syscall" diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml index db18e97d..5b0c8b44 100644 --- a/sync-server/Cargo.toml +++ b/sync-server/Cargo.toml @@ -34,7 +34,7 @@ bimap = "0.6.3" ts-rs = { version = "10.1", features = ["uuid-impl", "chrono-impl"] } serde_with = "3.12.0" base64 = "0.22.1" -reconcile-text = "0.4.10" +reconcile-text = "0.5.0" [profile.release] codegen-units = 1