Merge branch 'main' into feature/extension-classes

# Conflicts: # packages/core/src/utils/getSchema.ts
2020-10-12 22:25:33 +02:00
parent 41d68ec859 82ee198e57
commit 681f951f5f
25 changed files with 790 additions and 542 deletions
--- a/packages/core/package.json
+++ b/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",
--- a/packages/core/src/utils/getSchema.ts
+++ b/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'