Skip to content

Commit 7c7e957

Browse files
matthewlipskimatthewlipski
committed
Merge branch 'refs/heads/main' into releases
# Conflicts: # package-lock.json # packages/mantine/package.json
2 parents 51cf600 + e17cbc0 commit 7c7e957

File tree

66 files changed

+2749
-1988
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+2749
-1988
lines changed

‎docs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
"@blocknote/react": "^0.14.0",
1616
"@blocknote/shadcn": "^0.14.0",
1717
"@headlessui/react": "^1.7.18",
18-
"@mantine/core": "^7.7.1",
18+
"@mantine/core": "^7.10.1",
1919
"@next/bundle-analyzer": "^14.1.0",
2020
"@vercel/analytics": "^1.2.2",
2121
"@vercel/og": "^0.6.2",
2222
"classnames": "2.3.2",
2323
"clsx": "^2.1.0",
2424
"framer-motion": "^10.16.16",
25-
"next": "14.1.0",
25+
"next": "^14.2.3",
2626
"next-auth": "^5.0.0-beta.9",
2727
"nextra": "^2.13.2",
2828
"nextra-theme-docs": "^2.13.2",

‎examples/01-basic/01-minimal/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"lint": "eslint . --max-warnings 0"
1212
},
1313
"dependencies": {
14-
"@blocknote/core": "^0.13.0",
15-
"@blocknote/react": "^0.13.0",
16-
"@blocknote/ariakit": "^0.13.0",
17-
"@blocknote/mantine": "^0.13.0",
18-
"@blocknote/shadcn": "^0.13.0",
14+
"@blocknote/core": "latest",
15+
"@blocknote/react": "latest",
16+
"@blocknote/ariakit": "latest",
17+
"@blocknote/mantine": "latest",
18+
"@blocknote/shadcn": "latest",
1919
"react": "^18.3.1",
2020
"react-dom": "^18.3.1"
2121
},
@@ -34,4 +34,4 @@
3434
"eslintIgnore": [
3535
"dist"
3636
]
37-
}
37+
}

‎examples/01-basic/02-block-objects/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"lint": "eslint . --max-warnings 0"
1212
},
1313
"dependencies": {
14-
"@blocknote/core": "^0.13.0",
15-
"@blocknote/react": "^0.13.0",
16-
"@blocknote/ariakit": "^0.13.0",
17-
"@blocknote/mantine": "^0.13.0",
18-
"@blocknote/shadcn": "^0.13.0",
14+
"@blocknote/core": "latest",
15+
"@blocknote/react": "latest",
16+
"@blocknote/ariakit": "latest",
17+
"@blocknote/mantine": "latest",
18+
"@blocknote/shadcn": "latest",
1919
"react": "^18.3.1",
2020
"react-dom": "^18.3.1"
2121
},
@@ -34,4 +34,4 @@
3434
"eslintIgnore": [
3535
"dist"
3636
]
37-
}
37+
}

‎examples/01-basic/03-all-blocks/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"lint": "eslint . --max-warnings 0"
1212
},
1313
"dependencies": {
14-
"@blocknote/core": "^0.13.0",
15-
"@blocknote/react": "^0.13.0",
16-
"@blocknote/ariakit": "^0.13.0",
17-
"@blocknote/mantine": "^0.13.0",
18-
"@blocknote/shadcn": "^0.13.0",
14+
"@blocknote/core": "latest",
15+
"@blocknote/react": "latest",
16+
"@blocknote/ariakit": "latest",
17+
"@blocknote/mantine": "latest",
18+
"@blocknote/shadcn": "latest",
1919
"react": "^18.3.1",
2020
"react-dom": "^18.3.1"
2121
},
@@ -34,4 +34,4 @@
3434
"eslintIgnore": [
3535
"dist"
3636
]
37-
}
37+
}

‎examples/01-basic/04-selection-blocks/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"lint": "eslint . --max-warnings 0"
1212
},
1313
"dependencies": {
14-
"@blocknote/core": "^0.13.0",
15-
"@blocknote/react": "^0.13.0",
16-
"@blocknote/ariakit": "^0.13.0",
17-
"@blocknote/mantine": "^0.13.0",
18-
"@blocknote/shadcn": "^0.13.0",
14+
"@blocknote/core": "latest",
15+
"@blocknote/react": "latest",
16+
"@blocknote/ariakit": "latest",
17+
"@blocknote/mantine": "latest",
18+
"@blocknote/shadcn": "latest",
1919
"react": "^18.3.1",
2020
"react-dom": "^18.3.1"
2121
},
@@ -34,4 +34,4 @@
3434
"eslintIgnore": [
3535
"dist"
3636
]
37-
}
37+
}

