From 8867d40eb9948ce7842f07cb1b44f5572a9c10cd Mon Sep 17 00:00:00 2001 From: James Leftley Date: Wed, 11 Jul 2018 23:05:08 +0100 Subject: [PATCH] chore: bump jsondiffpatch benjamine/jsondiffpatch#172 was fixed from `jsondiffpatch@0.3.2`; the workaround for the webpack warnings is no longer required. --- package-lock.json | 68 +++++++++++++++++++++------------------------ package.json | 2 +- src/state/editor.js | 4 +-- 3 files changed, 34 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index a0af8c6..e3ea12d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2373,7 +2373,6 @@ "version": "1.9.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", - "dev": true, "requires": { "color-name": "1.1.3" } @@ -2381,8 +2380,7 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "color-string": { "version": "0.3.0", @@ -3568,6 +3566,11 @@ "integrity": "sha1-ogM8CcyOFY03dI+951B4Mr1s4Sc=", "dev": true }, + "diff-match-patch": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.1.tgz", + "integrity": "sha512-A0QEhr4PxGUMEtKxd6X+JLnOTFd3BfIPSDpsc4dMvj+CbSaErDwTpoTo/nFJDMSrjxLW4BiNq+FbNisAAHhWeQ==" + }, "diffie-hellman": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz", @@ -7117,53 +7120,44 @@ "dev": true }, "jsondiffpatch": { - "version": "github:d4rkr00t/jsondiffpatch#d80390b4354befe55802e292122b8059462c1b7d", + "version": "0.3.11", + "resolved": "https://registry.npmjs.org/jsondiffpatch/-/jsondiffpatch-0.3.11.tgz", + "integrity": "sha512-Xi3Iygdt/BGhml6bdUFhgDki1TgOsp3hG3iiH3KtzP+CahtGcdPfKRLlnZbSw+3b1umZkhmKrqXUgUcKenyhtA==", "requires": { - "chalk": "0.5.1" + "chalk": "2.4.1", + "diff-match-patch": "1.0.1" }, "dependencies": { - "ansi-regex": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", - "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=" - }, "ansi-styles": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", - "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "requires": { + "color-convert": "1.9.1" + } }, "chalk": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", - "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "requires": { - "ansi-styles": "1.1.0", + "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", - "has-ansi": "0.1.0", - "strip-ansi": "0.3.0", - "supports-color": "0.2.0" + "supports-color": "5.4.0" } }, - "has-ansi": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", - "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", - "requires": { - "ansi-regex": "0.2.1" - } + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, - "strip-ansi": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", - "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "requires": { - "ansi-regex": "0.2.1" + "has-flag": "3.0.0" } - }, - "supports-color": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", - "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=" } } }, diff --git a/package.json b/package.json index 2221241..885cbba 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "es6-object-assign": "^1.1.0", "html": "^1.0.0", "ie-array-find-polyfill": "^1.1.0", - "jsondiffpatch": "github:d4rkr00t/jsondiffpatch#d80390b4354befe55802e292122b8059462c1b7d", + "jsondiffpatch": "^0.3.11", "prop-types": "^15.6.0", "prosemirror-model": ">=1.0.0", "prosemirror-state": ">=1.0.0", diff --git a/src/state/editor.js b/src/state/editor.js index 07ddada..ec20979 100644 --- a/src/state/editor.js +++ b/src/state/editor.js @@ -1,6 +1,6 @@ import { DOMSerializer } from "prosemirror-model"; import { Container } from "unstated"; -import diffPatcher from "jsondiffpatch"; +import { DiffPatcher } from "jsondiffpatch"; import { prettyPrint } from "html"; import subscribeOnUpdates from "../utils/subscribe-on-updates"; import findNodeIn, { findNodeInJSON } from "../utils/find-node"; @@ -35,7 +35,7 @@ const nodesColors = [ "#8D7BC0" // indigo ]; -const diff = diffPatcher.create({ +const diff = new DiffPatcher({ arrays: { detectMove: false }, textDiff: { minLength: 1 } });