From 651c11f92a162c83831e571aef31023258532a76 Mon Sep 17 00:00:00 2001
From: BoHong Li <a60814billy@gmail.com>
Date: Thu, 11 Apr 2019 19:03:44 +0800
Subject: [PATCH] refactor: replace diff-match-patch to
 @hackmd/diff-match-patch

Signed-off-by: BoHong Li <a60814billy@gmail.com>
---
 lib/models/note.js       | 2 +-
 lib/workers/dmpWorker.js | 2 +-
 package.json             | 2 +-
 yarn.lock                | 9 +++++----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/models/note.js b/lib/models/note.js
index 0e8dd4dd..af58331b 100644
--- a/lib/models/note.js
+++ b/lib/models/note.js
@@ -11,7 +11,7 @@ var shortId = require('shortid')
 var Sequelize = require('sequelize')
 var async = require('async')
 var moment = require('moment')
-var DiffMatchPatch = require('diff-match-patch')
+var DiffMatchPatch = require('@hackmd/diff-match-patch')
 var dmp = new DiffMatchPatch()
 var S = require('string')
 
diff --git a/lib/workers/dmpWorker.js b/lib/workers/dmpWorker.js
index 60db0a12..c00952d1 100644
--- a/lib/workers/dmpWorker.js
+++ b/lib/workers/dmpWorker.js
@@ -1,6 +1,6 @@
 'use strict'
 // external modules
-var DiffMatchPatch = require('diff-match-patch')
+var DiffMatchPatch = require('@hackmd/diff-match-patch')
 var dmp = new DiffMatchPatch()
 
 // core
diff --git a/package.json b/package.json
index 17ca6e5f..534f28f2 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   },
   "dependencies": {
     "@hackmd/codemirror": "^5.41.2",
+    "@hackmd/diff-match-patch": "^1.1.1",
     "@hackmd/idle-js": "^1.0.1",
     "@hackmd/js-sequence-diagrams": "^0.0.1-alpha.2",
     "@passport-next/passport-openid": "^1.0.0",
@@ -36,7 +37,6 @@
     "cookie": "0.3.1",
     "cookie-parser": "1.4.3",
     "deep-freeze": "^0.0.1",
-    "diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git",
     "ejs": "^2.5.5",
     "emojify.js": "~1.1.0",
     "express": ">=4.14",
diff --git a/yarn.lock b/yarn.lock
index bcea3a81..79662bc1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -23,6 +23,11 @@
   resolved "https://registry.yarnpkg.com/@hackmd/codemirror/-/codemirror-5.41.2.tgz#14ead072a736bf9f1cae3eb349d600f22fbaf69c"
   integrity sha512-uYvDnyIIqyC4lJ/Qn67Zkwj1olUvk5+r8smWkZiNjGEoYz5qjiULrYcPFvu8vPUv6axy5Qq1AXIJs6CUCx0zow==
 
+"@hackmd/diff-match-patch@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@hackmd/diff-match-patch/-/diff-match-patch-1.1.1.tgz#9740833d315468fead567c336132faabe3f195eb"
+  integrity sha512-eZc7w8fyRYCPIbzM56OA74HSuIgrlj62AgUSattDVCyGO5Kh6/ZLSgx1xvmypWjP16t4EUA1F5CoZvftbiZ5fg==
+
 "@hackmd/idle-js@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@hackmd/idle-js/-/idle-js-1.0.1.tgz#89079a76d9c7bda87029660a708e72fbb2be3605"
@@ -2915,10 +2920,6 @@ diagnostics@^1.1.1:
     enabled "1.0.x"
     kuler "1.0.x"
 
-"diff-match-patch@git+https://github.com/hackmdio/diff-match-patch.git":
-  version "1.1.0"
-  resolved "git+https://github.com/hackmdio/diff-match-patch.git#73e56e779a2a8503b05458e607077d0fd1d80419"
-
 diff@3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"