[pull] main from liveblocks:main

packages/liveblocks-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liveblocks/client",
-  "version": "3.13.2",
+  "version": "3.13.3-rc1",
   "description": "A client that lets you interact with Liveblocks servers. Liveblocks is the all-in-one toolkit to build collaborative products like Figma, Notion, and more.",
   "license": "Apache-2.0",
   "type": "module",
@@ -34,7 +34,7 @@
     "test:watch": "NODE_OPTIONS=\"--no-deprecation\" vitest"
   },
   "dependencies": {
-    "@liveblocks/core": "3.13.2"
+    "@liveblocks/core": "3.13.3-rc1"
   },
   "devDependencies": {
     "@liveblocks/eslint-config": "*",

packages/liveblocks-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liveblocks/core",
-  "version": "3.13.2",
+  "version": "3.13.3-rc1",
   "description": "Private internals for Liveblocks. DO NOT import directly from this package!",
   "type": "module",
   "main": "./dist/index.cjs",

packages/liveblocks-core/src/index.ts

@@ -272,7 +272,6 @@ export {
   patchNotificationSettings,
 } from "./protocol/NotificationSettings";
 export type {
-  AckOp,
   ClientWireOp,
   CreateListOp,
   CreateMapOp,
@@ -282,6 +281,7 @@ export type {
   DeleteCrdtOp,
   DeleteObjectKeyOp,
   HasOpId,
+  IgnoredOp,
   Op,
   ServerWireOp,
   SetParentKeyOp,

packages/liveblocks-core/src/protocol/Op.ts

@@ -105,13 +105,13 @@ export type DeleteCrdtOp = {
 // way to trigger an acknowledgement for Ops that were seen by the server, but
 // deliberately ignored.
 //
-export type AckOp = {
+export type IgnoredOp = {
   readonly type: OpCode.DELETE_CRDT; // Not a typo!
   readonly id: "ACK"; // (H)ACK
   readonly opId: string;
 };
 
-export function isAckOp(op: ServerWireOp): op is AckOp {
+export function isIgnoredOp(op: ServerWireOp): op is IgnoredOp {
   return op.type === OpCode.DELETE_CRDT && op.id === "ACK";
 }
 
@@ -152,7 +152,7 @@ export type ClientWireCreateOp = CreateOp & HasOpId;
  */
 export type ServerWireOp =
   | ClientWireOp // "Our" Op echoed back in full to ACK (V7 response)
-  | AckOp // "Our" Op ignored, but acked with a classic V7 (h)ack response
+  | IgnoredOp // "Our" Op was ignored by the server (not forwarded) in v7
   | TheirOp; // "Their" Op (V7 forward)
 
 type TheirOp = DistributiveOmit<Op, "opId"> & { opId?: undefined };

packages/liveblocks-core/src/room.ts

@@ -70,7 +70,7 @@ import type {
 } from "./protocol/InboxNotifications";
 import type { MentionData } from "./protocol/MentionData";
 import type { ClientWireOp, Op, ServerWireOp } from "./protocol/Op";
-import { isAckOp, OpCode } from "./protocol/Op";
+import { isIgnoredOp, OpCode } from "./protocol/Op";
 import type { RoomSubscriptionSettings } from "./protocol/RoomSubscriptionSettings";
 import type { IdTuple, SerializedCrdt } from "./protocol/SerializedCrdt";
 import type {
@@ -2064,9 +2064,8 @@ export function createRoom<
   }
 
   function applyOp(op: Op, source: OpSource): ApplyResult {
-    // Explicit case to handle incoming "AckOp"s, which are supposed to be
-    // no-ops.
-    if (isAckOp(op)) {
+    // Explicit case to handle ignored Ops
+    if (isIgnoredOp(op)) {
       return { modified: false };
     }
 

packages/liveblocks-emails/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liveblocks/emails",
-  "version": "3.13.2",
+  "version": "3.13.3-rc1",
   "description": "A set of functions and utilities to make sending emails based on Liveblocks notification events easy. Liveblocks is the all-in-one toolkit to build collaborative products like Figma, Notion, and more.",
   "license": "Apache-2.0",
   "type": "module",
@@ -35,8 +35,8 @@
     "test:watch": "NODE_OPTIONS=\"--no-deprecation\" vitest"
   },
   "dependencies": {
-    "@liveblocks/core": "3.13.2",
-    "@liveblocks/node": "3.13.2"
+    "@liveblocks/core": "3.13.3-rc1",
+    "@liveblocks/node": "3.13.3-rc1"
   },
   "peerDependencies": {
     "react": "^18 || ^19 || ^19.0.0-rc"

packages/liveblocks-node-lexical/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liveblocks/node-lexical",
-  "version": "3.13.2",
+  "version": "3.13.3-rc1",
   "description": "A server-side utility that lets you modify lexical documents hosted in Liveblocks.",
   "license": "Apache-2.0",
   "type": "module",
@@ -34,8 +34,8 @@
     "test:watch": "NODE_OPTIONS=\"--no-deprecation\" vitest"
   },
   "dependencies": {
-    "@liveblocks/core": "3.13.2",
-    "@liveblocks/node": "3.13.2",
+    "@liveblocks/core": "3.13.3-rc1",
+    "@liveblocks/node": "3.13.3-rc1",
     "yjs": "^13.6.18"
   },
   "peerDependencies": {

packages/liveblocks-node-prosemirror/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liveblocks/node-prosemirror",
-  "version": "3.13.2",
+  "version": "3.13.3-rc1",
   "description": "A server-side utility that lets you modify prosemirror and tiptap documents hosted in Liveblocks.",
   "license": "Apache-2.0",
   "type": "module",
@@ -34,8 +34,8 @@
     "test:watch": "NODE_OPTIONS=\"--no-deprecation\" vitest"
   },
   "dependencies": {
-    "@liveblocks/core": "3.13.2",
-    "@liveblocks/node": "3.13.2",
+    "@liveblocks/core": "3.13.3-rc1",
+    "@liveblocks/node": "3.13.3-rc1",
     "yjs": "^13.6.20"
   },
   "peerDependencies": {

packages/liveblocks-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liveblocks/node",
-  "version": "3.13.2",
+  "version": "3.13.3-rc1",
   "description": "A server-side utility that lets you set up a Liveblocks authentication endpoint. Liveblocks is the all-in-one toolkit to build collaborative products like Figma, Notion, and more.",
   "license": "Apache-2.0",
   "type": "module",
@@ -34,7 +34,7 @@
     "test:watch": "NODE_OPTIONS=\"--no-deprecation\" vitest"
   },
   "dependencies": {
-    "@liveblocks/core": "3.13.2",
+    "@liveblocks/core": "3.13.3-rc1",
     "@stablelib/base64": "^1.0.1",
     "fast-sha256": "^1.3.0",
     "node-fetch": "^2.6.1"