diff --git a/docs/package.json b/docs/package.json index c839c3d5..b88d8662 100644 --- a/docs/package.json +++ b/docs/package.json @@ -10,26 +10,26 @@ "@gridsome/remark-prismjs": "^0.4.0", "@gridsome/source-filesystem": "^0.6.2", "@gridsome/transformer-json": "^0.2.1", - "@gridsome/vue-remark": "^0.2.4", + "@gridsome/vue-remark": "^0.2.5", "@mvasilkov/outdent": "^1.0.4", "collect.js": "^4.28.2", "globby": "^11.0.0", - "gridsome": "0.7.20", + "gridsome": "0.7.21", "gridsome-plugin-simple-analytics": "^1.1.0", "raw-loader": "^4.0.0", "react": "^16.13.1", "react-dom": "^16.13.1", "remark-container": "^0.1.2", - "typescript": "^4.0.2", + "typescript": "^4.0.3", "vue-github-button": "^1.1.2" }, "devDependencies": { "@babel/preset-env": "^7.11.5", "@babel/preset-react": "^7.10.4", - "html-loader": "^1.1.0", + "html-loader": "^1.3.1", "node-sass": "^4.14.1", "sass-loader": "^9.0.3", "style-resources-loader": "^1.3.3", - "ts-loader": "^8.0.3" + "ts-loader": "^8.0.4" } } diff --git a/package.json b/package.json index 7bc9f069..5a0b7abd 100644 --- a/package.json +++ b/package.json @@ -29,12 +29,12 @@ "@types/prosemirror-state": "^1.2.5", "@types/prosemirror-transform": "^1.1.1", "@types/prosemirror-view": "^1.15.0", - "cypress": "^5.1.0", + "cypress": "^5.2.0", "lerna": "^3.22.1", "microbundle": "^0.12.3", "sass-loader": "^9.0.3", "typedoc": "^0.18.0", - "typescript": "^4.0.2", + "typescript": "^4.0.3", "vue": "^2.6.12" } } diff --git a/packages/core/package.json b/packages/core/package.json index 0e431465..8596d981 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -22,9 +22,9 @@ "prosemirror-commands": "^1.1.3", "prosemirror-dropcursor": "^1.3.2", "prosemirror-gapcursor": "^1.1.5", - "prosemirror-inputrules": "^1.1.2", + "prosemirror-inputrules": "^1.1.3", "prosemirror-keymap": "^1.1.3", - "prosemirror-model": "^1.9.1", + "prosemirror-model": "^1.11.2", "prosemirror-schema-list": "^1.1.4", "prosemirror-state": "^1.3.3", "prosemirror-tables": "^1.1.1", diff --git a/packages/core/src/plugins/index.ts b/packages/core/src/plugins/index.ts index d4b64f83..188a1b3d 100644 --- a/packages/core/src/plugins/index.ts +++ b/packages/core/src/plugins/index.ts @@ -4,7 +4,7 @@ import { dropCursor } from 'prosemirror-dropcursor' import { gapCursor } from 'prosemirror-gapcursor' import editable from './editable' import focus from './focus' -import undoInputRule from '../utils/undoInputRule' +import { undoInputRule } from 'prosemirror-inputrules' export default [ () => dropCursor(), diff --git a/packages/core/src/utils/undoInputRule.ts b/packages/core/src/utils/undoInputRule.ts deleted file mode 100644 index d3a94f18..00000000 --- a/packages/core/src/utils/undoInputRule.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { EditorState, Transaction } from 'prosemirror-state' - -// source: https://github.com/ProseMirror/prosemirror-inputrules/blob/2d3ae3abe3428a1b4d343808915aafeff8563371/src/inputrules.js#L101 -export default function undoInputRule(state: EditorState, dispatch?: (tr: Transaction) => void) { - let plugins = state.plugins - - for (let i = 0; i < plugins.length; i++) { - let plugin = plugins[i], undoable - // @ts-ignore - if (plugin.spec.isInputRules && (undoable = plugin.getState(state))) { - if (dispatch) { - let tr = state.tr, toUndo = undoable.transform - - for (let j = toUndo.steps.length - 1; j >= 0; j--) { - tr.step(toUndo.steps[j].invert(toUndo.docs[j])) - } - - let marks = tr.doc.resolve(undoable.from).marks() - - if (!undoable.text) { - return false - } - - dispatch(tr.replaceWith(undoable.from, undoable.to, state.schema.text(undoable.text, marks))) - } - - return true - } - } - - return false -} \ No newline at end of file diff --git a/packages/html/package.json b/packages/html/package.json index ad70d7ef..b88cddfc 100644 --- a/packages/html/package.json +++ b/packages/html/package.json @@ -10,6 +10,6 @@ "@tiptap/core": "2.x", "@types/jsdom": "^16.2.4", "jsdom": "^16.4.0", - "prosemirror-model": "^1.11.0" + "prosemirror-model": "^1.11.2" } } diff --git a/yarn.lock b/yarn.lock index 08d55f62..b4c5abe0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1146,10 +1146,10 @@ dependencies: json-parse-better-errors "^1.0.2" -"@gridsome/transformer-remark@^0.6.2": - version "0.6.2" - resolved "https://registry.yarnpkg.com/@gridsome/transformer-remark/-/transformer-remark-0.6.2.tgz#ab8822556cdbc9dd4a53115aa125668b233d6998" - integrity sha512-6kkdKg35vuCiZYfNxM+rqkZjG9ztgCAVT8bb3Kqqu+/FNCwMYUInIfWeW7ApAjj+ng/YFG1tB+fAABCeH3sEbw== +"@gridsome/transformer-remark@^0.6.3": + version "0.6.3" + resolved "https://registry.yarnpkg.com/@gridsome/transformer-remark/-/transformer-remark-0.6.3.tgz#bac601e7f7aa8c346d83137334168059b6a26c9d" + integrity sha512-pU98Kn+/DIK1fBaop6QbL4+HMchbg3Nz57duBWVAtQ0WDLjNzYm1EnqsTjQyxrgt077sEjSLScrVmoAsxlsLZQ== dependencies: gray-matter "^4.0.2" hash-sum "^1.0.2" @@ -1167,17 +1167,17 @@ unist-util-visit "^1.4.0" vfile "^4.0.0" -"@gridsome/vue-remark@^0.2.4": - version "0.2.4" - resolved "https://registry.yarnpkg.com/@gridsome/vue-remark/-/vue-remark-0.2.4.tgz#42bf05135269e4b550ca0ab34ba634b5e7d89627" - integrity sha512-l6MMzkcsWcwruuV9Ug3CFHA9187qgAK0BHe45/9cSG/Byqh78wsgC9ltZ8b0LroZTdKOb5m83pD0ptNlGETBnQ== +"@gridsome/vue-remark@^0.2.5": + version "0.2.5" + resolved "https://registry.yarnpkg.com/@gridsome/vue-remark/-/vue-remark-0.2.5.tgz#cb84a09b62b57eca26599ddc29427fe4788b7f9c" + integrity sha512-zK/cQ/kf8T0p9cjHKa4ZiTbZKBTSi79hhkFemT3ubOJVTKwaPFiU2mw3lJYjiJn/RWViwWBHUrDRTktL8bnyZQ== dependencies: "@babel/core" "^7.0.0" "@babel/parser" "^7.0.0" "@babel/preset-env" "^7.0.0" "@babel/traverse" "^7.0.0" "@gridsome/source-filesystem" "^0.6.2" - "@gridsome/transformer-remark" "^0.6.2" + "@gridsome/transformer-remark" "^0.6.3" hash-sum "^1.0.2" hast-util-to-html "^5.0.0" he "^1.2.0" @@ -4688,10 +4688,10 @@ cyclist@^1.0.1: resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= -cypress@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-5.1.0.tgz#979e9ff3e0acd792eefd365bf104046479a9643b" - integrity sha512-craPRO+Viu4268s7eBvX5VJW8aBYcAQT+EwEccQSMY+eH1ZPwnxIgyDlmMWvxLVX9SkWxOlZbEycPyzanQScBQ== +cypress@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-5.2.0.tgz#6902efd90703242a2539f0623c6e1118aff01f95" + integrity sha512-9S2spcrpIXrQ+CQIKHsjRoLQyRc2ehB06clJXPXXp1zyOL/uZMM3Qc20ipNki4CcNwY0nBTQZffPbRpODeGYQg== dependencies: "@cypress/listr-verbose-renderer" "^0.4.1" "@cypress/request" "^2.88.5" @@ -6547,10 +6547,10 @@ graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1. resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== -graphql-compose@^7.3.0: - version "7.21.0" - resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-7.21.0.tgz#fdf154ff51a7c76624265d7e152cb53a6924d326" - integrity sha512-//zmQjJ8q4FS3Y13xFxdT/+keoD8mpi68aAWFQREvIr+ojnotvJ2qTj7vnHraGaHJAhjMj0kktTeSICDoXkeFQ== +graphql-compose@7.20.1: + version "7.20.1" + resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-7.20.1.tgz#9b44c1cae615d760c265ce515b3ddbcfdeaa7bd6" + integrity sha512-4SQgGGIeNdZn5+XrYgQ3ma+nKUzQG861TGB6tRVQaUALVZ6IraY0wzZtPmypR4un2B0Cvt90HXsF6pDQFNnwTA== dependencies: graphql-type-json "0.3.2" object-path "^0.11.4" @@ -6598,10 +6598,10 @@ gridsome-plugin-simple-analytics@^1.1.0: dependencies: simple-analytics-vue "^1.1.0" -gridsome@0.7.20: - version "0.7.20" - resolved "https://registry.yarnpkg.com/gridsome/-/gridsome-0.7.20.tgz#6b45135468db1185e5aea4b3e699d2c2d1e3557d" - integrity sha512-htk50W1dHLpoZ3iWQUZtBWki+STJDqzXxnrb/WBpDaGD9nW3gQK7HgPVVTVntqjTiJKoB1PT7q/g5mflJkgWuw== +gridsome@0.7.21: + version "0.7.21" + resolved "https://registry.yarnpkg.com/gridsome/-/gridsome-0.7.21.tgz#8f1ed742a14ee2a88c0286b0d3e623d509d334f2" + integrity sha512-PtdVorQDpihsgr4IXeLH6QTySiPVNhadnSjEgQP8zfY+2Ir7goifPpIohOBT65nXJj/j7to9f429PSDTlJUe7w== dependencies: "@babel/code-frame" "^7.5.5" "@babel/core" "^7.0.0" @@ -6633,7 +6633,7 @@ gridsome@0.7.20: fs-extra "^7.0.1" globby "^9.0.0" graphql "^14.4.2" - graphql-compose "^7.3.0" + graphql-compose "7.20.1" graphql-playground-middleware-express "^1.7.12" hash-sum "^1.0.2" hirestime "^3.2.1" @@ -6979,15 +6979,15 @@ html-entities@^1.2.0: resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44" integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA== -html-loader@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/html-loader/-/html-loader-1.3.0.tgz#2cbca7794702818b60f55b3b7c73ab642236635a" - integrity sha512-c4ROd3YokzLWj6YUfI/NcqAsZI8ULtKfkE/8W862vxd2fMst4SVIQt+RVMNUnNmnz0p4uz7Wqc7PXZOdm5KAXA== +html-loader@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/html-loader/-/html-loader-1.3.1.tgz#16ae142e23daa4f0d67a2ac2fccaa087be5d64e2" + integrity sha512-zL+z9mIhcXEXuHqzriTwZR4ZslZHi5IFNhjyJHyhJlhEgR8VtLTPbqeR5TdbNtHtb88zbVmlNB8ia2vr/GTrbA== dependencies: html-minifier-terser "^5.1.1" htmlparser2 "^4.1.0" loader-utils "^2.0.0" - schema-utils "^2.7.0" + schema-utils "^2.7.1" html-minifier-terser@^5.1.1: version "5.1.1" @@ -10798,10 +10798,10 @@ prosemirror-history@^1.1.3: prosemirror-transform "^1.0.0" rope-sequence "^1.3.0" -prosemirror-inputrules@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.1.2.tgz#487e46c763e1212a4577397aba7706139084f012" - integrity sha512-Ja5Z3BWestlHYGvtSGqyvxMeB8QEuBjlHM8YnKtLGUXMDp965qdDV4goV8lJb17kIWHk7e7JNj6Catuoa3302g== +prosemirror-inputrules@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.1.3.tgz#93f9199ca02473259c30d7e352e4c14022d54638" + integrity sha512-ZaHCLyBtvbyIHv0f5p6boQTIJjlD6o2NPZiEaZWT2DA+j591zS29QQEMT4lBqwcLW3qRSf7ZvoKNbf05YrsStw== dependencies: prosemirror-state "^1.0.0" prosemirror-transform "^1.0.0" @@ -10814,13 +10814,20 @@ prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.1.3: prosemirror-state "^1.0.0" w3c-keyname "^2.2.0" -prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.11.0, prosemirror-model@^1.8.1, prosemirror-model@^1.9.1: +prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.8.1: version "1.11.1" resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.11.1.tgz#549d81afe1e887cfb2b42ab280c8bf54021dbdc4" integrity sha512-cscne7s40lTQbZrU8fHBGI5awS2qX91w9wChl3HicKG2lkPS6cdGQADXbDCIU8SFl6lQYEsmIzn8F66Wm19YhA== dependencies: orderedmap "^1.1.0" +prosemirror-model@^1.11.2: + version "1.11.2" + resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.11.2.tgz#3ce08172b465bc725c8808c18c2e9378fe69418d" + integrity sha512-+gM+x1VUfGAyKR/g0bK7FC46fVNq0xVVL859QAQ7my2p5HzKrPps/pSbYn7T50XTG2r2IhZJChsUFUBHtcoN0Q== + dependencies: + orderedmap "^1.1.0" + prosemirror-schema-list@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.4.tgz#471f9caf2d2bed93641d2e490434c0d2d4330df1" @@ -11842,7 +11849,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.6.1, schema-utils@^2.6.5, schema-utils@^2.7.0: +schema-utils@^2.6.1, schema-utils@^2.6.5, schema-utils@^2.7.0, schema-utils@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== @@ -13121,10 +13128,10 @@ trough@^1.0.0: dependencies: glob "^7.1.2" -ts-loader@^8.0.3: - version "8.0.3" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.3.tgz#56858f4296edf1ed55e01f8520552984d3f0911c" - integrity sha512-wsqfnVdB7xQiqhqbz2ZPLGHLPZbHVV5Qn/MNFZkCFxRU1miDyxKORucDGxKtsQJ63Rfza0udiUxWF5nHY6bpdQ== +ts-loader@^8.0.4: + version "8.0.4" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.4.tgz#02b9c91fbcfdb3114d8b1e98a3829265270eee7a" + integrity sha512-5u8KF1SW8eCUb/Ff7At81e3wznPmT/27fvaGRO9CziVy+6NlPVRvrzSox4OwU0/e6OflOUB32Err4VquysCSAQ== dependencies: chalk "^2.3.0" enhanced-resolve "^4.0.0" @@ -13234,10 +13241,10 @@ typescript@^3.9.5: resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== -typescript@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2" - integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ== +typescript@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.3.tgz#153bbd468ef07725c1df9c77e8b453f8d36abba5" + integrity sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg== uglify-js@3.4.x: version "3.4.10"