From 336f1ceae32904a9a7118230d9bab91b98883926 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Tue, 17 Sep 2019 08:49:39 +0100
Subject: [PATCH] Indicate in import listing whether a plugin contains JS
 modules

---
 core/modules/upgraders/plugins.js | 37 +++++++++++++++++--------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/core/modules/upgraders/plugins.js b/core/modules/upgraders/plugins.js
index acd8f6db7..d1e699762 100644
--- a/core/modules/upgraders/plugins.js
+++ b/core/modules/upgraders/plugins.js
@@ -39,26 +39,29 @@ exports.upgrade = function(wiki,titles,tiddlers) {
 	$tw.utils.each(titles,function(title) {
 		var incomingTiddler = tiddlers[title];
 		// Check if we're dealing with a plugin
-		if(incomingTiddler && incomingTiddler["plugin-type"] && incomingTiddler.version) {
-			// Upgrade the incoming plugin if it is in the upgrade library
-			var libraryTiddler = getLibraryTiddler(title);
-			if(libraryTiddler && libraryTiddler["plugin-type"] && libraryTiddler.version) {
-				tiddlers[title] = libraryTiddler;
-				messages[title] = $tw.language.getString("Import/Upgrader/Plugins/Upgraded",{variables: {incoming: incomingTiddler.version, upgraded: libraryTiddler.version}});
-				return;
-			}
-			// Suppress the incoming plugin if it is older than the currently installed one
-			var existingTiddler = wiki.getTiddler(title);
-			if(existingTiddler && existingTiddler.hasField("plugin-type") && existingTiddler.hasField("version")) {
-				// Reject the incoming plugin by blanking all its fields
-				if($tw.utils.checkVersions(existingTiddler.fields.version,incomingTiddler.version)) {
-					tiddlers[title] = Object.create(null);
-					messages[title] = $tw.language.getString("Import/Upgrader/Plugins/Suppressed/Version",{variables: {incoming: incomingTiddler.version, existing: existingTiddler.fields.version}});
+		if(incomingTiddler && incomingTiddler["plugin-type"]) {
+			// Check whether the plugin contains JS modules
+			var doesContainJavaScript = $tw.wiki.doesPluginInfoContainModules(JSON.parse(incomingTiddler.text)) ? ($tw.wiki.getTiddlerText("$:/language/ControlPanel/Plugins/PluginWillRequireReload") + " ") : "";
+			messages[title] = doesContainJavaScript;
+			if(incomingTiddler.version) {
+				// Upgrade the incoming plugin if it is in the upgrade library
+				var libraryTiddler = getLibraryTiddler(title);
+				if(libraryTiddler && libraryTiddler["plugin-type"] && libraryTiddler.version) {
+					tiddlers[title] = libraryTiddler;
+					messages[title] = doesContainJavaScript + $tw.language.getString("Import/Upgrader/Plugins/Upgraded",{variables: {incoming: incomingTiddler.version, upgraded: libraryTiddler.version}});
 					return;
 				}
+				// Suppress the incoming plugin if it is older than the currently installed one
+				var existingTiddler = wiki.getTiddler(title);
+				if(existingTiddler && existingTiddler.hasField("plugin-type") && existingTiddler.hasField("version")) {
+					// Reject the incoming plugin by blanking all its fields
+					if($tw.utils.checkVersions(existingTiddler.fields.version,incomingTiddler.version)) {
+						tiddlers[title] = Object.create(null);
+						messages[title] = doesContainJavaScript + $tw.language.getString("Import/Upgrader/Plugins/Suppressed/Version",{variables: {incoming: incomingTiddler.version, existing: existingTiddler.fields.version}});
+						return;
+					}
+				}
 			}
-		}
-		if(incomingTiddler && incomingTiddler["plugin-type"]) {
 			// Check whether the plugin is on the blocked list
 			var blockInfo = BLOCKED_PLUGINS[title];
 			if(blockInfo) {