Merge remote-tracking branch 'origin/main' into releases

YousefED · YousefED · commit b6c56b1a2f88 · 2024-06-02T21:22:43.000+02:00
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -26,6 +26,7 @@ module.exports = {
   },
   ignorePatterns: ["**/ui/*"],
   rules: {
+    "no-console": "error",
     curly: 1,
     "import/no-extraneous-dependencies": [
       "error",
diff --git a/docs/package.json b/docs/package.json
@@ -33,7 +33,7 @@
     "react-github-btn": "^1.4.0",
     "react-icons": "^5.2.1",
     "y-partykit": "^0.0.25",
-    "yjs": "^13.6.1"
+    "yjs": "^13.6.15"
   },
   "devDependencies": {
     "@types/node": "^20",
diff --git a/examples/01-basic/03-all-blocks/App.tsx b/examples/01-basic/03-all-blocks/App.tsx
@@ -40,6 +40,10 @@ export default function App() {
         type: "numberedListItem",
         content: "Numbered List Item",
       },
+      {
+        type: "checkListItem",
+        content: "Check List Item",
+      },
       {
         type: "table",
         content: {
diff --git a/examples/06-collaboration/01-partykit/.bnexample.json b/examples/06-collaboration/01-partykit/.bnexample.json
@@ -5,6 +5,6 @@
   "tags": ["Advanced", "Saving/Loading", "Collaboration"],
   "dependencies": {
     "y-partykit": "^0.0.25",
-    "yjs": "^13.6.1"
+    "yjs": "^13.6.15"
   }
 }
diff --git a/examples/06-collaboration/01-partykit/package.json b/examples/06-collaboration/01-partykit/package.json
@@ -19,7 +19,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "y-partykit": "^0.0.25",
-    "yjs": "^13.6.1"
+    "yjs": "^13.6.15"
   },
   "devDependencies": {
     "@types/react": "^18.0.25",
diff --git a/examples/06-collaboration/02-liveblocks/.bnexample.json b/examples/06-collaboration/02-liveblocks/.bnexample.json
@@ -7,6 +7,6 @@
     "@liveblocks/client": "^1.10.0",
     "@liveblocks/react": "^1.10.0",
     "@liveblocks/yjs": "^1.10.0",
-    "yjs": "^13.6.1"
+    "yjs": "^13.6.15"
   }
 }
diff --git a/examples/06-collaboration/02-liveblocks/package.json b/examples/06-collaboration/02-liveblocks/package.json
@@ -21,7 +21,7 @@
     "@liveblocks/client": "^1.10.0",
     "@liveblocks/react": "^1.10.0",
     "@liveblocks/yjs": "^1.10.0",
-    "yjs": "^13.6.1"
+    "yjs": "^13.6.15"
   },
   "devDependencies": {
     "@types/react": "^18.0.25",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,10 +33,5 @@
     "prepublishOnly": "npm run build && cp README.md packages/core/README.md && cp README.md packages/react/README.md",
     "postpublish": "rm -rf packages/core/README.md && rm -rf packages/react/README.md",
     "clean": "lerna run --stream clean"
-  },
-  "overrides": {
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "prosemirror-model": "1.18.3"
   }
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -54,32 +54,32 @@
     "clean": "rimraf dist && rimraf types"
   },
   "dependencies": {
-    "@tiptap/core": "^2.0.3",
-    "@tiptap/extension-bold": "^2.0.3",
-    "@tiptap/extension-code": "^2.0.3",
-    "@tiptap/extension-collaboration": "^2.0.3",
-    "@tiptap/extension-collaboration-cursor": "^2.0.3",
-    "@tiptap/extension-dropcursor": "^2.0.3",
-    "@tiptap/extension-gapcursor": "^2.0.3",
-    "@tiptap/extension-hard-break": "^2.0.3",
-    "@tiptap/extension-history": "^2.0.3",
-    "@tiptap/extension-horizontal-rule": "^2.0.3",
-    "@tiptap/extension-italic": "^2.0.3",
-    "@tiptap/extension-link": "^2.0.3",
-    "@tiptap/extension-paragraph": "^2.0.3",
-    "@tiptap/extension-strike": "^2.0.3",
-    "@tiptap/extension-table-cell": "^2.0.3",
-    "@tiptap/extension-table-header": "^2.0.3",
-    "@tiptap/extension-table-row": "^2.0.3",
-    "@tiptap/extension-text": "^2.0.3",
-    "@tiptap/extension-underline": "^2.0.3",
-    "@tiptap/pm": "^2.0.3",
+    "@tiptap/core": "^2.4.0",
+    "@tiptap/extension-bold": "^2.4.0",
+    "@tiptap/extension-code": "^2.4.0",
+    "@tiptap/extension-collaboration": "^2.4.0",
+    "@tiptap/extension-collaboration-cursor": "^2.4.0",
+    "@tiptap/extension-dropcursor": "^2.4.0",
+    "@tiptap/extension-gapcursor": "^2.4.0",
+    "@tiptap/extension-hard-break": "^2.4.0",
+    "@tiptap/extension-history": "^2.4.0",
+    "@tiptap/extension-horizontal-rule": "^2.4.0",
+    "@tiptap/extension-italic": "^2.4.0",
+    "@tiptap/extension-link": "^2.4.0",
+    "@tiptap/extension-paragraph": "^2.4.0",
+    "@tiptap/extension-strike": "^2.4.0",
+    "@tiptap/extension-table-cell": "^2.4.0",
+    "@tiptap/extension-table-header": "^2.4.0",
+    "@tiptap/extension-table-row": "^2.4.0",
+    "@tiptap/extension-text": "^2.4.0",
+    "@tiptap/extension-underline": "^2.4.0",
+    "@tiptap/pm": "^2.4.0",
     "hast-util-from-dom": "^4.2.0",
-    "prosemirror-model": "^1.18.3",
+    "prosemirror-model": "^1.21.0",
     "prosemirror-state": "^1.4.3",
-    "prosemirror-tables": "^1.3.4",
-    "prosemirror-transform": "^1.7.2",
-    "prosemirror-view": "^1.31.4",
+    "prosemirror-tables": "^1.3.7",
+    "prosemirror-transform": "^1.9.0",
+    "prosemirror-view": "^1.33.7",
     "rehype-format": "^5.0.0",
     "rehype-parse": "^8.0.4",
     "rehype-remark": "^9.1.2",
@@ -90,9 +90,9 @@
     "remark-stringify": "^10.0.2",
     "unified": "^10.1.2",
     "uuid": "^8.3.2",
-    "y-prosemirror": "1.2.1",
-    "y-protocols": "^1.0.5",
-    "yjs": "^13.6.1"
+    "y-prosemirror": "1.2.5",
+    "y-protocols": "^1.0.6",
+    "yjs": "^13.6.15"
   },
   "devDependencies": {
     "@types/hast": "^2.3.4",
diff --git a/packages/core/src/editor/BlockNoteEditor.ts b/packages/core/src/editor/BlockNoteEditor.ts
@@ -307,6 +307,7 @@ export class BlockNoteEditor<
     this.resolveFileUrl = newOptions.resolveFileUrl || (async (url) => url);
 
     if (newOptions.collaboration && newOptions.initialContent) {
+      // eslint-disable-next-line no-console
       console.warn(
         "When using Collaboration, initialContent might cause conflicts, because changes should come from the collaboration provider"
       );
@@ -777,6 +778,7 @@ export class BlockNoteEditor<
     for (const mark of marks) {
       const config = this.schema.styleSchema[mark.type.name];
       if (!config) {
+        // eslint-disable-next-line no-console
         console.warn("mark not found in styleschema", mark.type.name);
         continue;
       }
diff --git a/packages/core/src/editor/BlockNoteTipTapEditor.ts b/packages/core/src/editor/BlockNoteTipTapEditor.ts
@@ -87,6 +87,7 @@ export class BlockNoteTipTapEditor extends TiptapEditor {
         this.options.parseOptions
       );
     } catch (e) {
+      // eslint-disable-next-line no-console
       console.error(
         "Error creating document from blocks passed as `initialContent`. Caused by exception: ",
         e
diff --git a/packages/core/src/i18n/locales/zh.ts b/packages/core/src/i18n/locales/zh.ts
@@ -61,7 +61,7 @@ export const zh: Dictionary = {
         "勾选列表",
         "复选框",
       ],
-      group: "基本块",
+      group: "基础",
     },
     paragraph: {
       title: "段落",
diff --git a/packages/core/src/schema/blocks/createSpec.ts b/packages/core/src/schema/blocks/createSpec.ts
@@ -1,4 +1,4 @@
-import { ParseRule } from "@tiptap/pm/model";
+import { TagParseRule } from "@tiptap/pm/model";
 import type { BlockNoteEditor } from "../../editor/BlockNoteEditor";
 import { InlineContentSchema } from "../inlineContent/types";
 import { StyleSchema } from "../styles/types";
@@ -68,7 +68,7 @@ export function getParseRules(
   config: BlockConfig,
   customParseFunction: CustomBlockImplementation<any, any, any>["parse"]
 ) {
-  const rules: ParseRule[] = [
+  const rules: TagParseRule[] = [
     {
       tag: "[data-content-type=" + config.type + "]",
       contentElement: "[data-editable]",
diff --git a/packages/core/src/schema/inlineContent/createSpec.ts b/packages/core/src/schema/inlineContent/createSpec.ts
@@ -1,5 +1,5 @@
 import { Node } from "@tiptap/core";
-import { ParseRule } from "@tiptap/pm/model";
+import { TagParseRule } from "@tiptap/pm/model";
 import { nodeToCustomInlineContent } from "../../api/nodeConversions/nodeConversions";
 import { propsToAttributes } from "../blocks/internal";
 import { Props } from "../propTypes";
@@ -46,7 +46,7 @@ export type CustomInlineContentImplementation<
 
 export function getInlineContentParseRules(
   config: CustomInlineContentConfig
-): ParseRule[] {
+): TagParseRule[] {
   return [
     {
       tag: `[data-inline-content-type="${config.type}"]`,
diff --git a/packages/dev-scripts/examples/gen.ts b/packages/dev-scripts/examples/gen.ts
@@ -51,6 +51,7 @@ async function writeTemplate(project: Project, templateFile: string) {
   // try {
   //   // fs.unlinkSync(targetFilePath);
   // } catch (e) {}
+  // eslint-disable-next-line no-console
   console.log("written", targetFilePath);
 }
 
@@ -79,6 +80,7 @@ async function generateExamplesData(projects: Project[]) {
 const projects = getExampleProjects();
 
 for (const project of projects) {
+  // eslint-disable-next-line no-console
   console.log("generating code for example", project);
   await generateCodeForExample(project);
 }
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -52,8 +52,8 @@
   "dependencies": {
     "@blocknote/core": "^0.13.4",
     "@floating-ui/react": "^0.26.4",
-    "@tiptap/core": "^2.0.3",
-    "@tiptap/react": "^2.0.3",
+    "@tiptap/core": "^2.4.0",
+    "@tiptap/react": "^2.4.0",
     "lodash.merge": "^4.6.2",
     "react": "^18",
     "react-dom": "^18",
diff --git a/packages/react/src/components/FormattingToolbar/FormattingToolbarController.tsx b/packages/react/src/components/FormattingToolbar/FormattingToolbarController.tsx
@@ -80,8 +80,8 @@ export const FormattingToolbarController = (props: {
     {
       placement,
       middleware: [offset(10), flip()],
-      onOpenChange: (open, event) => {
-        console.log("change", event);
+      onOpenChange: (open, _event) => {
+        // console.log("change", event);
         if (!open) {
           editor.formattingToolbar.closeMenu();
           editor.focus();
diff --git a/packages/react/src/components/SuggestionMenu/SuggestionMenu.test.tsx b/packages/react/src/components/SuggestionMenu/SuggestionMenu.test.tsx
@@ -33,12 +33,14 @@ it("has good typing", () => {
       suggestionMenuComponent={undefined as any}
       getItems={async () => [{ hello: "hello" }]}
       onItemClick={(item) => {
+        // eslint-disable-next-line no-console
         console.log(item.hello);
       }}
       triggerCharacter="/"
     />
   );
 
   // prevent typescript unused error
+  // eslint-disable-next-line no-console
   console.log("menu", menu);
 });
diff --git a/packages/react/src/editor/BlockNoteView.tsx b/packages/react/src/editor/BlockNoteView.tsx
@@ -30,38 +30,44 @@ const emptyFn = () => {
   // noop
 };
 
+export type BlockNoteViewProps<
+  BSchema extends BlockSchema,
+  ISchema extends InlineContentSchema,
+  SSchema extends StyleSchema
+> = {
+  editor: BlockNoteEditor<BSchema, ISchema, SSchema>;
+
+  theme?: "light" | "dark";
+
+  /**
+   * Locks the editor from being editable by the user if set to `false`.
+   */
+  editable?: boolean;
+  /**
+   * A callback function that runs whenever the text cursor position or selection changes.
+   */
+  onSelectionChange?: () => void;
+
+  /**
+   * A callback function that runs whenever the editor's contents change.
+   */
+  onChange?: () => void;
+
+  children?: ReactNode;
+
+  ref?: Ref<HTMLDivElement> | undefined; // only here to get types working with the generics. Regular form doesn't work
+} & Omit<
+  HTMLAttributes<HTMLDivElement>,
+  "onChange" | "onSelectionChange" | "children"
+> &
+  BlockNoteDefaultUIProps;
+
 function BlockNoteViewComponent<
   BSchema extends BlockSchema,
   ISchema extends InlineContentSchema,
   SSchema extends StyleSchema
 >(
-  props: {
-    editor: BlockNoteEditor<BSchema, ISchema, SSchema>;
-
-    theme?: "light" | "dark";
-
-    /**
-     * Locks the editor from being editable by the user if set to `false`.
-     */
-    editable?: boolean;
-    /**
-     * A callback function that runs whenever the text cursor position or selection changes.
-     */
-    onSelectionChange?: () => void;
-
-    /**
-     * A callback function that runs whenever the editor's contents change.
-     */
-    onChange?: () => void;
-
-    children?: ReactNode;
-
-    ref?: Ref<HTMLDivElement> | undefined; // only here to get types working with the generics. Regular form doesn't work
-  } & Omit<
-    HTMLAttributes<HTMLDivElement>,
-    "onChange" | "onSelectionChange" | "children"
-  > &
-    BlockNoteDefaultUIProps,
+  props: BlockNoteViewProps<BSchema, ISchema, SSchema>,
   ref: React.Ref<HTMLDivElement>
 ) {
   const {
diff --git a/packages/react/src/schema/@util/ReactRenderUtil.ts b/packages/react/src/schema/@util/ReactRenderUtil.ts
@@ -28,6 +28,7 @@ export function renderToDOMSpec(
 
   if (!div.childElementCount) {
     // TODO
+    // eslint-disable-next-line no-console
     console.warn("ReactInlineContentSpec: renderHTML() failed");
     return {
       dom: document.createElement("span"),
diff --git a/playground/package.json b/playground/package.json
@@ -23,7 +23,7 @@
     "react-icons": "^5.2.1",
     "react-router-dom": "^6.20.0",
     "y-partykit": "^0.0.25",
-    "yjs": "^13.6.10"
+    "yjs": "^13.6.15"
   },
   "devDependencies": {
     "@types/react": "^18.0.25",
diff --git a/playground/src/examples.gen.tsx b/playground/src/examples.gen.tsx
@@ -759,7 +759,7 @@
           ],
           "dependencies": {
             "y-partykit": "^0.0.25",
-            "yjs": "^13.6.1"
+            "yjs": "^13.6.15"
           }
         },
         "title": "Collaborative Editing with PartyKit",
@@ -785,7 +785,7 @@
             "@liveblocks/client": "^1.10.0",
             "@liveblocks/react": "^1.10.0",
             "@liveblocks/yjs": "^1.10.0",
-            "yjs": "^13.6.1"
+            "yjs": "^13.6.15"
           }
         },
         "title": "Collaborative Editing with Liveblocks",
diff --git a/playground/src/main.tsx b/playground/src/main.tsx
@@ -96,7 +96,6 @@ const App = (props: { project: (typeof examples.basic)["projects"][0] }) => {
   React.useEffect(() => {
     (async () => {
       // load app async
-      console.log("../../" + props.project.pathFromRoot + "/App.tsx");
       const c: any = await modules[
         "../../" + props.project.pathFromRoot + "/App.tsx"
       ]();
diff --git a/tests/src/utils/components/Editor.tsx b/tests/src/utils/components/Editor.tsx
@@ -1,13 +1,13 @@
 import { BlockNoteSchema, filterSuggestionItems } from "@blocknote/core";
 import "@blocknote/core/style.css";
+import { BlockNoteView } from "@blocknote/mantine";
+import "@blocknote/mantine/style.css";
 import {
   BlockNoteDefaultUI,
   SuggestionMenuController,
   getDefaultReactSlashMenuItems,
   useCreateBlockNote,
 } from "@blocknote/react";
-import { BlockNoteView } from "@blocknote/mantine";
-import "@blocknote/mantine/style.css";
 
 import { Alert, insertAlert } from "../customblocks/Alert";
 import { Button } from "../customblocks/Button";
@@ -24,8 +24,6 @@ const schema = BlockNoteSchema.create({
 export default function Editor() {
   const editor = useCreateBlockNote({ schema });
 
-  console.log(editor);
-
   // Give tests a way to get prosemirror instance
   (window as WindowWithProseMirror).ProseMirror = editor?._tiptapEditor;
   // editor.insertBlocks([{
diff --git a/tests/src/utils/customblocks/Alert.tsx b/tests/src/utils/customblocks/Alert.tsx
diff --git a/tests/src/utils/customblocks/ReactAlert.tsx b/tests/src/utils/customblocks/ReactAlert.tsx

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@`
`5`	`5`	`"tags": ["Advanced", "Saving/Loading", "Collaboration"],`
`6`	`6`	`"dependencies": {`
`7`	`7`	`"y-partykit": "^0.0.25",`
`8`		`- "yjs": "^13.6.1"`
	`8`	`+ "yjs": "^13.6.15"`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`	`"@liveblocks/client": "^1.10.0",`
`8`	`8`	`"@liveblocks/react": "^1.10.0",`
`9`	`9`	`"@liveblocks/yjs": "^1.10.0",`
`10`		`- "yjs": "^13.6.1"`
	`10`	`+ "yjs": "^13.6.15"`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,5 @@`
`33`	`33`	`"prepublishOnly": "npm run build && cp README.md packages/core/README.md && cp README.md packages/react/README.md",`
`34`	`34`	`"postpublish": "rm -rf packages/core/README.md && rm -rf packages/react/README.md",`
`35`	`35`	`"clean": "lerna run --stream clean"`
`36`		`- },`
`37`		`- "overrides": {`
`38`		`- "react": "18.2.0",`
`39`		`- "react-dom": "18.2.0",`
`40`		`- "prosemirror-model": "1.18.3"`
`41`	`36`	`}`
`42`	`37`	`}`