feat: #8734, remove semver.browser

use compare-versions as a module
NodeBB · Oct 9, 2020 · ae3a231 · ae3a231
1 parent 43df4b8
commit ae3a231
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 1,050 deletions.
diff --git a/install/package.json b/install/package.json
@@ -42,6 +42,7 @@
         "clipboard": "^2.0.6",
         "colors": "^1.4.0",
         "commander": "^6.0.0",
+        "compare-versions": "3.6.0",
         "compression": "^1.7.4",
         "connect-ensure-login": "^0.1.1",
         "connect-flash": "^0.1.1",

diff --git a/public/src/admin/dashboard.js b/public/src/admin/dashboard.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-define('admin/dashboard', ['semver', 'Chart', 'translator', 'benchpress'], function (semver, Chart, translator, Benchpress) {
+define('admin/dashboard', ['Chart', 'translator', 'benchpress'], function (Chart, translator, Benchpress) {
 	var	Admin = {};
 	var	intervals = {
 		rooms: false,

diff --git a/public/src/admin/extend/plugins.js b/public/src/admin/extend/plugins.js
@@ -128,8 +128,9 @@ define('admin/extend/plugins', ['jqueryui', 'translator', 'benchpress'], functio
 					return bootbox.alert('[[admin/extend/plugins:alert.package-manager-unreachable]]');
 				}
 
-				require(['semver'], function (semver) {
-					if (payload.version !== 'latest' && semver.gt(payload.version, parent.find('.currentVersion').text())) {
+				require(['compare-versions'], function (compareVersions) {
+					var currentVersion = parent.find('.currentVersion').text();
+					if (payload.version !== 'latest' && compareVersions.compare(payload.version, currentVersion, '>')) {
 						upgrade(pluginID, btn, payload.version);
 					} else if (payload.version === 'latest') {
 						confirmInstall(pluginID, function () {