470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplified autoInstallDependencies()

Browse Source
This commit is contained in:
TheSparta 2024-03-18 00:06:08 +00:00
parent e73fea8776
commit d4c04fc718
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
project/src/loaders/PreAkiModLoader.ts
View File

@ -500,7 +500,7 @@ export class PreAkiModLoader implements IModLoader
protected autoInstallDependencies(modPath: string, pkg: IPackageJsonData): void protected autoInstallDependencies(modPath: string, pkg: IPackageJsonData): void
{ {
const dependenciesToInstall: [string, string][] = []; const dependenciesToInstall = new Map<string, string>();
for (const [depName, depVersion] of Object.entries(pkg.dependencies)) for (const [depName, depVersion] of Object.entries(pkg.dependencies))
{ {
@ -512,12 +512,12 @@ export class PreAkiModLoader implements IModLoader
// if a mod's dependency does not exist in the server's dependencies we can add it to the list of dependencies to install. // if a mod's dependency does not exist in the server's dependencies we can add it to the list of dependencies to install.
if (!this.serverDependencies[depName]) if (!this.serverDependencies[depName])
{ {
dependenciesToInstall.push([depName, depVersion]); dependenciesToInstall.set(depName, depVersion);
} }
} }
// If the mod has no extra dependencies return as there's nothing that needs to be done. // If the mod has no extra dependencies return as there's nothing that needs to be done.
if (dependenciesToInstall.length === 0) if (dependenciesToInstall.size === 0)
{ {
return; return;
} }
@ -557,8 +557,13 @@ export class PreAkiModLoader implements IModLoader
globalThis.G_RELEASE_CONFIGURATION ? "Aki_Data/Server/@pnpm/exe" : "node_modules/@pnpm/exe", globalThis.G_RELEASE_CONFIGURATION ? "Aki_Data/Server/@pnpm/exe" : "node_modules/@pnpm/exe",
os.platform() === "win32" ? "pnpm.exe" : "pnpm", os.platform() === "win32" ? "pnpm.exe" : "pnpm",
); );
let command = `${pnpmPath} install `; let command = `${pnpmPath} install `;
command += dependenciesToInstall.map(([depName, depVersion]) => `${depName}@${depVersion}`).join(" "); for (const [depName, depVersion] of dependenciesToInstall)
{
command += `${depName}@${depVersion} `;
}
execSync(command, { cwd: modPath }); execSync(command, { cwd: modPath });
// Delete the new blank package.json then rename the backup back to the original name // Delete the new blank package.json then rename the backup back to the original name