From b23cdcba6b42de6234929c725b56e5c4d457eed0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sun, 3 Feb 2019 14:06:17 +0100
Subject: [PATCH 01/64] add basic collab implementation

---
 .../Components/Routes/Collaboration/Collab.js | 12 +++
 .../Components/Routes/Collaboration/index.vue | 88 +++++++++++++++++++
 examples/Components/Subnavigation/index.vue   |  3 +
 examples/main.js                              |  7 ++
 package.json                                  |  4 +-
 yarn.lock                                     |  7 ++
 6 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 examples/Components/Routes/Collaboration/Collab.js
 create mode 100644 examples/Components/Routes/Collaboration/index.vue

diff --git a/examples/Components/Routes/Collaboration/Collab.js b/examples/Components/Routes/Collaboration/Collab.js
new file mode 100644
index 00000000..7607d18a
--- /dev/null
+++ b/examples/Components/Routes/Collaboration/Collab.js
@@ -0,0 +1,12 @@
+import { Extension } from 'tiptap'
+import { collab } from 'prosemirror-collab'
+
+export default class CollabExtension extends Extension {
+  get name() {
+    return 'collab'
+  }
+
+  get plugins() {
+    return [collab()]
+  }
+}
diff --git a/examples/Components/Routes/Collaboration/index.vue b/examples/Components/Routes/Collaboration/index.vue
new file mode 100644
index 00000000..bd89ace0
--- /dev/null
+++ b/examples/Components/Routes/Collaboration/index.vue
@@ -0,0 +1,88 @@
+<template>
+  <div class="editor">
+    <editor-content class="editor__content" :editor="editor" />
+  </div>
+</template>
+
+<script>
+import { Editor, EditorContent } from 'tiptap'
+import { Step } from 'prosemirror-transform'
+import { receiveTransaction, sendableSteps, getVersion } from 'prosemirror-collab'
+import Collab from './Collab'
+
+export default {
+  components: {
+    EditorContent,
+  },
+
+  data() {
+    return {
+      ws: null,
+
+      authority: {
+        steps: [],
+        stepClientIDs: [],
+      },
+
+      editor: new Editor({
+        content: 'Collaboration!',
+        extensions: [new Collab()],
+        onUpdate: ({ state }) => {
+          const sendable = sendableSteps(state)
+
+          if (sendable) {
+            this.ws.send(JSON.stringify(sendable))
+          }
+        },
+      }),
+    }
+  },
+
+  methods: {
+    receiveData({ version, steps, clientID }) {
+      if (version !== this.authority.steps.length) {
+        return
+      }
+
+      steps.forEach(step => {
+        this.authority.steps.push(step)
+        this.authority.stepClientIDs.push(clientID)
+      })
+
+      this.updateDoc()
+    },
+
+    updateDoc() {
+      const { state, view, schema } = this.editor
+      const version = getVersion(state)
+      const data = this.stepsSince(version)
+      const transaction = receiveTransaction(
+        state,
+        data.steps.map(step => Step.fromJSON(schema, step)),
+        data.clientIDs,
+      )
+
+      view.dispatch(transaction)
+    },
+
+    stepsSince(version) {
+      return {
+        steps: this.authority.steps.slice(version),
+        clientIDs: this.authority.stepClientIDs.slice(version),
+      }
+    },
+  },
+
+  mounted() {
+    this.ws = new WebSocket('wss://tiptap-sockets.glitch.me')
+
+    this.ws.onmessage = event => {
+      this.receiveData(JSON.parse(event.data))
+    }
+  },
+
+  beforeDestroy() {
+    this.editor.destroy()
+  },
+}
+</script>
diff --git a/examples/Components/Subnavigation/index.vue b/examples/Components/Subnavigation/index.vue
index bcc2e246..c4c3b796 100644
--- a/examples/Components/Subnavigation/index.vue
+++ b/examples/Components/Subnavigation/index.vue
@@ -48,6 +48,9 @@
     <router-link class="subnavigation__link" to="/export">
       Export HTML or JSON
     </router-link>
+    <router-link class="subnavigation__link" to="/collaboration">
+      Collaboration
+    </router-link>
   </div>
 </template>
 
diff --git a/examples/main.js b/examples/main.js
index aea0bad9..3102cc93 100644
--- a/examples/main.js
+++ b/examples/main.js
@@ -124,6 +124,13 @@ const routes = [
       githubUrl: 'https://github.com/scrumpy/tiptap/tree/master/examples/Components/Routes/Export',
     },
   },
+  {
+    path: '/collaboration',
+    component: () => import('Components/Routes/Collaboration'),
+    meta: {
+      githubUrl: 'https://github.com/scrumpy/tiptap/tree/master/examples/Components/Routes/Collaboration',
+    },
+  },
 ]
 
 const router = new VueRouter({
diff --git a/package.json b/package.json
index 23fb1971..15bdc6ca 100644
--- a/package.json
+++ b/package.json
@@ -86,5 +86,7 @@
     "webpack-svgstore-plugin": "^4.1.0",
     "zlib": "^1.0.5"
   },
-  "dependencies": {}
+  "dependencies": {
+    "prosemirror-collab": "^1.1.1"
+  }
 }
diff --git a/yarn.lock b/yarn.lock
index 073741b9..a50601f2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9572,6 +9572,13 @@ promzard@^0.3.0:
   dependencies:
     read "1"
 
+prosemirror-collab@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/prosemirror-collab/-/prosemirror-collab-1.1.1.tgz#c8f5d951abaeac8a80818b6bd960f5a392b35b3f"
+  integrity sha512-BpXIB3WBD7UvgxuiasKOxlAZ78TTOdW+SQN4bbJan995tVx/wM/OZXtRJebS+tSWWAbRisHaO3ciFo732vuvdA==
+  dependencies:
+    prosemirror-state "^1.0.0"
+
 prosemirror-commands@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.0.7.tgz#e5a2ba821e29ea7065c88277fe2c3d7f6b0b9d37"

From bf21ebd719c942a4a766360d343f0e787d8d36d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sun, 3 Feb 2019 21:18:03 +0100
Subject: [PATCH 02/64] improve collab demo

---
 .../Components/Routes/Collaboration/Collab.js | 14 ++++-
 .../Components/Routes/Collaboration/index.vue | 52 +++++++++++++------
 2 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/examples/Components/Routes/Collaboration/Collab.js b/examples/Components/Routes/Collaboration/Collab.js
index 7607d18a..21dc7255 100644
--- a/examples/Components/Routes/Collaboration/Collab.js
+++ b/examples/Components/Routes/Collaboration/Collab.js
@@ -6,7 +6,19 @@ export default class CollabExtension extends Extension {
     return 'collab'
   }
 
+  get defaultOptions() {
+    return {
+      version: 0,
+      clientID: Math.floor(Math.random() * 0xFFFFFFFF),
+    }
+  }
+
   get plugins() {
-    return [collab()]
+    return [
+      collab({
+        version: this.options.version,
+        clientID: this.options.clientID,
+      }),
+    ]
   }
 }
diff --git a/examples/Components/Routes/Collaboration/index.vue b/examples/Components/Routes/Collaboration/index.vue
index bd89ace0..0d7620eb 100644
--- a/examples/Components/Routes/Collaboration/index.vue
+++ b/examples/Components/Routes/Collaboration/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="editor">
-    <editor-content class="editor__content" :editor="editor" />
+    <editor-content class="editor__content" :editor="editor" v-if="editor" />
   </div>
 </template>
 
