fix: patch in the latest version of yjs

Author: nperez0111

packages/core/src/pm-nodes/BlockContainer.ts

@@ -23,7 +23,8 @@ export const BlockContainer = Node.create<{
   name: "blockContainer",
   group: "blockGroupChild bnBlock",
   // A block always contains content, and optionally a blockGroup which contains nested blocks
-  content: "suggestionBlockContent* blockContent suggestionBlockContent* blockGroup?",
+  content:
+    "suggestionBlockContent* blockContent suggestionBlockContent* blockGroup?",
   // Ensures content-specific keyboard handlers trigger first.
   priority: 50,
   defining: true,

packages/core/src/y/extensions/YSync.ts

@@ -120,11 +120,13 @@ export const YSyncExtension = createExtension(
           mapAttributionToMark,
           attributedNodes: (
             nodeName: string,
-            kinds: { deleted: boolean; inserted: boolean; formatted: boolean },
+            kinds: { delete: boolean; insert: boolean; format: boolean },
           ) => {
-            // eslint-disable-next-line no-console
-            console.log(nodeName, kinds);
-            return Boolean(editor.schema.blockSpecs[nodeName] && kinds.deleted);
+            const result = Boolean(
+              editor.schema.blockSpecs[nodeName] && kinds.delete,
+            );
+
+            return result;
           },
         }),
       ],

patches/@y__prosemirror@2.0.0-2.patch

@@ -35,4 +35,5 @@ allowBuilds:
   leveldown: false
 patchedDependencies:
   "@y/prosemirror@2.0.0-2": "patches/@y__prosemirror@2.0.0-2.patch"
+  '@y/y@14.0.0-rc.16': patches/@y__y@14.0.0-rc.16.patch
   lib0@1.0.0-rc.13: patches/lib0@1.0.0-rc.13.patch

patches/@y__y@14.0.0-rc.16.patch

@@ -0,0 +1,110 @@
+#!/usr/bin/env bash
+#
+# Regenerates the pnpm patch for @y/y (yjs) from a local build.
+#
+# Usage:
+#   ./scripts/patch-yjs.sh [path-to-yjs]
+#
+# Defaults to ../yjs relative to this repo root.
+
+set -euo pipefail
+
+# Version that is actually installed in this repo (pnpm patches the installed
+# version). The local ../yjs checkout may be a newer rc; we still pin to this.
+YJS_PKG="@y/y"
+YJS_VERSION="14.0.0-rc.16"
+
+# pnpm keeps the scope path for the temp patch dir (e.g. .pnpm_patches/@y/y@VER)
+# but escapes "/" to "__" for the committed patch file name.
+YJS_PATCH_DIR_NAME="$YJS_PKG@$YJS_VERSION"
+YJS_PATCH_FILE_NAME="@y__y@$YJS_VERSION.patch"
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+BLOCKNOTE_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+LOCAL_YJS="${1:-$(cd "$BLOCKNOTE_ROOT/../yjs" && pwd)}"
+
+if [[ ! -d "$LOCAL_YJS/src" ]]; then
+  echo "ERROR: Cannot find yjs at $LOCAL_YJS"
+  echo "Pass the path as an argument: $0 /path/to/yjs"
+  exit 1
+fi
+
+echo "==> Using local yjs at: $LOCAL_YJS"
+echo "==> BlockNote root: $BLOCKNOTE_ROOT"
+
+# 0. Build yjs so dist/ is up to date
+echo "==> Building yjs (npm run dist) ..."
+(cd "$LOCAL_YJS" && npm run dist)
+
+PATCH_DIR="$BLOCKNOTE_ROOT/node_modules/.pnpm_patches/$YJS_PATCH_DIR_NAME"
+
+# 1. Clean up any leftover patch dir, then start fresh
+if [[ -d "$PATCH_DIR" ]]; then
+  echo "==> Cleaning up old patch dir ..."
+  rm -rf "$PATCH_DIR"
+fi
+
+echo "==> Running pnpm patch $YJS_PKG@$YJS_VERSION ..."
+cd "$BLOCKNOTE_ROOT"
+pnpm patch "$YJS_PKG@$YJS_VERSION"
+
+echo "==> Patch temp dir: $PATCH_DIR"
+
+# 2. Replace src/ with local build
+echo "==> Replacing src/ ..."
+rm -rf "$PATCH_DIR/src"
+cp -R "$LOCAL_YJS/src" "$PATCH_DIR/src"
+
+# 3. Replace dist/ with local build (.d.ts files)
+echo "==> Replacing dist/ ..."
+rm -rf "$PATCH_DIR/dist"
+cp -R "$LOCAL_YJS/dist" "$PATCH_DIR/dist"
+
+# 4. Replace tests/ (testHelper is part of the published exports)
+if [[ -d "$LOCAL_YJS/tests" ]]; then
+  echo "==> Replacing tests/ ..."
+  rm -rf "$PATCH_DIR/tests"
+  cp -R "$LOCAL_YJS/tests" "$PATCH_DIR/tests"
+fi
+
+# 5. Copy top-level type decls referenced by the package (e.g. global.d.ts)
+if [[ -f "$LOCAL_YJS/global.d.ts" ]]; then
+  echo "==> Copying global.d.ts ..."
+  cp "$LOCAL_YJS/global.d.ts" "$PATCH_DIR/global.d.ts"
+fi
+
+# 6. Update package.json in the patch dir
+echo "==> Updating package.json ..."
+node -e "
+const fs = require('fs');
+const orig = JSON.parse(fs.readFileSync('$PATCH_DIR/package.json', 'utf8'));
+const local = JSON.parse(fs.readFileSync('$LOCAL_YJS/package.json', 'utf8'));
+
+// Keep the original (installed) version so pnpm doesn't try to fetch a
+// different version from the registry.
+orig.version = '$YJS_VERSION';
+
+// Update exports (this package is exports-based, no main/module)
+if (local.exports) orig.exports = local.exports;
+
+// Update files list
+if (local.files) orig.files = local.files;
+
+// Update type/sideEffects if present
+if (local.type) orig.type = local.type;
+if ('sideEffects' in local) orig.sideEffects = local.sideEffects;
+
+// Update bin if present
+if (local.bin) orig.bin = local.bin;
+
+fs.writeFileSync('$PATCH_DIR/package.json', JSON.stringify(orig, null, 2) + '\n');
+console.log('   package.json updated');
+"
+
+# 7. Commit the patch
+echo ""
+echo "==> Running pnpm patch-commit ..."
+pnpm patch-commit "$PATCH_DIR"
+
+echo ""
+echo "==> Done! Patch regenerated at patches/$YJS_PATCH_FILE_NAME"