‎examples/01-basic/05-block-manipulation/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"lint": "eslint . --max-warnings 0"
1212
},
1313
"dependencies": {
14-
"@blocknote/core": "^0.13.0",
15-
"@blocknote/react": "^0.13.0",
16-
"@blocknote/ariakit": "^0.13.0",
17-
"@blocknote/mantine": "^0.13.0",
18-
"@blocknote/shadcn": "^0.13.0",
14+
"@blocknote/core": "latest",
15+
"@blocknote/react": "latest",
16+
"@blocknote/ariakit": "latest",
17+
"@blocknote/mantine": "latest",
18+
"@blocknote/shadcn": "latest",
1919
"react": "^18.3.1",
2020
"react-dom": "^18.3.1"
2121
},
@@ -34,4 +34,4 @@
3434
"eslintIgnore": [
3535
"dist"
3636
]
37-
}
37+
}

‎examples/01-basic/06-file-uploading/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"lint": "eslint . --max-warnings 0"
1212
},
1313
"dependencies": {
14-
"@blocknote/core": "^0.13.0",
15-
"@blocknote/react": "^0.13.0",
16-
"@blocknote/ariakit": "^0.13.0",
17-
"@blocknote/mantine": "^0.13.0",
18-
"@blocknote/shadcn": "^0.13.0",
14+
"@blocknote/core": "latest",
15+
"@blocknote/react": "latest",
16+
"@blocknote/ariakit": "latest",
17+
"@blocknote/mantine": "latest",
18+
"@blocknote/shadcn": "latest",
1919
"react": "^18.3.1",
2020
"react-dom": "^18.3.1"
2121
},
@@ -34,4 +34,4 @@
3434
"eslintIgnore": [
3535
"dist"
3636
]
37-
}
37+
}

‎examples/01-basic/07-saving-loading/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"lint": "eslint . --max-warnings 0"
1212
},
1313
"dependencies": {
14-
"@blocknote/core": "^0.13.0",
15-
"@blocknote/react": "^0.13.0",
16-
"@blocknote/ariakit": "^0.13.0",
17-
"@blocknote/mantine": "^0.13.0",
18-
"@blocknote/shadcn": "^0.13.0",
14+
"@blocknote/core": "latest",
15+
"@blocknote/react": "latest",
16+
"@blocknote/ariakit": "latest",
17+
"@blocknote/mantine": "latest",
18+
"@blocknote/shadcn": "latest",
1919
"react": "^18.3.1",
2020
"react-dom": "^18.3.1"
2121
},
@@ -34,4 +34,4 @@
3434
"eslintIgnore": [
3535
"dist"
3636
]
37-
}
37+
}

‎examples/01-basic/08-shadcn/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"lint": "eslint . --max-warnings 0"
1212
},
1313
"dependencies": {
14-
"@blocknote/core": "^0.13.0",
15-
"@blocknote/react": "^0.13.0",
16-
"@blocknote/ariakit": "^0.13.0",
17-
"@blocknote/mantine": "^0.13.0",
18-
"@blocknote/shadcn": "^0.13.0",
14+
"@blocknote/core": "latest",
15+
"@blocknote/react": "latest",
16+
"@blocknote/ariakit": "latest",
17+
"@blocknote/mantine": "latest",
18+
"@blocknote/shadcn": "latest",
1919
"react": "^18.3.1",
2020
"react-dom": "^18.3.1"
2121
},
@@ -34,4 +34,4 @@
3434
"eslintIgnore": [
3535
"dist"
3636
]
37-
}
37+
}

‎examples/01-basic/09-ariakit/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"lint": "eslint . --max-warnings 0"
1212
},
1313
"dependencies": {
14-
"@blocknote/core": "^0.13.0",
15-
"@blocknote/react": "^0.13.0",
16-
"@blocknote/ariakit": "^0.13.0",
17-
"@blocknote/mantine": "^0.13.0",
18-
"@blocknote/shadcn": "^0.13.0",
14+
"@blocknote/core": "latest",
15+
"@blocknote/react": "latest",
16+
"@blocknote/ariakit": "latest",
17+
"@blocknote/mantine": "latest",
18+
"@blocknote/shadcn": "latest",
1919
"react": "^18.3.1",
2020
"react-dom": "^18.3.1"
2121
},
@@ -34,4 +34,4 @@
3434
"eslintIgnore": [
3535
"dist"
3636
]
37-
}
37+
}

‎examples/01-basic/10-localization/App.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ import "@blocknote/core/fonts/inter.css";
33
import { BlockNoteView } from "@blocknote/mantine";
44
import "@blocknote/mantine/style.css";
55
import { useCreateBlockNote } from "@blocknote/react";
6+
// import { useTranslation } from "some-i18n-library"; // You can use any i18n library you like
67

