Merge branch 'main' into feature/extension-classes

# Conflicts:
#	packages/core/src/utils/getSchema.ts

packages/core/package.json

@@ -24,7 +24,7 @@
     "prosemirror-gapcursor": "^1.1.5",
     "prosemirror-inputrules": "^1.1.3",
     "prosemirror-keymap": "^1.1.3",
-    "prosemirror-model": "^1.11.2",
+    "prosemirror-model": "^1.12.0",
     "prosemirror-schema-list": "^1.1.4",
     "prosemirror-state": "^1.3.3",
     "prosemirror-tables": "^1.1.1",

packages/core/src/utils/getSchema.ts

@@ -1,5 +1,5 @@
-import deepmerge from 'deepmerge'
 import { NodeSpec, Schema } from 'prosemirror-model'
+
 import { Extensions } from '../types'
 import getTopNodeFromExtensions from './getTopNodeFromExtensions'
 import getNodesFromExtensions from './getNodesFromExtensions'

packages/extension-code-block/index.ts

@@ -60,7 +60,7 @@ export default new Node<CodeBlockOptions>()
     },
   }))
   .keys(({ editor }) => ({
-    'Shift-Control-\\': () => editor.codeBlock(),
+    'Mod-Shift-c': () => editor.codeBlock(),
   }))
   .inputRules(({ type }) => [
     textblockTypeInputRule(backtickInputRegex, type, ({ groups }: any) => groups),

packages/html/package.json

@@ -10,6 +10,6 @@
     "@tiptap/core": "2.x",
     "@types/jsdom": "^16.2.4",
     "jsdom": "^16.4.0",
-    "prosemirror-model": "^1.11.2"
+    "prosemirror-model": "^1.12.0"
   }
 }