Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #8630, sort extra deps

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-10-17 23:56:42 -04:00
parent d9a16855d0
commit e362c342a3
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/cli/package-install.js
View File

@@ -27,10 +27,7 @@ function updatePackageFile() {
});
// Sort dependencies alphabetically
dependencies = Object.entries({ ...dependencies, ...defaultPackageContents.dependencies }).sort((a, b) => (a < b ? -1 : 1)).reduce((memo, pkg) => {
memo[pkg[0]] = pkg[1];
return memo;
}, {});
dependencies = sortDependencies({ ...dependencies, ...defaultPackageContents.dependencies });
const packageContents = { ...oldPackageContents, ...defaultPackageContents, dependencies: dependencies };
@@ -95,9 +92,9 @@ function preserveExtraneousPlugins() {
return;
}
const packages = fs.readdirSync(paths.nodeModules).filter(function (pkgName) {
return pluginNamePattern.test(pkgName);
});
const packages = fs.readdirSync(paths.nodeModules)
.filter(pkgName => pluginNamePattern.test(pkgName));
const packageContents = JSON.parse(fs.readFileSync(paths.currentPackage, 'utf8'));
const extraneous = packages
@@ -116,8 +113,18 @@ function preserveExtraneousPlugins() {
}, {});
// Add those packages to package.json
Object.assign(packageContents.dependencies, extraneous);
packageContents.dependencies = sortDependencies({ ...packageContents.dependencies, ...extraneous });
fs.writeFileSync(paths.currentPackage, JSON.stringify(packageContents, null, 2));
}
function sortDependencies(dependencies) {
return Object.entries(dependencies)
.sort((a, b) => (a < b ? -1 : 1))
.reduce((memo, pkg) => {
memo[pkg[0]] = pkg[1];
return memo;
}, {});
}
exports.preserveExtraneousPlugins = preserveExtraneousPlugins;