Merge branch 'master' into feature/code-highlighting

README.md

@@ -59,6 +59,7 @@ export default {
 | `editable` | `Boolean` | `true` | When set to `false` the editor is read-only. |
 | `doc` | `Object` | `null` | The editor state object used by Prosemirror. You can also pass HTML to the `content` slot. When used both, the `content` slot will be ignored. |
 | `extensions` | `Array` | `[]` | A list of extensions used, by the editor. This can be `Nodes`, `Marks` or `Plugins`. |
+| `@init` | `Object` | `undefined` | This will return an Object with the current `state` and `view` of Prosemirror on init. |
 | `@update` | `Object` | `undefined` | This will return an Object with the current `state` of Prosemirror, a `getJSON()` and `getHTML()` function on every change. |
 
 ## Scoped Slots

examples/main.js

@@ -104,6 +104,7 @@ const routes = [
 
 const router = new VueRouter({
   routes,
+  mode: 'history',
   linkActiveClass: 'is-active',
   linkExactActiveClass: 'is-exact-active',
 })

netlify.toml

@@ -0,0 +1,4 @@
+[[redirects]]
+  from = "/*"
+  to = "/index.html"
+  status = 200

package.json

@@ -29,36 +29,36 @@
     "ie >= 9"
   ],
   "devDependencies": {
-    "@babel/core": "^7.0.0-rc.2",
-    "@babel/node": "^7.0.0-rc.2",
-    "@babel/plugin-syntax-dynamic-import": "^7.0.0-rc.2",
-    "@babel/plugin-transform-runtime": "^7.0.0-rc.2",
-    "@babel/polyfill": "^7.0.0-rc.2",
-    "@babel/preset-env": "^7.0.0-rc.2",
-    "@babel/preset-stage-2": "^7.0.0-rc.2",
-    "@babel/runtime": "^7.0.0-rc.2",
+    "@babel/core": "^7.0.0",
+    "@babel/node": "^7.0.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
+    "@babel/plugin-transform-runtime": "^7.0.0",
+    "@babel/polyfill": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
+    "@babel/preset-stage-2": "^7.0.0",
+    "@babel/runtime": "^7.0.0",
     "autoprefixer": "^9.1.3",
-    "babel-eslint": "^8.2.5",
-    "babel-loader": "^8.0.0-beta.6",
-    "browser-sync": "^2.24.5",
+    "babel-eslint": "^9.0.0",
+    "babel-loader": "^8.0.2",
+    "browser-sync": "^2.24.7",
     "copy-webpack-plugin": "^4.5.2",
     "css-loader": "^1.0.0",
-    "eslint": "^5.4.0",
+    "eslint": "^5.5.0",
     "eslint-config-airbnb-base": "^13.0.0",
     "eslint-plugin-html": "^4.0.5",
     "eslint-plugin-import": "^2.13.0",
     "eslint-plugin-vue": "4.7.1",
     "file-loader": "^2.0.0",
-    "glob": "^7.1.2",
+    "glob": "^7.1.3",
     "html-webpack-plugin": "^3.2.0",
-    "http-proxy-middleware": "^0.18.0",
+    "http-proxy-middleware": "^0.19.0",
     "http-server": "^0.11.1",
     "imagemin-webpack-plugin": "^2.1.5",
-    "lerna": "^3.1.4",
+    "lerna": "^3.2.1",
     "mini-css-extract-plugin": "^0.4.2",
     "minimist": "^1.2.0",
     "node-sass": "^4.9.1",
-    "optimize-css-assets-webpack-plugin": "^5.0.0",
+    "optimize-css-assets-webpack-plugin": "^5.0.1",
     "ora": "^3.0.0",
     "postcss": "^7.0.2",
     "postcss-loader": "^3.0.0",
@@ -71,16 +71,16 @@
     "rollup-plugin-replace": "^2.0.0",
     "rollup-plugin-vue": "^4.3.2",
     "sass-loader": "^7.0.3",
-    "style-loader": "^0.22.1",
-    "uglify-js": "^3.4.7",
+    "style-loader": "^0.23.0",
+    "uglify-js": "^3.4.9",
     "vue": "^2.5.17",
-    "vue-loader": "^15.4.0",
+    "vue-loader": "^15.4.1",
     "vue-router": "^3.0.1",
     "vue-style-loader": "^4.1.0",
     "vue-template-compiler": "^2.5.17",
-    "webpack": "^4.17.1",
+    "webpack": "^4.17.2",
     "webpack-dev-middleware": "^3.1.3",
-    "webpack-hot-middleware": "^2.22.2",
+    "webpack-hot-middleware": "^2.23.1",
     "webpack-manifest-plugin": "^2.0.3",
     "webpack-svgstore-plugin": "^4.0.3",
     "zlib": "^1.0.5"

packages/tiptap-extensions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiptap-extensions",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Extensions for tiptap",
   "homepage": "https://tiptap.scrumpy.io",
   "license": "MIT",
@@ -22,7 +22,7 @@
   "dependencies": {
     "lowlight": "^1.10.0",
     "prosemirror-history": "^1.0.2",
-    "tiptap": "^0.8.0",
+    "tiptap": "^0.9.0",
     "tiptap-commands": "^0.2.4"
   }
 }

packages/tiptap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiptap",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "A rich-text editor for Vue.js",
   "homepage": "https://tiptap.scrumpy.io",
   "license": "MIT",

packages/tiptap/src/components/editor.js

@@ -100,6 +100,10 @@ export default {
 			this.view = this.createView()
 			this.commands = this.createCommands()
 			this.updateMenuActions()
+			this.$emit('init', {
+				view: this.view,
+				state: this.state,
+			})
 		},
 
 		createSchema() {
@@ -200,6 +204,10 @@ export default {
 		},
 
 		dispatchTransaction(transaction) {
+			if (!transaction.docChanged) {
+				return
+			}
+			
 			this.state = this.state.apply(transaction)
 			this.view.updateState(this.state)
 			this.$emit('update', {