Browse Source
Merge pull request #21594 from abpframework/auto-merge/rel-9-0/3285
Merge branch dev with rel-9.0
pull/21599/head
maliming
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
5 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/Utils/NpmHelper.cs
|
|
|
@ -72,7 +72,7 @@ public class InstallLibsService : IInstallLibsService, ITransientDependency |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
NpmHelper.RunNpmInstall(projectDirectory); |
|
|
|
NpmHelper.RunNpmInstall(projectDirectory, "--no-audit"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -92,7 +92,7 @@ public class InstallLibsService : IInstallLibsService, ITransientDependency |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
NpmHelper.RunNpmInstall(projectDirectory); |
|
|
|
NpmHelper.RunNpmInstall(projectDirectory, "--no-audit"); |
|
|
|
} |
|
|
|
|
|
|
|
await CleanAndCopyResources(projectDirectory); |
|
|
|
|
|
|
|
@ -1,4 +1,5 @@ |
|
|
|
using System; |
|
|
|
using System.Collections.Generic; |
|
|
|
using System.Linq; |
|
|
|
using Microsoft.Extensions.Logging; |
|
|
|
using Microsoft.Extensions.Logging.Abstractions; |
|
|
|
@ -48,10 +49,10 @@ public class NpmHelper : ITransientDependency |
|
|
|
return version > SemanticVersion.Parse("1.20.0"); |
|
|
|
} |
|
|
|
|
|
|
|
public void RunNpmInstall(string directory) |
|
|
|
public void RunNpmInstall(string directory, params string[] args) |
|
|
|
{ |
|
|
|
Logger.LogInformation($"Running npm install on {directory}"); |
|
|
|
CmdHelper.RunCmd($"npm install", directory); |
|
|
|
CmdHelper.RunCmd($"npm install {args.JoinAsString(" ")}", directory); |
|
|
|
} |
|
|
|
|
|
|
|
public void RunYarn(string directory) |
|
|
|
|