@@ -17,16 +17,29 @@ export default {
 
   data() {
     return {
+      editor: null,
       ws: null,
-
-      authority: {
+      clientID: Math.floor(Math.random() * 0xFFFFFFFF),
+      collabStartVersion: 0,
+      collabHistory: {
         steps: [],
-        stepClientIDs: [],
+        clientIDs: [],
       },
+    }
+  },
 
-      editor: new Editor({
-        content: 'Collaboration!',
-        extensions: [new Collab()],
+  methods: {
+    initEditor({ doc, version }) {
+      this.collabStartVersion = version + 1
+
+      this.editor = new Editor({
+        content: doc,
+        extensions: [
+          new Collab({
+            version: this.collabStartVersion,
+            clientID: this.clientID,
+          }),
+        ],
         onUpdate: ({ state }) => {
           const sendable = sendableSteps(state)
 
@@ -34,19 +47,17 @@ export default {
             this.ws.send(JSON.stringify(sendable))
           }
         },
-      }),
-    }
-  },
+      })
+    },
 
-  methods: {
     receiveData({ version, steps, clientID }) {
-      if (version !== this.authority.steps.length) {
+      if (version !== this.collabHistory.steps.length + this.collabStartVersion) {
         return
       }
 
       steps.forEach(step => {
-        this.authority.steps.push(step)
-        this.authority.stepClientIDs.push(clientID)
+        this.collabHistory.steps.push(step)
+        this.collabHistory.clientIDs.push(clientID)
       })
 
       this.updateDoc()
@@ -66,9 +77,10 @@ export default {
     },
 
     stepsSince(version) {
+      const count = version - this.collabStartVersion
       return {
-        steps: this.authority.steps.slice(version),
-        clientIDs: this.authority.stepClientIDs.slice(version),
+        steps: this.collabHistory.steps.slice(count),
+        clientIDs: this.collabHistory.clientIDs.slice(count),
       }
     },
   },
@@ -77,7 +89,13 @@ export default {
     this.ws = new WebSocket('wss://tiptap-sockets.glitch.me')
 
     this.ws.onmessage = event => {
-      this.receiveData(JSON.parse(event.data))
+      const payload = JSON.parse(event.data)
+
+      if (payload.doc) {
+        this.initEditor(payload)
+      } else {
+        this.receiveData(payload)
+      }
     }
   },
 

From 9b0c35d34ccc9fdfa8106eda7cb9d1fc7dc3ec41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 5 Feb 2019 00:03:27 +0100
Subject: [PATCH 03/64] update eslint

---
 .eslintrc.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.eslintrc.js b/.eslintrc.js
index b21e48fc..9dd30988 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -56,5 +56,7 @@ module.exports = {
     'class-methods-use-this': 'off',
 
     'global-require': 'off',
+
+    'func-names': ['error', 'never'],
   }
 }

From aba26c7e74d12cb7041a31c3cb74e5f783b11745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 5 Feb 2019 02:20:49 +0100
Subject: [PATCH 04/64] started adding a better collab demo

---
 .../Routes/Collaboration2/Collab.js           |  24 +++
 .../Routes/Collaboration2/index.vue           | 150 ++++++++++++++++++
 examples/Components/Subnavigation/index.vue   |   3 +
 examples/main.js                              |   7 +
 4 files changed, 184 insertions(+)
 create mode 100644 examples/Components/Routes/Collaboration2/Collab.js
 create mode 100644 examples/Components/Routes/Collaboration2/index.vue

diff --git a/examples/Components/Routes/Collaboration2/Collab.js b/examples/Components/Routes/Collaboration2/Collab.js
new file mode 100644
index 00000000..21dc7255
--- /dev/null
+++ b/examples/Components/Routes/Collaboration2/Collab.js
@@ -0,0 +1,24 @@
+import { Extension } from 'tiptap'
+import { collab } from 'prosemirror-collab'
+
+export default class CollabExtension extends Extension {
+  get name() {
+    return 'collab'
+  }
+
+  get defaultOptions() {
+    return {
+      version: 0,
+      clientID: Math.floor(Math.random() * 0xFFFFFFFF),
+    }
+  }
+
+  get plugins() {
+    return [
+      collab({
+        version: this.options.version,
+        clientID: this.options.clientID,
+      }),
+    ]
+  }
+}
diff --git a/examples/Components/Routes/Collaboration2/index.vue b/examples/Components/Routes/Collaboration2/index.vue
new file mode 100644
index 00000000..1cedbe2f
--- /dev/null
+++ b/examples/Components/Routes/Collaboration2/index.vue
@@ -0,0 +1,150 @@
+<template>
+  <div class="editor">
+    <editor-content class="editor__content" :editor="editor" v-if="editor" />
+  </div>
+</template>
+
+<script>
+import { debounce } from 'lodash-es'
+import { Editor, EditorContent } from 'tiptap'
+import { Step } from 'prosemirror-transform'
+import { receiveTransaction, sendableSteps, getVersion } from 'prosemirror-collab'
+import Collab from './Collab'
+
+export default {
+  components: {
+    EditorContent,
+  },
+
+  data() {
+    return {
+      editor: null,
+      ws: null,
+      clientID: Math.floor(Math.random() * 0xFFFFFFFF),
+      collabStartVersion: 0,
+      collabHistory: {
+        steps: [],
+        clientIDs: [],
+      },
+    }
+  },
+
+  methods: {
+    initEditor({ doc, version }) {
+      this.collabStartVersion = version
+
+      this.editor = new Editor({
+        content: doc,
+        extensions: [
+          new Collab({
+            version: this.collabStartVersion,
+            clientID: this.clientID,
+          }),
+        ],
+        onUpdate: ({ state }) => {
+          this.getSendableSteps(state)
+        },
+      })
+    },
+
+    getSendableSteps: debounce(function (state) {
+      const sendable = sendableSteps(state)
+
+      if (sendable) {
+        this.ws.send(JSON.stringify(sendable))
+
+
+        console.log({ sendable })
+
+
+        const transaction = receiveTransaction(
+          this.editor.state,
+          sendable.steps,
+          this.repeat(sendable.clientID, sendable.steps.length),
+        )
+
+        this.editor.view.dispatch(transaction)
+      }
+    }, 250),
+
+    receiveData({ steps }) {
+      // if (version !== this.collabHistory.steps.length + this.collabStartVersion) {
+      //   return
+      // }
+
+      // steps.forEach(step => {
+      //   this.collabHistory.steps.push(step)
+      //   this.collabHistory.clientIDs.push(clientID)
+      // })
+
+      // this.updateDoc()
+
+      // const { state, view, schema } = this.editor
+      // const version = getVersion(state)
+      // const data = this.stepsSince(version)
+      // const transaction = receiveTransaction(
+      //   state,
+      //   steps,
+      //   steps,
+      // )
+
+      // view.dispatch(transaction)
+
+      const { state, view, schema } = this.editor
+
+      const transaction = receiveTransaction(
+        state,
+        steps.map(step => Step.fromJSON(schema, step)),
+        steps.map(step => step.clientID),
+      )
+
+      view.dispatch(transaction)
+    },
+
+    repeat(val, n) {
+      const result = []
+      for (let i = 0; i < n; i++) result.push(val)
+      return result
+    },
+
+    // updateDoc() {
+    //   const { state, view, schema } = this.editor
+    //   const version = getVersion(state)
+    //   const data = this.stepsSince(version)
+    //   const transaction = receiveTransaction(
+    //     state,
+    //     data.steps.map(step => Step.fromJSON(schema, step)),
+    //     data.clientIDs,
+    //   )
+
+    //   view.dispatch(transaction)
+    // },
+
+    stepsSince(version) {
+      const count = version - this.collabStartVersion
+      return {
+        steps: this.collabHistory.steps.slice(count),
+        clientIDs: this.collabHistory.clientIDs.slice(count),
+      }
+    },
+  },
+
+  mounted() {
+    this.ws = new WebSocket('wss://tiptap-sockets-2.glitch.me')
+
+    this.ws.onmessage = event => {
+      const payload = JSON.parse(event.data)
+
+      if (payload.doc) {
+        this.initEditor(payload)
+      } else {
+        this.receiveData(payload)
+      }
+    }
+  },
+
+  beforeDestroy() {
+    this.editor.destroy()
+  },
+}
+</script>
diff --git a/examples/Components/Subnavigation/index.vue b/examples/Components/Subnavigation/index.vue
index c4c3b796..e49ef25b 100644
--- a/examples/Components/Subnavigation/index.vue
+++ b/examples/Components/Subnavigation/index.vue
@@ -51,6 +51,9 @@
     <router-link class="subnavigation__link" to="/collaboration">
       Collaboration
     </router-link>
+    <router-link class="subnavigation__link" to="/collaboration2">
+      Collaboration 2
+    </router-link>
   </div>
 </template>
 
diff --git a/examples/main.js b/examples/main.js
index 3102cc93..22ea4397 100644
--- a/examples/main.js
+++ b/examples/main.js
@@ -131,6 +131,13 @@ const routes = [
       githubUrl: 'https://github.com/scrumpy/tiptap/tree/master/examples/Components/Routes/Collaboration',
     },
   },
+  {
+    path: '/collaboration2',
+    component: () => import('Components/Routes/Collaboration2'),
+    meta: {
+      githubUrl: 'https://github.com/scrumpy/tiptap/tree/master/examples/Components/Routes/Collaboration2',
+    },
+  },
 ]
 
 const router = new VueRouter({

From bdcd5c967f3d0b614eaa92b05be07f35417234af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 5 Feb 2019 03:07:43 +0100
Subject: [PATCH 05/64] add socket.io to collab demo

---
 .../Routes/Collaboration2/index.vue           | 88 +++++--------------
 package.json                                  |  4 +-
 yarn.lock                                     | 58 ++++++++++++
 3 files changed, 83 insertions(+), 67 deletions(-)

diff --git a/examples/Components/Routes/Collaboration2/index.vue b/examples/Components/Routes/Collaboration2/index.vue
index 1cedbe2f..c9b2bff9 100644
--- a/examples/Components/Routes/Collaboration2/index.vue
+++ b/examples/Components/Routes/Collaboration2/index.vue
@@ -5,6 +5,7 @@
 </template>
 
 <script>
+import io from 'socket.io-client'
 import { debounce } from 'lodash-es'
 import { Editor, EditorContent } from 'tiptap'
 import { Step } from 'prosemirror-transform'
@@ -19,25 +20,22 @@ export default {
   data() {
     return {
       editor: null,
-      ws: null,
+      socket: null,
       clientID: Math.floor(Math.random() * 0xFFFFFFFF),
-      collabStartVersion: 0,
-      collabHistory: {
-        steps: [],
-        clientIDs: [],
-      },
     }
   },
 
   methods: {
     initEditor({ doc, version }) {
-      this.collabStartVersion = version
+      if (this.editor) {
+        this.editor.destroy()
+      }
 
       this.editor = new Editor({
         content: doc,
         extensions: [
           new Collab({
-            version: this.collabStartVersion,
+            version,
             clientID: this.clientID,
           }),
         ],
@@ -51,11 +49,7 @@ export default {
       const sendable = sendableSteps(state)
 
       if (sendable) {
-        this.ws.send(JSON.stringify(sendable))
-
-
-        console.log({ sendable })
-
+        this.socket.emit('message', sendable)
 
         const transaction = receiveTransaction(
           this.editor.state,
@@ -68,28 +62,6 @@ export default {
     }, 250),
 
     receiveData({ steps }) {
-      // if (version !== this.collabHistory.steps.length + this.collabStartVersion) {
-      //   return
-      // }
-
-      // steps.forEach(step => {
-      //   this.collabHistory.steps.push(step)
-      //   this.collabHistory.clientIDs.push(clientID)
-      // })
-
-      // this.updateDoc()
-
-      // const { state, view, schema } = this.editor
-      // const version = getVersion(state)
-      // const data = this.stepsSince(version)
-      // const transaction = receiveTransaction(
-      //   state,
-      //   steps,
-      //   steps,
-      // )
-
-      // view.dispatch(transaction)
-
       const { state, view, schema } = this.editor
 
       const transaction = receiveTransaction(
@@ -106,41 +78,25 @@ export default {
       for (let i = 0; i < n; i++) result.push(val)
       return result
     },
-
-    // updateDoc() {
-    //   const { state, view, schema } = this.editor
-    //   const version = getVersion(state)
-    //   const data = this.stepsSince(version)
-    //   const transaction = receiveTransaction(
-    //     state,
-    //     data.steps.map(step => Step.fromJSON(schema, step)),
-    //     data.clientIDs,
-    //   )
-
-    //   view.dispatch(transaction)
-    // },
-
-    stepsSince(version) {
-      const count = version - this.collabStartVersion
-      return {
-        steps: this.collabHistory.steps.slice(count),
-        clientIDs: this.collabHistory.clientIDs.slice(count),
-      }
-    },
   },
 
   mounted() {
-    this.ws = new WebSocket('wss://tiptap-sockets-2.glitch.me')
+    this.socket = io('wss://tiptap-sockets-2.glitch.me')
 
-    this.ws.onmessage = event => {
-      const payload = JSON.parse(event.data)
-
-      if (payload.doc) {
-        this.initEditor(payload)
-      } else {
-        this.receiveData(payload)
-      }
-    }
+    this.socket
+      .on('connect', () => {
+        console.log('connected')
+      })
+      .on('disconnect', () => {
+        console.log('disconnected')
+      })
+      .on('message', data => {
+        if (data.doc) {
+          this.initEditor(data)
+        } else {
+          this.receiveData(data)
+        }
+      })
   },
 
   beforeDestroy() {
diff --git a/package.json b/package.json
index 15bdc6ca..1726dbc6 100644
--- a/package.json
+++ b/package.json
@@ -87,6 +87,8 @@
     "zlib": "^1.0.5"
   },
   "dependencies": {
-    "prosemirror-collab": "^1.1.1"
+    "lodash-es": "^4.17.11",
+    "prosemirror-collab": "^1.1.1",
+    "socket.io-client": "^2.2.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index a50601f2..1ce1857d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4226,6 +4226,23 @@ engine.io-client@~3.2.0:
     xmlhttprequest-ssl "~1.5.4"
     yeast "0.1.2"
 
+engine.io-client@~3.3.1:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.3.2.tgz#04e068798d75beda14375a264bb3d742d7bc33aa"
+  integrity sha512-y0CPINnhMvPuwtqXfsGuWE8BB66+B6wTtCofQDRecMQPYX3MYUZXFNKDhdrSe3EVjgOu4V3rxdeqN/Tr91IgbQ==
+  dependencies:
+    component-emitter "1.2.1"
+    component-inherit "0.0.3"
+    debug "~3.1.0"
+    engine.io-parser "~2.1.1"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    ws "~6.1.0"
+    xmlhttprequest-ssl "~1.5.4"
+    yeast "0.1.2"
+
 engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6"
@@ -7432,6 +7449,11 @@ lock-verify@^2.0.2:
     npm-package-arg "^5.1.2 || 6"
     semver "^5.4.1"
 
+lodash-es@^4.17.11:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.11.tgz#145ab4a7ac5c5e52a3531fb4f310255a152b4be0"
+  integrity sha512-DHb1ub+rMjjrxqlB3H56/6MXtm1lSksDp2rA2cNWjG8mlDUYFhUj3Di2Zn5IwSU87xLv8tNIQ7sSwE/YOX/D/Q==
+
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -10939,6 +10961,26 @@ socket.io-client@2.1.1, socket.io-client@^2.0.4:
     socket.io-parser "~3.2.0"
     to-array "0.1.4"
 
+socket.io-client@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.2.0.tgz#84e73ee3c43d5020ccc1a258faeeb9aec2723af7"
+  integrity sha512-56ZrkTDbdTLmBIyfFYesgOxsjcLnwAKoN4CiPyTVkMQj3zTUh0QAx3GbvIvLpFEOvQWu92yyWICxB0u7wkVbYA==
+  dependencies:
+    backo2 "1.0.2"
+    base64-arraybuffer "0.1.5"
+    component-bind "1.0.0"
+    component-emitter "1.2.1"
+    debug "~3.1.0"
+    engine.io-client "~3.3.1"
+    has-binary2 "~1.0.2"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    object-component "0.0.3"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    socket.io-parser "~3.3.0"
+    to-array "0.1.4"
+
 socket.io-parser@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
@@ -10948,6 +10990,15 @@ socket.io-parser@~3.2.0:
     debug "~3.1.0"
     isarray "2.0.1"
 
+socket.io-parser@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.0.tgz#2b52a96a509fdf31440ba40fed6094c7d4f1262f"
+  integrity sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==
+  dependencies:
+    component-emitter "1.2.1"
+    debug "~3.1.0"
+    isarray "2.0.1"
+
 socket.io@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980"
@@ -12432,6 +12483,13 @@ ws@~3.3.1:
     safe-buffer "~5.1.0"
     ultron "~1.1.0"
 
+ws@~6.1.0:
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.3.tgz#d2d2e5f0e3c700ef2de89080ebc0ac6e1bf3a72d"
+  integrity sha512-tbSxiT+qJI223AP4iLfQbkbxkwdFcneYinM2+x46Gx2wgvbaOMO36czfdfVUBRTHvzAMRhDd98sA5d/BuWbQdg==
+  dependencies:
+    async-limiter "~1.0.0"
+
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"

From f4fa5a8e704a2546f19b1188b77d2581c48c0865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 5 Feb 2019 14:00:30 +0100
Subject: [PATCH 06/64] refactoring

---
 .../Routes/Collaboration2/index.vue           | 38 ++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/examples/Components/Routes/Collaboration2/index.vue b/examples/Components/Routes/Collaboration2/index.vue
index c9b2bff9..574cf85b 100644
--- a/examples/Components/Routes/Collaboration2/index.vue
+++ b/examples/Components/Routes/Collaboration2/index.vue
@@ -48,8 +48,10 @@ export default {
     getSendableSteps: debounce(function (state) {
       const sendable = sendableSteps(state)
 
+      this.prevState = state
+
       if (sendable) {
-        this.socket.emit('message', sendable)
+        this.socket.emit('update', sendable)
 
         const transaction = receiveTransaction(
           this.editor.state,
@@ -82,20 +84,38 @@ export default {
 
   mounted() {
     this.socket = io('wss://tiptap-sockets-2.glitch.me')
-
-    this.socket
       .on('connect', () => {
         console.log('connected')
       })
       .on('disconnect', () => {
         console.log('disconnected')
       })
-      .on('message', data => {
-        if (data.doc) {
-          this.initEditor(data)
-        } else {
-          this.receiveData(data)
-        }
+      .on('document', data => {
+        this.initEditor(data)
+      })
+      .on('update', data => {
+        this.receiveData(data)
+      })
+      .on('versionMismatch', () => {
+        // set state to the latest synced version?
+        // this.editor.view.updateState(this.prevState)
+
+        const currentVersion = getVersion(this.editor.state)
+        console.log('should poll version', currentVersion)
+
+        this.socket.emit('getVersionSteps', currentVersion)
+      })
+      .on('versionSteps', data => {
+        console.log('versionSteps', data)
+        const { state, view, schema } = this.editor
+
+        const transaction = receiveTransaction(
+          state,
+          data.map(item => Step.fromJSON(schema, item.step)),
+          data.map(item => item.clientID),
+        )
+
+        view.dispatch(transaction)
       })
   },
 

From 6a0aaf15e69ab91ff9c4da37fcae3d697270847d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 6 Feb 2019 00:03:23 +0100
Subject: [PATCH 07/64] add something broken again

---
 .../Routes/Collaboration2/index.vue           | 95 +++++++++++++++----
 packages/tiptap/src/Editor.js                 |  5 +
 2 files changed, 81 insertions(+), 19 deletions(-)

diff --git a/examples/Components/Routes/Collaboration2/index.vue b/examples/Components/Routes/Collaboration2/index.vue
index 574cf85b..85c90ae3 100644
--- a/examples/Components/Routes/Collaboration2/index.vue
+++ b/examples/Components/Routes/Collaboration2/index.vue
@@ -19,8 +19,10 @@ export default {
 
   data() {
     return {
+      history: [],
       editor: null,
       socket: null,
+      newState: null,
       clientID: Math.floor(Math.random() * 0xFFFFFFFF),
     }
   },
@@ -39,6 +41,12 @@ export default {
             clientID: this.clientID,
           }),
         ],
+        // onTransaction: transaction => {
+        //   console.log('onTransaction')
+        //   this.newState = this.editor.state.apply(transaction)
+        //   this.editor.view.updateState(this.state.edit)
+        //   return false
+        // },
         onUpdate: ({ state }) => {
           this.getSendableSteps(state)
         },
@@ -48,15 +56,23 @@ export default {
     getSendableSteps: debounce(function (state) {
       const sendable = sendableSteps(state)
 
-      this.prevState = state
-
       if (sendable) {
         this.socket.emit('update', sendable)
 
+        const { steps } = sendable
+        const clientIDs = this.repeat(sendable.clientID, steps.length)
+
+        this.history.push({
+          state,
+          version: getVersion(state),
+          steps,
+          clientIDs,
+        })
+
         const transaction = receiveTransaction(
-          this.editor.state,
-          sendable.steps,
-          this.repeat(sendable.clientID, sendable.steps.length),
+          state,
+          steps,
+          clientIDs,
         )
 
         this.editor.view.dispatch(transaction)
@@ -96,27 +112,68 @@ export default {
       .on('update', data => {
         this.receiveData(data)
       })
-      .on('versionMismatch', () => {
-        // set state to the latest synced version?
-        // this.editor.view.updateState(this.prevState)
-
-        const currentVersion = getVersion(this.editor.state)
-        console.log('should poll version', currentVersion)
-
-        this.socket.emit('getVersionSteps', currentVersion)
+      .on('versionInSync', version => {
+        console.log('version in sync', version)
+        // TODO remove steps older than version
       })
-      .on('versionSteps', data => {
-        console.log('versionSteps', data)
+      .on('versionMismatch', ({ version, data }) => {
+        console.log('version mismatch', version)
+        // TODO: go back to `version`, apply `steps`, apply unmerged `steps`
+
+        console.log(this.history.length)
+
+        const history = this.history.find(item => {
+          console.log('search', item.version, version)
+          return item.version === version
+        })
+
+        console.log({ history })
+
         const { state, view, schema } = this.editor
 
-        const transaction = receiveTransaction(
-          state,
+        view.updateState(history.state)
+
+        view.dispatch(receiveTransaction(
+          history.state,
           data.map(item => Step.fromJSON(schema, item.step)),
           data.map(item => item.clientID),
-        )
+        ))
 
-        view.dispatch(transaction)
+        view.dispatch(receiveTransaction(
+          history.state,
+          history.steps,
+          history.clientIDs,
+        ))
+
+        // const transaction = receiveTransaction(
+        //   state,
+        //   steps,
+        //   clientIDs,
+        // )
+
+        // this.editor.view.dispatch(transaction)
       })
+      // .on('versionMismatch', (version, steps) => {
+      //   // set state to the latest synced version?
+      //   // this.editor.view.updateState(this.prevState)
+
+      //   const currentVersion = getVersion(this.editor.state)
+      //   console.log('should poll version', currentVersion)
+
+      //   this.socket.emit('getVersionSteps', currentVersion)
+      // })
+      // .on('versionSteps', data => {
+      //   console.log('versionSteps', data)
+      //   const { state, view, schema } = this.editor
+
+      //   const transaction = receiveTransaction(
+      //     state,
+      //     data.map(item => Step.fromJSON(schema, item.step)),
+      //     data.map(item => item.clientID),
+      //   )
+
+      //   view.dispatch(transaction)
+      // })
   },
 
   beforeDestroy() {
diff --git a/packages/tiptap/src/Editor.js b/packages/tiptap/src/Editor.js
index 20f89d5e..dba9016e 100644
--- a/packages/tiptap/src/Editor.js
+++ b/packages/tiptap/src/Editor.js
@@ -32,6 +32,7 @@ export default class Editor {
       onFocus: () => {},
       onBlur: () => {},
       onPaste: () => {},
+      onTransaction: () => true,
     }
 
     this.init(options)
@@ -265,6 +266,10 @@ export default class Editor {
   }
 
   dispatchTransaction(transaction) {
+    if (!this.options.onTransaction(transaction)) {
+      return
+    }
+
     this.state = this.state.apply(transaction)
     this.view.updateState(this.state)
     this.setActiveNodesAndMarks()

From ac3b95716e889b6cc2d6caa63b4727aa016f6ca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 6 Feb 2019 10:33:16 +0100
Subject: [PATCH 08/64] add new collab test

---
 .../Routes/Collaboration3/Collab.js           |  24 +++
 .../Routes/Collaboration3/index.vue           | 176 ++++++++++++++++++
 examples/Components/Subnavigation/index.vue   |   3 +
 examples/main.js                              |   7 +
 4 files changed, 210 insertions(+)
 create mode 100644 examples/Components/Routes/Collaboration3/Collab.js
 create mode 100644 examples/Components/Routes/Collaboration3/index.vue

diff --git a/examples/Components/Routes/Collaboration3/Collab.js b/examples/Components/Routes/Collaboration3/Collab.js
new file mode 100644
index 00000000..21dc7255
--- /dev/null
+++ b/examples/Components/Routes/Collaboration3/Collab.js
@@ -0,0 +1,24 @@
+import { Extension } from 'tiptap'
+import { collab } from 'prosemirror-collab'
+
+export default class CollabExtension extends Extension {
+  get name() {
+    return 'collab'
+  }
+
+  get defaultOptions() {
+    return {
+      version: 0,
+      clientID: Math.floor(Math.random() * 0xFFFFFFFF),
+    }
+  }
+
+  get plugins() {
+    return [
+      collab({
+        version: this.options.version,
+        clientID: this.options.clientID,
+      }),
+    ]
+  }
+}
diff --git a/examples/Components/Routes/Collaboration3/index.vue b/examples/Components/Routes/Collaboration3/index.vue
new file mode 100644
index 00000000..cac658d8
--- /dev/null
+++ b/examples/Components/Routes/Collaboration3/index.vue
@@ -0,0 +1,176 @@
+<template>
+  <div class="editor">
+    <editor-content class="editor__content" :editor="editor" v-if="editor" />
+  </div>
+</template>
+
+<script>
+import io from 'socket.io-client'
+import { debounce } from 'lodash-es'
+import { Editor, EditorContent } from 'tiptap'
+import { Step } from 'prosemirror-transform'
+import { receiveTransaction, sendableSteps, getVersion } from 'prosemirror-collab'
+import Collab from './Collab'
+
+export default {
+  components: {
+    EditorContent,
+  },
+
+  data() {
+    return {
+      history: [],
+      editor: null,
+      socket: null,
+      newState: null,
+      clientID: Math.floor(Math.random() * 0xFFFFFFFF),
+    }
+  },
+
+  methods: {
+    initEditor({ doc, version }) {
+      if (this.editor) {
+        this.editor.destroy()
+      }
+
+      this.editor = new Editor({
+        content: doc,
+        extensions: [
+          new Collab({
+            version,
+            clientID: this.clientID,
+          }),
+        ],
+        // onTransaction: transaction => {
+        //   console.log('onTransaction')
+        //   this.newState = this.editor.state.apply(transaction)
+        //   this.editor.view.updateState(this.state.edit)
+        //   return false
+        // },
+        onUpdate: ({ state }) => {
+          this.getSendableSteps(state)
+        },
+      })
+    },
+
+    getSendableSteps: debounce(function (state) {
+      const sendable = sendableSteps(state)
+
+      if (sendable) {
+        this.socket.emit('update', sendable)
+
+        const { steps } = sendable
+        const clientIDs = this.repeat(sendable.clientID, steps.length)
+
+        this.history.push({
+          state,
+          version: getVersion(state),
+          steps,
+          clientIDs,
+        })
+
+        const transaction = receiveTransaction(
+          state,
+          steps,
+          clientIDs,
+        )
+
+        this.editor.view.dispatch(transaction)
+      }
+    }, 250),
+
+    receiveData({ steps }) {
+      const { state, view, schema } = this.editor
+
+      const transaction = receiveTransaction(
+        state,
+        steps.map(step => Step.fromJSON(schema, step)),
+        steps.map(step => step.clientID),
+      )
+
+      view.dispatch(transaction)
+    },
+
+    repeat(val, n) {
+      const result = []
+      for (let i = 0; i < n; i++) result.push(val)
+      return result
+    },
+  },
+
+  mounted() {
+    this.socket = io('wss://tiptap-sockets-2.glitch.me')
+      .on('connect', () => {
+        console.log('connected')
+      })
+      .on('disconnect', () => {
+        console.log('disconnected')
+      })
+      .on('document', data => {
+        this.initEditor(data)
+      })
+      .on('update', data => {
+        this.receiveData(data)
+      })
+      .on('versionInSync', version => {
+        console.log('version in sync', version)
+        // TODO remove steps older than version
+      })
+      .on('versionMismatch', ({ version, data }) => {
+        console.log('version mismatch', version)
+        // TODO: go back to `version`, apply `steps`, apply unmerged `steps`
+
+        const history = this.history.find(item => item.version === version)
+
+        const { state, view, schema } = this.editor
+
+        view.updateState(history.state)
+
+        view.dispatch(receiveTransaction(
+          history.state,
+          data.map(item => Step.fromJSON(schema, item.step)),
+          data.map(item => item.clientID),
+        ))
+
+        view.dispatch(receiveTransaction(
+          history.state,
+          history.steps,
+          history.clientIDs,
+        ))
+
+        // const transaction = receiveTransaction(
+        //   state,
+        //   steps,
+        //   clientIDs,
+        // )
+
+        // this.editor.view.dispatch(transaction)
+      })
+      // .on('versionMismatch', (version, steps) => {
+      //   // set state to the latest synced version?
+      //   // this.editor.view.updateState(this.prevState)
+
+      //   const currentVersion = getVersion(this.editor.state)
+      //   console.log('should poll version', currentVersion)
+
+      //   this.socket.emit('getVersionSteps', currentVersion)
+      // })
+      // .on('versionSteps', data => {
+      //   console.log('versionSteps', data)
+      //   const { state, view, schema } = this.editor
+
+      //   const transaction = receiveTransaction(
+      //     state,
+      //     data.map(item => Step.fromJSON(schema, item.step)),
+      //     data.map(item => item.clientID),
+      //   )
+
+      //   view.dispatch(transaction)
+      // })
+  },
+
+  beforeDestroy() {
+    this.editor.destroy()
+  },
+}
+</script>
diff --git a/examples/Components/Subnavigation/index.vue b/examples/Components/Subnavigation/index.vue
index e49ef25b..1ff9f905 100644
--- a/examples/Components/Subnavigation/index.vue
+++ b/examples/Components/Subnavigation/index.vue
@@ -54,6 +54,9 @@
     <router-link class="subnavigation__link" to="/collaboration2">
       Collaboration 2
     </router-link>
+    <router-link class="subnavigation__link" to="/collaboration3">
+      Collaboration 3
+    </router-link>
   </div>
 </template>
 
diff --git a/examples/main.js b/examples/main.js
index 22ea4397..cd124936 100644
--- a/examples/main.js
+++ b/examples/main.js
@@ -138,6 +138,13 @@ const routes = [
       githubUrl: 'https://github.com/scrumpy/tiptap/tree/master/examples/Components/Routes/Collaboration2',
     },
   },
+  {
+    path: '/collaboration3',
+    component: () => import('Components/Routes/Collaboration3'),
+    meta: {
+      githubUrl: 'https://github.com/scrumpy/tiptap/tree/master/examples/Components/Routes/Collaboration3',
+    },
+  },
 ]
 
 const router = new VueRouter({

From f490ca1469c8d8b972cf148b9a6be494a592e7b3 Mon Sep 17 00:00:00 2001
From: Chrissi2812 <cf@pixel-kraft.de>
Date: Thu, 7 Mar 2019 18:13:19 +0100
Subject: [PATCH 09/64] fix menububble position

---
 packages/tiptap/src/Plugins/MenuBubble.js | 49 ++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/packages/tiptap/src/Plugins/MenuBubble.js b/packages/tiptap/src/Plugins/MenuBubble.js
index 95510b77..2c80c4f4 100644
--- a/packages/tiptap/src/Plugins/MenuBubble.js
+++ b/packages/tiptap/src/Plugins/MenuBubble.js
@@ -1,4 +1,49 @@
 import { Plugin } from 'prosemirror-state'
+import { textRange } from 'prosemirror-view/src/dom'
+
+function singleRect(object, bias) {
+  const rects = object.getClientRects()
+  return !rects.length ? object.getBoundingClientRect() : rects[bias < 0 ? 0 : rects.length - 1]
+}
+
+function coordsAtPos(view, pos, end = false) {
+  const { node, offset } = view.docView.domFromPos(pos)
+  let side
+  let rect
+  if (node.nodeType === 3) {
+    if (end && offset < node.nodeValue.length) {
+      rect = singleRect(textRange(node, offset - 1, offset), -1)
+      side = 'right'
+    } else if (offset < node.nodeValue.length) {
+      rect = singleRect(textRange(node, offset, offset + 1), -1)
+      side = 'left'
+    }
+  } else if (node.firstChild) {
+    if (offset < node.childNodes.length) {
+      const child = node.childNodes[offset]
+      rect = singleRect(child.nodeType === 3 ? textRange(child) : child, -1)
+      side = 'left'
+    }
+    if ((!rect || rect.top === rect.bottom) && offset) {
+      const child = node.childNodes[offset - 1]
+      rect = singleRect(child.nodeType === 3 ? textRange(child) : child, 1)
+      side = 'right'
+    }
+  } else {
+    rect = node.getBoundingClientRect()
+    side = 'left'
+  }
+
+  const x = rect[side]
+
+  return {
+    top: rect.top,
+    bottom: rect.bottom,
+    left: x,
+    right: x,
+  }
+}
+
 
 class Menu {
 
@@ -36,8 +81,8 @@ class Menu {
     const { from, to } = state.selection
 
     // These are in screen coordinates
-    const start = view.coordsAtPos(from)
-    const end = view.coordsAtPos(to)
+    const start = coordsAtPos(view, from)
+    const end = coordsAtPos(view, to, true)
 
     // The box in which the tooltip is positioned, to use as base
     const box = this.options.element.offsetParent.getBoundingClientRect()

From 8ddc0c016af9ccbda487e460a60202d864524c7a Mon Sep 17 00:00:00 2001
From: Chrissi2812 <cf@pixel-kraft.de>
Date: Thu, 7 Mar 2019 18:15:45 +0100
Subject: [PATCH 10/64] add note why we had to use our own cordsAtPos
 implementation

---
 packages/tiptap/src/Plugins/MenuBubble.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/tiptap/src/Plugins/MenuBubble.js b/packages/tiptap/src/Plugins/MenuBubble.js
index 2c80c4f4..e003d37d 100644
--- a/packages/tiptap/src/Plugins/MenuBubble.js
+++ b/packages/tiptap/src/Plugins/MenuBubble.js
@@ -81,6 +81,8 @@ class Menu {
     const { from, to } = state.selection
 
     // These are in screen coordinates
+    // We can't use EditorView.cordsAtPos here because it can't handle linebreaks correctly
+    // See: https://github.com/ProseMirror/prosemirror-view/pull/47
     const start = coordsAtPos(view, from)
     const end = coordsAtPos(view, to, true)
 

From e441041860da82ebc4bc5e7554a7f7735b54cedd Mon Sep 17 00:00:00 2001
From: Chrissi2812 <cf@pixel-kraft.de>
Date: Thu, 7 Mar 2019 18:28:27 +0100
Subject: [PATCH 11/64] fix travis-ci: copied textRange function from
 prosemirror-view

---
 packages/tiptap/src/Plugins/MenuBubble.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/tiptap/src/Plugins/MenuBubble.js b/packages/tiptap/src/Plugins/MenuBubble.js
index e003d37d..0a0235d3 100644
--- a/packages/tiptap/src/Plugins/MenuBubble.js
+++ b/packages/tiptap/src/Plugins/MenuBubble.js
@@ -1,5 +1,11 @@
 import { Plugin } from 'prosemirror-state'
-import { textRange } from 'prosemirror-view/src/dom'
+
+function textRange(node, from, to) {
+  const range = document.createRange()
+  range.setEnd(node, to == null ? node.nodeValue.length : to)
+  range.setStart(node, from || 0)
+  return range
+}
 
 function singleRect(object, bias) {
   const rects = object.getClientRects()

From cf7a442edd3b668e077d3b4c46e452b416ec0fd3 Mon Sep 17 00:00:00 2001
From: Chrissi2812 <cf@pixel-kraft.de>
Date: Wed, 24 Apr 2019 18:33:59 +0200
Subject: [PATCH 12/64] add link to documentation

---
 examples/Components/Navigation/index.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/examples/Components/Navigation/index.vue b/examples/Components/Navigation/index.vue
index 4a94ef61..89f41a0d 100644
--- a/examples/Components/Navigation/index.vue
+++ b/examples/Components/Navigation/index.vue
@@ -6,6 +6,9 @@
     </h1>
 
     <div>
+      <a class="navigation__link" href="https://tiptap.scrumpy.io/docs" target="_blank">
+        Documentation
+      </a>
       <a class="navigation__link" href="https://github.com/scrumpy/tiptap/blob/master/CONTRIBUTING.md" target="_blank">
         Contribute
       </a>

From 2f0acf2f91e9569e8a192210b196b25093a4a023 Mon Sep 17 00:00:00 2001
From: Chrissi2812 <cf@pixel-kraft.de>
Date: Thu, 25 Apr 2019 16:01:27 +0200
Subject: [PATCH 13/64] keep menuBubble in bounding box of editor

---
 examples/Components/Routes/MenuBubble/index.vue    |  3 ++-
 packages/tiptap/src/Components/EditorMenuBubble.js |  5 +++++
 packages/tiptap/src/Plugins/MenuBubble.js          | 10 +++++++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/examples/Components/Routes/MenuBubble/index.vue b/examples/Components/Routes/MenuBubble/index.vue
index 6a7780b5..30601375 100644
--- a/examples/Components/Routes/MenuBubble/index.vue
+++ b/examples/Components/Routes/MenuBubble/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="editor">
-    <editor-menu-bubble :editor="editor">
+    <editor-menu-bubble :editor="editor" :keepInBounds="keepInBounds">
       <div
         slot-scope="{ commands, isActive, menu }"
         class="menububble"
@@ -69,6 +69,7 @@ export default {
   },
   data() {
     return {
+      keepInBounds: true,
       editor: new Editor({
         extensions: [
           new Blockquote(),
diff --git a/packages/tiptap/src/Components/EditorMenuBubble.js b/packages/tiptap/src/Components/EditorMenuBubble.js
index 2d72a3ef..29928375 100644
--- a/packages/tiptap/src/Components/EditorMenuBubble.js
+++ b/packages/tiptap/src/Components/EditorMenuBubble.js
@@ -7,6 +7,10 @@ export default {
       default: null,
       type: Object,
     },
+    keepInBounds: {
+      default: true,
+      type: Boolean,
+    },
   },
 
   data() {
@@ -27,6 +31,7 @@ export default {
           this.$nextTick(() => {
             editor.registerPlugin(MenuBubble({
               element: this.$el,
+              keepInBounds: this.keepInBounds,
               onUpdate: menu => {
                 // the second check ensures event is fired only once
                 if (menu.isActive && this.menu.isActive === false) {
diff --git a/packages/tiptap/src/Plugins/MenuBubble.js b/packages/tiptap/src/Plugins/MenuBubble.js
index 0a0235d3..77c72650 100644
--- a/packages/tiptap/src/Plugins/MenuBubble.js
+++ b/packages/tiptap/src/Plugins/MenuBubble.js
@@ -57,6 +57,7 @@ class Menu {
     this.options = {
       ...{
         element: null,
+        keepInBounds: true,
         onUpdate: () => false,
       },
       ...options,
@@ -94,14 +95,17 @@ class Menu {
 
     // The box in which the tooltip is positioned, to use as base
     const box = this.options.element.offsetParent.getBoundingClientRect()
+    const el = this.options.element.getBoundingClientRect()
 
     // Find a center-ish x position from the selection endpoints (when
     // crossing lines, end may be more to the left)
-    const left = Math.max((start.left + end.left) / 2, start.left + 3)
+    const left = ((start.left + end.left) / 2) - box.left
 
+    // Keep the menuBubble in the bounding box of the offsetParent i
+    this.left = Math.round(this.options.keepInBounds
+        ? Math.min(box.width - (el.width / 2), Math.max(left, el.width / 2)) : left)
+    this.bottom = Math.round(box.bottom - start.top)
     this.isActive = true
-    this.left = parseInt(left - box.left, 10)
-    this.bottom = parseInt(box.bottom - start.top, 10)
 
     this.sendUpdate()
   }

From 1b5b60c59502d3abcdd93d797af07138babb20db Mon Sep 17 00:00:00 2001
From: Chrissi2812 <cf@pixel-kraft.de>
Date: Thu, 25 Apr 2019 17:29:52 +0200
Subject: [PATCH 14/64] simplify placeholder example

---
 examples/Components/Routes/Placeholder/index.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/examples/Components/Routes/Placeholder/index.vue b/examples/Components/Routes/Placeholder/index.vue
index 7549540d..486400da 100644
--- a/examples/Components/Routes/Placeholder/index.vue
+++ b/examples/Components/Routes/Placeholder/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="editor">
-    <input type="text" v-model="placeholder">
+    <input type="text" v-model="editor.extensions.options.placeholder.emptyNodeText">
     <editor-content class="editor__content" :editor="editor" />
   </div>
 </template>
@@ -19,7 +19,6 @@ export default {
   },
   data() {
     return {
-      placeholder: 'Write something …',
       editor: new Editor({
         extensions: [
           new BulletList(),
@@ -36,11 +35,6 @@ export default {
   beforeDestroy() {
     this.editor.destroy()
   },
-  watch: {
-    placeholder(newValue) {
-      this.editor.extensions.options.placeholder.emptyNodeText = newValue
-    },
-  },
 }
 </script>
 

From 44dc5337dcecf2f9e106b75c73cee15d04986560 Mon Sep 17 00:00:00 2001
From: Chrissi2812 <cf@pixel-kraft.de>
Date: Mon, 29 Apr 2019 15:24:03 +0200
Subject: [PATCH 15/64] fix #275: link click handler no longer open on
 selection click

---
 packages/tiptap-extensions/src/marks/Link.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/tiptap-extensions/src/marks/Link.js b/packages/tiptap-extensions/src/marks/Link.js
index 69a7e231..bde85a5b 100644
--- a/packages/tiptap-extensions/src/marks/Link.js
+++ b/packages/tiptap-extensions/src/marks/Link.js
@@ -59,7 +59,7 @@ export default class Link extends Mark {
             const { schema } = view.state
             const attrs = getMarkAttrs(view.state, schema.marks.link)
 
-            if (attrs.href) {
+            if (attrs.href && event.target instanceof HTMLAnchorElement) {
               event.stopPropagation()
               window.open(attrs.href)
             }

From bbab998ae8766b732fba5245b2b98f3e3e80e78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 30 Apr 2019 16:16:57 +0200
Subject: [PATCH 16/64] update dev dependencies

---
 package.json |  24 +-
 yarn.lock    | 730 +++++++++++++++++++++------------------------------
 2 files changed, 312 insertions(+), 442 deletions(-)

diff --git a/package.json b/package.json
index 2eb2c5fe..de974dbb 100644
--- a/package.json
+++ b/package.json
@@ -24,23 +24,23 @@
     "ie >= 9"
   ],
   "devDependencies": {
-    "@babel/core": "^7.4.3",
+    "@babel/core": "^7.4.4",
     "@babel/node": "^7.2.2",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/plugin-transform-runtime": "^7.4.3",
-    "@babel/polyfill": "^7.4.3",
-    "@babel/preset-env": "^7.4.3",
+    "@babel/plugin-transform-runtime": "^7.4.4",
+    "@babel/polyfill": "^7.4.4",
+    "@babel/preset-env": "^7.4.4",
     "@babel/preset-stage-2": "^7.0.0",
-    "@babel/runtime": "^7.4.3",
+    "@babel/runtime": "^7.4.4",
     "audit-ci": "^1.6.0",
     "autoprefixer": "^9.5.1",
     "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "^10.0.1",
     "babel-jest": "^24.7.1",
     "babel-loader": "^8.0.5",
-    "browser-sync": "^2.26.3",
+    "browser-sync": "^2.26.5",
     "connect-history-api-fallback": "^1.6.0",
-    "copy-webpack-plugin": "^5.0.2",
+    "copy-webpack-plugin": "^5.0.3",
     "css-loader": "^2.1.0",
     "dart-sass": "^1.19.0",
     "eslint": "^5.16.0",
@@ -48,7 +48,7 @@
     "eslint-plugin-html": "^5.0.3",
     "eslint-plugin-import": "^2.17.2",
     "eslint-plugin-vue": "5.2.2",
-    "fibers": "^3.1.1",
+    "fibers": "^4.0.0",
     "file-loader": "^3.0.1",
     "fuse.js": "^3.4.2",
     "glob": "^7.1.3",
@@ -57,7 +57,7 @@
     "http-server": "^0.11.1",
     "imagemin-webpack-plugin": "^2.4.2",
     "jest": "^24.7.1",
-    "lerna": "^3.13.3",
+    "lerna": "^3.13.4",
     "mini-css-extract-plugin": "^0.6.0",
     "minimist": "^1.2.0",
     "optimize-css-assets-webpack-plugin": "^5.0.1",
@@ -75,8 +75,8 @@
     "rollup-plugin-vue": "^5.0.0",
     "sass-loader": "^7.0.3",
     "style-loader": "^0.23.1",
-    "tippy.js": "^4.2.1",
-    "uglify-js": "^3.5.5",
+    "tippy.js": "^4.3.0",
+    "uglify-js": "^3.5.9",
     "vue": "^2.6.10",
     "vue-loader": "^15.7.0",
     "vue-router": "^3.0.6",
@@ -84,7 +84,7 @@
     "vue-template-compiler": "^2.6.10",
     "webpack": "^4.30.0",
     "webpack-dev-middleware": "^3.6.2",
-    "webpack-hot-middleware": "^2.24.3",
+    "webpack-hot-middleware": "^2.24.4",
     "webpack-manifest-plugin": "^2.0.4",
     "webpack-svgstore-plugin": "^4.1.0",
     "zlib": "^1.0.5"
diff --git a/yarn.lock b/yarn.lock
index 7e507974..170d70b3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -29,18 +29,18 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.3.tgz#198d6d3af4567be3989550d97e068de94503074f"
-  integrity sha512-oDpASqKFlbspQfzAE7yaeTmdljSH2ADIvBlb0RwbStltTuWa0+7CCI1fYVINNv9saHPa1W7oaKeuNuKj+RQCvA==
+"@babel/core@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.4.tgz#84055750b05fcd50f9915a826b44fa347a825250"
+  integrity sha512-lQgGX3FPRgbz2SKmhMtYgJvVzGZrmjaF4apZ2bLwofAKiSjxU0drPh4S/VasyYXwaTs+A1gvQ45BN8SQJzHsQQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.4.0"
-    "@babel/helpers" "^7.4.3"
-    "@babel/parser" "^7.4.3"
-    "@babel/template" "^7.4.0"
-    "@babel/traverse" "^7.4.3"
-    "@babel/types" "^7.4.0"
+    "@babel/generator" "^7.4.4"
+    "@babel/helpers" "^7.4.4"
+    "@babel/parser" "^7.4.4"
+    "@babel/template" "^7.4.4"
+    "@babel/traverse" "^7.4.4"
+    "@babel/types" "^7.4.4"
     convert-source-map "^1.1.0"
     debug "^4.1.0"
     json5 "^2.1.0"
@@ -60,6 +60,17 @@
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
+"@babel/generator@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.4.tgz#174a215eb843fc392c7edcaabeaa873de6e8f041"
+  integrity sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==
+  dependencies:
+    "@babel/types" "^7.4.4"
+    jsesc "^2.5.1"
+    lodash "^4.17.11"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
 "@babel/helper-annotate-as-pure@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
@@ -75,22 +86,22 @@
     "@babel/helper-explode-assignable-expression" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-call-delegate@^7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.0.tgz#f308eabe0d44f451217853aedf4dea5f6fe3294f"
-  integrity sha512-SdqDfbVdNQCBp3WhK2mNdDvHd3BD6qbmIc43CAyjnsfCmgHMeqgDcM3BzY2lchi7HBJGJ2CVdynLWbezaE4mmQ==
+"@babel/helper-call-delegate@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz#87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43"
+  integrity sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.4.0"
-    "@babel/traverse" "^7.4.0"
-    "@babel/types" "^7.4.0"
+    "@babel/helper-hoist-variables" "^7.4.4"
+    "@babel/traverse" "^7.4.4"
+    "@babel/types" "^7.4.4"
 
-"@babel/helper-define-map@^7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.4.0.tgz#cbfd8c1b2f12708e262c26f600cd16ed6a3bc6c9"
-  integrity sha512-wAhQ9HdnLIywERVcSvX40CEJwKdAa1ID4neI9NXQPDOHwwA+57DqwLiPEVy2AIyWzAk0CQ8qx4awO0VUURwLtA==
+"@babel/helper-define-map@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.4.4.tgz#6969d1f570b46bdc900d1eba8e5d59c48ba2c12a"
+  integrity sha512-IX3Ln8gLhZpSuqHJSnTNBWGDE9kdkTEWl21A/K7PQ00tseBwbqCHTvNLHSBd9M0R5rER4h5Rsvj9vw0R5SieBg==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
-    "@babel/types" "^7.4.0"
+    "@babel/types" "^7.4.4"
     lodash "^4.17.11"
 
 "@babel/helper-explode-assignable-expression@^7.1.0":
@@ -117,12 +128,12 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-hoist-variables@^7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.0.tgz#25b621399ae229869329730a62015bbeb0a6fbd6"
-  integrity sha512-/NErCuoe/et17IlAQFKWM24qtyYYie7sFIrW/tIQXpck6vAu2hhtYYsKLBWQV+BQZMbcIYPU/QMYuTufrY4aQw==
+"@babel/helper-hoist-variables@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a"
+  integrity sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==
   dependencies:
-    "@babel/types" "^7.4.0"
+    "@babel/types" "^7.4.4"
 
 "@babel/helper-member-expression-to-functions@^7.0.0":
   version "7.0.0"
@@ -150,16 +161,16 @@
     "@babel/types" "^7.2.2"
     lodash "^4.17.10"
 
-"@babel/helper-module-transforms@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.4.3.tgz#b1e357a1c49e58a47211a6853abb8e2aaefeb064"
-  integrity sha512-H88T9IySZW25anu5uqyaC1DaQre7ofM+joZtAaO2F8NBdFfupH0SZ4gKjgSFVcvtx/aAirqA9L9Clio2heYbZA==
+"@babel/helper-module-transforms@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.4.4.tgz#96115ea42a2f139e619e98ed46df6019b94414b8"
+  integrity sha512-3Z1yp8TVQf+B4ynN7WoHPKS8EkdTbgAEy0nU0rs/1Kw4pDgmvYH3rz3aI11KgxKCba2cn7N+tqzV1mY2HMN96w==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-simple-access" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/template" "^7.2.2"
-    "@babel/types" "^7.2.2"
+    "@babel/helper-split-export-declaration" "^7.4.4"
+    "@babel/template" "^7.4.4"
+    "@babel/types" "^7.4.4"
     lodash "^4.17.11"
 
 "@babel/helper-optimise-call-expression@^7.0.0":
@@ -181,10 +192,10 @@
   dependencies:
     lodash "^4.17.10"
 
-"@babel/helper-regex@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.4.3.tgz#9d6e5428bfd638ab53b37ae4ec8caf0477495147"
-  integrity sha512-hnoq5u96pLCfgjXuj8ZLX3QQ+6nAulS+zSgi6HulUwFbEruRAKwbGLU5OvXkE14L8XW6XsQEKsIDfgthKLRAyA==
+"@babel/helper-regex@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.4.4.tgz#a47e02bc91fb259d2e6727c2a30013e3ac13c4a2"
+  integrity sha512-Y5nuB/kESmR3tKjU8Nkn1wMGEx1tjJX076HBMeL3XLQCu6vA/YRzuTW0bbb+qRnXvQGn+d6Rx953yffl8vEy7Q==
   dependencies:
     lodash "^4.17.11"
 
@@ -199,7 +210,7 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-replace-supers@^7.1.0", "@babel/helper-replace-supers@^7.4.0":
+"@babel/helper-replace-supers@^7.1.0":
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.4.0.tgz#4f56adb6aedcd449d2da9399c2dcf0545463b64c"
   integrity sha512-PVwCVnWWAgnal+kJ+ZSAphzyl58XrFeSKSAJRiqg5QToTsjL+Xu1f9+RJ+d+Q0aPhPfBGaYfkox66k86thxNSg==
@@ -209,6 +220,16 @@
     "@babel/traverse" "^7.4.0"
     "@babel/types" "^7.4.0"
 
+"@babel/helper-replace-supers@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.4.4.tgz#aee41783ebe4f2d3ab3ae775e1cc6f1a90cefa27"
+  integrity sha512-04xGEnd+s01nY1l15EuMS1rfKktNF+1CkKmHoErDppjAAZL+IUBZpzT748x262HF7fibaQPhbvWUl5HeSt1EXg==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.0.0"
+    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/traverse" "^7.4.4"
+    "@babel/types" "^7.4.4"
+
 "@babel/helper-simple-access@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
@@ -224,6 +245,13 @@
   dependencies:
     "@babel/types" "^7.4.0"
 
+"@babel/helper-split-export-declaration@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677"
+  integrity sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==
+  dependencies:
+    "@babel/types" "^7.4.4"
+
 "@babel/helper-wrap-function@^7.1.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa"
@@ -243,14 +271,14 @@
     "@babel/traverse" "^7.4.0"
     "@babel/types" "^7.4.0"
 
-"@babel/helpers@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.4.3.tgz#7b1d354363494b31cb9a2417ae86af32b7853a3b"
-  integrity sha512-BMh7X0oZqb36CfyhvtbSmcWc3GXocfxv3yNsAEuM0l+fAqSO22rQrUpijr3oE/10jCTrB6/0b9kzmG4VetCj8Q==
+"@babel/helpers@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.4.4.tgz#868b0ef59c1dd4e78744562d5ce1b59c89f2f2a5"
+  integrity sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==
   dependencies:
-    "@babel/template" "^7.4.0"
-    "@babel/traverse" "^7.4.3"
-    "@babel/types" "^7.4.0"
+    "@babel/template" "^7.4.4"
+    "@babel/traverse" "^7.4.4"
+    "@babel/types" "^7.4.4"
 
 "@babel/highlight@^7.0.0":
   version "7.0.0"
@@ -277,10 +305,10 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.0.tgz#6de669e73ac3a32c754280d0fef8fca6aad2c416"
   integrity sha512-ZmMhJfU/+SXXvy9ALjDZopa3T3EixQtQai89JRC48eM9OUwrxJjYjuM/0wmdl2AekytlzMVhPY8cYdLb13kpKQ==
 
-"@babel/parser@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.3.tgz#eb3ac80f64aa101c907d4ce5406360fe75b7895b"
-  integrity sha512-gxpEUhTS1sGA63EGQGuA+WESPR/6tz6ng7tSHFCmaTJK/cGK8y37cBTspX+U2xCAue2IQVvF6Z0oigmjwD8YGQ==
+"@babel/parser@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.4.tgz#5977129431b8fe33471730d255ce8654ae1250b6"
+  integrity sha512-5pCS4mOsL+ANsFZGdvNLybx4wtqAZJ0MJjMHxvzI3bvIsz6sQvzW8XX92EYIkiPtIvcfG3Aj+Ir5VNyjnZhP7w==
 
 "@babel/plugin-proposal-async-generator-functions@^7.2.0":
   version "7.2.0"
@@ -299,10 +327,10 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
 
-"@babel/plugin-proposal-object-rest-spread@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.3.tgz#be27cd416eceeba84141305b93c282f5de23bbb4"
-  integrity sha512-xC//6DNSSHVjq8O2ge0dyYlhshsH4T7XdCVoxbi5HzLYWfsC5ooFlJjrXk8RcAT+hjHAK9UjBXdylzSoDK3t4g==
+"@babel/plugin-proposal-object-rest-spread@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.4.tgz#1ef173fcf24b3e2df92a678f027673b55e7e3005"
+  integrity sha512-dMBG6cSPBbHeEBdFXeQ2QLc5gUpg4Vkaz8octD4aoW/ISO+jBOcsuxYL7bsb5WSu8RLP6boxrBIALEHgoHtO9g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
@@ -315,13 +343,13 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.0.tgz#202d91ee977d760ef83f4f416b280d568be84623"
-  integrity sha512-h/KjEZ3nK9wv1P1FSNb9G079jXrNYR0Ko+7XkOx85+gM24iZbPn0rh4vCftk+5QKY7y1uByFataBTmX7irEF1w==
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz#501ffd9826c0b91da22690720722ac7cb1ca9c78"
+  integrity sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
+    "@babel/helper-regex" "^7.4.4"
     regexpu-core "^4.5.4"
 
 "@babel/plugin-syntax-async-generators@^7.2.0":
@@ -366,10 +394,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-async-to-generator@^7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.0.tgz#234fe3e458dce95865c0d152d256119b237834b0"
-  integrity sha512-EeaFdCeUULM+GPFEsf7pFcNSxM7hYjoj5fiYbyuiXobW4JhFnjAv9OWzNwHyHcKoPNpAfeRDuW6VyaXEDUBa7g==
+"@babel/plugin-transform-async-to-generator@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.4.tgz#a3f1d01f2f21cadab20b33a82133116f14fb5894"
+  integrity sha512-YiqW2Li8TXmzgbXw+STsSqPBPFnGviiaSp6CYOq55X8GQ2SGVLrXB6pNid8HkqkZAzOH6knbai3snhP7v0fNwA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -382,26 +410,26 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-block-scoping@^7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.0.tgz#164df3bb41e3deb954c4ca32ffa9fcaa56d30bcb"
-  integrity sha512-AWyt3k+fBXQqt2qb9r97tn3iBwFpiv9xdAiG+Gr2HpAZpuayvbL55yWrsV3MyHvXk/4vmSiedhDRl1YI2Iy5nQ==
+"@babel/plugin-transform-block-scoping@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.4.tgz#c13279fabf6b916661531841a23c4b7dae29646d"
+  integrity sha512-jkTUyWZcTrwxu5DD4rWz6rDB5Cjdmgz6z7M7RLXOJyCUkFBawssDGcGh8M/0FTSB87avyJI1HsTwUXp9nKA1PA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     lodash "^4.17.11"
 
-"@babel/plugin-transform-classes@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.3.tgz#adc7a1137ab4287a555d429cc56ecde8f40c062c"
-  integrity sha512-PUaIKyFUDtG6jF5DUJOfkBdwAS/kFFV3XFk7Nn0a6vR7ZT8jYw5cGtIlat77wcnd0C6ViGqo/wyNf4ZHytF/nQ==
+"@babel/plugin-transform-classes@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.4.tgz#0ce4094cdafd709721076d3b9c38ad31ca715eb6"
+  integrity sha512-/e44eFLImEGIpL9qPxSRat13I5QNRgBLu2hOQJCF7VLy/otSM/sypV1+XaIw5+502RX/+6YaSAPmldk+nhHDPw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-define-map" "^7.4.0"
+    "@babel/helper-define-map" "^7.4.4"
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.4.0"
-    "@babel/helper-split-export-declaration" "^7.4.0"
+    "@babel/helper-replace-supers" "^7.4.4"
+    "@babel/helper-split-export-declaration" "^7.4.4"
     globals "^11.1.0"
 
 "@babel/plugin-transform-computed-properties@^7.2.0":
@@ -411,20 +439,20 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-destructuring@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.3.tgz#1a95f5ca2bf2f91ef0648d5de38a8d472da4350f"
-  integrity sha512-rVTLLZpydDFDyN4qnXdzwoVpk1oaXHIvPEOkOLyr88o7oHxVc/LyrnDx+amuBWGOwUb7D1s/uLsKBNTx08htZg==
+"@babel/plugin-transform-destructuring@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.4.tgz#9d964717829cc9e4b601fc82a26a71a4d8faf20f"
+  integrity sha512-/aOx+nW0w8eHiEHm+BTERB2oJn5D127iye/SUQl7NjHy0lf+j7h4MKMMSOwdazGq9OxgiNADncE+SRJkCxjZpQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-dotall-regex@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.3.tgz#fceff1c16d00c53d32d980448606f812cd6d02bf"
-  integrity sha512-9Arc2I0AGynzXRR/oPdSALv3k0rM38IMFyto7kOCwb5F9sLUt2Ykdo3V9yUPR+Bgr4kb6bVEyLkPEiBhzcTeoA==
+"@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz#361a148bc951444312c69446d76ed1ea8e4450c3"
+  integrity sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.4.3"
+    "@babel/helper-regex" "^7.4.4"
     regexpu-core "^4.5.4"
 
 "@babel/plugin-transform-duplicate-keys@^7.2.0":
@@ -442,17 +470,17 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-for-of@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.3.tgz#c36ff40d893f2b8352202a2558824f70cd75e9fe"
-  integrity sha512-UselcZPwVWNSURnqcfpnxtMehrb8wjXYOimlYQPBnup/Zld426YzIhNEvuRsEWVHfESIECGrxoI6L5QqzuLH5Q==
+"@babel/plugin-transform-for-of@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz#0267fc735e24c808ba173866c6c4d1440fc3c556"
+  integrity sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-function-name@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.3.tgz#130c27ec7fb4f0cba30e958989449e5ec8d22bbd"
-  integrity sha512-uT5J/3qI/8vACBR9I1GlAuU/JqBtWdfCrynuOkrWG6nCDieZd5przB1vfP59FRHBZQ9DC2IUfqr/xKqzOD5x0A==
+"@babel/plugin-transform-function-name@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz#e1436116abb0610c2259094848754ac5230922ad"
+  integrity sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -479,21 +507,21 @@
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.3.tgz#3917f260463ac08f8896aa5bd54403f6e1fed165"
-  integrity sha512-sMP4JqOTbMJMimqsSZwYWsMjppD+KRyDIUVW91pd7td0dZKAvPmhCaxhOzkzLParKwgQc7bdL9UNv+rpJB0HfA==
+"@babel/plugin-transform-modules-commonjs@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.4.tgz#0bef4713d30f1d78c2e59b3d6db40e60192cac1e"
+  integrity sha512-4sfBOJt58sEo9a2BQXnZq+Q3ZTSAUXyK3E30o36BOGnJ+tvJ6YSxF0PG6kERvbeISgProodWuI9UVG3/FMY6iw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.4.3"
+    "@babel/helper-module-transforms" "^7.4.4"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-simple-access" "^7.1.0"
 
-"@babel/plugin-transform-modules-systemjs@^7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.0.tgz#c2495e55528135797bc816f5d50f851698c586a1"
-  integrity sha512-gjPdHmqiNhVoBqus5qK60mWPp1CmYWp/tkh11mvb0rrys01HycEGD7NvvSoKXlWEfSM9TcL36CpsK8ElsADptQ==
+"@babel/plugin-transform-modules-systemjs@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.4.tgz#dc83c5665b07d6c2a7b224c00ac63659ea36a405"
+  integrity sha512-MSiModfILQc3/oqnG7NrP1jHaSPryO6tA2kOMmAQApz5dayPxWiHqmq4sWH2xF5LcQK56LlbKByCd8Aah/OIkQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.4.0"
+    "@babel/helper-hoist-variables" "^7.4.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-modules-umd@^7.2.0":
@@ -504,17 +532,17 @@
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.4.2":
-  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.2.tgz#800391136d6cbcc80728dbdba3c1c6e46f86c12e"
-  integrity sha512-NsAuliSwkL3WO2dzWTOL1oZJHm0TM8ZY8ZSxk2ANyKkt5SQlToGA4pzctmq1BEjoacurdwZ3xp2dCQWJkME0gQ==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.4.tgz#5611d96d987dfc4a3a81c4383bb173361037d68d"
+  integrity sha512-Ki+Y9nXBlKfhD+LXaRS7v95TtTGYRAf9Y1rTDiE75zf8YQz4GDaWRXosMfJBXxnk88mGFjWdCRIeqDbon7spYA==
   dependencies:
     regexp-tree "^0.1.0"
 
-"@babel/plugin-transform-new-target@^7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.0.tgz#67658a1d944edb53c8d4fa3004473a0dd7838150"
-  integrity sha512-6ZKNgMQmQmrEX/ncuCwnnw1yVGoaOW5KpxNhoWI7pCQdA0uZ0HqHGqenCUIENAnxRjy2WwNQ30gfGdIgqJXXqw==
+"@babel/plugin-transform-new-target@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz#18d120438b0cc9ee95a47f2c72bc9768fbed60a5"
+  integrity sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -526,12 +554,12 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-replace-supers" "^7.1.0"
 
-"@babel/plugin-transform-parameters@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.3.tgz#e5ff62929fdf4cf93e58badb5e2430303003800d"
-  integrity sha512-ULJYC2Vnw96/zdotCZkMGr2QVfKpIT/4/K+xWWY0MbOJyMZuk660BGkr3bEKWQrrciwz6xpmft39nA4BF7hJuA==
+"@babel/plugin-transform-parameters@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz#7556cf03f318bd2719fe4c922d2d808be5571e16"
+  integrity sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==
   dependencies:
-    "@babel/helper-call-delegate" "^7.4.0"
+    "@babel/helper-call-delegate" "^7.4.4"
     "@babel/helper-get-function-arity" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -542,10 +570,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-regenerator@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.3.tgz#2a697af96887e2bbf5d303ab0221d139de5e739c"
-  integrity sha512-kEzotPuOpv6/iSlHroCDydPkKYw7tiJGKlmYp6iJn4a6C/+b2FdttlJsLKYxolYHgotTJ5G5UY5h0qey5ka3+A==
+"@babel/plugin-transform-regenerator@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.4.tgz#5b4da4df79391895fca9e28f99e87e22cfc02072"
+  integrity sha512-Zz3w+pX1SI0KMIiqshFZkwnVGUhDZzpX2vtPzfJBKQQq8WsP/Xy9DNdELWivxcKOCX/Pywge4SiEaPaLtoDT4g==
   dependencies:
     regenerator-transform "^0.13.4"
 
@@ -556,10 +584,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-runtime@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.4.3.tgz#4d6691690ecdc9f5cb8c3ab170a1576c1f556371"
-  integrity sha512-7Q61bU+uEI7bCUFReT1NKn7/X6sDQsZ7wL1sJ9IYMAO7cI+eg6x9re1cEw2fCRMbbTVyoeUKWSV1M6azEfKCfg==
+"@babel/plugin-transform-runtime@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.4.4.tgz#a50f5d16e9c3a4ac18a1a9f9803c107c380bce08"
+  integrity sha512-aMVojEjPszvau3NRg+TIH14ynZLvPewH4xhlCW1w6A3rkxTS1m4uwzRclYR9oS+rl/dr+kT+pzbfHuAWP/lc7Q==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -588,10 +616,10 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
 
-"@babel/plugin-transform-template-literals@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.2.0.tgz#d87ed01b8eaac7a92473f608c97c089de2ba1e5b"
-  integrity sha512-FkPix00J9A/XWXv4VoKJBMeSkyY9x/TqIh76wzcdfl57RJJcf8CehQ08uwfhCDNtRQYtHQKBTwKZDEyjE13Lwg==
+"@babel/plugin-transform-template-literals@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz#9d28fea7bbce637fb7612a0750989d8321d4bcb0"
+  integrity sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -603,13 +631,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-unicode-regex@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.3.tgz#3868703fc0e8f443dda65654b298df576f7b863b"
-  integrity sha512-lnSNgkVjL8EMtnE8eSS7t2ku8qvKH3eqNf/IwIfnSPUqzgqYmRwzdsQWv4mNQAN9Nuo6Gz1Y0a4CSmdpu1Pp6g==
+"@babel/plugin-transform-unicode-regex@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz#ab4634bb4f14d36728bf5978322b35587787970f"
+  integrity sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.4.3"
+    "@babel/helper-regex" "^7.4.4"
     regexpu-core "^4.5.4"
 
 "@babel/polyfill@^7.0.0":
@@ -620,62 +648,62 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.2"
 
-"@babel/polyfill@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.4.3.tgz#332dc6f57b718017c3a8b37b4eea8aa6eeac1187"
-  integrity sha512-rkv8WIvJshA5Ev8iNMGgz5WZkRtgtiPexiT7w5qevGTuT7ZBfM3de9ox1y9JR5/OXb/sWGBbWlHNa7vQKqku3Q==
+"@babel/polyfill@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.4.4.tgz#78801cf3dbe657844eeabf31c1cae3828051e893"
+  integrity sha512-WlthFLfhQQhh+A2Gn5NSFl0Huxz36x86Jn+E9OW7ibK8edKPq+KLy4apM1yDpQ8kJOVi1OVjpP4vSDLdrI04dg==
   dependencies:
     core-js "^2.6.5"
     regenerator-runtime "^0.13.2"
 
-"@babel/preset-env@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.4.3.tgz#e71e16e123dc0fbf65a52cbcbcefd072fbd02880"
-  integrity sha512-FYbZdV12yHdJU5Z70cEg0f6lvtpZ8jFSDakTm7WXeJbLXh4R0ztGEu/SW7G1nJ2ZvKwDhz8YrbA84eYyprmGqw==
+"@babel/preset-env@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.4.4.tgz#b6f6825bfb27b3e1394ca3de4f926482722c1d6f"
+  integrity sha512-FU1H+ACWqZZqfw1x2G1tgtSSYSfxJLkpaUQL37CenULFARDo+h4xJoVHzRoHbK+85ViLciuI7ME4WTIhFRBBlw==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
     "@babel/plugin-proposal-json-strings" "^7.2.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.4.3"
+    "@babel/plugin-proposal-object-rest-spread" "^7.4.4"
     "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.4.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
     "@babel/plugin-transform-arrow-functions" "^7.2.0"
-    "@babel/plugin-transform-async-to-generator" "^7.4.0"
+    "@babel/plugin-transform-async-to-generator" "^7.4.4"
     "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
-    "@babel/plugin-transform-block-scoping" "^7.4.0"
-    "@babel/plugin-transform-classes" "^7.4.3"
+    "@babel/plugin-transform-block-scoping" "^7.4.4"
+    "@babel/plugin-transform-classes" "^7.4.4"
     "@babel/plugin-transform-computed-properties" "^7.2.0"
-    "@babel/plugin-transform-destructuring" "^7.4.3"
-    "@babel/plugin-transform-dotall-regex" "^7.4.3"
+    "@babel/plugin-transform-destructuring" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.4.4"
     "@babel/plugin-transform-duplicate-keys" "^7.2.0"
     "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
-    "@babel/plugin-transform-for-of" "^7.4.3"
-    "@babel/plugin-transform-function-name" "^7.4.3"
+    "@babel/plugin-transform-for-of" "^7.4.4"
+    "@babel/plugin-transform-function-name" "^7.4.4"
     "@babel/plugin-transform-literals" "^7.2.0"
     "@babel/plugin-transform-member-expression-literals" "^7.2.0"
     "@babel/plugin-transform-modules-amd" "^7.2.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.4.3"
-    "@babel/plugin-transform-modules-systemjs" "^7.4.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.4.4"
+    "@babel/plugin-transform-modules-systemjs" "^7.4.4"
     "@babel/plugin-transform-modules-umd" "^7.2.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.4.2"
-    "@babel/plugin-transform-new-target" "^7.4.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.4.4"
+    "@babel/plugin-transform-new-target" "^7.4.4"
     "@babel/plugin-transform-object-super" "^7.2.0"
-    "@babel/plugin-transform-parameters" "^7.4.3"
+    "@babel/plugin-transform-parameters" "^7.4.4"
     "@babel/plugin-transform-property-literals" "^7.2.0"
-    "@babel/plugin-transform-regenerator" "^7.4.3"
+    "@babel/plugin-transform-regenerator" "^7.4.4"
     "@babel/plugin-transform-reserved-words" "^7.2.0"
     "@babel/plugin-transform-shorthand-properties" "^7.2.0"
     "@babel/plugin-transform-spread" "^7.2.0"
     "@babel/plugin-transform-sticky-regex" "^7.2.0"
-    "@babel/plugin-transform-template-literals" "^7.2.0"
+    "@babel/plugin-transform-template-literals" "^7.4.4"
     "@babel/plugin-transform-typeof-symbol" "^7.2.0"
-    "@babel/plugin-transform-unicode-regex" "^7.4.3"
-    "@babel/types" "^7.4.0"
+    "@babel/plugin-transform-unicode-regex" "^7.4.4"
+    "@babel/types" "^7.4.4"
     browserslist "^4.5.2"
     core-js-compat "^3.0.0"
     invariant "^2.2.2"
@@ -699,10 +727,10 @@
     pirates "^4.0.0"
     source-map-support "^0.5.9"
 
-"@babel/runtime@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.3.tgz#79888e452034223ad9609187a0ad1fe0d2ad4bdc"
-  integrity sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==
+"@babel/runtime@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.4.tgz#dc2e34982eb236803aa27a07fea6857af1b9171d"
+  integrity sha512-w0+uT71b6Yi7i5SE0co4NioIpSYS6lLiXvCzWzGSKvpK5vdQtCbICHMj+gbAKAOtxiV6HsVh/MBdaF9EQ6faSg==
   dependencies:
     regenerator-runtime "^0.13.2"
 
@@ -715,6 +743,15 @@
     "@babel/parser" "^7.4.0"
     "@babel/types" "^7.4.0"
 
+"@babel/template@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"
+  integrity sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.4.4"
+    "@babel/types" "^7.4.4"
+
 "@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.0":
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.0.tgz#14006967dd1d2b3494cdd650c686db9daf0ddada"
@@ -730,17 +767,17 @@
     globals "^11.1.0"
     lodash "^4.17.11"
 
-"@babel/traverse@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.3.tgz#1a01f078fc575d589ff30c0f71bf3c3d9ccbad84"
-  integrity sha512-HmA01qrtaCwwJWpSKpA948cBvU5BrmviAief/b3AVw936DtcdsTexlbyzNuDnthwhOQ37xshn7hvQaEQk7ISYQ==
+"@babel/traverse@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.4.tgz#0776f038f6d78361860b6823887d4f3937133fe8"
+  integrity sha512-Gw6qqkw/e6AGzlyj9KnkabJX7VcubqPtkUQVAwkc0wUMldr3A/hezNB3Rc5eIvId95iSGkGIOe5hh1kMKf951A==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.4.0"
+    "@babel/generator" "^7.4.4"
     "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.4.0"
-    "@babel/parser" "^7.4.3"
-    "@babel/types" "^7.4.0"
+    "@babel/helper-split-export-declaration" "^7.4.4"
+    "@babel/parser" "^7.4.4"
+    "@babel/types" "^7.4.4"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.11"
@@ -754,6 +791,15 @@
     lodash "^4.17.11"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.4.tgz#8db9e9a629bb7c29370009b4b779ed93fe57d5f0"
+  integrity sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.17.11"
+    to-fast-properties "^2.0.0"
+
 "@cnakazawa/watch@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
@@ -961,16 +1007,16 @@
     read-package-tree "^5.1.6"
     semver "^5.5.0"
 
-"@lerna/changed@3.13.3":
-  version "3.13.3"
-  resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.13.3.tgz#f2a2e982f4317157345f7abb3f6b12cc69394657"
-  integrity sha512-REMZ/1UvYrizUhN7ktlbfMUa0vhMf1ogAe97WQC4I8r3s973Orfhs3aselo1GwudUwM4tMHBH8A9vnll9or3iA==
+"@lerna/changed@3.13.4":
+  version "3.13.4"
+  resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.13.4.tgz#c69d8a079999e49611dd58987f08437baee81ad4"
+  integrity sha512-9lfOyRVObasw6L/z7yCSfsEl1QKy0Eamb8t2Krg1deIoAt+cE3JXOdGGC1MhOSli+7f/U9LyLXjJzIOs/pc9fw==
   dependencies:
     "@lerna/collect-updates" "3.13.3"
     "@lerna/command" "3.13.3"
     "@lerna/listable" "3.13.0"
     "@lerna/output" "3.13.0"
-    "@lerna/version" "3.13.3"
+    "@lerna/version" "3.13.4"
 
 "@lerna/check-working-tree@3.13.3":
   version "3.13.3"
@@ -1177,10 +1223,10 @@
     "@lerna/child-process" "3.13.3"
     semver "^5.5.0"
 
-"@lerna/import@3.13.3":
-  version "3.13.3"
-  resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.13.3.tgz#1dc84f2c5644ba874be9552395a3b158688b263c"
-  integrity sha512-gDjLAFVavG/CMvj9leBfiwd7vrXqtdFXPIz1oXmghBMnje7nCTbodbNWFe4VDDWx7reDaZIN+6PxTSvrPcF//A==
+"@lerna/import@3.13.4":
+  version "3.13.4"
+  resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.13.4.tgz#e9a1831b8fed33f3cbeab3b84c722c9371a2eaf7"
+  integrity sha512-dn6eNuPEljWsifBEzJ9B6NoaLwl/Zvof7PBUPA4hRyRlqG5sXRn6F9DnusMTovvSarbicmTURbOokYuotVWQQA==
   dependencies:
     "@lerna/child-process" "3.13.3"
     "@lerna/command" "3.13.3"
@@ -1361,10 +1407,10 @@
     inquirer "^6.2.0"
     npmlog "^4.1.2"
 
-"@lerna/publish@3.13.3":
-  version "3.13.3"
-  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.13.3.tgz#9adde543064e85851f02c0c2dbd40d52d1c519a4"
-  integrity sha512-Ni3pZKueIfgJJoL0OXfbAuWhGlJrDNwGx3CYWp2dbNqJmKD6uBZmsDtmeARKDp92oUK60W0drXCMydkIFFHMDQ==
+"@lerna/publish@3.13.4":
+  version "3.13.4"
+  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.13.4.tgz#25b678c285110897a7fc5198a35bdfa9db7f9cc1"
+  integrity sha512-v03pabiPlqCDwX6cVNis1PDdT6/jBgkVb5Nl4e8wcJXevIhZw3ClvtI94gSZu/wdoVFX0RMfc8QBVmaimSO0qg==
   dependencies:
     "@lerna/batch-packages" "3.13.0"
     "@lerna/check-working-tree" "3.13.3"
@@ -1383,7 +1429,7 @@
     "@lerna/run-lifecycle" "3.13.0"
     "@lerna/run-parallel-batches" "3.13.0"
     "@lerna/validation-error" "3.13.0"
-    "@lerna/version" "3.13.3"
+    "@lerna/version" "3.13.4"
     figgy-pudding "^3.5.1"
     fs-extra "^7.0.0"
     libnpmaccess "^3.0.1"
@@ -1491,10 +1537,10 @@
   dependencies:
     npmlog "^4.1.2"
 
-"@lerna/version@3.13.3":
-  version "3.13.3"
-  resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.13.3.tgz#3ec1b5aee2fd42353b95452c38cc0b284b93a1f0"
-  integrity sha512-o/yQGAwDHmyu17wTj4Kat1/uDhjYFMeG+H0Y0HC4zJ4a/T6rEiXx7jJrnucPTmTQTDcUBoH/It5LrPYGOPsExA==
+"@lerna/version@3.13.4":
+  version "3.13.4"
+  resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.13.4.tgz#ea23b264bebda425ccbfcdcd1de13ef45a390e59"
+  integrity sha512-pptWUEgN/lUTQZu34+gfH1g4Uhs7TDKRcdZY9A4T9k6RTOwpKC2ceLGiXdeR+ZgQJAey2C4qiE8fo5Z6Rbc6QA==
   dependencies:
     "@lerna/batch-packages" "3.13.0"
     "@lerna/check-working-tree" "3.13.3"
@@ -2175,19 +2221,12 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
-  dependencies:
-    arr-flatten "^1.0.1"
-
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
   integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
-arr-flatten@^1.0.1, arr-flatten@^1.1.0:
+arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
   integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
@@ -2242,11 +2281,6 @@ array-uniq@^2.0.0:
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-2.0.0.tgz#0009e30306e37a6dd2e2e2480db5316fdade1583"
   integrity sha512-O3QZEr+3wDj7otzF7PjNGs6CA3qmYMLvt5xGkjY/V0VxS+ovvqVo/5wKM/OVOAyuX4DTh9H31zE/yKtO66hTkg==
 
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
-
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
@@ -2649,15 +2683,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
 braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
@@ -2691,20 +2716,20 @@ browser-resolve@^1.11.3:
   dependencies:
     resolve "1.1.7"
 
-browser-sync-client@^2.26.2:
-  version "2.26.2"
-  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.26.2.tgz#dd0070c80bdc6d9021e89f7837ee70ed0a8acf91"
-  integrity sha512-FEuVJD41fI24HJ30XOT2RyF5WcnEtdJhhTqeyDlnMk/8Ox9MZw109rvk9pdfRWye4soZLe+xcAo9tHSMxvgAdw==
+browser-sync-client@^2.26.4:
+  version "2.26.4"
+  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.26.4.tgz#2b2972579139ce73bfaf0d165c31ef2fecdf02f9"
+  integrity sha512-mQiDp5/tf79VezDS5j/EExU4Ze6f5DQYuL0Z7VdJgBbNLTHDfkYGi2R620qc6HkY9XZA0m4/UwihT7J42RBIJA==
   dependencies:
     etag "1.8.1"
     fresh "0.5.2"
     mitt "^1.1.3"
     rxjs "^5.5.6"
 
-browser-sync-ui@^2.26.2:
-  version "2.26.2"
-  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.26.2.tgz#a1d8e107cfed5849d77e3bbd84ae5d566beb4ea0"
-  integrity sha512-LF7GMWo8ELOE0eAlxuRCfnGQT1ZxKP9flCfGgZdXFc6BwmoqaJHlYe7MmVvykKkXjolRXTz8ztXAKGVqNwJ3EQ==
+browser-sync-ui@^2.26.4:
+  version "2.26.4"
+  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.26.4.tgz#3772f13c6b93f2d7d333f4be0ca1ec02aae97dba"
+  integrity sha512-u20P3EsZoM8Pt+puoi3BU3KlbQAH1lAcV+/O4saF26qokrBqIDotmGonfWwoRbUmdxZkM9MBmA0K39ZTG1h4sA==
   dependencies:
     async-each-series "0.1.1"
     connect-history-api-fallback "^1"
@@ -2713,13 +2738,13 @@ browser-sync-ui@^2.26.2:
     socket.io-client "^2.0.4"
     stream-throttle "^0.1.3"
 
-browser-sync@^2.26.3:
-  version "2.26.3"
-  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.26.3.tgz#1b59bd5935938a5b0fa73b3d78ef1050bd2bf912"
-  integrity sha512-VLzpjCA4uXqfzkwqWtMM6hvPm2PNHp2RcmzBXcbi6C9WpkUhhFb8SVAr4CFrCsFxDg+oY6HalOjn8F+egyvhag==
+browser-sync@^2.26.5:
+  version "2.26.5"
+  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.26.5.tgz#c11353ffd4694be88a34b9a5d2a5a0ba789587d0"
+  integrity sha512-zVa6MmadAFgl5Uk53Yy5cw5tGTO7xSGAWK3Yx70GJ1t5jK+r6B4q3xq+1XbYfLt1SbeFg7WoNWneNhMT4B9jFw==
   dependencies:
-    browser-sync-client "^2.26.2"
-    browser-sync-ui "^2.26.2"
+    browser-sync-client "^2.26.4"
+    browser-sync-ui "^2.26.4"
     bs-recipes "1.3.4"
     bs-snippet-injector "^2.0.1"
     chokidar "^2.0.4"
@@ -2734,7 +2759,7 @@ browser-sync@^2.26.3:
     http-proxy "1.15.2"
     immutable "^3"
     localtunnel "1.9.1"
-    micromatch "2.3.11"
+    micromatch "^3.1.10"
     opn "5.3.0"
     portscanner "2.1.1"
     qs "6.2.3"
@@ -2928,7 +2953,7 @@ bytes@3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
-cacache@^11.0.1, cacache@^11.0.2, cacache@^11.3.1, cacache@^11.3.2:
+cacache@^11.0.1, cacache@^11.0.2, cacache@^11.3.2:
   version "11.3.2"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
   integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
@@ -3650,21 +3675,22 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-webpack-plugin@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.2.tgz#56186dfddbf9aa1b29c97fa4c796c1be98870da4"
-  integrity sha512-7nC7EynPrnBTtBwwbG1aTqrfNS1aTb9eEjSmQDqFtKAsJrR3uDb+pCDIFT2LzhW+SgGJxQcYzThrmXzzZ720uw==
+copy-webpack-plugin@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.3.tgz#2179e3c8fd69f13afe74da338896f1f01a875b5c"
+  integrity sha512-PlZRs9CUMnAVylZq+vg2Juew662jWtwOXOqH4lbQD9ZFhRG9R7tVStOgHt21CBGVq7k5yIJaz8TXDLSjV+Lj8Q==
   dependencies:
-    cacache "^11.3.1"
-    find-cache-dir "^2.0.0"
+    cacache "^11.3.2"
+    find-cache-dir "^2.1.0"
     glob-parent "^3.1.0"
     globby "^7.1.1"
-    is-glob "^4.0.0"
-    loader-utils "^1.1.0"
+    is-glob "^4.0.1"
+    loader-utils "^1.2.3"
     minimatch "^3.0.4"
     normalize-path "^3.0.0"
-    p-limit "^2.1.0"
-    serialize-javascript "^1.4.0"
+    p-limit "^2.2.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^1.7.0"
     webpack-log "^2.0.0"
 
 core-js-compat@^3.0.0:
@@ -4991,13 +5017,6 @@ exit@^0.1.2:
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -5011,13 +5030,6 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
-  dependencies:
-    fill-range "^2.1.0"
-
 expect@^24.7.1:
   version "24.7.1"
   resolved "https://registry.yarnpkg.com/expect/-/expect-24.7.1.tgz#d91defbab4e627470a152feaf35b3c31aa1c7c14"
@@ -5074,13 +5086,6 @@ external-editor@^3.0.3:
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
-  dependencies:
-    is-extglob "^1.0.0"
-
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -5158,10 +5163,10 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
-fibers@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/fibers/-/fibers-3.1.1.tgz#0238902ca938347bd779523692fbeefdf4f688ab"
-  integrity sha512-dl3Ukt08rHVQfY8xGD0ODwyjwrRALtaghuqGH2jByYX1wpY+nAnRQjJ6Dbqq0DnVgNVQ9yibObzbF4IlPyiwPw==
+fibers@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fibers/-/fibers-4.0.0.tgz#2f43ec96bf278947dcc3f142c0d84495f511d45b"
+  integrity sha512-By4/A0GDWa3BF8rTHG9ocV3N88J5aR6jttrXKRe4EB4q0x1G4Xjg8ZP+VXuE2YAKfpU0dWqAMt7MRTJra58X6Q==
   dependencies:
     detect-libc "^1.0.3"
 
@@ -5230,11 +5235,6 @@ file-type@^8.1.0:
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-8.1.0.tgz#244f3b7ef641bbe0cca196c7276e4b332399f68c"
   integrity sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==
 
-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
-
 filename-reserved-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229"
@@ -5257,17 +5257,6 @@ fileset@^2.0.3:
     glob "^7.0.3"
     minimatch "^3.0.3"
 
-fill-range@^2.1.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
-  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^3.0.0"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -5291,7 +5280,7 @@ finalhandler@1.1.0:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
-find-cache-dir@^2.0.0:
+find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
   integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
@@ -5377,13 +5366,6 @@ for-in@^1.0.1, for-in@^1.0.2:
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
-  dependencies:
-    for-in "^1.0.1"
-
 for-own@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
@@ -5658,21 +5640,6 @@ gitconfiglocal@^1.0.0:
   dependencies:
     ini "^1.3.2"
 
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
-  dependencies:
-    is-glob "^2.0.0"
-
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
@@ -6571,18 +6538,6 @@ is-directory@^0.3.1:
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
   integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
-  dependencies:
-    is-primitive "^2.0.0"
-
 is-expression@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f"
@@ -6603,11 +6558,6 @@ is-extendable@^1.0.1:
   dependencies:
     is-plain-object "^2.0.4"
 
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
-
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -6644,13 +6594,6 @@ is-gif@^3.0.0:
   dependencies:
     file-type "^10.4.0"
 
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
-  dependencies:
-    is-extglob "^1.0.0"
-
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -6665,6 +6608,13 @@ is-glob@^4.0.0:
   dependencies:
     is-extglob "^2.1.1"
 
+is-glob@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  dependencies:
+    is-extglob "^2.1.1"
+
 is-jpg@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-jpg/-/is-jpg-2.0.0.tgz#2e1997fa6e9166eaac0242daae443403e4ef1d97"
@@ -6687,13 +6637,6 @@ is-number-like@^1.0.3:
   dependencies:
     lodash.isfinite "^3.3.2"
 
-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
-  dependencies:
-    kind-of "^3.0.2"
-
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -6701,11 +6644,6 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
-is-number@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
-
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@@ -6733,16 +6671,6 @@ is-png@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-png/-/is-png-1.1.0.tgz#d574b12bf275c0350455570b0e5b57ab062077ce"
   integrity sha1-1XSxK/J1wDUEVVcLDltXqwYgd84=
 
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
-
 is-promise@^2.0.0, is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
@@ -7540,26 +7468,26 @@ left-pad@^1.3.0:
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
   integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==
 
-lerna@^3.13.3:
-  version "3.13.3"
-  resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.13.3.tgz#bfd64e99466eaaf35b5d27994973b9f694796181"
-  integrity sha512-0TkG40F02A4wjKraJBztPtj87BjUezFmaZKAha8eLdtngZkSpAdrSANa5K7jnnA8mywmpQwrKJuBmjdNpm9cBw==
+lerna@^3.13.4:
+  version "3.13.4"
+  resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.13.4.tgz#03026c11c5643f341fda42e4fb1882e2df35e6cb"
+  integrity sha512-qTp22nlpcgVrJGZuD7oHnFbTk72j2USFimc2Pj4kC0/rXmcU2xPtCiyuxLl8y6/6Lj5g9kwEuvKDZtSXujjX/A==
   dependencies:
     "@lerna/add" "3.13.3"
     "@lerna/bootstrap" "3.13.3"
-    "@lerna/changed" "3.13.3"
+    "@lerna/changed" "3.13.4"
     "@lerna/clean" "3.13.3"
     "@lerna/cli" "3.13.0"
     "@lerna/create" "3.13.3"
     "@lerna/diff" "3.13.3"
     "@lerna/exec" "3.13.3"
-    "@lerna/import" "3.13.3"
+    "@lerna/import" "3.13.4"
     "@lerna/init" "3.13.3"
     "@lerna/link" "3.13.3"
     "@lerna/list" "3.13.3"
-    "@lerna/publish" "3.13.3"
+    "@lerna/publish" "3.13.4"
     "@lerna/run" "3.13.3"
-    "@lerna/version" "3.13.3"
+    "@lerna/version" "3.13.4"
     import-local "^1.0.0"
     npmlog "^4.1.2"
 
@@ -7953,11 +7881,6 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-math-random@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
-  integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
-
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
@@ -8039,25 +7962,6 @@ merge2@^1.2.3:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
   integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
 
-micromatch@2.3.11:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
 micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -8478,7 +8382,7 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.1, normalize-path@^2.1.1:
+normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
@@ -8683,14 +8587,6 @@ object.getownpropertydescriptors@^2.0.3:
     define-properties "^1.1.2"
     es-abstract "^1.5.1"
 
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -8917,7 +8813,7 @@ p-limit@^1.1.0:
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0, p-limit@^2.1.0:
+p-limit@^2.0.0, p-limit@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
   integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
@@ -9069,16 +8965,6 @@ parse-github-repo-url@^1.3.0:
   resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
   integrity sha1-nn2LslKmy2ukJZUGC3v23z28H1A=
 
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
@@ -9730,11 +9616,6 @@ prepend-http@^2.0.0:
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
   integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
 
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
-
 prettier@1.16.3:
   version "1.16.3"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d"
@@ -10229,15 +10110,6 @@ quick-lru@^1.0.0:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
   integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
 
-randomatic@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
-  integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==
-  dependencies:
-    is-number "^4.0.0"
-    kind-of "^6.0.0"
-    math-random "^1.0.1"
-
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -10472,13 +10344,6 @@ regenerator-transform@^0.13.4:
   dependencies:
     private "^0.1.6"
 
-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
-  dependencies:
-    is-equal-shallow "^0.1.3"
-
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
@@ -11009,6 +10874,11 @@ serialize-javascript@^1.4.0:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879"
   integrity sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==
 
+serialize-javascript@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65"
+  integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==
+
 serve-index@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
@@ -11913,10 +11783,10 @@ timsort@^0.3.0:
   resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
   integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
 
-tippy.js@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-4.2.1.tgz#9e4939d976465f77229b05a3cb233b5dc28cf850"
-  integrity sha512-xEE7zYNgQxCDdPcuT6T04f0frPh0wO7CcIqJKMFazU/NqusyjCgYSkLRosIHoiRkZMRzSPOudC8wRN5GjvAyOQ==
+tippy.js@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-4.3.0.tgz#5f661fed7fa30c90609eb87f6657005dd041ede3"
+  integrity sha512-SjctzIfkx3+waue+Ew58MMTuzYD4SK9wJOnCEdrCmwZiKJ7chZSxOguFmBm11tmTlZuGbxncUC/5Qu6GqzD2qQ==
   dependencies:
     popper.js "^1.14.7"
 
@@ -12099,10 +11969,10 @@ uglify-js@^2.6.1:
   optionalDependencies:
     uglify-to-browserify "~1.0.0"
 
-uglify-js@^3.5.5:
-  version "3.5.5"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.5.tgz#9c5aaaf3a7586fbf559df31fa6d3bca1b3ba7e9b"
-  integrity sha512-e58FqZzPwaLODQetDQKlvErZaGkh1UmzP8YwU0aG65NLourKNtwVyDG8tkIyUU0vqWzxaikSvTaxrCSscmvqvQ==
+uglify-js@^3.5.9:
+  version "3.5.9"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.9.tgz#372fbf95939555b1f460b1777d33a67d4a994ac9"
+  integrity sha512-WpT0RqsDtAWPNJK955DEnb6xjymR8Fn0OlK4TT4pS0ASYsVPqr5ELhgwOwLCP5J5vHeJ4xmMmz3DEgdqC10JeQ==
   dependencies:
     commander "~2.20.0"
     source-map "~0.6.1"
@@ -12502,10 +12372,10 @@ webpack-dev-middleware@^3.6.2:
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-hot-middleware@^2.24.3:
-  version "2.24.3"
-  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.24.3.tgz#5bb76259a8fc0d97463ab517640ba91d3382d4a6"
-  integrity sha512-pPlmcdoR2Fn6UhYjAhp1g/IJy1Yc9hD+T6O9mjRcWV2pFbBjIFoJXhP0CoD0xPOhWJuWXuZXGBga9ybbOdzXpg==
+webpack-hot-middleware@^2.24.4:
+  version "2.24.4"
+  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.24.4.tgz#0ae1eeca000c6ffdcb22eb574d0e6d7717672b0f"
+  integrity sha512-YFA4j2tg9WPkcQKcyHMZn6787QngWf/ahXvAJRZ1ripySa+4ihjzDcYBsfC4ihOucTd02IJ12v+VTGMsEGxq0w==
   dependencies:
     ansi-html "0.0.7"
     html-entities "^1.2.0"

From 0d69570576f8f90b8cb095466bb07ebae16cf6eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 30 Apr 2019 16:19:28 +0200
Subject: [PATCH 17/64] code style

---
 examples/Components/Routes/MenuBubble/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/Components/Routes/MenuBubble/index.vue b/examples/Components/Routes/MenuBubble/index.vue
index 30601375..c72625e3 100644
--- a/examples/Components/Routes/MenuBubble/index.vue
+++ b/examples/Components/Routes/MenuBubble/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="editor">
-    <editor-menu-bubble :editor="editor" :keepInBounds="keepInBounds">
+    <editor-menu-bubble :editor="editor" :keep-in-bounds="keepInBounds">
       <div
         slot-scope="{ commands, isActive, menu }"
         class="menububble"

From 5e6d60c3fe8d25e4c7e6566954db2b9091e10191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 30 Apr 2019 16:19:38 +0200
Subject: [PATCH 18/64] update dependencies

---
 packages/tiptap-commands/package.json   |  2 +-
 packages/tiptap-extensions/package.json |  2 +-
 packages/tiptap-utils/package.json      |  2 +-
 yarn.lock                               | 16 ++++++++--------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/tiptap-commands/package.json b/packages/tiptap-commands/package.json
index f0450a08..ed9e95ec 100644
--- a/packages/tiptap-commands/package.json
+++ b/packages/tiptap-commands/package.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "prosemirror-commands": "^1.0.7",
     "prosemirror-inputrules": "^1.0.1",
-    "prosemirror-schema-list": "^1.0.2",
+    "prosemirror-schema-list": "^1.0.3",
     "prosemirror-state": "^1.2.2",
     "tiptap-utils": "^1.3.0"
   }
diff --git a/packages/tiptap-extensions/package.json b/packages/tiptap-extensions/package.json
index 4ac52d54..8eef5846 100644
--- a/packages/tiptap-extensions/package.json
+++ b/packages/tiptap-extensions/package.json
@@ -24,7 +24,7 @@
     "lowlight": "^1.11.0",
     "prosemirror-history": "^1.0.4",
     "prosemirror-state": "^1.2.2",
-    "prosemirror-tables": "^0.7.10",
+    "prosemirror-tables": "^0.7.11",
     "prosemirror-utils": "^0.7.6",
     "prosemirror-view": "^1.8.9",
     "tiptap": "^1.16.2",
diff --git a/packages/tiptap-utils/package.json b/packages/tiptap-utils/package.json
index c5c1e07c..04838823 100644
--- a/packages/tiptap-utils/package.json
+++ b/packages/tiptap-utils/package.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "prosemirror-model": "^1.7.0",
     "prosemirror-state": "^1.2.2",
-    "prosemirror-tables": "^0.7.9",
+    "prosemirror-tables": "^0.7.11",
     "prosemirror-utils": "^0.7.6"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 170d70b3..5a114fca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9754,10 +9754,10 @@ prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.7.0:
   dependencies:
     orderedmap "^1.0.0"
 
-prosemirror-schema-list@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.0.2.tgz#8381fb0c1eaf439d848059f62e2fac517033c2ef"
-  integrity sha512-IJ4DEpUEymfO+NNA4DAgCMF39XiQqpmCoPYY3SXa1jYcVgObGpGfJlSjZYVFEpimoLI7/mLoOLDhCtpGCRhTfg==
+prosemirror-schema-list@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.0.3.tgz#539caafa4f9314000943bd783be4017165ec0bd6"
+  integrity sha512-+zzSawVds8LsZpl/bLTCYk2lYactF93W219Czh81zBILikCRDOHjp1CQ1os4ZXBp6LlD+JnBqF1h59Q+hilOoQ==
   dependencies:
     prosemirror-model "^1.0.0"
     prosemirror-transform "^1.0.0"
@@ -9770,10 +9770,10 @@ prosemirror-state@^1.0.0, prosemirror-state@^1.2.1, prosemirror-state@^1.2.2:
     prosemirror-model "^1.0.0"
     prosemirror-transform "^1.0.0"
 
-prosemirror-tables@^0.7.10, prosemirror-tables@^0.7.9:
-  version "0.7.10"
-  resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-0.7.10.tgz#4b0f623422b4b8f84cdc9c559f8a87579846b3ba"
-  integrity sha512-VIu7UGS9keYEHs0Y6AEOTGbNE9QI2rL1OKng4vV6yoTshW/lYcb+s3hGXI12i+WLMjDVm7ujhfdWrpKpvFZOkQ==
+prosemirror-tables@^0.7.11:
+  version "0.7.11"
+  resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-0.7.11.tgz#400317df5898473f8c33eef8f8016451d0d1ceed"
+  integrity sha512-IOvz4sE4RgEeI8aKbis6ADqXEZlqnU1aZ/hdZLj6F74HeCGv5cC/hnOkhlip+4IaQvqn1u3oyBWKMzjGlUJuww==
   dependencies:
     prosemirror-keymap "^1.0.0"
     prosemirror-model "^1.0.0"

From 7128dd7bf3676aeff5810e64ec167a4af847fa00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 30 Apr 2019 18:32:12 +0200
Subject: [PATCH 19/64] replace uglify with terser

---
 build/packages/build.js |  7 ++-----
 package.json            |  2 +-
 yarn.lock               | 15 +--------------
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/build/packages/build.js b/build/packages/build.js
index 82a57e43..4f16997e 100644
--- a/build/packages/build.js
+++ b/build/packages/build.js
@@ -1,7 +1,7 @@
 import fs from 'fs'
 import path from 'path'
 import zlib from 'zlib'
-import uglify from 'uglify-js'
+import Terser from 'terser'
 import { rollup } from 'rollup'
 import config from './config'
 
@@ -43,9 +43,8 @@ function buildEntry({ input, output }) {
   return rollup(input)
     .then(bundle => bundle.generate(output))
     .then(response => {
-      // console.log({ bla })
       if (isProd) {
-        const minified = uglify.minify(response.output[0].code, {
+        const minified = Terser.minify(response.output[0].code, {
           output: {
             preamble: output.banner,
             ascii_only: true,
@@ -53,8 +52,6 @@ function buildEntry({ input, output }) {
         }).code
         return write(output.file, minified, true)
       }
-      // console.log({ isProd })
-      // console.dir(response, { depth: null })
       return write(output.file, response.output[0].code)
     })
 }
diff --git a/package.json b/package.json
index de974dbb..7c49a2c6 100644
--- a/package.json
+++ b/package.json
@@ -75,8 +75,8 @@
     "rollup-plugin-vue": "^5.0.0",
     "sass-loader": "^7.0.3",
     "style-loader": "^0.23.1",
+    "terser": "^3.17.0",
     "tippy.js": "^4.3.0",
-    "uglify-js": "^3.5.9",
     "vue": "^2.6.10",
     "vue-loader": "^15.7.0",
     "vue-router": "^3.0.6",
diff --git a/yarn.lock b/yarn.lock
index 5a114fca..0422dd16 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3436,11 +3436,6 @@ commander@^2.19.0, commander@^2.2.0, commander@^2.8.1, commander@~2.19.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
 
-commander@~2.20.0:
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
-  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
-
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -11711,7 +11706,7 @@ terser-webpack-plugin@^1.1.0:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
-terser@^3.16.1:
+terser@^3.16.1, terser@^3.17.0:
   version "3.17.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
   integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
@@ -11969,14 +11964,6 @@ uglify-js@^2.6.1:
   optionalDependencies:
     uglify-to-browserify "~1.0.0"
 
-uglify-js@^3.5.9:
-  version "3.5.9"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.9.tgz#372fbf95939555b1f460b1777d33a67d4a994ac9"
-  integrity sha512-WpT0RqsDtAWPNJK955DEnb6xjymR8Fn0OlK4TT4pS0ASYsVPqr5ELhgwOwLCP5J5vHeJ4xmMmz3DEgdqC10JeQ==
-  dependencies:
-    commander "~2.20.0"
-    source-map "~0.6.1"
-
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"

From d0fc40413943cc70c19a4d27964a93d3fc3ba6f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 30 Apr 2019 18:35:33 +0200
Subject: [PATCH 20/64] fix output names

---
 build/packages/config.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/build/packages/config.js b/build/packages/config.js
index 49ed49e7..c3100f26 100644
--- a/build/packages/config.js
+++ b/build/packages/config.js
@@ -41,7 +41,7 @@ function genConfig(opts) {
       file: opts.file,
       format: opts.format,
       banner,
-      name: 'tiptap',
+      name: opts.outputName,
     },
   }
 
@@ -57,23 +57,28 @@ function genConfig(opts) {
 export default [
   {
     package: 'tiptap',
+    outputName: 'tiptap',
     outputFileName: 'tiptap',
   },
   {
     package: 'tiptap-commands',
+    outputName: 'tiptapCommands',
     outputFileName: 'commands',
   },
   {
     package: 'tiptap-utils',
+    outputName: 'tiptapUtils',
     outputFileName: 'utils',
   },
   {
     package: 'tiptap-extensions',
+    outputName: 'tiptapExtensions',
     outputFileName: 'extensions',
   },
 ].map(item => [
   {
     name: item.package,
+    outputName: item.outputName,
     package: resolve(`packages/${item.package}/package.json`),
     input: resolve(`packages/${item.package}/src/index.js`),
     file: resolve(`packages/${item.package}/dist/${item.outputFileName}.js`),
@@ -82,6 +87,7 @@ export default [
   },
   {
     name: item.package,
+    outputName: item.outputName,
     package: resolve(`packages/${item.package}/package.json`),
     input: resolve(`packages/${item.package}/src/index.js`),
     file: resolve(`packages/${item.package}/dist/${item.outputFileName}.min.js`),
@@ -90,6 +96,7 @@ export default [
   },
   {
     name: item.package,
+    outputName: item.outputName,
     package: resolve(`packages/${item.package}/package.json`),
     input: resolve(`packages/${item.package}/src/index.js`),
     file: resolve(`packages/${item.package}/dist/${item.outputFileName}.common.js`),
@@ -97,6 +104,7 @@ export default [
   },
   {
     name: item.package,
+    outputName: item.outputName,
     package: resolve(`packages/${item.package}/package.json`),
     input: resolve(`packages/${item.package}/src/index.js`),
     file: resolve(`packages/${item.package}/dist/${item.outputFileName}.esm.js`),

From 0e59e0cc0c2b4f0be5c46ebf2a698c674bfda821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 30 Apr 2019 20:16:04 +0200
Subject: [PATCH 21/64] Publish

 - tiptap-commands@1.8.0
 - tiptap-extensions@1.17.0
 - tiptap-utils@1.4.0
 - tiptap@1.17.0
---
 packages/tiptap-commands/package.json   | 4 ++--
 packages/tiptap-extensions/package.json | 6 +++---
 packages/tiptap-utils/package.json      | 2 +-
 packages/tiptap/package.json            | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/tiptap-commands/package.json b/packages/tiptap-commands/package.json
index ed9e95ec..0d0fad5f 100644
--- a/packages/tiptap-commands/package.json
+++ b/packages/tiptap-commands/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tiptap-commands",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "description": "Commands for tiptap",
   "homepage": "https://tiptap.scrumpy.io",
   "license": "MIT",
@@ -24,6 +24,6 @@
     "prosemirror-inputrules": "^1.0.1",
     "prosemirror-schema-list": "^1.0.3",
     "prosemirror-state": "^1.2.2",
-    "tiptap-utils": "^1.3.0"
+    "tiptap-utils": "^1.4.0"
   }
 }
diff --git a/packages/tiptap-extensions/package.json b/packages/tiptap-extensions/package.json
index 8eef5846..420e99a3 100644
--- a/packages/tiptap-extensions/package.json
+++ b/packages/tiptap-extensions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tiptap-extensions",
-  "version": "1.16.2",
+  "version": "1.17.0",
   "description": "Extensions for tiptap",
   "homepage": "https://tiptap.scrumpy.io",
   "license": "MIT",
@@ -27,8 +27,8 @@
     "prosemirror-tables": "^0.7.11",
     "prosemirror-utils": "^0.7.6",
     "prosemirror-view": "^1.8.9",
-    "tiptap": "^1.16.2",
-    "tiptap-commands": "^1.7.1"
+    "tiptap": "^1.17.0",
+    "tiptap-commands": "^1.8.0"
   },
   "peerDependencies": {
     "vue": "^2.5.17",
diff --git a/packages/tiptap-utils/package.json b/packages/tiptap-utils/package.json
index 04838823..228ca670 100644
--- a/packages/tiptap-utils/package.json
+++ b/packages/tiptap-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tiptap-utils",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Utility functions for tiptap",
   "homepage": "https://tiptap.scrumpy.io",
   "license": "MIT",
diff --git a/packages/tiptap/package.json b/packages/tiptap/package.json
index 50739f06..05a77e77 100644
--- a/packages/tiptap/package.json
+++ b/packages/tiptap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tiptap",
-  "version": "1.16.2",
+  "version": "1.17.0",
   "description": "A rich-text editor for Vue.js",
   "homepage": "https://tiptap.scrumpy.io",
   "license": "MIT",
@@ -28,8 +28,8 @@
     "prosemirror-model": "^1.7.0",
     "prosemirror-state": "^1.2.1",
     "prosemirror-view": "^1.8.9",
-    "tiptap-commands": "^1.7.1",
-    "tiptap-utils": "^1.3.0"
+    "tiptap-commands": "^1.8.0",
+    "tiptap-utils": "^1.4.0"
   },
   "peerDependencies": {
     "vue": "^2.5.17",

From e9ac6f0d0bf96a266fe384db0e845337464b59ba Mon Sep 17 00:00:00 2001
From: Christoph Flathmann <cf@pixel-kraft.de>
Date: Fri, 3 May 2019 12:54:28 +0200
Subject: [PATCH 22/64] Add issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 36 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md | 20 +++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..5e32f994
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Steps to Reproduce / Codesandbox Example**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+ Fork this or create a new Codesandbox replicating your error
+ https://codesandbox.io/s/qxv5m9y6oq?fontsize=14
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+ - Mobile / Desktop: [eg. Desktop]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..fefa40d5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'feature request'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

From 5b530d5d0c6dbde70271a32373c27fb6bd596d4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 3 May 2019 14:04:14 +0200
Subject: [PATCH 23/64] add oldstate to update event

---
 packages/tiptap/src/Editor.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/tiptap/src/Editor.js b/packages/tiptap/src/Editor.js
index 741adc64..12fd34bb 100644
--- a/packages/tiptap/src/Editor.js
+++ b/packages/tiptap/src/Editor.js
@@ -288,6 +288,8 @@ export default class Editor {
       return
     }
 
+    const oldState = this.state
+
     this.state = this.state.apply(transaction)
     this.view.updateState(this.state)
     this.setActiveNodesAndMarks()
@@ -296,14 +298,15 @@ export default class Editor {
       return
     }
 
-    this.emitUpdate(transaction)
+    this.emitUpdate(transaction, oldState)
   }
 
-  emitUpdate(transaction) {
+  emitUpdate(transaction, oldState) {
     this.options.onUpdate({
       getHTML: this.getHTML.bind(this),
       getJSON: this.getJSON.bind(this),
       state: this.state,
+      oldState,
       transaction,
     })
   }

From 543387018388e56a7482e552aa6eb3fb7f4afae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 3 May 2019 14:04:37 +0200
Subject: [PATCH 24/64] add something broken

---
 .../Routes/Collaboration3/index.vue           | 47 +++++++++++++++----
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/examples/Components/Routes/Collaboration3/index.vue b/examples/Components/Routes/Collaboration3/index.vue
index cac658d8..471909ec 100644
--- a/examples/Components/Routes/Collaboration3/index.vue
+++ b/examples/Components/Routes/Collaboration3/index.vue
@@ -47,15 +47,19 @@ export default {
         //   this.editor.view.updateState(this.state.edit)
         //   return false
         // },
-        onUpdate: ({ state }) => {
-          this.getSendableSteps(state)
+        onUpdate: ({ state, oldState }) => {
+          this.getSendableSteps(state, oldState)
         },
       })
     },
 
-    getSendableSteps: debounce(function (state) {
+    getSendableSteps: debounce(function (state, oldState) {
       const sendable = sendableSteps(state)
 
+      console.log('update editor', { sendable })
+
+      // console.log({ state, oldState })
+
       if (sendable) {
         this.socket.emit('update', sendable)
 
@@ -63,7 +67,7 @@ export default {
         const clientIDs = this.repeat(sendable.clientID, steps.length)
 
         this.history.push({
-          state,
+          state: oldState,
           version: getVersion(state),
           steps,
           clientIDs,
@@ -116,7 +120,7 @@ export default {
         console.log('version in sync', version)
         // TODO remove steps older than version
       })
-      .on('versionMismatch', ({ version, data }) => {
+      .on('versionMismatch', ({ version, data, doc }) => {
         console.log('version mismatch', version)
         // TODO: go back to `version`, apply `steps`, apply unmerged `steps`
 
@@ -124,20 +128,47 @@ export default {
 
         const { state, view, schema } = this.editor
 
-        view.updateState(history.state)
+        // view.updateState(history.state)
 
-        view.dispatch(receiveTransaction(
+        console.log('other steps', { data })
+        // console.log(getVersion(view.state))
+
+        const newstate = history.state.apply(receiveTransaction(
           history.state,
           data.map(item => Step.fromJSON(schema, item.step)),
           data.map(item => item.clientID),
         ))
 
+        view.updateState(newstate)
+
+        // const newstate2 = newstate.apply(receiveTransaction(
+        //   newstate,
+        //   history.steps,
+        //   history.clientIDs,
+        // ))
+
         view.dispatch(receiveTransaction(
-          history.state,
+          state,
           history.steps,
           history.clientIDs,
         ))
 
+        // view.updateState(newstate2)
+
+        // view.dispatch(receiveTransaction(
+        //   view.state,
+        //   data.map(item => Step.fromJSON(schema, item.step)),
+        //   data.map(item => item.clientID),
+        // ))
+
+        // console.log('own', { history })
+
+        // view.dispatch(receiveTransaction(
+        //   history.state,
+        //   history.steps,
+        //   history.clientIDs,
+        // ))
+
         // const transaction = receiveTransaction(
         //   state,
         //   steps,

From ee12e0577daa663dce752e80ff427655f087ab29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 3 May 2019 16:05:30 +0200
Subject: [PATCH 25/64] add something broken

---
 .../Routes/Collaboration3/index.vue           | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/examples/Components/Routes/Collaboration3/index.vue b/examples/Components/Routes/Collaboration3/index.vue
index 471909ec..7267a472 100644
--- a/examples/Components/Routes/Collaboration3/index.vue
+++ b/examples/Components/Routes/Collaboration3/index.vue
@@ -9,7 +9,9 @@ import io from 'socket.io-client'
 import { debounce } from 'lodash-es'
 import { Editor, EditorContent } from 'tiptap'
 import { Step } from 'prosemirror-transform'
-import { receiveTransaction, sendableSteps, getVersion } from 'prosemirror-collab'
+import {
+ receiveTransaction, sendableSteps, getVersion, rebaseSteps,
+} from 'prosemirror-collab'
 import Collab from './Collab'
 
 export default {
@@ -71,6 +73,7 @@ export default {
           version: getVersion(state),
           steps,
           clientIDs,
+          sendable,
         })
 
         const transaction = receiveTransaction(
@@ -125,13 +128,9 @@ export default {
         // TODO: go back to `version`, apply `steps`, apply unmerged `steps`
 
         const history = this.history.find(item => item.version === version)
-
         const { state, view, schema } = this.editor
 
-        // view.updateState(history.state)
-
-        console.log('other steps', { data })
-        // console.log(getVersion(view.state))
+        // console.log('other steps', { data })
 
         const newstate = history.state.apply(receiveTransaction(
           history.state,
@@ -139,19 +138,30 @@ export default {
           data.map(item => item.clientID),
         ))
 
+        // this.editor.state =
         view.updateState(newstate)
 
-        // const newstate2 = newstate.apply(receiveTransaction(
-        //   newstate,
-        //   history.steps,
-        //   history.clientIDs,
-        // ))
+        if (history.steps.length) {
+          view.dispatch(receiveTransaction(
+            state,
+            history.steps,
+            history.clientIDs,
+          ))
+
+          // const sendable = sendableSteps(state)
+          // console.log({ sendable })
+
+          // this.socket.emit('update', {
+          //   version: getVersion(state),
+          //   steps: history.steps,
+          // })
+        }
+
+
+        // const currentVersion = getVersion(view.state)
+        // const historySteps = history.steps
+        // console.log({ currentVersion, historySteps })
 
-        view.dispatch(receiveTransaction(
-          state,
-          history.steps,
-          history.clientIDs,
-        ))
 
         // view.updateState(newstate2)
 

From b5a5472171b476e79bb4fb10c79ef81a5635f078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 3 May 2019 17:50:30 +0200
Subject: [PATCH 26/64] refactoring

---
 .../Routes/Collaboration3/index.vue           | 156 ++----------------
 packages/tiptap/src/Editor.js                 |   5 -
 2 files changed, 13 insertions(+), 148 deletions(-)

diff --git a/examples/Components/Routes/Collaboration3/index.vue b/examples/Components/Routes/Collaboration3/index.vue
index 7267a472..6301f756 100644
--- a/examples/Components/Routes/Collaboration3/index.vue
+++ b/examples/Components/Routes/Collaboration3/index.vue
@@ -9,9 +9,7 @@ import io from 'socket.io-client'
 import { debounce } from 'lodash-es'
 import { Editor, EditorContent } from 'tiptap'
 import { Step } from 'prosemirror-transform'
-import {
- receiveTransaction, sendableSteps, getVersion, rebaseSteps,
-} from 'prosemirror-collab'
+import { receiveTransaction, sendableSteps, getVersion } from 'prosemirror-collab'
 import Collab from './Collab'
 
 export default {
@@ -21,10 +19,8 @@ export default {
 
   data() {
     return {
-      history: [],
       editor: null,
       socket: null,
-      newState: null,
       clientID: Math.floor(Math.random() * 0xFFFFFFFF),
     }
   },
@@ -43,171 +39,45 @@ export default {
             clientID: this.clientID,
           }),
         ],
-        // onTransaction: transaction => {
-        //   console.log('onTransaction')
-        //   this.newState = this.editor.state.apply(transaction)
-        //   this.editor.view.updateState(this.state.edit)
-        //   return false
-        // },
-        onUpdate: ({ state, oldState }) => {
-          this.getSendableSteps(state, oldState)
+        onUpdate: ({ state }) => {
+          this.getSendableSteps(state)
         },
       })
     },
 
-    getSendableSteps: debounce(function (state, oldState) {
+    getSendableSteps: debounce(function (state) {
       const sendable = sendableSteps(state)
 
-      console.log('update editor', { sendable })
-
-      // console.log({ state, oldState })
-
       if (sendable) {
         this.socket.emit('update', sendable)
-
-        const { steps } = sendable
-        const clientIDs = this.repeat(sendable.clientID, steps.length)
-
-        this.history.push({
-          state: oldState,
-          version: getVersion(state),
-          steps,
-          clientIDs,
-          sendable,
-        })
-
-        const transaction = receiveTransaction(
-          state,
-          steps,
-          clientIDs,
-        )
-
-        this.editor.view.dispatch(transaction)
       }
     }, 250),
 
-    receiveData({ steps }) {
+    receiveData({ steps, version }) {
       const { state, view, schema } = this.editor
 
+      if (getVersion(state) > version) {
+        return
+      }
+
       const transaction = receiveTransaction(
         state,
-        steps.map(step => Step.fromJSON(schema, step)),
-        steps.map(step => step.clientID),
+        steps.map(item => Step.fromJSON(schema, item.step)),
+        steps.map(item => item.clientID),
       )
 
       view.dispatch(transaction)
     },
-
-    repeat(val, n) {
-      const result = []
-      for (let i = 0; i < n; i++) result.push(val)
-      return result
-    },
   },
 
   mounted() {
     this.socket = io('wss://tiptap-sockets-2.glitch.me')
-      .on('connect', () => {
-        console.log('connected')
-      })
-      .on('disconnect', () => {
-        console.log('disconnected')
-      })
       .on('document', data => {
         this.initEditor(data)
       })
-      .on('update', data => {
-        this.receiveData(data)
+      .on('update', ({ steps, version }) => {
+        this.receiveData({ steps, version })
       })
-      .on('versionInSync', version => {
-        console.log('version in sync', version)
-        // TODO remove steps older than version
-      })
-      .on('versionMismatch', ({ version, data, doc }) => {
-        console.log('version mismatch', version)
-        // TODO: go back to `version`, apply `steps`, apply unmerged `steps`
-
-        const history = this.history.find(item => item.version === version)
-        const { state, view, schema } = this.editor
-
-        // console.log('other steps', { data })
-
-        const newstate = history.state.apply(receiveTransaction(
-          history.state,
-          data.map(item => Step.fromJSON(schema, item.step)),
-          data.map(item => item.clientID),
-        ))
-
-        // this.editor.state =
-        view.updateState(newstate)
-
-        if (history.steps.length) {
-          view.dispatch(receiveTransaction(
-            state,
-            history.steps,
-            history.clientIDs,
-          ))
-
-          // const sendable = sendableSteps(state)
-          // console.log({ sendable })
-
-          // this.socket.emit('update', {
-          //   version: getVersion(state),
-          //   steps: history.steps,
-          // })
-        }
-
-
-        // const currentVersion = getVersion(view.state)
-        // const historySteps = history.steps
-        // console.log({ currentVersion, historySteps })
-
-
-        // view.updateState(newstate2)
-
-        // view.dispatch(receiveTransaction(
-        //   view.state,
-        //   data.map(item => Step.fromJSON(schema, item.step)),
-        //   data.map(item => item.clientID),
-        // ))
-
-        // console.log('own', { history })
-
-        // view.dispatch(receiveTransaction(
-        //   history.state,
-        //   history.steps,
-        //   history.clientIDs,
-        // ))
-
-        // const transaction = receiveTransaction(
-        //   state,
-        //   steps,
-        //   clientIDs,
-        // )
-
-        // this.editor.view.dispatch(transaction)
-      })
-      // .on('versionMismatch', (version, steps) => {
-      //   // set state to the latest synced version?
-      //   // this.editor.view.updateState(this.prevState)
-
-      //   const currentVersion = getVersion(this.editor.state)
-      //   console.log('should poll version', currentVersion)
-
-      //   this.socket.emit('getVersionSteps', currentVersion)
-      // })
-      // .on('versionSteps', data => {
-      //   console.log('versionSteps', data)
-      //   const { state, view, schema } = this.editor
-
-      //   const transaction = receiveTransaction(
-      //     state,
-      //     data.map(item => Step.fromJSON(schema, item.step)),
-      //     data.map(item => item.clientID),
-      //   )
-
-      //   view.dispatch(transaction)
-      // })
   },
 
   beforeDestroy() {
diff --git a/packages/tiptap/src/Editor.js b/packages/tiptap/src/Editor.js
index 12fd34bb..6228524f 100644
--- a/packages/tiptap/src/Editor.js
+++ b/packages/tiptap/src/Editor.js
@@ -39,7 +39,6 @@ export default class Editor {
       onBlur: () => {},
       onPaste: () => {},
       onDrop: () => {},
-      onTransaction: () => true,
     }
 
     this.init(options)
@@ -284,10 +283,6 @@ export default class Editor {
   }
 
   dispatchTransaction(transaction) {
-    if (!this.options.onTransaction(transaction)) {
-      return
-    }
-
     const oldState = this.state
 
     this.state = this.state.apply(transaction)

From e9e50a2e75e7853e5119143928655135a4fdfcf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 3 May 2019 18:05:05 +0200
Subject: [PATCH 27/64] refactoring

---
 .../Components/Routes/Collaboration/index.vue |  83 +++-----
 .../Routes/Collaboration2/Collab.js           |  24 ---
 .../Routes/Collaboration2/index.vue           | 183 ------------------
 .../Routes/Collaboration3/Collab.js           |  24 ---
 .../Routes/Collaboration3/index.vue           |  87 ---------
 examples/Components/Subnavigation/index.vue   |   6 -
 examples/main.js                              |  14 --
 7 files changed, 27 insertions(+), 394 deletions(-)
 delete mode 100644 examples/Components/Routes/Collaboration2/Collab.js
 delete mode 100644 examples/Components/Routes/Collaboration2/index.vue
 delete mode 100644 examples/Components/Routes/Collaboration3/Collab.js
 delete mode 100644 examples/Components/Routes/Collaboration3/index.vue

diff --git a/examples/Components/Routes/Collaboration/index.vue b/examples/Components/Routes/Collaboration/index.vue
index 0d7620eb..c3d84fa0 100644
--- a/examples/Components/Routes/Collaboration/index.vue
+++ b/examples/Components/Routes/Collaboration/index.vue
@@ -5,6 +5,8 @@
 </template>
 
 <script>
+import io from 'socket.io-client'
+import { debounce } from 'lodash-es'
 import { Editor, EditorContent } from 'tiptap'
 import { Step } from 'prosemirror-transform'
 import { receiveTransaction, sendableSteps, getVersion } from 'prosemirror-collab'
@@ -18,85 +20,54 @@ export default {
   data() {
     return {
       editor: null,
-      ws: null,
-      clientID: Math.floor(Math.random() * 0xFFFFFFFF),
-      collabStartVersion: 0,
-      collabHistory: {
-        steps: [],
-        clientIDs: [],
-      },
+      socket: null,
     }
   },
 
   methods: {
     initEditor({ doc, version }) {
-      this.collabStartVersion = version + 1
+      if (this.editor) {
+        this.editor.destroy()
+      }
 
       this.editor = new Editor({
         content: doc,
         extensions: [
-          new Collab({
-            version: this.collabStartVersion,
-            clientID: this.clientID,
-          }),
+          new Collab({ version }),
         ],
         onUpdate: ({ state }) => {
-          const sendable = sendableSteps(state)
-
-          if (sendable) {
-            this.ws.send(JSON.stringify(sendable))
-          }
+          this.getSendableSteps(state)
         },
       })
     },
 
-    receiveData({ version, steps, clientID }) {
-      if (version !== this.collabHistory.steps.length + this.collabStartVersion) {
+    getSendableSteps: debounce(function (state) {
+      const sendable = sendableSteps(state)
+
+      if (sendable) {
+        this.socket.emit('update', sendable)
+      }
+    }, 250),
+
+    receiveData({ steps, version }) {
+      const { state, view, schema } = this.editor
+
+      if (getVersion(state) > version) {
         return
       }
 
-      steps.forEach(step => {
-        this.collabHistory.steps.push(step)
-        this.collabHistory.clientIDs.push(clientID)
-      })
-
-      this.updateDoc()
-    },
-
-    updateDoc() {
-      const { state, view, schema } = this.editor
-      const version = getVersion(state)
-      const data = this.stepsSince(version)
-      const transaction = receiveTransaction(
+      view.dispatch(receiveTransaction(
         state,
-        data.steps.map(step => Step.fromJSON(schema, step)),
-        data.clientIDs,
-      )
-
-      view.dispatch(transaction)
-    },
-
-    stepsSince(version) {
-      const count = version - this.collabStartVersion
-      return {
-        steps: this.collabHistory.steps.slice(count),
-        clientIDs: this.collabHistory.clientIDs.slice(count),
-      }
+        steps.map(item => Step.fromJSON(schema, item.step)),
+        steps.map(item => item.clientID),
+      ))
     },
   },
 
   mounted() {
-    this.ws = new WebSocket('wss://tiptap-sockets.glitch.me')
-
-    this.ws.onmessage = event => {
-      const payload = JSON.parse(event.data)
-
-      if (payload.doc) {
-        this.initEditor(payload)
-      } else {
-        this.receiveData(payload)
-      }
-    }
+    this.socket = io('wss://tiptap-sockets-2.glitch.me')
+      .on('document', data => this.initEditor(data))
+      .on('update', data => this.receiveData(data))
   },
 
   beforeDestroy() {
diff --git a/examples/Components/Routes/Collaboration2/Collab.js b/examples/Components/Routes/Collaboration2/Collab.js
deleted file mode 100644
index 21dc7255..00000000
--- a/examples/Components/Routes/Collaboration2/Collab.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Extension } from 'tiptap'
-import { collab } from 'prosemirror-collab'
-
-export default class CollabExtension extends Extension {
-  get name() {
-    return 'collab'
-  }
-
-  get defaultOptions() {
-    return {
-      version: 0,
-      clientID: Math.floor(Math.random() * 0xFFFFFFFF),
-    }
-  }
-
-  get plugins() {
-    return [
-      collab({
-        version: this.options.version,
-        clientID: this.options.clientID,
-      }),
-    ]
-  }
-}
diff --git a/examples/Components/Routes/Collaboration2/index.vue b/examples/Components/Routes/Collaboration2/index.vue
deleted file mode 100644
index 85c90ae3..00000000
--- a/examples/Components/Routes/Collaboration2/index.vue
+++ /dev/null
@@ -1,183 +0,0 @@
-<template>
-  <div class="editor">
-    <editor-content class="editor__content" :editor="editor" v-if="editor" />
-  </div>
-</template>
-
-<script>
-import io from 'socket.io-client'
-import { debounce } from 'lodash-es'
-import { Editor, EditorContent } from 'tiptap'
-import { Step } from 'prosemirror-transform'
-import { receiveTransaction, sendableSteps, getVersion } from 'prosemirror-collab'
-import Collab from './Collab'
-
-export default {
-  components: {
-    EditorContent,
-  },
-
-  data() {
-    return {
-      history: [],
-      editor: null,
-      socket: null,
-      newState: null,
-      clientID: Math.floor(Math.random() * 0xFFFFFFFF),
-    }
-  },
-
-  methods: {
-    initEditor({ doc, version }) {
-      if (this.editor) {
-        this.editor.destroy()
-      }
-
-      this.editor = new Editor({
-        content: doc,
-        extensions: [
-          new Collab({
-            version,
-            clientID: this.clientID,
-          }),
-        ],
-        // onTransaction: transaction => {
-        //   console.log('onTransaction')
-        //   this.newState = this.editor.state.apply(transaction)
-        //   this.editor.view.updateState(this.state.edit)
-        //   return false
-        // },
-        onUpdate: ({ state }) => {
-          this.getSendableSteps(state)
-        },
-      })
-    },
-
-    getSendableSteps: debounce(function (state) {
-      const sendable = sendableSteps(state)
-
-      if (sendable) {
-        this.socket.emit('update', sendable)
-
-        const { steps } = sendable
-        const clientIDs = this.repeat(sendable.clientID, steps.length)
-
-        this.history.push({
-          state,
-          version: getVersion(state),
-          steps,
-          clientIDs,
-        })
-
-        const transaction = receiveTransaction(
-          state,
-          steps,
-          clientIDs,
-        )
-
-        this.editor.view.dispatch(transaction)
-      }
-    }, 250),
-
-    receiveData({ steps }) {
-      const { state, view, schema } = this.editor
-
-      const transaction = receiveTransaction(
-        state,
-        steps.map(step => Step.fromJSON(schema, step)),
-        steps.map(step => step.clientID),
-      )
-
-      view.dispatch(transaction)
-    },
-
-    repeat(val, n) {
-      const result = []
-      for (let i = 0; i < n; i++) result.push(val)
-      return result
-    },
-  },
-
-  mounted() {
-    this.socket = io('wss://tiptap-sockets-2.glitch.me')
-      .on('connect', () => {
-        console.log('connected')
-      })
-      .on('disconnect', () => {
-        console.log('disconnected')
-      })
-      .on('document', data => {
-        this.initEditor(data)
-      })
-      .on('update', data => {
-        this.receiveData(data)
-      })
-      .on('versionInSync', version => {
-        console.log('version in sync', version)
-        // TODO remove steps older than version
-      })
-      .on('versionMismatch', ({ version, data }) => {
-        console.log('version mismatch', version)
-        // TODO: go back to `version`, apply `steps`, apply unmerged `steps`
-
-        console.log(this.history.length)
-
-        const history = this.history.find(item => {
-          console.log('search', item.version, version)
-          return item.version === version
-        })
-
-        console.log({ history })
-
-        const { state, view, schema } = this.editor
-
-        view.updateState(history.state)
-
-        view.dispatch(receiveTransaction(
-          history.state,
-          data.map(item => Step.fromJSON(schema, item.step)),
-          data.map(item => item.clientID),
-        ))
-
-        view.dispatch(receiveTransaction(
-          history.state,
-          history.steps,
-          history.clientIDs,
-        ))
-
-        // const transaction = receiveTransaction(
-        //   state,
-        //   steps,
-        //   clientIDs,
-        // )
-
-        // this.editor.view.dispatch(transaction)
-      })
-      // .on('versionMismatch', (version, steps) => {
-      //   // set state to the latest synced version?
-      //   // this.editor.view.updateState(this.prevState)
-
-      //   const currentVersion = getVersion(this.editor.state)
-      //   console.log('should poll version', currentVersion)
-
-      //   this.socket.emit('getVersionSteps', currentVersion)
-      // })
-      // .on('versionSteps', data => {
-      //   console.log('versionSteps', data)
-      //   const { state, view, schema } = this.editor
-
-      //   const transaction = receiveTransaction(
-      //     state,
-      //     data.map(item => Step.fromJSON(schema, item.step)),
-      //     data.map(item => item.clientID),
-      //   )
-
-      //   view.dispatch(transaction)
-      // })
-  },
-
-  beforeDestroy() {
-    this.editor.destroy()
-  },
-}
-</script>
diff --git a/examples/Components/Routes/Collaboration3/Collab.js b/examples/Components/Routes/Collaboration3/Collab.js
deleted file mode 100644
index 21dc7255..00000000
--- a/examples/Components/Routes/Collaboration3/Collab.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Extension } from 'tiptap'
-import { collab } from 'prosemirror-collab'
-
-export default class CollabExtension extends Extension {
-  get name() {
-    return 'collab'
-  }
-
-  get defaultOptions() {
-    return {
-      version: 0,
-      clientID: Math.floor(Math.random() * 0xFFFFFFFF),
-    }
-  }
-
-  get plugins() {
-    return [
-      collab({
-        version: this.options.version,
-        clientID: this.options.clientID,
-      }),
-    ]
-  }
-}
diff --git a/examples/Components/Routes/Collaboration3/index.vue b/examples/Components/Routes/Collaboration3/index.vue
deleted file mode 100644
index 6301f756..00000000
--- a/examples/Components/Routes/Collaboration3/index.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div class="editor">
-    <editor-content class="editor__content" :editor="editor" v-if="editor" />
-  </div>
-</template>
-
-<script>
-import io from 'socket.io-client'
-import { debounce } from 'lodash-es'
-import { Editor, EditorContent } from 'tiptap'
-import { Step } from 'prosemirror-transform'
-import { receiveTransaction, sendableSteps, getVersion } from 'prosemirror-collab'
-import Collab from './Collab'
-
-export default {
-  components: {
-    EditorContent,
-  },
-
-  data() {
-    return {
-      editor: null,
-      socket: null,
-      clientID: Math.floor(Math.random() * 0xFFFFFFFF),
-    }
-  },
-
-  methods: {
-    initEditor({ doc, version }) {
-      if (this.editor) {
-        this.editor.destroy()
-      }
-
-      this.editor = new Editor({
-        content: doc,
-        extensions: [
-          new Collab({
-            version,
-            clientID: this.clientID,
-          }),
-        ],
-        onUpdate: ({ state }) => {
-          this.getSendableSteps(state)
-        },
-      })
-    },
-
-    getSendableSteps: debounce(function (state) {
-      const sendable = sendableSteps(state)
-
-      if (sendable) {
-        this.socket.emit('update', sendable)
-      }
-    }, 250),
-
-    receiveData({ steps, version }) {
-      const { state, view, schema } = this.editor
-
-      if (getVersion(state) > version) {
-        return
-      }
-
-      const transaction = receiveTransaction(
-        state,
-        steps.map(item => Step.fromJSON(schema, item.step)),
-        steps.map(item => item.clientID),
-      )
-
-      view.dispatch(transaction)
-    },
-  },
-
-  mounted() {
-    this.socket = io('wss://tiptap-sockets-2.glitch.me')
-      .on('document', data => {
-        this.initEditor(data)
-      })
-      .on('update', ({ steps, version }) => {
-        this.receiveData({ steps, version })
-      })
-  },
-
-  beforeDestroy() {
-    this.editor.destroy()
-  },
-}
-</script>
diff --git a/examples/Components/Subnavigation/index.vue b/examples/Components/Subnavigation/index.vue
index 1ff9f905..c4c3b796 100644
--- a/examples/Components/Subnavigation/index.vue
+++ b/examples/Components/Subnavigation/index.vue
@@ -51,12 +51,6 @@
     <router-link class="subnavigation__link" to="/collaboration">
       Collaboration
     </router-link>
-    <router-link class="subnavigation__link" to="/collaboration2">
-      Collaboration 2
-    </router-link>
-    <router-link class="subnavigation__link" to="/collaboration3">
-      Collaboration 3
-    </router-link>
   </div>
 </template>
 
diff --git a/examples/main.js b/examples/main.js
index cd124936..3102cc93 100644
--- a/examples/main.js
+++ b/examples/main.js
@@ -131,20 +131,6 @@ const routes = [
       githubUrl: 'https://github.com/scrumpy/tiptap/tree/master/examples/Components/Routes/Collaboration',
     },
   },
-  {
-    path: '/collaboration2',
-    component: () => import('Components/Routes/Collaboration2'),
-    meta: {
-      githubUrl: 'https://github.com/scrumpy/tiptap/tree/master/examples/Components/Routes/Collaboration2',
-    },
-  },
-  {
-    path: '/collaboration3',
-    component: () => import('Components/Routes/Collaboration3'),
-    meta: {
-      githubUrl: 'https://github.com/scrumpy/tiptap/tree/master/examples/Components/Routes/Collaboration3',
-    },
-  },
 ]
 
 const router = new VueRouter({

From 392f8a20b3fa08e3875053719683dc885cb138e0 Mon Sep 17 00:00:00 2001
From: Marius Tolzmann <m@rius.berlin>
Date: Fri, 3 May 2019 19:06:18 +0200
Subject: [PATCH 28/64] Revert "fix eslint warning"

This reverts commit c4e0bbeaf41ce8bb8f56ef1e4060c6a551982c21.
---
 packages/tiptap-utils/src/utils/getMarkRange.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/tiptap-utils/src/utils/getMarkRange.js b/packages/tiptap-utils/src/utils/getMarkRange.js
index ce563ab7..b7026156 100644
--- a/packages/tiptap-utils/src/utils/getMarkRange.js
+++ b/packages/tiptap-utils/src/utils/getMarkRange.js
@@ -22,7 +22,7 @@ export default function ($pos = null, type = null) {
     startPos -= $pos.parent.child(startIndex).nodeSize
   }
 
-  // const endIndex = $pos.indexAfter()
+  const endIndex = $pos.indexAfter()
   const endPos = startPos + start.node.nodeSize
 
   // disable for now. see #156

From d057d5d7d9490b41220fdbf703c57eb7e4b89833 Mon Sep 17 00:00:00 2001
From: Marius Tolzmann <m@rius.berlin>
Date: Fri, 3 May 2019 19:06:19 +0200
Subject: [PATCH 29/64] Revert "fix a bug for getting mark range, fix #156"

This reverts commit 0cf905abb9f9546fb379b7f539428d9ff655fa02.
---
 packages/tiptap-utils/src/utils/getMarkRange.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/tiptap-utils/src/utils/getMarkRange.js b/packages/tiptap-utils/src/utils/getMarkRange.js
index b7026156..115f8b6b 100644
--- a/packages/tiptap-utils/src/utils/getMarkRange.js
+++ b/packages/tiptap-utils/src/utils/getMarkRange.js
@@ -22,14 +22,12 @@ export default function ($pos = null, type = null) {
     startPos -= $pos.parent.child(startIndex).nodeSize
   }
 
-  const endIndex = $pos.indexAfter()
-  const endPos = startPos + start.node.nodeSize
-
-  // disable for now. see #156
-  // while (endIndex < $pos.parent.childCount && link.isInSet($pos.parent.child(endIndex).marks)) {
-  //   endPos += $pos.parent.child(endIndex).nodeSize
-  //   endIndex += 1
-  // }
+  let endIndex = $pos.indexAfter()
+  let endPos = startPos + start.node.nodeSize
+  while (endIndex < $pos.parent.childCount && link.isInSet($pos.parent.child(endIndex).marks)) {
+    endPos += $pos.parent.child(endIndex).nodeSize
+    endIndex += 1
+  }
 
   return { from: startPos, to: endPos }
 

From 9787b876fe270d66ff6c3080bb2a800167309189 Mon Sep 17 00:00:00 2001
From: Marius Tolzmann <m@rius.berlin>
Date: Fri, 3 May 2019 19:08:50 +0200
Subject: [PATCH 30/64] fix endPosition in getMarkRange

getMarkRange() will not return the actual end position of the current mark.

might reintroduce bug from #156 (i cannot reproduce #156 so i cannot check)

fixes in this commit:

A) work around a possible bug in indexAfter()?:
   $pos.indexAfter() seems to return the same index as $pos.index() at some point
   -> fixed by increasing startIndex by 1 instead of using indexAfter()

B) endPos needs to be initialized with initial startPos + nodeSize and not
   with resulting startPos:
   -> moved initialization right after setting startPos
---
 packages/tiptap-utils/src/utils/getMarkRange.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/tiptap-utils/src/utils/getMarkRange.js b/packages/tiptap-utils/src/utils/getMarkRange.js
index 115f8b6b..b3b02977 100644
--- a/packages/tiptap-utils/src/utils/getMarkRange.js
+++ b/packages/tiptap-utils/src/utils/getMarkRange.js
@@ -17,13 +17,14 @@ export default function ($pos = null, type = null) {
 
   let startIndex = $pos.index()
   let startPos = $pos.start() + start.offset
+  let endIndex = startIndex + 1
+  let endPos = startPos + start.node.nodeSize
+
   while (startIndex > 0 && link.isInSet($pos.parent.child(startIndex - 1).marks)) {
     startIndex -= 1
     startPos -= $pos.parent.child(startIndex).nodeSize
   }
 
-  let endIndex = $pos.indexAfter()
-  let endPos = startPos + start.node.nodeSize
   while (endIndex < $pos.parent.childCount && link.isInSet($pos.parent.child(endIndex).marks)) {
     endPos += $pos.parent.child(endIndex).nodeSize
     endIndex += 1

From fd404f5c1fd350331160669161ff6010d39865d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 3 May 2019 21:50:17 +0200
Subject: [PATCH 31/64] change socket url

---
 examples/Components/Routes/Collaboration/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/Components/Routes/Collaboration/index.vue b/examples/Components/Routes/Collaboration/index.vue
index c3d84fa0..c65c1919 100644
--- a/examples/Components/Routes/Collaboration/index.vue
+++ b/examples/Components/Routes/Collaboration/index.vue
@@ -65,8 +65,8 @@ export default {
   },
 
   mounted() {
-    this.socket = io('wss://tiptap-sockets-2.glitch.me')
-      .on('document', data => this.initEditor(data))
+    this.socket = io('wss://tiptap-sockets.glitch.me')
+      .on('init', data => this.initEditor(data))
       .on('update', data => this.receiveData(data))
   },
 

From 2475bf6123f97d57269756d27ea8935ed69cb04f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 3 May 2019 22:14:18 +0200
Subject: [PATCH 32/64] add loading state

---
 examples/Components/Routes/Collaboration/index.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/examples/Components/Routes/Collaboration/index.vue b/examples/Components/Routes/Collaboration/index.vue
index c65c1919..6ac6073d 100644
--- a/examples/Components/Routes/Collaboration/index.vue
+++ b/examples/Components/Routes/Collaboration/index.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="editor">
-    <editor-content class="editor__content" :editor="editor" v-if="editor" />
+    <editor-content class="editor__content" :editor="editor" v-if="editor && !loading" />
+    <em v-else>
+      Connecting to socket server …
+    </em>
   </div>
 </template>
 
@@ -19,6 +22,7 @@ export default {
 
   data() {
     return {
+      loading: true,
       editor: null,
       socket: null,
     }
@@ -26,6 +30,8 @@ export default {
 
   methods: {
     initEditor({ doc, version }) {
+      this.loading = false
+
       if (this.editor) {
         this.editor.destroy()
       }

From cd46b163d059260a5643bdd253bb1a3d82fdc020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sat, 4 May 2019 00:05:39 +0200
Subject: [PATCH 33/64] add emitter, move some collab logic to extension

---
 babel.config.js                               |  1 +
 .../Components/Routes/Collaboration/Collab.js | 21 ++++++-
 .../Components/Routes/Collaboration/index.vue | 32 +++++-----
 package.json                                  |  1 +
 packages/tiptap/src/Editor.js                 | 42 ++++++++-----
 packages/tiptap/src/Utils/Emitter.js          | 59 +++++++++++++++++++
 packages/tiptap/src/Utils/Extension.js        |  8 +++
 packages/tiptap/src/Utils/ExtensionManager.js |  6 +-
 packages/tiptap/src/Utils/camelCase.js        |  3 +
 packages/tiptap/src/Utils/index.js            |  2 +
 yarn.lock                                     | 51 ++++++++++------
 11 files changed, 173 insertions(+), 53 deletions(-)
 create mode 100644 packages/tiptap/src/Utils/Emitter.js
 create mode 100644 packages/tiptap/src/Utils/camelCase.js

diff --git a/babel.config.js b/babel.config.js
index 9f8a0a19..ebc1a253 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -4,5 +4,6 @@ module.exports = {
   ],
   plugins: [
     '@babel/plugin-syntax-dynamic-import',
+    '@babel/plugin-proposal-class-properties',
   ],
 }
diff --git a/examples/Components/Routes/Collaboration/Collab.js b/examples/Components/Routes/Collaboration/Collab.js
index 21dc7255..a59328b2 100644
--- a/examples/Components/Routes/Collaboration/Collab.js
+++ b/examples/Components/Routes/Collaboration/Collab.js
@@ -1,15 +1,25 @@
 import { Extension } from 'tiptap'
-import { collab } from 'prosemirror-collab'
+import { collab, sendableSteps } from 'prosemirror-collab'
+import { debounce } from 'lodash-es'
 
 export default class CollabExtension extends Extension {
+
   get name() {
     return 'collab'
   }
 
+  init() {
+    this.editor.on('update', ({ state }) => {
+      this.getSendableSteps(state)
+    })
+  }
+
   get defaultOptions() {
     return {
       version: 0,
       clientID: Math.floor(Math.random() * 0xFFFFFFFF),
+      debounce: 250,
+      onSend: () => {},
     }
   }
 
@@ -21,4 +31,13 @@ export default class CollabExtension extends Extension {
       }),
     ]
   }
+
+  getSendableSteps = debounce(state => {
+    const sendable = sendableSteps(state)
+
+    if (sendable) {
+      this.options.onSend(sendable)
+    }
+  }, this.options.debounce)
+
 }
diff --git a/examples/Components/Routes/Collaboration/index.vue b/examples/Components/Routes/Collaboration/index.vue
index 6ac6073d..f7adc7cb 100644
--- a/examples/Components/Routes/Collaboration/index.vue
+++ b/examples/Components/Routes/Collaboration/index.vue
@@ -9,10 +9,9 @@
 
 <script>
 import io from 'socket.io-client'
-import { debounce } from 'lodash-es'
 import { Editor, EditorContent } from 'tiptap'
 import { Step } from 'prosemirror-transform'
-import { receiveTransaction, sendableSteps, getVersion } from 'prosemirror-collab'
+import { receiveTransaction, getVersion } from 'prosemirror-collab'
 import Collab from './Collab'
 
 export default {
@@ -29,7 +28,7 @@ export default {
   },
 
   methods: {
-    initEditor({ doc, version }) {
+    onInit({ doc, version }) {
       this.loading = false
 
       if (this.editor) {
@@ -39,23 +38,20 @@ export default {
       this.editor = new Editor({
         content: doc,
         extensions: [
-          new Collab({ version }),
+          new Collab({
+            version,
+            debounce: 250,
+            onSend: sendable => {
+              this.socket.emit('update', sendable)
+            },
+          }),
         ],
-        onUpdate: ({ state }) => {
-          this.getSendableSteps(state)
-        },
       })
+
+      // console.log(this.editor.extensions.options.collab.version)
     },
 
-    getSendableSteps: debounce(function (state) {
-      const sendable = sendableSteps(state)
-
-      if (sendable) {
-        this.socket.emit('update', sendable)
-      }
-    }, 250),
-
-    receiveData({ steps, version }) {
+    onUpdate({ steps, version }) {
       const { state, view, schema } = this.editor
 
       if (getVersion(state) > version) {
@@ -72,8 +68,8 @@ export default {
 
   mounted() {
     this.socket = io('wss://tiptap-sockets.glitch.me')
-      .on('init', data => this.initEditor(data))
-      .on('update', data => this.receiveData(data))
+      .on('init', data => this.onInit(data))
+      .on('update', data => this.onUpdate(data))
   },
 
   beforeDestroy() {
diff --git a/package.json b/package.json
index 67021d76..027d3bbf 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
   "devDependencies": {
     "@babel/core": "^7.4.4",
     "@babel/node": "^7.2.2",
+    "@babel/plugin-proposal-class-properties": "^7.4.4",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/plugin-transform-runtime": "^7.4.4",
     "@babel/polyfill": "^7.4.4",
diff --git a/packages/tiptap/src/Editor.js b/packages/tiptap/src/Editor.js
index 6228524f..d9997cb9 100644
--- a/packages/tiptap/src/Editor.js
+++ b/packages/tiptap/src/Editor.js
@@ -12,12 +12,16 @@ import { keymap } from 'prosemirror-keymap'
 import { baseKeymap } from 'prosemirror-commands'
 import { inputRules, undoInputRule } from 'prosemirror-inputrules'
 import { markIsActive, nodeIsActive, getMarkAttrs } from 'tiptap-utils'
-import { ExtensionManager, ComponentView } from './Utils'
+import {
+ camelCase, Emitter, ExtensionManager, ComponentView,
+} from './Utils'
 import { Doc, Paragraph, Text } from './Nodes'
 
-export default class Editor {
+export default class Editor extends Emitter {
 
   constructor(options = {}) {
+    super()
+
     this.defaultOptions = {
       editorProps: {},
       editable: true,
@@ -41,6 +45,15 @@ export default class Editor {
       onDrop: () => {},
     }
 
+    this.events = [
+      'init',
+      'update',
+      'focus',
+      'blur',
+      'paste',
+      'drop',
+    ]
+
     this.init(options)
   }
 
@@ -69,7 +82,11 @@ export default class Editor {
       }, 10)
     }
 
-    this.options.onInit({
+    this.events.forEach(name => {
+      this.on(name, this.options[camelCase(`on ${name}`)])
+    })
+
+    this.emit('init', {
       view: this.view,
       state: this.state,
     })
@@ -105,7 +122,7 @@ export default class Editor {
     return new ExtensionManager([
       ...this.builtInExtensions,
       ...this.options.extensions,
-    ])
+    ], this)
   }
 
   createPlugins() {
@@ -217,20 +234,20 @@ export default class Editor {
   createView() {
     const view = new EditorView(this.element, {
       state: this.state,
-      handlePaste: this.options.onPaste,
-      handleDrop: this.options.onDrop,
+      handlePaste: (...args) => { this.emit('paste', ...args) },
+      handleDrop: (...args) => { this.emit('drop', ...args) },
       dispatchTransaction: this.dispatchTransaction.bind(this),
     })
 
     view.dom.style.whiteSpace = 'pre-wrap'
 
-    view.dom.addEventListener('focus', event => this.options.onFocus({
+    view.dom.addEventListener('focus', event => this.emit('focus', {
       event,
       state: this.state,
       view: this.view,
     }))
 
-    view.dom.addEventListener('blur', event => this.options.onBlur({
+    view.dom.addEventListener('blur', event => this.emit('blur', {
       event,
       state: this.state,
       view: this.view,
@@ -283,8 +300,6 @@ export default class Editor {
   }
 
   dispatchTransaction(transaction) {
-    const oldState = this.state
-
     this.state = this.state.apply(transaction)
     this.view.updateState(this.state)
     this.setActiveNodesAndMarks()
@@ -293,15 +308,14 @@ export default class Editor {
       return
     }
 
-    this.emitUpdate(transaction, oldState)
+    this.emitUpdate(transaction)
   }
 
-  emitUpdate(transaction, oldState) {
-    this.options.onUpdate({
+  emitUpdate(transaction) {
+    this.emit('update', {
       getHTML: this.getHTML.bind(this),
       getJSON: this.getJSON.bind(this),
       state: this.state,
-      oldState,
       transaction,
     })
   }
diff --git a/packages/tiptap/src/Utils/Emitter.js b/packages/tiptap/src/Utils/Emitter.js
new file mode 100644
index 00000000..2ce3bb52
--- /dev/null
+++ b/packages/tiptap/src/Utils/Emitter.js
@@ -0,0 +1,59 @@
+export default class Emitter {
+  // Add an event listener for given event
+  on(event, fn) {
+    this._callbacks = this._callbacks || {}
+    // Create namespace for this event
+    if (!this._callbacks[event]) {
+      this._callbacks[event] = []
+    }
+    this._callbacks[event].push(fn)
+    return this
+  }
+
+
+  emit(event, ...args) {
+    this._callbacks = this._callbacks || {}
+    const callbacks = this._callbacks[event]
+
+    if (callbacks) {
+      for (const callback of callbacks) {
+        callback.apply(this, args)
+      }
+    }
+
+    return this
+  }
+
+  // Remove event listener for given event. If fn is not provided, all event
+  // listeners for that event will be removed. If neither is provided, all
+  // event listeners will be removed.
+  off(event, fn) {
+    if (!this._callbacks || (arguments.length === 0)) {
+      this._callbacks = {}
+      return this
+    }
+
+    // specific event
+    const callbacks = this._callbacks[event]
+    if (!callbacks) {
+      return this
+    }
+
+    // remove all handlers
+    if (arguments.length === 1) {
+      delete this._callbacks[event]
+      return this
+    }
+
+    // remove specific handler
+    for (let i = 0; i < callbacks.length; i++) {
+      const callback = callbacks[i]
+      if (callback === fn) {
+        callbacks.splice(i, 1)
+        break
+      }
+    }
+
+    return this
+  }
+}
diff --git a/packages/tiptap/src/Utils/Extension.js b/packages/tiptap/src/Utils/Extension.js
index d6579eef..b28d281a 100644
--- a/packages/tiptap/src/Utils/Extension.js
+++ b/packages/tiptap/src/Utils/Extension.js
@@ -7,6 +7,14 @@ export default class Extension {
     }
   }
 
+  init() {
+    return null
+  }
+
+  bindEditor(editor = null) {
+    this.editor = editor
+  }
+
   get name() {
     return null
   }
diff --git a/packages/tiptap/src/Utils/ExtensionManager.js b/packages/tiptap/src/Utils/ExtensionManager.js
index 20da9068..1d6a74f0 100644
--- a/packages/tiptap/src/Utils/ExtensionManager.js
+++ b/packages/tiptap/src/Utils/ExtensionManager.js
@@ -2,7 +2,11 @@ import { keymap } from 'prosemirror-keymap'
 
 export default class ExtensionManager {
 
-  constructor(extensions = []) {
+  constructor(extensions = [], editor) {
+    extensions.forEach(extension => {
+      extension.bindEditor(editor)
+      extension.init()
+    })
     this.extensions = extensions
   }
 
diff --git a/packages/tiptap/src/Utils/camelCase.js b/packages/tiptap/src/Utils/camelCase.js
new file mode 100644
index 00000000..c99895b0
--- /dev/null
+++ b/packages/tiptap/src/Utils/camelCase.js
@@ -0,0 +1,3 @@
+export default function (str) {
+  return str.replace(/(?:^\w|[A-Z]|\b\w)/g, (word, index) => (index == 0 ? word.toLowerCase() : word.toUpperCase())).replace(/\s+/g, '')
+}
diff --git a/packages/tiptap/src/Utils/index.js b/packages/tiptap/src/Utils/index.js
index baec08cb..75b1c3ab 100644
--- a/packages/tiptap/src/Utils/index.js
+++ b/packages/tiptap/src/Utils/index.js
@@ -1,4 +1,6 @@
+export { default as camelCase } from './camelCase'
 export { default as ComponentView } from './ComponentView'
+export { default as Emitter } from './Emitter'
 export { default as Extension } from './Extension'
 export { default as ExtensionManager } from './ExtensionManager'
 export { default as Mark } from './Mark'
diff --git a/yarn.lock b/yarn.lock
index f4b29ad0..62eca021 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -64,6 +64,18 @@
     "@babel/traverse" "^7.4.4"
     "@babel/types" "^7.4.4"
 
+"@babel/helper-create-class-features-plugin@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.4.tgz#fc3d690af6554cc9efc607364a82d48f58736dba"
+  integrity sha512-UbBHIa2qeAGgyiNR9RszVF7bUHEdgS4JAUNT8SiqrAN6YJVxlOxeLr5pBzb5kan302dejJ9nla4RyKcR1XT6XA==
+  dependencies:
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-member-expression-to-functions" "^7.0.0"
+    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.4.4"
+    "@babel/helper-split-export-declaration" "^7.4.4"
+
 "@babel/helper-define-map@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.4.4.tgz#6969d1f570b46bdc900d1eba8e5d59c48ba2c12a"
@@ -238,6 +250,14 @@
     "@babel/helper-remap-async-to-generator" "^7.1.0"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
 
+"@babel/plugin-proposal-class-properties@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.4.tgz#93a6486eed86d53452ab9bab35e368e9461198ce"
+  integrity sha512-WjKTI8g8d5w1Bc9zgwSz2nfrsNQsXcCf9J9cdCvrJV6RF56yztwm4TmJC0MgJ9tvwO9gUA/mcYe89bLdGfiXFg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.4.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-proposal-json-strings@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317"
@@ -3032,11 +3052,6 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-charset@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/charset/-/charset-1.0.1.tgz#8d59546c355be61049a8fa9164747793319852bd"
-  integrity sha512-6dVyOOYjpfFcL1Y4qChrAoQLRHvj2ziyhcm0QJlhOcAhykL/k1kTUPbeo+87MNRTRdk2OIIsIXbuF3x2wi5EXg==
-
 chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.4:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
@@ -4399,16 +4414,14 @@ ecc-jsbn@~0.1.1:
     safer-buffer "^2.1.0"
 
 ecstatic@^3.0.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-4.1.2.tgz#3afbe29849b32bc2a1f8a90f67e01dc048c7ad40"
-  integrity sha512-lnrAOpU2f7Ra8dm1pW0D1ucyUxQIEk8RjFrvROg1YqCV0ueVu9hzgiSEbSyROqXDDiHREdqC4w3AwOTb23P4UQ==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-3.3.2.tgz#6d1dd49814d00594682c652adb66076a69d46c48"
+  integrity sha512-fLf9l1hnwrHI2xn9mEDT7KIi22UDqA2jaCwyCbSUJh9a1V+LEUSL/JO/6TIz/QyuBURWUHrFL5Kg2TtO1bkkog==
   dependencies:
-    charset "^1.0.1"
     he "^1.1.1"
-    mime "^2.4.1"
+    mime "^1.6.0"
     minimist "^1.1.0"
-    on-finished "^2.3.0"
-    url-join "^4.0.0"
+    url-join "^2.0.5"
 
 ee-first@1.1.1:
   version "1.1.1"
@@ -7893,12 +7906,12 @@ mime@1.4.1:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
-mime@^1.4.1:
+mime@^1.4.1, mime@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^2.3.1, mime@^2.4.1:
+mime@^2.3.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.2.tgz#ce5229a5e99ffc313abac806b482c10e7ba6ac78"
   integrity sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==
@@ -8489,7 +8502,7 @@ octokit-pagination-methods@^1.1.0:
   resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4"
   integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==
 
-on-finished@^2.3.0, on-finished@~2.3.0:
+on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
   integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
@@ -12008,10 +12021,10 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-join@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.0.tgz#4d3340e807d3773bda9991f8305acdcc2a665d2a"
-  integrity sha1-TTNA6AfTdzvamZH4MFrNzCpmXSo=
+url-join@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728"
+  integrity sha1-WvIvGMBSoACkjXuCxenC4v7tpyg=
 
 url-parse-lax@^1.0.0:
   version "1.0.0"

From 55e5a4a3ae35f9e1d509b32d5193ebe183b7a3c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sat, 4 May 2019 00:25:14 +0200
Subject: [PATCH 34/64] move collab extension

---
 .../Components/Routes/Collaboration/Collab.js | 43 -------------
 .../Components/Routes/Collaboration/index.vue | 28 ++-------
 package.json                                  |  2 -
 packages/tiptap-extensions/package.json       |  3 +
 .../src/extensions/Collaboration.js           | 62 +++++++++++++++++++
 packages/tiptap-extensions/src/index.js       |  1 +
 yarn.lock                                     |  2 +-
 7 files changed, 72 insertions(+), 69 deletions(-)
 delete mode 100644 examples/Components/Routes/Collaboration/Collab.js
 create mode 100644 packages/tiptap-extensions/src/extensions/Collaboration.js

diff --git a/examples/Components/Routes/Collaboration/Collab.js b/examples/Components/Routes/Collaboration/Collab.js
deleted file mode 100644
index a59328b2..00000000
--- a/examples/Components/Routes/Collaboration/Collab.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Extension } from 'tiptap'
-import { collab, sendableSteps } from 'prosemirror-collab'
-import { debounce } from 'lodash-es'
-
-export default class CollabExtension extends Extension {
-
-  get name() {
-    return 'collab'
-  }
-
-  init() {
-    this.editor.on('update', ({ state }) => {
-      this.getSendableSteps(state)
-    })
-  }
-
-  get defaultOptions() {
-    return {
-      version: 0,
-      clientID: Math.floor(Math.random() * 0xFFFFFFFF),
-      debounce: 250,
-      onSend: () => {},
-    }
-  }
-
-  get plugins() {
-    return [
-      collab({
-        version: this.options.version,
-        clientID: this.options.clientID,
-      }),
-    ]
-  }
-
-  getSendableSteps = debounce(state => {
-    const sendable = sendableSteps(state)
-
-    if (sendable) {
-      this.options.onSend(sendable)
-    }
-  }, this.options.debounce)
-
-}
diff --git a/examples/Components/Routes/Collaboration/index.vue b/examples/Components/Routes/Collaboration/index.vue
index f7adc7cb..293541e5 100644
--- a/examples/Components/Routes/Collaboration/index.vue
+++ b/examples/Components/Routes/Collaboration/index.vue
@@ -10,9 +10,7 @@
 <script>
 import io from 'socket.io-client'
 import { Editor, EditorContent } from 'tiptap'
-import { Step } from 'prosemirror-transform'
-import { receiveTransaction, getVersion } from 'prosemirror-collab'
-import Collab from './Collab'
+import { Collaboration } from 'tiptap-extensions'
 
 export default {
   components: {
@@ -38,38 +36,22 @@ export default {
       this.editor = new Editor({
         content: doc,
         extensions: [
-          new Collab({
+          new Collaboration({
             version,
             debounce: 250,
-            onSend: sendable => {
-              this.socket.emit('update', sendable)
+            onSendable: data => {
+              this.socket.emit('update', data)
             },
           }),
         ],
       })
-
-      // console.log(this.editor.extensions.options.collab.version)
-    },
-
-    onUpdate({ steps, version }) {
-      const { state, view, schema } = this.editor
-
-      if (getVersion(state) > version) {
-        return
-      }
-
-      view.dispatch(receiveTransaction(
-        state,
-        steps.map(item => Step.fromJSON(schema, item.step)),
-        steps.map(item => item.clientID),
-      ))
     },
   },
 
   mounted() {
     this.socket = io('wss://tiptap-sockets.glitch.me')
       .on('init', data => this.onInit(data))
-      .on('update', data => this.onUpdate(data))
+      .on('update', data => this.editor.extensions.options.collaboration.onUpdate(data))
   },
 
   beforeDestroy() {
diff --git a/package.json b/package.json
index 027d3bbf..f4d00af8 100644
--- a/package.json
+++ b/package.json
@@ -91,8 +91,6 @@
     "zlib": "^1.0.5"
   },
   "dependencies": {
-    "lodash-es": "^4.17.11",
-    "prosemirror-collab": "^1.1.1",
     "socket.io-client": "^2.2.0"
   }
 }
diff --git a/packages/tiptap-extensions/package.json b/packages/tiptap-extensions/package.json
index 420e99a3..f9a89978 100644
--- a/packages/tiptap-extensions/package.json
+++ b/packages/tiptap-extensions/package.json
@@ -21,10 +21,13 @@
     "url": "https://github.com/scrumpy/tiptap/issues"
   },
   "dependencies": {
+    "lodash-es": "^4.17.11",
     "lowlight": "^1.11.0",
+    "prosemirror-collab": "^1.1.1",
     "prosemirror-history": "^1.0.4",
     "prosemirror-state": "^1.2.2",
     "prosemirror-tables": "^0.7.11",
+    "prosemirror-transform": "^1.1.3",
     "prosemirror-utils": "^0.7.6",
     "prosemirror-view": "^1.8.9",
     "tiptap": "^1.17.0",
diff --git a/packages/tiptap-extensions/src/extensions/Collaboration.js b/packages/tiptap-extensions/src/extensions/Collaboration.js
new file mode 100644
index 00000000..47250dd4
--- /dev/null
+++ b/packages/tiptap-extensions/src/extensions/Collaboration.js
@@ -0,0 +1,62 @@
+import { debounce } from 'lodash-es'
+import { Extension } from 'tiptap'
+import { Step } from 'prosemirror-transform'
+import {
+  collab,
+  sendableSteps,
+  getVersion,
+  receiveTransaction,
+} from 'prosemirror-collab'
+
+export default class CollaborationExtension extends Extension {
+
+  get name() {
+    return 'collaboration'
+  }
+
+  init() {
+    this.editor.on('update', ({ state }) => {
+      this.getSendableSteps(state)
+    })
+  }
+
+  get defaultOptions() {
+    return {
+      version: 0,
+      clientID: Math.floor(Math.random() * 0xFFFFFFFF),
+      debounce: 250,
+      onSendable: () => {},
+      onUpdate: ({ steps, version }) => {
+        const { state, view, schema } = this.editor
+
+        if (getVersion(state) > version) {
+          return
+        }
+
+        view.dispatch(receiveTransaction(
+          state,
+          steps.map(item => Step.fromJSON(schema, item.step)),
+          steps.map(item => item.clientID),
+        ))
+      },
+    }
+  }
+
+  get plugins() {
+    return [
+      collab({
+        version: this.options.version,
+        clientID: this.options.clientID,
+      }),
+    ]
+  }
+
+  getSendableSteps = debounce(state => {
+    const sendable = sendableSteps(state)
+
+    if (sendable) {
+      this.options.onSendable(sendable)
+    }
+  }, this.options.debounce)
+
+}
diff --git a/packages/tiptap-extensions/src/index.js b/packages/tiptap-extensions/src/index.js
index d0d6a169..4851bb51 100644
--- a/packages/tiptap-extensions/src/index.js
+++ b/packages/tiptap-extensions/src/index.js
@@ -23,6 +23,7 @@ export { default as Link } from './marks/Link'
 export { default as Strike } from './marks/Strike'
 export { default as Underline } from './marks/Underline'
 
+export { default as Collaboration } from './extensions/Collaboration'
 export { default as History } from './extensions/History'
 export { default as Placeholder } from './extensions/Placeholder'
 
diff --git a/yarn.lock b/yarn.lock
index 62eca021..0addca56 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9681,7 +9681,7 @@ prosemirror-tables@^0.7.11:
     prosemirror-transform "^1.0.0"
     prosemirror-view "^1.0.0"
 
-prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0:
+prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.1.3.tgz#28cfdf1f9ee514edc40466be7b7db39eed545fdf"
   integrity sha512-1O6Di5lOL1mp4nuCnQNkHY7l2roIW5y8RH4ZG3hMYmkmDEWzTaFFnxxAAHsE5ipGLBSRcTlP7SsDhYBIdSuLpQ==

From a614f0cce12d4fa022dd6d53705756e78e570bf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sat, 4 May 2019 00:28:29 +0200
Subject: [PATCH 35/64] move url

---
 examples/Components/Subnavigation/index.vue |  6 +++---
 examples/main.js                            | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/Components/Subnavigation/index.vue b/examples/Components/Subnavigation/index.vue
index c4c3b796..953b8a6d 100644
--- a/examples/Components/Subnavigation/index.vue
+++ b/examples/Components/Subnavigation/index.vue
@@ -45,12 +45,12 @@
     <router-link class="subnavigation__link" to="/placeholder">
       Placeholder
     </router-link>
-    <router-link class="subnavigation__link" to="/export">
-      Export HTML or JSON
-    </router-link>
     <router-link class="subnavigation__link" to="/collaboration">
       Collaboration
     </router-link>
+    <router-link class="subnavigation__link" to="/export">
+      Export HTML or JSON
+    </router-link>
   </div>
 </template>
 
diff --git a/examples/main.js b/examples/main.js
index 3102cc93..933ff7c0 100644
--- a/examples/main.js
+++ b/examples/main.js
@@ -117,13 +117,6 @@ const routes = [
       githubUrl: 'https://github.com/scrumpy/tiptap/tree/master/examples/Components/Routes/Placeholder',
     },
   },
-  {
-    path: '/export',
-    component: () => import('Components/Routes/Export'),
-    meta: {
-      githubUrl: 'https://github.com/scrumpy/tiptap/tree/master/examples/Components/Routes/Export',
-    },
-  },
   {
     path: '/collaboration',
     component: () => import('Components/Routes/Collaboration'),
@@ -131,6 +124,13 @@ const routes = [
       githubUrl: 'https://github.com/scrumpy/tiptap/tree/master/examples/Components/Routes/Collaboration',
     },
   },
+  {
+    path: '/export',
+    component: () => import('Components/Routes/Export'),
+    meta: {
+      githubUrl: 'https://github.com/scrumpy/tiptap/tree/master/examples/Components/Routes/Export',
+    },
+  },
 ]
 
 const router = new VueRouter({

From b2ec2d66e1d8d33a4fc27c60b3261a0048bc2814 Mon Sep 17 00:00:00 2001
From: Marius Tolzmann <m@rius.berlin>
Date: Sat, 4 May 2019 02:07:22 +0200
Subject: [PATCH 36/64] fix nodeIsActive()

this fixes isActive.image() mentioned in #225

nodeIsActive was only checking parent nodes and missed the node
currently selected.
---
 packages/tiptap-utils/src/utils/nodeIsActive.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/tiptap-utils/src/utils/nodeIsActive.js b/packages/tiptap-utils/src/utils/nodeIsActive.js
index 53f2037c..2dbfdb71 100644
--- a/packages/tiptap-utils/src/utils/nodeIsActive.js
+++ b/packages/tiptap-utils/src/utils/nodeIsActive.js
@@ -1,12 +1,16 @@
-import { findParentNode } from 'prosemirror-utils'
+import {
+  findParentNode,
+  findSelectedNodeOfType,
+} from 'prosemirror-utils'
 
 export default function (state, type, attrs = {}) {
   const predicate = node => node.type === type
-  const parent = findParentNode(predicate)(state.selection)
+  const node = findSelectedNodeOfType(type)(state.selection)
+    || findParentNode(predicate)(state.selection)
 
-  if (!Object.keys(attrs).length || !parent) {
-    return !!parent
+  if (!Object.keys(attrs).length || !node) {
+    return !!node
   }
 
-  return parent.node.hasMarkup(type, attrs)
+  return node.node.hasMarkup(type, attrs)
 }

From 0a98827b4c2bd40f25992e1bc0c767f1fffa32f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sat, 4 May 2019 10:54:53 +0200
Subject: [PATCH 37/64] refactoring

---
 examples/Components/Routes/Collaboration/index.vue         | 2 +-
 packages/tiptap-extensions/src/extensions/Collaboration.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/Components/Routes/Collaboration/index.vue b/examples/Components/Routes/Collaboration/index.vue
index 293541e5..a3b8e093 100644
--- a/examples/Components/Routes/Collaboration/index.vue
+++ b/examples/Components/Routes/Collaboration/index.vue
@@ -51,7 +51,7 @@ export default {
   mounted() {
     this.socket = io('wss://tiptap-sockets.glitch.me')
       .on('init', data => this.onInit(data))
-      .on('update', data => this.editor.extensions.options.collaboration.onUpdate(data))
+      .on('update', data => this.editor.extensions.options.collaboration.update(data))
   },
 
   beforeDestroy() {
diff --git a/packages/tiptap-extensions/src/extensions/Collaboration.js b/packages/tiptap-extensions/src/extensions/Collaboration.js
index 47250dd4..f0f714ed 100644
--- a/packages/tiptap-extensions/src/extensions/Collaboration.js
+++ b/packages/tiptap-extensions/src/extensions/Collaboration.js
@@ -26,7 +26,7 @@ export default class CollaborationExtension extends Extension {
       clientID: Math.floor(Math.random() * 0xFFFFFFFF),
       debounce: 250,
       onSendable: () => {},
-      onUpdate: ({ steps, version }) => {
+      update: ({ steps, version }) => {
         const { state, view, schema } = this.editor
 
         if (getVersion(state) > version) {

From 3a42fe388bdfe8598162f2495f6defc731bd7c57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sat, 4 May 2019 11:00:50 +0200
Subject: [PATCH 38/64] fix linter errors

---
 .../tiptap-commands/src/commands/splitToDefaultListItem.js  | 4 ++--
 packages/tiptap/src/Utils/Emitter.js                        | 6 ++----
 packages/tiptap/src/Utils/camelCase.js                      | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/tiptap-commands/src/commands/splitToDefaultListItem.js b/packages/tiptap-commands/src/commands/splitToDefaultListItem.js
index 70cc6f64..948bf456 100644
--- a/packages/tiptap-commands/src/commands/splitToDefaultListItem.js
+++ b/packages/tiptap-commands/src/commands/splitToDefaultListItem.js
@@ -32,8 +32,8 @@ index = $pos.index(d)
 // this is a copy of splitListItem
 // see https://github.com/ProseMirror/prosemirror-schema-list/blob/master/src/schema-list.js
 
-export default function splitListItem(itemType) {
-  return function _splitListItem(state, dispatch) {
+export default function splitToDefaultListItem(itemType) {
+  return function (state, dispatch) {
     const { $from, $to, node } = state.selection
     if ((node && node.isBlock) || $from.depth < 2 || !$from.sameParent($to)) return false
     const grandParent = $from.node(-1)
diff --git a/packages/tiptap/src/Utils/Emitter.js b/packages/tiptap/src/Utils/Emitter.js
index 2ce3bb52..5fa5a36e 100644
--- a/packages/tiptap/src/Utils/Emitter.js
+++ b/packages/tiptap/src/Utils/Emitter.js
@@ -16,9 +16,7 @@ export default class Emitter {
     const callbacks = this._callbacks[event]
 
     if (callbacks) {
-      for (const callback of callbacks) {
-        callback.apply(this, args)
-      }
+      callbacks.forEach(callback => callback.apply(this, args))
     }
 
     return this
@@ -46,7 +44,7 @@ export default class Emitter {
     }
 
     // remove specific handler
-    for (let i = 0; i < callbacks.length; i++) {
+    for (let i = 0; i < callbacks.length; i += 1) {
       const callback = callbacks[i]
       if (callback === fn) {
         callbacks.splice(i, 1)
diff --git a/packages/tiptap/src/Utils/camelCase.js b/packages/tiptap/src/Utils/camelCase.js
index c99895b0..c840c9a9 100644
--- a/packages/tiptap/src/Utils/camelCase.js
+++ b/packages/tiptap/src/Utils/camelCase.js
@@ -1,3 +1,3 @@
 export default function (str) {
-  return str.replace(/(?:^\w|[A-Z]|\b\w)/g, (word, index) => (index == 0 ? word.toLowerCase() : word.toUpperCase())).replace(/\s+/g, '')
+  return str.replace(/(?:^\w|[A-Z]|\b\w)/g, (word, index) => (index === 0 ? word.toLowerCase() : word.toUpperCase())).replace(/\s+/g, '')
 }

From 9a688409fb2cd7dce20aa5549ee303713e651567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sat, 4 May 2019 11:04:39 +0200
Subject: [PATCH 39/64] add history plugin to collab

---
 examples/Components/Routes/Collaboration/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/Components/Routes/Collaboration/index.vue b/examples/Components/Routes/Collaboration/index.vue
index a3b8e093..5756da26 100644
--- a/examples/Components/Routes/Collaboration/index.vue
+++ b/examples/Components/Routes/Collaboration/index.vue
@@ -10,7 +10,7 @@
 <script>
 import io from 'socket.io-client'
 import { Editor, EditorContent } from 'tiptap'
-import { Collaboration } from 'tiptap-extensions'
+import { History, Collaboration } from 'tiptap-extensions'
 
 export default {
   components: {
@@ -36,6 +36,7 @@ export default {
       this.editor = new Editor({
         content: doc,
         extensions: [
+          new History(),
           new Collaboration({
             version,
             debounce: 250,

From fc42cba033653095083955ae1462a171b02c04c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sat, 4 May 2019 12:20:34 +0200
Subject: [PATCH 40/64] remove lodash

---
 packages/tiptap-extensions/package.json          |  1 -
 .../src/extensions/Collaboration.js              | 16 ++++++++++++++--
 yarn.lock                                        |  5 -----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/tiptap-extensions/package.json b/packages/tiptap-extensions/package.json
index f9a89978..5be9c03f 100644
--- a/packages/tiptap-extensions/package.json
+++ b/packages/tiptap-extensions/package.json
@@ -21,7 +21,6 @@
     "url": "https://github.com/scrumpy/tiptap/issues"
   },
   "dependencies": {
-    "lodash-es": "^4.17.11",
     "lowlight": "^1.11.0",
     "prosemirror-collab": "^1.1.1",
     "prosemirror-history": "^1.0.4",
diff --git a/packages/tiptap-extensions/src/extensions/Collaboration.js b/packages/tiptap-extensions/src/extensions/Collaboration.js
index f0f714ed..806baf48 100644
--- a/packages/tiptap-extensions/src/extensions/Collaboration.js
+++ b/packages/tiptap-extensions/src/extensions/Collaboration.js
@@ -1,4 +1,3 @@
-import { debounce } from 'lodash-es'
 import { Extension } from 'tiptap'
 import { Step } from 'prosemirror-transform'
 import {
@@ -51,7 +50,7 @@ export default class CollaborationExtension extends Extension {
     ]
   }
 
-  getSendableSteps = debounce(state => {
+  getSendableSteps = this.debounce(state => {
     const sendable = sendableSteps(state)
 
     if (sendable) {
@@ -59,4 +58,17 @@ export default class CollaborationExtension extends Extension {
     }
   }, this.options.debounce)
 
+  debounce(fn, delay) {
+    let timeout
+    return function (...args) {
+      if (timeout) {
+        clearTimeout(timeout)
+      }
+      timeout = setTimeout(() => {
+        fn(...args)
+        timeout = null
+      }, delay)
+    }
+  }
+
 }
diff --git a/yarn.lock b/yarn.lock
index 0addca56..9b15027b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7521,11 +7521,6 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
-lodash-es@^4.17.11:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.11.tgz#145ab4a7ac5c5e52a3531fb4f310255a152b4be0"
-  integrity sha512-DHb1ub+rMjjrxqlB3H56/6MXtm1lSksDp2rA2cNWjG8mlDUYFhUj3Di2Zn5IwSU87xLv8tNIQ7sSwE/YOX/D/Q==
-
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"

From 055d72be26fa491bf3831b579631624e3bda07f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sat, 4 May 2019 12:21:16 +0200
Subject: [PATCH 41/64] wording

---
 packages/tiptap-extensions/src/extensions/Collaboration.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/tiptap-extensions/src/extensions/Collaboration.js b/packages/tiptap-extensions/src/extensions/Collaboration.js
index 806baf48..5eacd203 100644
--- a/packages/tiptap-extensions/src/extensions/Collaboration.js
+++ b/packages/tiptap-extensions/src/extensions/Collaboration.js
@@ -7,7 +7,7 @@ import {
   receiveTransaction,
 } from 'prosemirror-collab'
 
-export default class CollaborationExtension extends Extension {
+export default class Collaboration extends Extension {
 
   get name() {
     return 'collaboration'

From 7cad96ee3ccdd7bb3b13881fe99298ba08a2e7e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sat, 4 May 2019 12:31:10 +0200
Subject: [PATCH 42/64] add some comments

---
 examples/Components/Routes/Collaboration/index.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/examples/Components/Routes/Collaboration/index.vue b/examples/Components/Routes/Collaboration/index.vue
index 5756da26..9189911b 100644
--- a/examples/Components/Routes/Collaboration/index.vue
+++ b/examples/Components/Routes/Collaboration/index.vue
@@ -38,8 +38,12 @@ export default {
         extensions: [
           new History(),
           new Collaboration({
+            // the initial version we start with
+            // version is an integer which is incremented with every change
             version,
+            // debounce changes so we can save some bandwidth
             debounce: 250,
+            // onSendable is called whenever there are changed we have to send to our server
             onSendable: data => {
               this.socket.emit('update', data)
             },
@@ -50,8 +54,11 @@ export default {
   },
 
   mounted() {
+    // server implementation: https://glitch.com/edit/#!/tiptap-sockets
     this.socket = io('wss://tiptap-sockets.glitch.me')
+      // get the current document and its version
       .on('init', data => this.onInit(data))
+      // send all updates to the collaboration extension
       .on('update', data => this.editor.extensions.options.collaboration.update(data))
   },
 

From 03cb2d4c75d018250dcb242d3611182abaa30af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sat, 4 May 2019 20:40:18 +0200
Subject: [PATCH 43/64] show users count

---
 .../Components/Routes/Collaboration/index.vue | 43 ++++++++++++++++++-
 examples/assets/sass/main.scss                |  9 ++++
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/examples/Components/Routes/Collaboration/index.vue b/examples/Components/Routes/Collaboration/index.vue
index 9189911b..e7420bc4 100644
--- a/examples/Components/Routes/Collaboration/index.vue
+++ b/examples/Components/Routes/Collaboration/index.vue
@@ -1,6 +1,14 @@
 <template>
   <div class="editor">
-    <editor-content class="editor__content" :editor="editor" v-if="editor && !loading" />
+    <div class="message">
+      With the Collaboration Extension it's possible for several users to work on a document at the same time. To make this possible, client-side and server-side code is required. This example shows this using a <a href="https://glitch.com/edit/#!/tiptap-sockets" target="_blank">socket server</a>. Try it out below:
+    </div>
+    <template v-if="editor && !loading">
+      <div class="count">
+        {{ count }} {{ count === 1 ? 'user' : 'users' }} connected
+      </div>
+      <editor-content class="editor__content" :editor="editor"  />
+    </template>
     <em v-else>
       Connecting to socket server …
     </em>
@@ -22,6 +30,7 @@ export default {
       loading: true,
       editor: null,
       socket: null,
+      count: 0,
     }
   },
 
@@ -51,6 +60,10 @@ export default {
         ],
       })
     },
+
+    setCount(count) {
+      this.count = count
+    },
   },
 
   mounted() {
@@ -60,6 +73,8 @@ export default {
       .on('init', data => this.onInit(data))
       // send all updates to the collaboration extension
       .on('update', data => this.editor.extensions.options.collaboration.update(data))
+      // get count of connected users
+      .on('getCount', count => this.setCount(count))
   },
 
   beforeDestroy() {
@@ -67,3 +82,29 @@ export default {
   },
 }
 </script>
+
+<style lang="scss">
+@import "~variables";
+
+.count {
+  display: flex;
+  align-items: center;
+  font-weight: bold;
+  color: rgba($color-black, 0.5);
+  color: #27b127;
+  margin-bottom: 0.5rem;
+  text-transform: uppercase;
+  font-size: 0.7rem;
+  line-height: 1;
+
+  &:before {
+    content: '';
+    display: inline-flex;
+    background-color: #27b127;
+    width: 0.4rem;
+    height: 0.4rem;
+    border-radius: 50%;
+    margin-right: 0.3rem;
+  }
+}
+</style>
diff --git a/examples/assets/sass/main.scss b/examples/assets/sass/main.scss
index 89a88025..9c62a81e 100644
--- a/examples/assets/sass/main.scss
+++ b/examples/assets/sass/main.scss
@@ -74,6 +74,15 @@ h3 {
   background-color: rgba($color-black, 0.1);
 }
 
+.message {
+  background-color: rgba($color-black, 0.05);
+  color: rgba($color-black, 0.7);
+  padding: 1rem;
+  border-radius: 6px;
+  margin-bottom: 1rem;
+  font-style: italic;
+}
+
 @import "./editor";
 @import "./menubar";
 @import "./menububble";

From 76dca53d806c06d4ae74d90b85a2505cd75df561 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sun, 5 May 2019 21:47:52 +0200
Subject: [PATCH 44/64] send only json steps

---
 .../Components/Routes/Collaboration/index.vue     | 15 ++++++++++++++-
 .../src/extensions/Collaboration.js               |  6 +++++-
 packages/tiptap/src/Editor.js                     |  7 +++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/examples/Components/Routes/Collaboration/index.vue b/examples/Components/Routes/Collaboration/index.vue
index e7420bc4..19f5ab06 100644
--- a/examples/Components/Routes/Collaboration/index.vue
+++ b/examples/Components/Routes/Collaboration/index.vue
@@ -18,7 +18,15 @@
 <script>
 import io from 'socket.io-client'
 import { Editor, EditorContent } from 'tiptap'
-import { History, Collaboration } from 'tiptap-extensions'
+import {
+  HardBreak,
+  Heading,
+  Bold,
+  Code,
+  Italic,
+  History,
+  Collaboration,
+} from 'tiptap-extensions'
 
 export default {
   components: {
@@ -45,6 +53,11 @@ export default {
       this.editor = new Editor({
         content: doc,
         extensions: [
+          new HardBreak(),
+          new Heading({ levels: [1, 2, 3] }),
+          new Bold(),
+          new Code(),
+          new Italic(),
           new History(),
           new Collaboration({
             // the initial version we start with
diff --git a/packages/tiptap-extensions/src/extensions/Collaboration.js b/packages/tiptap-extensions/src/extensions/Collaboration.js
index 5eacd203..3b4a122c 100644
--- a/packages/tiptap-extensions/src/extensions/Collaboration.js
+++ b/packages/tiptap-extensions/src/extensions/Collaboration.js
@@ -54,7 +54,11 @@ export default class Collaboration extends Extension {
     const sendable = sendableSteps(state)
 
     if (sendable) {
-      this.options.onSendable(sendable)
+      this.options.onSendable({
+        version: sendable.version,
+        steps: sendable.steps.map(step => step.toJSON()),
+        clientID: sendable.clientID,
+      })
     }
   }, this.options.debounce)
 
diff --git a/packages/tiptap/src/Editor.js b/packages/tiptap/src/Editor.js
index d9997cb9..bc35201a 100644
--- a/packages/tiptap/src/Editor.js
+++ b/packages/tiptap/src/Editor.js
@@ -342,6 +342,13 @@ export default class Editor extends Emitter {
     this.view.dom.blur()
   }
 
+  getSchemaJSON() {
+    return JSON.parse(JSON.stringify({
+      nodes: this.extensions.nodes,
+      marks: this.extensions.marks,
+    }))
+  }
+
   getHTML() {
     const div = document.createElement('div')
     const fragment = DOMSerializer

From a22185de5797a515564f60977c5dff27e568d92a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sun, 5 May 2019 23:08:28 +0200
Subject: [PATCH 45/64] improve spacings

---
 examples/Components/Routes/Collaboration/index.vue | 2 +-
 examples/assets/sass/main.scss                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/Components/Routes/Collaboration/index.vue b/examples/Components/Routes/Collaboration/index.vue
index 19f5ab06..f3abacbd 100644
--- a/examples/Components/Routes/Collaboration/index.vue
+++ b/examples/Components/Routes/Collaboration/index.vue
@@ -105,7 +105,7 @@ export default {
   font-weight: bold;
   color: rgba($color-black, 0.5);
   color: #27b127;
-  margin-bottom: 0.5rem;
+  margin-bottom: 1rem;
   text-transform: uppercase;
   font-size: 0.7rem;
   line-height: 1;
diff --git a/examples/assets/sass/main.scss b/examples/assets/sass/main.scss
index 9c62a81e..b62f878a 100644
--- a/examples/assets/sass/main.scss
+++ b/examples/assets/sass/main.scss
@@ -79,7 +79,7 @@ h3 {
   color: rgba($color-black, 0.7);
   padding: 1rem;
   border-radius: 6px;
-  margin-bottom: 1rem;
+  margin-bottom: 1.5rem;
   font-style: italic;
 }
 

From d8cc84bde980d09b736b2ec50fb47af84cf3f4c8 Mon Sep 17 00:00:00 2001
From: Marius Tolzmann <m@rius.berlin>
Date: Mon, 6 May 2019 06:46:10 +0200
Subject: [PATCH 46/64] fix link pattern to also detect new (longer) top level
 domains

---
 packages/tiptap-extensions/src/marks/Link.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/tiptap-extensions/src/marks/Link.js b/packages/tiptap-extensions/src/marks/Link.js
index bde85a5b..2ff3dec5 100644
--- a/packages/tiptap-extensions/src/marks/Link.js
+++ b/packages/tiptap-extensions/src/marks/Link.js
@@ -44,7 +44,7 @@ export default class Link extends Mark {
   pasteRules({ type }) {
     return [
       pasteRule(
-        /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&//=]*)/g,
+        /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-zA-Z]{2,}\b([-a-zA-Z0-9@:%_+.~#?&//=]*)/g,
         type,
         url => ({ href: url }),
       ),

From 0776aa2e5d269e86219f2c27ce4143a58fff8b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 6 May 2019 09:54:11 +0200
Subject: [PATCH 47/64] add .nvmrc

---
 .nvmrc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .nvmrc

diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 00000000..b4de3947
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+11

From 44565709aeecf5065b6583189d77bff687ab5323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 6 May 2019 10:01:13 +0200
Subject: [PATCH 48/64] update npmrc file

---
 .nvmrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.nvmrc b/.nvmrc
index b4de3947..8cee8d72 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-11
+v11.6.0

From 0c0435f009b75848209653970fe180b2d087328e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 6 May 2019 10:05:05 +0200
Subject: [PATCH 49/64] remove fibers

---
 build/examples/webpack.config.js | 2 --
 package.json                     | 1 -
 yarn.lock                        | 9 +--------
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/build/examples/webpack.config.js b/build/examples/webpack.config.js
index cbc987a7..46bff342 100644
--- a/build/examples/webpack.config.js
+++ b/build/examples/webpack.config.js
@@ -1,6 +1,5 @@
 import path from 'path'
 import webpack from 'webpack'
-import Fiber from 'fibers'
 import DartSass from 'dart-sass'
 import { VueLoaderPlugin } from 'vue-loader'
 import SvgStore from 'webpack-svgstore-plugin'
@@ -93,7 +92,6 @@ export default {
             loader: 'sass-loader',
             options: {
               implementation: DartSass,
-              fiber: Fiber,
             },
           },
         ]),
diff --git a/package.json b/package.json
index 7c49a2c6..c84a6a02 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,6 @@
     "eslint-plugin-html": "^5.0.3",
     "eslint-plugin-import": "^2.17.2",
     "eslint-plugin-vue": "5.2.2",
-    "fibers": "^4.0.0",
     "file-loader": "^3.0.1",
     "fuse.js": "^3.4.2",
     "glob": "^7.1.3",
diff --git a/yarn.lock b/yarn.lock
index 0422dd16..44a4860f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4291,7 +4291,7 @@ detect-indent@^5.0.0:
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
   integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
 
-detect-libc@^1.0.2, detect-libc@^1.0.3:
+detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
   integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
@@ -5158,13 +5158,6 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
-fibers@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fibers/-/fibers-4.0.0.tgz#2f43ec96bf278947dcc3f142c0d84495f511d45b"
-  integrity sha512-By4/A0GDWa3BF8rTHG9ocV3N88J5aR6jttrXKRe4EB4q0x1G4Xjg8ZP+VXuE2YAKfpU0dWqAMt7MRTJra58X6Q==
-  dependencies:
-    detect-libc "^1.0.3"
-
 figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"

From 1df723d269bb0e1c346bc50d06a73e008d51f5a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 6 May 2019 10:16:55 +0200
Subject: [PATCH 50/64] add heading to collab page

---
 examples/Components/Routes/Collaboration/index.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/examples/Components/Routes/Collaboration/index.vue b/examples/Components/Routes/Collaboration/index.vue
index f3abacbd..8c8f7d18 100644
--- a/examples/Components/Routes/Collaboration/index.vue
+++ b/examples/Components/Routes/Collaboration/index.vue
@@ -1,5 +1,8 @@
 <template>
   <div class="editor">
+    <h2>
+      Collaborative Editing
+    </h2>
     <div class="message">
       With the Collaboration Extension it's possible for several users to work on a document at the same time. To make this possible, client-side and server-side code is required. This example shows this using a <a href="https://glitch.com/edit/#!/tiptap-sockets" target="_blank">socket server</a>. Try it out below:
     </div>

From d0da644b90f2855950813d2ecf5cf37bda80851b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 6 May 2019 10:27:40 +0200
Subject: [PATCH 51/64] remove @babel/plugin-proposal-class-properties

---
 babel.config.js                               |  1 -
 package.json                                  |  1 -
 .../src/extensions/Collaboration.js           | 24 +++++++++----------
 yarn.lock                                     | 20 ----------------
 4 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/babel.config.js b/babel.config.js
index ebc1a253..9f8a0a19 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -4,6 +4,5 @@ module.exports = {
   ],
   plugins: [
     '@babel/plugin-syntax-dynamic-import',
-    '@babel/plugin-proposal-class-properties',
   ],
 }
diff --git a/package.json b/package.json
index f9b2d649..193b2aad 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,6 @@
   "devDependencies": {
     "@babel/core": "^7.4.4",
     "@babel/node": "^7.2.2",
-    "@babel/plugin-proposal-class-properties": "^7.4.4",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/plugin-transform-runtime": "^7.4.4",
     "@babel/polyfill": "^7.4.4",
diff --git a/packages/tiptap-extensions/src/extensions/Collaboration.js b/packages/tiptap-extensions/src/extensions/Collaboration.js
index 3b4a122c..ab105209 100644
--- a/packages/tiptap-extensions/src/extensions/Collaboration.js
+++ b/packages/tiptap-extensions/src/extensions/Collaboration.js
@@ -14,6 +14,18 @@ export default class Collaboration extends Extension {
   }
 
   init() {
+    this.getSendableSteps = this.debounce(state => {
+      const sendable = sendableSteps(state)
+
+      if (sendable) {
+        this.options.onSendable({
+          version: sendable.version,
+          steps: sendable.steps.map(step => step.toJSON()),
+          clientID: sendable.clientID,
+        })
+      }
+    }, this.options.debounce)
+
     this.editor.on('update', ({ state }) => {
       this.getSendableSteps(state)
     })
@@ -50,18 +62,6 @@ export default class Collaboration extends Extension {
     ]
   }
 
-  getSendableSteps = this.debounce(state => {
-    const sendable = sendableSteps(state)
-
-    if (sendable) {
-      this.options.onSendable({
-        version: sendable.version,
-        steps: sendable.steps.map(step => step.toJSON()),
-        clientID: sendable.clientID,
-      })
-    }
-  }, this.options.debounce)
-
   debounce(fn, delay) {
     let timeout
     return function (...args) {
diff --git a/yarn.lock b/yarn.lock
index 9ade5f77..c69a9341 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -64,18 +64,6 @@
     "@babel/traverse" "^7.4.4"
     "@babel/types" "^7.4.4"
 
-"@babel/helper-create-class-features-plugin@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.4.tgz#fc3d690af6554cc9efc607364a82d48f58736dba"
-  integrity sha512-UbBHIa2qeAGgyiNR9RszVF7bUHEdgS4JAUNT8SiqrAN6YJVxlOxeLr5pBzb5kan302dejJ9nla4RyKcR1XT6XA==
-  dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-member-expression-to-functions" "^7.0.0"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.4.4"
-    "@babel/helper-split-export-declaration" "^7.4.4"
-
 "@babel/helper-define-map@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.4.4.tgz#6969d1f570b46bdc900d1eba8e5d59c48ba2c12a"
@@ -250,14 +238,6 @@
     "@babel/helper-remap-async-to-generator" "^7.1.0"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
 
-"@babel/plugin-proposal-class-properties@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.4.tgz#93a6486eed86d53452ab9bab35e368e9461198ce"
-  integrity sha512-WjKTI8g8d5w1Bc9zgwSz2nfrsNQsXcCf9J9cdCvrJV6RF56yztwm4TmJC0MgJ9tvwO9gUA/mcYe89bLdGfiXFg==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.4.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-proposal-json-strings@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317"

From a44a4e7d393862ee24fa80c1e457e27f7df87d24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 6 May 2019 10:28:28 +0200
Subject: [PATCH 52/64] Publish

 - tiptap-commands@1.9.0
 - tiptap-extensions@1.18.0
 - tiptap@1.18.0
---
 packages/tiptap-commands/package.json   | 2 +-
 packages/tiptap-extensions/package.json | 6 +++---
 packages/tiptap/package.json            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/tiptap-commands/package.json b/packages/tiptap-commands/package.json
index 0d0fad5f..b9920d93 100644
--- a/packages/tiptap-commands/package.json
+++ b/packages/tiptap-commands/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tiptap-commands",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "Commands for tiptap",
   "homepage": "https://tiptap.scrumpy.io",
   "license": "MIT",
diff --git a/packages/tiptap-extensions/package.json b/packages/tiptap-extensions/package.json
index 5be9c03f..b90fcafb 100644
--- a/packages/tiptap-extensions/package.json
+++ b/packages/tiptap-extensions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tiptap-extensions",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "description": "Extensions for tiptap",
   "homepage": "https://tiptap.scrumpy.io",
   "license": "MIT",
@@ -29,8 +29,8 @@
     "prosemirror-transform": "^1.1.3",
     "prosemirror-utils": "^0.7.6",
     "prosemirror-view": "^1.8.9",
-    "tiptap": "^1.17.0",
-    "tiptap-commands": "^1.8.0"
+    "tiptap": "^1.18.0",
+    "tiptap-commands": "^1.9.0"
   },
   "peerDependencies": {
     "vue": "^2.5.17",
diff --git a/packages/tiptap/package.json b/packages/tiptap/package.json
index 05a77e77..df0f877e 100644
--- a/packages/tiptap/package.json
+++ b/packages/tiptap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tiptap",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "description": "A rich-text editor for Vue.js",
   "homepage": "https://tiptap.scrumpy.io",
   "license": "MIT",
@@ -28,7 +28,7 @@
     "prosemirror-model": "^1.7.0",
     "prosemirror-state": "^1.2.1",
     "prosemirror-view": "^1.8.9",
-    "tiptap-commands": "^1.8.0",
+    "tiptap-commands": "^1.9.0",
     "tiptap-utils": "^1.4.0"
   },
   "peerDependencies": {

From fe73a9aaff59a4cdcf95adb3a81dd747e56327bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 6 May 2019 13:52:48 +0200
Subject: [PATCH 53/64] update dependencies

---
 packages/tiptap-extensions/package.json | 2 +-
 packages/tiptap/package.json            | 4 ++--
 yarn.lock                               | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/tiptap-extensions/package.json b/packages/tiptap-extensions/package.json
index b90fcafb..fb411e06 100644
--- a/packages/tiptap-extensions/package.json
+++ b/packages/tiptap-extensions/package.json
@@ -28,7 +28,7 @@
     "prosemirror-tables": "^0.7.11",
     "prosemirror-transform": "^1.1.3",
     "prosemirror-utils": "^0.7.6",
-    "prosemirror-view": "^1.8.9",
+    "prosemirror-view": "^1.9.1",
     "tiptap": "^1.18.0",
     "tiptap-commands": "^1.9.0"
   },
diff --git a/packages/tiptap/package.json b/packages/tiptap/package.json
index df0f877e..c4807b25 100644
--- a/packages/tiptap/package.json
+++ b/packages/tiptap/package.json
@@ -26,8 +26,8 @@
     "prosemirror-inputrules": "^1.0.1",
     "prosemirror-keymap": "^1.0.1",
     "prosemirror-model": "^1.7.0",
-    "prosemirror-state": "^1.2.1",
-    "prosemirror-view": "^1.8.9",
+    "prosemirror-state": "^1.2.2",
+    "prosemirror-view": "^1.9.1",
     "tiptap-commands": "^1.9.0",
     "tiptap-utils": "^1.4.0"
   },
diff --git a/yarn.lock b/yarn.lock
index c69a9341..ab91d738 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9592,7 +9592,7 @@ prosemirror-schema-list@^1.0.3:
     prosemirror-model "^1.0.0"
     prosemirror-transform "^1.0.0"
 
-prosemirror-state@^1.0.0, prosemirror-state@^1.2.1, prosemirror-state@^1.2.2:
+prosemirror-state@^1.0.0, prosemirror-state@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.2.2.tgz#8df26d95fd6fd327c0f9984a760e84d863204154"
   integrity sha512-j8aC/kf9BJSCQau485I/9pj39XQoce+TqH5xzekT7WWFARTsRYFLJtiXBcCKakv1VSeev+sC3bJP0pLfz7Ft8g==
@@ -9623,7 +9623,7 @@ prosemirror-utils@^0.7.6:
   resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.7.7.tgz#a9bda2468113d34f3721ba15eaa2fd04b81d7dc8"
   integrity sha512-0cSWive9oCOr4nnTlEQ9scr8g8kj126glAigb6cKLB4sq/eSyumVu8Ogqus6KEoLInBy6WONXJbgm/2xJ8MShw==
 
-prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.8.9:
+prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.9.1.tgz#3f987d55586909d4156a76b32918338655e32699"
   integrity sha512-/8kQ9/CZaaDoQEqBfgyW2ex/SnuqkMim20oMpLwHYuuxfe2K30kymQYP1pEKmTVK1K97s7uE78YPyOrUU+VeuQ==

From e4dd55d08bb660566fec6e76e52fc01da5ad76aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 6 May 2019 17:26:41 +0200
Subject: [PATCH 54/64] fix missing peer dependency

---
 packages/tiptap-extensions/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/tiptap-extensions/package.json b/packages/tiptap-extensions/package.json
index fb411e06..146ac81c 100644
--- a/packages/tiptap-extensions/package.json
+++ b/packages/tiptap-extensions/package.json
@@ -24,6 +24,7 @@
     "lowlight": "^1.11.0",
     "prosemirror-collab": "^1.1.1",
     "prosemirror-history": "^1.0.4",
+    "prosemirror-model": "^1.7.0",
     "prosemirror-state": "^1.2.2",
     "prosemirror-tables": "^0.7.11",
     "prosemirror-transform": "^1.1.3",

From d4a9c0ee09fabfb7ca7eac13c321b326b74ea62a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 6 May 2019 17:46:05 +0200
Subject: [PATCH 55/64] add state getter

---
 packages/tiptap/src/Editor.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/tiptap/src/Editor.js b/packages/tiptap/src/Editor.js
index bc35201a..5db9c5e4 100644
--- a/packages/tiptap/src/Editor.js
+++ b/packages/tiptap/src/Editor.js
@@ -71,7 +71,6 @@ export default class Editor extends Emitter {
     this.keymaps = this.createKeymaps()
     this.inputRules = this.createInputRules()
     this.pasteRules = this.createPasteRules()
-    this.state = this.createState()
     this.view = this.createView()
     this.commands = this.createCommands()
     this.setActiveNodesAndMarks()
@@ -118,6 +117,10 @@ export default class Editor extends Emitter {
     ]
   }
 
+  get state() {
+    return this.view ? this.view.state : null
+  }
+
   createExtensions() {
     return new ExtensionManager([
       ...this.builtInExtensions,
@@ -233,7 +236,7 @@ export default class Editor extends Emitter {
 
   createView() {
     const view = new EditorView(this.element, {
-      state: this.state,
+      state: this.createState(),
       handlePaste: (...args) => { this.emit('paste', ...args) },
       handleDrop: (...args) => { this.emit('drop', ...args) },
       dispatchTransaction: this.dispatchTransaction.bind(this),
@@ -300,8 +303,8 @@ export default class Editor extends Emitter {
   }
 
   dispatchTransaction(transaction) {
-    this.state = this.state.apply(transaction)
-    this.view.updateState(this.state)
+    const newState = this.state.apply(transaction)
+    this.view.updateState(newState)
     this.setActiveNodesAndMarks()
 
     if (!transaction.docChanged) {
@@ -365,13 +368,13 @@ export default class Editor extends Emitter {
   }
 
   setContent(content = {}, emitUpdate = false, parseOptions) {
-    this.state = EditorState.create({
+    const newState = EditorState.create({
       schema: this.state.schema,
       doc: this.createDocument(content, parseOptions),
       plugins: this.state.plugins,
     })
 
-    this.view.updateState(this.state)
+    this.view.updateState(newState)
 
     if (emitUpdate) {
       this.emitUpdate()
@@ -426,10 +429,10 @@ export default class Editor extends Emitter {
       return
     }
 
-    this.state = this.state.reconfigure({
+    const newState = this.state.reconfigure({
       plugins: this.state.plugins.concat([plugin]),
     })
-    this.view.updateState(this.state)
+    this.view.updateState(newState)
   }
 
   destroy() {

From e9cd6b6f6c8e8873d30a472782d2cbcdc13e6dae Mon Sep 17 00:00:00 2001
From: Alecyrus <heyuangunia@gmail.com>
Date: Tue, 7 May 2019 08:50:21 +0800
Subject: [PATCH 56/64] fix #289

A workaround before the better solution comes out.
---
 packages/tiptap/src/Editor.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/tiptap/src/Editor.js b/packages/tiptap/src/Editor.js
index 5db9c5e4..d6f7afba 100644
--- a/packages/tiptap/src/Editor.js
+++ b/packages/tiptap/src/Editor.js
@@ -433,6 +433,7 @@ export default class Editor extends Emitter {
       plugins: this.state.plugins.concat([plugin]),
     })
     this.view.updateState(newState)
+    this.view.updatePluginViews()
   }
 
   destroy() {

From 75f782b1ea1639ba8cc537d7ee89c74ec6513fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20K=C3=BChn?= <kontakt@philipp-kuehn.com>
Date: Tue, 7 May 2019 07:59:41 +0200
Subject: [PATCH 57/64] add mariux to credits

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 882b7e7c..b7ce2ee0 100644
--- a/README.md
+++ b/README.md
@@ -477,6 +477,7 @@ Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
 - [Philipp Kühn](https://github.com/philippkuehn)
 - [Christoph Flathmann](https://github.com/Chrissi2812)
 - [Erick Wilder](https://github.com/erickwilder)
+- [Marius Tolzmann](https://github.com/mariux)
 - [All Contributors](../../contributors)
 
 ## Packages Using Tiptap

From 0c3b6e4cd66c71854ff7ef2a9958eb06414bd540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 7 May 2019 08:00:53 +0200
Subject: [PATCH 58/64] Publish

 - tiptap-commands@1.9.1
 - tiptap-extensions@1.18.1
 - tiptap-utils@1.4.1
 - tiptap@1.18.1
---
 packages/tiptap-commands/package.json   | 4 ++--
 packages/tiptap-extensions/package.json | 6 +++---
 packages/tiptap-utils/package.json      | 2 +-
 packages/tiptap/package.json            | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/tiptap-commands/package.json b/packages/tiptap-commands/package.json
index b9920d93..494f8e45 100644
--- a/packages/tiptap-commands/package.json
+++ b/packages/tiptap-commands/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tiptap-commands",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "Commands for tiptap",
   "homepage": "https://tiptap.scrumpy.io",
   "license": "MIT",
@@ -24,6 +24,6 @@
     "prosemirror-inputrules": "^1.0.1",
     "prosemirror-schema-list": "^1.0.3",
     "prosemirror-state": "^1.2.2",
-    "tiptap-utils": "^1.4.0"
+    "tiptap-utils": "^1.4.1"
   }
 }
diff --git a/packages/tiptap-extensions/package.json b/packages/tiptap-extensions/package.json
index 146ac81c..94b95c18 100644
--- a/packages/tiptap-extensions/package.json
+++ b/packages/tiptap-extensions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tiptap-extensions",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "Extensions for tiptap",
   "homepage": "https://tiptap.scrumpy.io",
   "license": "MIT",
@@ -30,8 +30,8 @@
     "prosemirror-transform": "^1.1.3",
     "prosemirror-utils": "^0.7.6",
     "prosemirror-view": "^1.9.1",
-    "tiptap": "^1.18.0",
-    "tiptap-commands": "^1.9.0"
+    "tiptap": "^1.18.1",
+    "tiptap-commands": "^1.9.1"
   },
   "peerDependencies": {
     "vue": "^2.5.17",
diff --git a/packages/tiptap-utils/package.json b/packages/tiptap-utils/package.json
index 228ca670..780fae5b 100644
--- a/packages/tiptap-utils/package.json
+++ b/packages/tiptap-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tiptap-utils",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Utility functions for tiptap",
   "homepage": "https://tiptap.scrumpy.io",
   "license": "MIT",
diff --git a/packages/tiptap/package.json b/packages/tiptap/package.json
index c4807b25..884067bc 100644
--- a/packages/tiptap/package.json
+++ b/packages/tiptap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tiptap",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "A rich-text editor for Vue.js",
   "homepage": "https://tiptap.scrumpy.io",
   "license": "MIT",
@@ -28,8 +28,8 @@
     "prosemirror-model": "^1.7.0",
     "prosemirror-state": "^1.2.2",
     "prosemirror-view": "^1.9.1",
-    "tiptap-commands": "^1.9.0",
-    "tiptap-utils": "^1.4.0"
+    "tiptap-commands": "^1.9.1",
+    "tiptap-utils": "^1.4.1"
   },
   "peerDependencies": {
     "vue": "^2.5.17",

From 1f953a3136c31ba24113aa8f2544d1932b09a57f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 7 May 2019 10:32:43 +0200
Subject: [PATCH 59/64] update collab text

---
 examples/Components/Routes/Collaboration/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/Components/Routes/Collaboration/index.vue b/examples/Components/Routes/Collaboration/index.vue
index 8c8f7d18..4c6d56b0 100644
--- a/examples/Components/Routes/Collaboration/index.vue
+++ b/examples/Components/Routes/Collaboration/index.vue
@@ -4,7 +4,7 @@
       Collaborative Editing
     </h2>
     <div class="message">
-      With the Collaboration Extension it's possible for several users to work on a document at the same time. To make this possible, client-side and server-side code is required. This example shows this using a <a href="https://glitch.com/edit/#!/tiptap-sockets" target="_blank">socket server</a>. Try it out below:
+      With the Collaboration Extension it's possible for several users to work on a document at the same time. To make this possible, client-side and server-side code is required. This example shows this using a <a href="https://glitch.com/edit/#!/tiptap-sockets" target="_blank">socket server on glitch.com</a>. To keep the demo code clean, only a few nodes and marks are actived. There is also set a 250ms decounce for all changes. Try it out below:
     </div>
     <template v-if="editor && !loading">
       <div class="count">

From 364c744cefb7285f6170f890d493a5182cc1e34a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 7 May 2019 10:38:27 +0200
Subject: [PATCH 60/64] wording

---
 examples/Components/Routes/Collaboration/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/Components/Routes/Collaboration/index.vue b/examples/Components/Routes/Collaboration/index.vue
index 4c6d56b0..acb8f1b6 100644
--- a/examples/Components/Routes/Collaboration/index.vue
+++ b/examples/Components/Routes/Collaboration/index.vue
@@ -4,7 +4,7 @@
       Collaborative Editing
     </h2>
     <div class="message">
-      With the Collaboration Extension it's possible for several users to work on a document at the same time. To make this possible, client-side and server-side code is required. This example shows this using a <a href="https://glitch.com/edit/#!/tiptap-sockets" target="_blank">socket server on glitch.com</a>. To keep the demo code clean, only a few nodes and marks are actived. There is also set a 250ms decounce for all changes. Try it out below:
+      With the Collaboration Extension it's possible for several users to work on a document at the same time. To make this possible, client-side and server-side code is required. This example shows this using a <a href="https://glitch.com/edit/#!/tiptap-sockets" target="_blank">socket server on glitch.com</a>. To keep the demo code clean, only a few nodes and marks are activated. There is also set a 250ms debounce for all changes. Try it out below:
     </div>
     <template v-if="editor && !loading">
       <div class="count">

From 2dda11ba60588bad432332d367bde809067cad14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 7 May 2019 18:52:46 +0200
Subject: [PATCH 61/64] fix a bug in updateComponentProps

---
 packages/tiptap/src/Utils/ComponentView.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/tiptap/src/Utils/ComponentView.js b/packages/tiptap/src/Utils/ComponentView.js
index 1dffed34..88af52ec 100644
--- a/packages/tiptap/src/Utils/ComponentView.js
+++ b/packages/tiptap/src/Utils/ComponentView.js
@@ -65,6 +65,10 @@ export default class ComponentView {
   }
 
   updateComponentProps(props) {
+    if (!this.vm._props) {
+      return
+    }
+
     // Update props in component
     // TODO: Avoid mutating a prop directly.
     // Maybe there is a better way to do this?

From c6f281e487a6c28540f8dc7fe2489872319c3809 Mon Sep 17 00:00:00 2001
From: "Gil B. Chan" <bnbcmindnpass@gmail.com>
Date: Wed, 8 May 2019 06:23:53 +0900
Subject: [PATCH 62/64] change deprecated `slot-scope` to `v-slot`

Directive `slot-scope` is deprecated as of Vue v2.6.0. See [here](https://vuejs.org/v2/guide/components-slots.html) for details. Currently tiptap depends on Vue ^2.6.10. So this commit introduces new directive `v-slot` on README.md and examples.
---
 README.md                                          | 14 +++++---------
 examples/Components/Routes/Basic/index.vue         |  4 ++--
 examples/Components/Routes/Export/index.vue        |  4 ++--
 examples/Components/Routes/FloatingMenu/index.vue  |  3 +--
 examples/Components/Routes/HidingMenuBar/index.vue |  3 +--
 examples/Components/Routes/History/index.vue       |  4 ++--
 examples/Components/Routes/Images/index.vue        |  4 ++--
 examples/Components/Routes/Links/index.vue         |  3 +--
 examples/Components/Routes/MenuBubble/index.vue    |  3 +--
 examples/Components/Routes/Suggestions/index.vue   |  4 ++--
 examples/Components/Routes/Tables/index.vue        |  4 ++--
 examples/Components/Routes/TodoList/index.vue      |  4 ++--
 12 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index b7ce2ee0..14a37c7f 100644
--- a/README.md
+++ b/README.md
@@ -117,8 +117,8 @@ The `<editor-menu-bar />` component is renderless and will receive some properti
 
 ```vue
 <template>
-  <editor-menu-bar :editor="editor">
-    <div slot-scope="{ commands, isActive }">
+  <editor-menu-bar :editor="editor" v-slot="{ commands, isActive }">
+    <div>
       <button :class="{ 'is-active': isActive.bold() }" @click="commands.bold">
         Bold
       </button>
@@ -147,9 +147,8 @@ The `<editor-menu-bubble />` component is renderless and will receive some prope
 
 ```vue
 <template>
-  <editor-menu-bubble :editor="editor">
+  <editor-menu-bubble :editor="editor" v-slot="{ commands, isActive, menu }">
     <div
-      slot-scope="{ commands, isActive, menu }"
       :class="{ 'is-active': menu.isActive }"
       :style="`left: ${menu.left}px; bottom: ${menu.bottom}px;`"
     >
@@ -181,9 +180,8 @@ The `<editor-floating-menu />` component is renderless and will receive some pro
 
 ```vue
 <template>
-  <editor-floating-menu :editor="editor">
+  <editor-floating-menu :editor="editor" v-slot="{ commands, isActive, menu }">
     <div
-      slot-scope="{ commands, isActive, menu }"
       :class="{ 'is-active': menu.isActive }"
       :style="`top: ${menu.top}px`"
     >
@@ -207,12 +205,10 @@ By default, the editor will only support paragraphs. Other nodes and marks are a
 ```vue
 <template>
   <div>
-    <editor-menu-bar :editor="editor">
-      <div slot-scope="{ commands, isActive }">
+    <editor-menu-bar :editor="editor" v-slot="{ commands, isActive }">
         <button :class="{ 'is-active': isActive.bold() }" @click="commands.bold">
           Bold
         </button>
-      </div>
     </editor-menu-bar>
     <editor-content :editor="editor" />
   </div>
diff --git a/examples/Components/Routes/Basic/index.vue b/examples/Components/Routes/Basic/index.vue
index ff95f0f9..1d009918 100644
--- a/examples/Components/Routes/Basic/index.vue
+++ b/examples/Components/Routes/Basic/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="editor">
-    <editor-menu-bar :editor="editor">
-      <div class="menubar" slot-scope="{ commands, isActive }">
+    <editor-menu-bar :editor="editor" v-slot="{ commands, isActive }">
+      <div class="menubar">
 
         <button
           class="menubar__button"
diff --git a/examples/Components/Routes/Export/index.vue b/examples/Components/Routes/Export/index.vue
index e5a648b8..e5ff05b2 100644
--- a/examples/Components/Routes/Export/index.vue
+++ b/examples/Components/Routes/Export/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <div class="editor">
-      <editor-menu-bar :editor="editor">
-        <div class="menubar" slot-scope="{ commands, isActive }">
+      <editor-menu-bar :editor="editor" v-slot="{ commands, isActive }">
+        <div class="menubar">
 
           <button
             class="menubar__button"
diff --git a/examples/Components/Routes/FloatingMenu/index.vue b/examples/Components/Routes/FloatingMenu/index.vue
index f9015797..10182ce6 100644
--- a/examples/Components/Routes/FloatingMenu/index.vue
+++ b/examples/Components/Routes/FloatingMenu/index.vue
@@ -1,8 +1,7 @@
 <template>
   <div class="editor">
-    <editor-floating-menu :editor="editor">
+    <editor-floating-menu :editor="editor" v-slot="{ commands, isActive, menu }">
       <div
-        slot-scope="{ commands, isActive, menu }"
         class="editor__floating-menu"
         :class="{ 'is-active': menu.isActive }"
         :style="`top: ${menu.top}px`"
diff --git a/examples/Components/Routes/HidingMenuBar/index.vue b/examples/Components/Routes/HidingMenuBar/index.vue
index a5449618..9dcd7ba3 100644
--- a/examples/Components/Routes/HidingMenuBar/index.vue
+++ b/examples/Components/Routes/HidingMenuBar/index.vue
@@ -1,10 +1,9 @@
 <template>
   <div class="editor">
-    <editor-menu-bar :editor="editor">
+    <editor-menu-bar :editor="editor" v-slot="{ commands, isActive, focused }">
       <div
         class="menubar is-hidden"
         :class="{ 'is-focused': focused }"
-        slot-scope="{ commands, isActive, focused }"
       >
 
         <button
diff --git a/examples/Components/Routes/History/index.vue b/examples/Components/Routes/History/index.vue
index 0bcd5fdc..019df8e5 100644
--- a/examples/Components/Routes/History/index.vue
+++ b/examples/Components/Routes/History/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="editor">
-    <editor-menu-bar :editor="editor">
-      <div class="menubar" slot-scope="{ commands, isActive }">
+    <editor-menu-bar :editor="editor" v-slot="{ commands, isActive }">
+      <div class="menubar">
 
         <button
           class="menubar__button"
diff --git a/examples/Components/Routes/Images/index.vue b/examples/Components/Routes/Images/index.vue
index aae665a3..7e9f5026 100644
--- a/examples/Components/Routes/Images/index.vue
+++ b/examples/Components/Routes/Images/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="editor">
-    <editor-menu-bar :editor="editor">
-      <div class="menubar" slot-scope="{ commands }">
+    <editor-menu-bar :editor="editor" v-slot="{ commands }">
+      <div class="menubar">
         <button
           class="menubar__button"
           @click="showImagePrompt(commands.image)"
diff --git a/examples/Components/Routes/Links/index.vue b/examples/Components/Routes/Links/index.vue
index 460524aa..6de03c79 100644
--- a/examples/Components/Routes/Links/index.vue
+++ b/examples/Components/Routes/Links/index.vue
@@ -1,8 +1,7 @@
 <template>
   <div class="editor">
-    <editor-menu-bubble class="menububble" :editor="editor" @hide="hideLinkMenu">
+    <editor-menu-bubble class="menububble" :editor="editor" @hide="hideLinkMenu" v-slot="{ commands, isActive, getMarkAttrs, menu }">
       <div
-        slot-scope="{ commands, isActive, getMarkAttrs, menu }"
         class="menububble"
         :class="{ 'is-active': menu.isActive }"
         :style="`left: ${menu.left}px; bottom: ${menu.bottom}px;`"
diff --git a/examples/Components/Routes/MenuBubble/index.vue b/examples/Components/Routes/MenuBubble/index.vue
index c72625e3..6819b9e0 100644
--- a/examples/Components/Routes/MenuBubble/index.vue
+++ b/examples/Components/Routes/MenuBubble/index.vue
@@ -1,8 +1,7 @@
 <template>
   <div class="editor">
-    <editor-menu-bubble :editor="editor" :keep-in-bounds="keepInBounds">
+    <editor-menu-bubble :editor="editor" :keep-in-bounds="keepInBounds" v-slot="{ commands, isActive, menu }">
       <div
-        slot-scope="{ commands, isActive, menu }"
         class="menububble"
         :class="{ 'is-active': menu.isActive }"
         :style="`left: ${menu.left}px; bottom: ${menu.bottom}px;`"
diff --git a/examples/Components/Routes/Suggestions/index.vue b/examples/Components/Routes/Suggestions/index.vue
index 6d96c641..c906d1b4 100644
--- a/examples/Components/Routes/Suggestions/index.vue
+++ b/examples/Components/Routes/Suggestions/index.vue
@@ -2,8 +2,8 @@
   <div>
 
     <div class="editor">
-      <editor-menu-bar :editor="editor">
-        <div class="menubar" slot-scope="{ commands }">
+      <editor-menu-bar :editor="editor" v-slot="{ commands }">
+        <div class="menubar">
           <button class="menubar__button" @click="commands.mention({ id: 1, label: 'Philipp Kühn' })">
             <icon name="mention" />
             <span>Insert Mention</span>
diff --git a/examples/Components/Routes/Tables/index.vue b/examples/Components/Routes/Tables/index.vue
index 5045d8e5..f6304234 100644
--- a/examples/Components/Routes/Tables/index.vue
+++ b/examples/Components/Routes/Tables/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="editor">
-		<editor-menu-bar :editor="editor">
-			<div class="menubar" slot-scope="{ commands, isActive }">
+		<editor-menu-bar :editor="editor" v-slot="{ commands, isActive }">
+			<div class="menubar">
 				<div class="toolbar">
 					<button
 						class="menubar__button"
diff --git a/examples/Components/Routes/TodoList/index.vue b/examples/Components/Routes/TodoList/index.vue
index 0e92d41d..cd144ceb 100644
--- a/examples/Components/Routes/TodoList/index.vue
+++ b/examples/Components/Routes/TodoList/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="editor">
-    <editor-menu-bar :editor="editor">
-      <div class="menubar" slot-scope="{ commands, isActive }">
+    <editor-menu-bar :editor="editor" v-slot="{ commands, isActive }">
+      <div class="menubar">
 
         <button
           class="menubar__button"

From 22100ff76a58570f3c14e3bf8364ea957a3ec51b Mon Sep 17 00:00:00 2001
From: "GIL B. Chan" <bnbcmindnpass@gmail.com>
Date: Wed, 8 May 2019 07:27:05 +0900
Subject: [PATCH 63/64] refactor src/Utils/ExtensionManager.js

- remove duplication of logic
- reduce code lines to half (not entire module, but the part this refactor is applied to)
---
 packages/tiptap/src/Utils/ExtensionManager.js | 54 +++++++------------
 1 file changed, 19 insertions(+), 35 deletions(-)

diff --git a/packages/tiptap/src/Utils/ExtensionManager.js b/packages/tiptap/src/Utils/ExtensionManager.js
index 1d6a74f0..fd343e85 100644
--- a/packages/tiptap/src/Utils/ExtensionManager.js
+++ b/packages/tiptap/src/Utils/ExtensionManager.js
@@ -137,44 +137,28 @@ export default class ExtensionManager {
           } : {},
         })
 
-        if (Array.isArray(value)) {
-          commands[name] = attrs => value
-            .forEach(callback => {
-              if (!editable) {
-                return false
-              }
-              view.focus()
-              return callback(attrs)(view.state, view.dispatch, view)
-            })
-        } else if (typeof value === 'function') {
-          commands[name] = attrs => {
-            if (!editable) {
-              return false
-            }
-            view.focus()
-            return value(attrs)(view.state, view.dispatch, view)
+        const apply = (cb, attrs) => {
+          if (!editable) {
+            return false
           }
-        } else if (typeof value === 'object') {
+          view.focus()
+          return cb(attrs)(view.state, view.dispatch, view)
+        }
+
+        const handle = (_name, _value) => {
+          if (Array.isArray(_value)) {
+            commands[_name] = attrs => _value.forEach(callback => apply(callback, attrs))
+          } else if (typeof _value === 'function') {
+            commands[_name] = attrs => apply(_value, attrs)
+          }
+        }
+
+        if (typeof value === 'object') {
           Object.entries(value).forEach(([commandName, commandValue]) => {
-            if (Array.isArray(commandValue)) {
-              commands[commandName] = attrs => commandValue
-                .forEach(callback => {
-                  if (!editable) {
-                    return false
-                  }
-                  view.focus()
-                  return callback(attrs)(view.state, view.dispatch, view)
-                })
-            } else {
-              commands[commandName] = attrs => {
-                if (!editable) {
-                  return false
-                }
-                view.focus()
-                return commandValue(attrs)(view.state, view.dispatch, view)
-              }
-            }
+            handle(commandName, commandValue)
           })
+        } else {
+          handle(name, value)
         }
 
         return {

From 676ce7d9f1a76cbc1de274a70a2394408f5867f0 Mon Sep 17 00:00:00 2001
From: "GIL B. Chan" <bnbcmindnpass@gmail.com>
Date: Wed, 8 May 2019 15:01:21 +0900
Subject: [PATCH 64/64] refactor src/Utils/Emitter.js

- Make flow of logic more compact. It reduces 12 code lines.
- Use filter for simple element removal. Unless there are lots of elements, breaking a loop doesn't actually have practical benefit.
- More flexible. It would be easier to edit even if argument is changed
to option pack (json).
---
 packages/tiptap/src/Utils/Emitter.js | 40 ++++++++++------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/packages/tiptap/src/Utils/Emitter.js b/packages/tiptap/src/Utils/Emitter.js
index 5fa5a36e..23a2dd32 100644
--- a/packages/tiptap/src/Utils/Emitter.js
+++ b/packages/tiptap/src/Utils/Emitter.js
@@ -10,7 +10,6 @@ export default class Emitter {
     return this
   }
 
-
   emit(event, ...args) {
     this._callbacks = this._callbacks || {}
     const callbacks = this._callbacks[event]
@@ -22,33 +21,22 @@ export default class Emitter {
     return this
   }
 
-  // Remove event listener for given event. If fn is not provided, all event
-  // listeners for that event will be removed. If neither is provided, all
-  // event listeners will be removed.
+  // Remove event listener for given event.
+  // If fn is not provided, all event listeners for that event will be removed.
+  // If neither is provided, all event listeners will be removed.
   off(event, fn) {
-    if (!this._callbacks || (arguments.length === 0)) {
+
+    if (!arguments.length) {
       this._callbacks = {}
-      return this
-    }
-
-    // specific event
-    const callbacks = this._callbacks[event]
-    if (!callbacks) {
-      return this
-    }
-
-    // remove all handlers
-    if (arguments.length === 1) {
-      delete this._callbacks[event]
-      return this
-    }
-
-    // remove specific handler
-    for (let i = 0; i < callbacks.length; i += 1) {
-      const callback = callbacks[i]
-      if (callback === fn) {
-        callbacks.splice(i, 1)
-        break
+    } else {
+      // event listeners for the given event
+      const callbacks = this._callbacks ? this._callbacks[event] : null
+      if (callbacks) {
+        if (fn) {
+          this._callbacks[event] = callbacks.filter(cb => cb !== fn) // remove specific handler
+        } else {
+          delete this._callbacks[event] // remove all handlers
+        }
       }
     }