From 274844a07f17276549084029d10d52a543a97c07 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 19 Aug 2015 18:28:31 -0400 Subject: [PATCH 1/5] check _resolved --- src/meta/dependencies.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/meta/dependencies.js b/src/meta/dependencies.js index 8baa5b5fdf..bd08191c8f 100644 --- a/src/meta/dependencies.js +++ b/src/meta/dependencies.js @@ -29,7 +29,7 @@ module.exports = function(Meta) { var pkgData = JSON.parse(pkgData), ok = semver.satisfies(pkgData.version, pkg.dependencies[module]); - if (ok || pkgData._resolved.indexOf('//github.com') != -1) { + if (ok || (pkgData._resolved && pkgData._resolved.indexOf('//github.com') !== -1)) { next(true); } else { process.stdout.write('[' + 'outdated'.yellow + '] ' + module.bold + ' v' + pkgData.version + ', requires ' + pkg.dependencies[module] + '\n') From 3c5df8a8ecfb8c1d81bf48663928894020c7c6e1 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 20 Aug 2015 10:10:28 -0400 Subject: [PATCH 2/5] removing the -dev flag from this branch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0b90a904ab..1b032b83b4 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPL-3.0", "description": "NodeBB Forum", - "version": "0.7.3-dev", + "version": "0.7.3", "homepage": "http://www.nodebb.org", "repository": { "type": "git", From 3464141b0f3e2f257c5ef34ef610b55f6c3e4a74 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 20 Aug 2015 10:29:38 -0400 Subject: [PATCH 3/5] updating soundpack version min --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1b032b83b4..23fa012afe 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "nodebb-plugin-emoji-extended": "0.4.9", "nodebb-plugin-markdown": "4.0.4", "nodebb-plugin-mentions": "1.0.0", - "nodebb-plugin-soundpack-default": "0.1.2", + "nodebb-plugin-soundpack-default": "0.1.3", "nodebb-plugin-spam-be-gone": "0.4.1", "nodebb-rewards-essentials": "0.0.3", "nodebb-theme-lavender": "1.0.49", From 23bb45b480bd48ba0a457c65b2aeba8d3bdcaf5b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 20 Aug 2015 10:29:58 -0400 Subject: [PATCH 4/5] fixing plugin version checker to use satisfies again --- src/plugins/load.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/load.js b/src/plugins/load.js index 569880bb0c..351ef638e5 100644 --- a/src/plugins/load.js +++ b/src/plugins/load.js @@ -62,7 +62,7 @@ module.exports = function(Plugins) { } if (pluginData.nbbpm && pluginData.nbbpm.compatibility && semver.validRange(pluginData.nbbpm.compatibility)) { - if (!semver.gtr(nconf.get('version'), pluginData.nbbpm.compatibility)) { + if (!semver.satisfies(nconf.get('version'), pluginData.nbbpm.compatibility)) { display(); } } else { From e382dcab135d587b15fbd7ec652e24de09d42bfd Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 20 Aug 2015 11:01:59 -0400 Subject: [PATCH 5/5] Reduce verbosity of plugin incompatibility errors Instead of showing a 4-5 line warning for each potentially incompatible plugin, we'll show the warning and then a list of plugins. --- src/plugins.js | 12 ++++++++++++ src/plugins/load.js | 17 ++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/plugins.js b/src/plugins.js index d2a726096b..046809e76e 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -31,6 +31,7 @@ var fs = require('fs'), Plugins.clientScripts = []; Plugins.customLanguages = []; Plugins.libraryPaths = []; + Plugins.versionWarning = []; Plugins.initialized = false; @@ -74,6 +75,7 @@ var fs = require('fs'), Plugins.libraries = {}; Plugins.loadedHooks = {}; Plugins.staticDirs = {}; + Plugins.versionWarning = []; Plugins.cssFiles.length = 0; Plugins.lessFiles.length = 0; Plugins.clientScripts.length = 0; @@ -106,6 +108,16 @@ var fs = require('fs'), }); }, function(next) { + // If some plugins are incompatible, throw the warning here + if (Plugins.versionWarning.length) { + process.stdout.write('\n'); + winston.warn('[plugins/load] The following plugins may not be compatible with your version of NodeBB. This may cause unintended behaviour or crashing. In the event of an unresponsive NodeBB caused by this plugin, run `./nodebb reset -p PLUGINNAME` to disable it.'); + for(var x=0,numPlugins=Plugins.versionWarning.length;x