From 79080bbcb5fa81179cc74ccec29ea32fc9c102e9 Mon Sep 17 00:00:00 2001 From: Ryan Blenis Date: Sat, 4 Jan 2020 13:27:25 -0500 Subject: [PATCH 1/3] Add semver dependency for plugin version and compatibility checks --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index b5fb9918..f457295f 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "multiparty": "^4.2.1", "nedb": "^1.8.0", "node-forge": "^0.8.4", + "semver": "^5.5.0", "ws": "^6.2.1", "xmldom": "^0.1.27", "yauzl": "^2.10.0" From 5445818fe19bdac16e0d490b5a97fe85e915f44f Mon Sep 17 00:00:00 2001 From: Ryan Blenis Date: Sat, 4 Jan 2020 13:49:08 -0500 Subject: [PATCH 2/3] Only if plugins are enabled, add semver module --- meshcentral.js | 1 + 1 file changed, 1 insertion(+) diff --git a/meshcentral.js b/meshcentral.js index a6596b3b..7fa44d77 100644 --- a/meshcentral.js +++ b/meshcentral.js @@ -2178,6 +2178,7 @@ function mainStart() { if (config.settings.mqtt != null) { modules.push('aedes'); } // Add MQTT Modules if (config.settings.mongodb != null) { modules.push('mongodb'); } // Add MongoDB, official driver. if (config.settings.vault != null) { modules.push('node-vault'); } // Add official HashiCorp's Vault module. + if (config.settings.plugins != null) { modules.push('semver'); } // Required for version compat testing and update checks if ((config.settings.plugins != null) && (config.settings.plugins.proxy != null)) { modules.push('https-proxy-agent'); } // Required for HTTP/HTTPS proxy support else if (config.settings.xmongodb != null) { modules.push('mongojs'); } // Add MongoJS, old driver. if (config.smtp != null) { modules.push('nodemailer'); } // Add SMTP support From 173b983deb9de49a49e0e17089fb2907d506e133 Mon Sep 17 00:00:00 2001 From: Ryan Blenis Date: Sat, 4 Jan 2020 13:51:27 -0500 Subject: [PATCH 3/3] Remove straight dep in lieu of module push if plugins are enabled --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index f457295f..b5fb9918 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,6 @@ "multiparty": "^4.2.1", "nedb": "^1.8.0", "node-forge": "^0.8.4", - "semver": "^5.5.0", "ws": "^6.2.1", "xmldom": "^0.1.27", "yauzl": "^2.10.0"