Browse Source
Merge pull request #12807 from abpframework/auto-merge/rel-5-3/1121
Merge branch dev with rel-5.3
pull/12816/head
Yunus Emre Kalkan
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
4 deletions
-
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs
-
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs
|
|
|
@ -236,13 +236,13 @@ public class InstallLibsService : IInstallLibsService, ITransientDependency |
|
|
|
private void RunNpmInstall(string directory) |
|
|
|
{ |
|
|
|
Logger.LogInformation($"Running npm install on {directory}"); |
|
|
|
CmdHelper.RunCmd($"cd {directory} && npm install"); |
|
|
|
CmdHelper.RunCmd($"npm install", directory); |
|
|
|
} |
|
|
|
|
|
|
|
private void RunYarn(string directory) |
|
|
|
{ |
|
|
|
Logger.LogInformation($"Running Yarn on {directory}"); |
|
|
|
CmdHelper.RunCmd($"cd {directory} && yarn"); |
|
|
|
CmdHelper.RunCmd($"yarn", directory); |
|
|
|
} |
|
|
|
|
|
|
|
private bool IsNpmInstalled() |
|
|
|
|
|
|
|
@ -314,13 +314,13 @@ public class NpmPackagesUpdater : ITransientDependency |
|
|
|
protected virtual void RunYarn(string fileDirectory) |
|
|
|
{ |
|
|
|
Logger.LogInformation($"Running Yarn on {fileDirectory}"); |
|
|
|
CmdHelper.RunCmd($"cd {fileDirectory} && yarn"); |
|
|
|
CmdHelper.RunCmd($"yarn", fileDirectory); |
|
|
|
} |
|
|
|
|
|
|
|
protected virtual void RunNpmInstall(string fileDirectory) |
|
|
|
{ |
|
|
|
Logger.LogInformation($"Running npm install on {fileDirectory}"); |
|
|
|
CmdHelper.RunCmd($"cd {fileDirectory} && npm install"); |
|
|
|
CmdHelper.RunCmd($"npm install", fileDirectory); |
|
|
|
} |
|
|
|
|
|
|
|
protected virtual List<string> GetPackageVersionList(JProperty package) |
|
|
|
|