diff options
| author | Stefan <stefan@stefans-entwicklerecke.de> | 2016-12-20 00:07:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-20 00:07:26 +0100 |
| commit | 368bbe48368b74ca701625fa1f182699e984898d (patch) | |
| tree | 91c9d080d69de81adc5140a4bcb544eba16acb90 /src | |
| parent | db94ce9413f0904b8e82d92cf9940741e2dc3b46 (diff) | |
| parent | 00c9caf7a3ebbc6824a65a2b86fd0cc8391ecb9f (diff) | |
| download | etherpad-lite-368bbe48368b74ca701625fa1f182699e984898d.zip | |
Merge pull request #3084 from Gared/fix_npm_node7
Updated npm to 4.0.2 and removed recursive searching for ep-plugins
Diffstat (limited to 'src')
| -rw-r--r-- | src/package.json | 2 | ||||
| -rw-r--r-- | src/static/js/pluginfw/plugins.js | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/package.json b/src/package.json index f8d3cf86..e280406f 100644 --- a/src/package.json +++ b/src/package.json @@ -28,7 +28,7 @@ "log4js" : "0.6.35", "cheerio" : "0.20.0", "async-stacktrace" : "0.0.2", - "npm" : "2.7.6", + "npm" : "4.0.2", "ejs" : "2.4.1", "graceful-fs" : "4.1.3", "slide" : "1.1.6", diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js index dfdf941e..0d0fa1ed 100644 --- a/src/static/js/pluginfw/plugins.js +++ b/src/static/js/pluginfw/plugins.js @@ -117,13 +117,14 @@ exports.getPackages = function (cb) { delete packages[name].parent; } - if (deps[name].dependencies !== undefined) flatten(deps[name].dependencies); + // I don't think we need recursion + //if (deps[name].dependencies !== undefined) flatten(deps[name].dependencies); }); } var tmp = {}; tmp[data.name] = data; - flatten(tmp); + flatten(tmp[undefined].dependencies); cb(null, packages); }); }; |