Merge branch 'master' into feature/suggestions

# Conflicts: # packages/tiptap-extensions/package.json
2018-09-04 23:12:00 +02:00
parent c716fe605f 518413e33f
commit 0e3810bca0
24 changed files with 1045 additions and 652 deletions
--- a/packages/tiptap-extensions/package.json
+++ b/packages/tiptap-extensions/package.json
@@ -1,6 +1,6 @@
 {
  "name": "tiptap-extensions",
-  "version": "0.6.1",
+  "version": "0.8.0",
  "description": "Extensions for tiptap",
  "homepage": "https://tiptap.scrumpy.io",
  "license": "MIT",
@@ -20,10 +20,11 @@
    "url": "https://github.com/heyscrumpy/tiptap/issues"
  },
  "dependencies": {
+    "lowlight": "^1.10.0",
    "prosemirror-history": "^1.0.2",
    "prosemirror-state": "^1.2.2",
    "prosemirror-view": "^1.5.1",
-    "tiptap": "^0.8.0",
-    "tiptap-commands": "^0.2.4"
+    "tiptap": "^0.10.0",
+    "tiptap-commands": "^0.3.0"
  }
 }