fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3084 from Gared/fix_npm_node7 

Updated npm to 4.0.2 and removed recursive searching for ep-plugins
This commit is contained in:
Stefan 2016-12-20 00:07:26 +01:00 committed by GitHub
parent db94ce9413 00c9caf7a3
commit 368bbe4836
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/package.json
View File

@ -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",

5
src/static/js/pluginfw/plugins.js
View File

@ -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);
});
};