Merge branch 'main' into new-releases

# Conflicts:
#	examples/editor/package.json
#	package-lock.json
#	packages/react/package.json

Author: matthewlipski

README.md

@@ -35,7 +35,7 @@ Play with the editor @ [https://blocknote-main.vercel.app/](https://blocknote-ma
 
 ```typescript
 import { BlockNoteView, useBlockNote } from "@blocknote/react";
-import "@blocknote/core/style.css";
+import "@blocknote/react/style.css";
 
 function App() {
   const editor = useBlockNote({

examples/editor/examples/basic/App.tsx

@@ -1,6 +1,6 @@
 import { uploadToTmpFilesDotOrg_DEV_ONLY } from "@blocknote/core";
-import "@blocknote/core/style.css";
 import { BlockNoteView, useBlockNote } from "@blocknote/react";
+import "@blocknote/react/style.css";
 
 type WindowWithProseMirror = Window & typeof globalThis & { ProseMirror: any };
 

examples/editor/examples/collaboration/App.tsx

@@ -1,6 +1,6 @@
 import { uploadToTmpFilesDotOrg_DEV_ONLY } from "@blocknote/core";
-import "@blocknote/core/style.css";
 import { BlockNoteView, useBlockNote } from "@blocknote/react";
+import "@blocknote/react/style.css";
 
 import YPartyKitProvider from "y-partykit/provider";
 import * as Y from "yjs";

examples/editor/examples/react-custom-blocks/App.tsx

@@ -1,10 +1,10 @@
 import { defaultBlockSpecs, defaultProps } from "@blocknote/core";
-import "@blocknote/core/style.css";
 import {
   BlockNoteView,
   createReactBlockSpec,
   useBlockNote,
 } from "@blocknote/react";
+import "@blocknote/react/style.css";
 import "../vanilla-custom-blocks/style.css";
 
 type WindowWithProseMirror = Window & typeof globalThis & { ProseMirror: any };

examples/editor/examples/react-custom-inline-content/App.tsx

@@ -1,10 +1,10 @@
 import { defaultInlineContentSpecs } from "@blocknote/core";
-import "@blocknote/core/style.css";
 import {
   BlockNoteView,
   createReactInlineContentSpec,
   useBlockNote,
 } from "@blocknote/react";
+import "@blocknote/react/style.css";
 
 type WindowWithProseMirror = Window & typeof globalThis & { ProseMirror: any };
 

examples/editor/examples/react-custom-styles/App.tsx

@@ -4,7 +4,6 @@ import {
   DefaultInlineContentSchema,
   defaultStyleSpecs,
 } from "@blocknote/core";
-import "@blocknote/core/style.css";
 import {
   BlockNoteView,
   createReactStyleSpec,
@@ -14,6 +13,7 @@ import {
   useActiveStyles,
   useBlockNote,
 } from "@blocknote/react";
+import "@blocknote/react/style.css";
 
 type WindowWithProseMirror = Window & typeof globalThis & { ProseMirror: any };
 

examples/editor/examples/vanilla-custom-blocks/App.tsx

@@ -3,8 +3,8 @@ import {
   defaultBlockSpecs,
   defaultProps,
 } from "@blocknote/core";
-import "@blocknote/core/style.css";
 import { BlockNoteView, useBlockNote } from "@blocknote/react";
+import "@blocknote/react/style.css";
 import "./style.css";
 
 type WindowWithProseMirror = Window & typeof globalThis & { ProseMirror: any };

examples/editor/examples/vanilla-custom-inline-content/App.tsx

@@ -2,8 +2,8 @@ import {
   createInlineContentSpec,
   defaultInlineContentSpecs,
 } from "@blocknote/core";
-import "@blocknote/core/style.css";
 import { BlockNoteView, useBlockNote } from "@blocknote/react";
+import "@blocknote/react/style.css";
 
 type WindowWithProseMirror = Window & typeof globalThis & { ProseMirror: any };
 

examples/editor/examples/vanilla-custom-styles/App.tsx

@@ -5,7 +5,6 @@ import {
   DefaultInlineContentSchema,
   defaultStyleSpecs,
 } from "@blocknote/core";
-import "@blocknote/core/style.css";
 import {
   BlockNoteView,
   FormattingToolbarPositioner,
@@ -14,6 +13,7 @@ import {
   useActiveStyles,
   useBlockNote,
 } from "@blocknote/react";
+import "@blocknote/react/style.css";
 
 type WindowWithProseMirror = Window & typeof globalThis & { ProseMirror: any };
 

examples/editor/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@blocknote/core": "^0.10.1",
     "@blocknote/react": "^0.10.1",
-    "@mantine/core": "^5.6.1",
+    "@mantine/core": "^7.3.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.20.0",