From 1d88324175a8978c03d6b5a45063d807b184c8a7 Mon Sep 17 00:00:00 2001
From: Tom Byers <tombaromba@gmail.com>
Date: Tue, 16 Apr 2019 13:09:15 +0100
Subject: [PATCH 1/2] Revert "Update diff-dom package to 3.1.0"

This reverts commit 01b97986f6b24c956d20e1b4b6db8445b75c157f.
---
 app/assets/javascripts/updateContent.js | 2 +-
 gulpfile.js                             | 2 +-
 package.json                            | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/updateContent.js b/app/assets/javascripts/updateContent.js
index eb94f33eb..516bd913f 100644
--- a/app/assets/javascripts/updateContent.js
+++ b/app/assets/javascripts/updateContent.js
@@ -2,7 +2,7 @@
   "use strict";
 
   var queues = {};
-  var dd = new diffDOM.DiffDOM();
+  var dd = new diffDOM();
 
   var getRenderer = $component => response => dd.apply(
     $component.get(0),
diff --git a/gulpfile.js b/gulpfile.js
index 60533475f..15df27cb6 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -105,7 +105,7 @@ const javascripts = () => {
       paths.npm + 'hogan.js/dist/hogan-3.0.2.js',
       paths.npm + 'jquery/dist/jquery.min.js',
       paths.npm + 'query-command-supported/dist/queryCommandSupported.min.js',
-      paths.npm + 'diff-dom/browser/diffDOM.js',
+      paths.npm + 'diff-dom/diffDOM.js',
       paths.npm + 'timeago/jquery.timeago.js',
       paths.npm + 'textarea-caret/index.js'
     ]))
diff --git a/package.json b/package.json
index 2273a1e9a..fabff510a 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "@babel/core": "7.4.0",
     "@babel/preset-env": "7.4.2",
-    "diff-dom": "https://github.com/fiduswriter/diffDOM/archive/v3.1.0.tar.gz",
+    "diff-dom": "2.3.1",
     "govuk-elements-sass": "3.1.2",
     "govuk_frontend_toolkit": "8.1.0",
     "govuk_template_jinja": "0.24.1",
@@ -45,8 +45,5 @@
     "gulp-sass-lint": "1.4.0",
     "jshint": "2.10.2",
     "jshint-stylish": "2.2.1"
-  },
-  "peerDependencies": {
-    "rollup": "1.10.0"
   }
 }

From 891443457313cd32d460ebe7e9e29883fd387c64 Mon Sep 17 00:00:00 2001
From: Tom Byers <tombaromba@gmail.com>
Date: Tue, 16 Apr 2019 13:11:24 +0100
Subject: [PATCH 2/2] Bump diff-dom to latest without Object.entries

Versions past this make use of Object.entries
which is not supported in IE11 (so causes an
error). This is meant to be taken care of by
polyfills but our frontend build pipeline isn't
set up to polyfill NPM modules at the moment.

This moves the version bump to the latest that
will still work with our current pipeline.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fabff510a..be991f89a 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "@babel/core": "7.4.0",
     "@babel/preset-env": "7.4.2",
-    "diff-dom": "2.3.1",
+    "diff-dom": "2.5.1",
     "govuk-elements-sass": "3.1.2",
     "govuk_frontend_toolkit": "8.1.0",
     "govuk_template_jinja": "0.24.1",