78
export default function App() {
9+
// const { lang } = useTranslation('common'); // You can get the current language from the i18n library or alternatively from a router
810
// Creates a new editor instance.
911
const editor = useCreateBlockNote({
1012
// Passes the Dutch (NL) dictionary to the editor instance.
1113
// You can also provide your own dictionary here to customize the strings used in the editor,
1214
// or submit a Pull Request to add support for your language of your choice
1315
dictionary: locales.nl,
16+
// dictionary: locales[lang as keyof typeof locales], // Use the language from the i18n library dynamically
1417
});
1518

1619
// Renders the editor instance using a React component.

‎examples/01-basic/10-localization/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"lint": "eslint . --max-warnings 0"
1212
},
1313
"dependencies": {
14-
"@blocknote/core": "^0.13.0",
15-
"@blocknote/react": "^0.13.0",
16-
"@blocknote/ariakit": "^0.13.0",
17-
"@blocknote/mantine": "^0.13.0",
18-
"@blocknote/shadcn": "^0.13.0",
14+
"@blocknote/core": "latest",
15+
"@blocknote/react": "latest",
16+
"@blocknote/ariakit": "latest",
17+
"@blocknote/mantine": "latest",
18+
"@blocknote/shadcn": "latest",
1919
"react": "^18.3.1",
2020
"react-dom": "^18.3.1"
2121
},
@@ -34,4 +34,4 @@
3434
"eslintIgnore": [
3535
"dist"
3636
]
37-
}
37+
}

‎examples/01-basic/testing/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"lint": "eslint . --max-warnings 0"
1212
},
1313
"dependencies": {
14-
"@blocknote/core": "^0.13.0",
15-
"@blocknote/react": "^0.13.0",
16-
"@blocknote/ariakit": "^0.13.0",
17-
"@blocknote/mantine": "^0.13.0",
18-
"@blocknote/shadcn": "^0.13.0",
14+
"@blocknote/core": "latest",
15+
"@blocknote/react": "latest",
16+
"@blocknote/ariakit": "latest",
17+
"@blocknote/mantine": "latest",
18+
"@blocknote/shadcn": "latest",
1919
"react": "^18.3.1",
2020
"react-dom": "^18.3.1"
2121
},
@@ -34,4 +34,4 @@
3434
"eslintIgnore": [
3535
"dist"
3636
]
37-
}
37+
}

‎examples/02-ui-components/01-ui-elements-remove/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"lint": "eslint . --max-warnings 0"
1212
},
1313
"dependencies": {
14-
"@blocknote/core": "^0.13.0",
15-
"@blocknote/react": "^0.13.0",
16-
"@blocknote/ariakit": "^0.13.0",
17-
"@blocknote/mantine": "^0.13.0",
18-
"@blocknote/shadcn": "^0.13.0",
14+
"@blocknote/core": "latest",
15+
"@blocknote/react": "latest",
16+
"@blocknote/ariakit": "latest",
17+
"@blocknote/mantine": "latest",
18+
"@blocknote/shadcn": "latest",
1919
"react": "^18.3.1",
2020
"react-dom": "^18.3.1"
2121
},
@@ -34,4 +34,4 @@
3434
"eslintIgnore": [
3535
"dist"
3636
]
37-
}
37+
}

‎examples/02-ui-components/02-formatting-toolbar-buttons/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"lint": "eslint . --max-warnings 0"
1212
},
1313
"dependencies": {
14-
"@blocknote/core": "^0.13.0",
15-
"@blocknote/react": "^0.13.0",
16-
"@blocknote/ariakit": "^0.13.0",
17-
"@blocknote/mantine": "^0.13.0",
18-
"@blocknote/shadcn": "^0.13.0",
14+
"@blocknote/core": "latest",
15+
"@blocknote/react": "latest",
16+
"@blocknote/ariakit": "latest",
17+
"@blocknote/mantine": "latest",
18+
"@blocknote/shadcn": "latest",
1919
"react": "^18.3.1",
2020
"react-dom": "^18.3.1"
2121
},
@@ -34,4 +34,4 @@
3434
"eslintIgnore": [
3535
"dist"
3636
]
37-
}
37+
}

‎examples/02-ui-components/03-formatting-toolbar-block-type-items/.bnexample.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"author": "matthewlipski",
55
"tags": ["Intermediate", "Blocks", "UI Components", "Formatting Toolbar", "Custom Schemas"],
66
"dependencies": {
7-
"@mantine/core": "^7.7.1",
7+
"@mantine/core": "^7.10.1",
88
"react-icons": "^5.2.1"
99
}
1010
}

‎examples/02-ui-components/03-formatting-toolbar-block-type-items/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
"lint": "eslint . --max-warnings 0"
1212
},
1313
"dependencies": {
14-
"@blocknote/core": "^0.13.0",
15-
"@blocknote/react": "^0.13.0",
16-
"@blocknote/ariakit": "^0.13.0",
17-
"@blocknote/mantine": "^0.13.0",
18-
"@blocknote/shadcn": "^0.13.0",
14+
"@blocknote/core": "latest",
15+
"@blocknote/react": "latest",
16+
"@blocknote/ariakit": "latest",
17+
"@blocknote/mantine": "latest",
18+
"@blocknote/shadcn": "latest",
1919
"react": "^18.3.1",
2020
"react-dom": "^18.3.1",
21-
"@mantine/core": "^7.7.1",
21+
"@mantine/core": "^7.10.1",
2222
"react-icons": "^5.2.1"
2323
},
2424
"devDependencies": {
@@ -36,4 +36,4 @@
3636
"eslintIgnore": [
3737
"dist"
3838
]
39-
}
39+
}

0 commit comments

Comments
 (0)