From b280ae985c33c400473f1b6fa20b61a442337658 Mon Sep 17 00:00:00 2001
From: Ed Sanders <esanders@wikimedia.org>
Date: Wed, 13 Sep 2017 14:57:11 +0100
Subject: [PATCH] Make ve.dm.Change part of core module

Also:
* Add ve.dm.Change.test.js to MW test suite
* Remove server scripts from ext.visualEditor.rebase, they
  only need to be in rebaser.build in core.
* Don't load ext.visualEditor.rebase on every page

Bug: T175828
Change-Id: I0ed0c320373b0d653b0d7a012aa7416e88e43e00
---
 VisualEditor.hooks.php |  2 ++
 extension.json         | 10 ++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 290bb5c7f3..af932c1165 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -959,6 +959,7 @@ class VisualEditorHooks {
 				'lib/ve/tests/dm/ve.dm.LinearData.test.js',
 				'lib/ve/tests/dm/ve.dm.Transaction.test.js',
 				'lib/ve/tests/dm/ve.dm.TransactionBuilder.test.js',
+				'lib/ve/tests/dm/ve.dm.Change.test.js',
 				'lib/ve/tests/dm/ve.dm.TreeModifier.test.js',
 				'lib/ve/tests/dm/ve.dm.TransactionProcessor.test.js',
 				'lib/ve/tests/dm/ve.dm.APIResultsQueue.test.js',
@@ -1070,6 +1071,7 @@ class VisualEditorHooks {
 				'ext.visualEditor.experimental',
 				'ext.visualEditor.desktopArticleTarget.init',
 				'ext.visualEditor.desktopArticleTarget',
+				'ext.visualEditor.rebase'
 			],
 			'localBasePath' => __DIR__,
 			'remoteExtPath' => 'VisualEditor',
diff --git a/extension.json b/extension.json
index da7df8eb4d..f986095d0d 100644
--- a/extension.json
+++ b/extension.json
@@ -451,7 +451,8 @@
 				"ext.visualEditor.mediawiki",
 				"ext.visualEditor.core.desktop",
 				"ext.visualEditor.mwextensions.desktop",
-				"ext.visualEditor.desktopTarget"
+				"ext.visualEditor.desktopTarget",
+				"ext.visualEditor.rebase"
 			]
 		},
 		"ext.visualEditor.collabTarget.init": {
@@ -624,6 +625,7 @@
 				"lib/ve/src/dm/ve.dm.TransactionProcessor.js",
 				"lib/ve/src/dm/ve.dm.Transaction.js",
 				"lib/ve/src/dm/ve.dm.TransactionBuilder.js",
+				"lib/ve/src/dm/ve.dm.Change.js",
 				"lib/ve/src/dm/ve.dm.TreeCursor.js",
 				"lib/ve/src/dm/ve.dm.TreeModifier.js",
 				"lib/ve/src/dm/ve.dm.Selection.js",
@@ -1122,10 +1124,7 @@
 		},
 		"ext.visualEditor.rebase": {
 			"scripts": [
-				"lib/ve/src/ve.utils-es6.js",
-				"lib/ve/src/dm/ve.dm.Change.js",
 				"lib/ve/src/dm/ve.dm.RebaseClient.js",
-				"lib/ve/src/dm/ve.dm.RebaseDocState.js",
 				"lib/ve/src/dm/ve.dm.SurfaceSynchronizer.js",
 				"lib/ve/src/ui/widgets/ve.ui.AuthorItemWidget.js",
 				"lib/ve/src/ui/tools/ve.ui.AuthorListPopupTool.js"
@@ -1152,8 +1151,7 @@
 				"lib/ve/src/ui/styles/ve.ui.DesktopContext.css"
 			],
 			"dependencies": [
-				"ext.visualEditor.core",
-				"ext.visualEditor.rebase"
+				"ext.visualEditor.core"
 			],
 			"targets": [
 				"desktop"