Browse Source

Add --ignore-scripts flag to npm/yarn commands in ABP CLI

Fixes #25209
pull/25210/head
maliming 6 months ago
parent
commit
f2d7070f86
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 4
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs
  2. 4
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNpmPackageAdder.cs
  3. 8
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/NpmHelper.cs

4
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs

@ -380,13 +380,13 @@ public class NpmPackagesUpdater : ITransientDependency
protected virtual void RunYarn(string fileDirectory) protected virtual void RunYarn(string fileDirectory)
{ {
Logger.LogInformation($"Running Yarn on {fileDirectory}"); Logger.LogInformation($"Running Yarn on {fileDirectory}");
CmdHelper.RunCmd($"npx yarn", fileDirectory); CmdHelper.RunCmd($"npx yarn --ignore-scripts", fileDirectory);
} }
protected virtual void RunNpmInstall(string fileDirectory) protected virtual void RunNpmInstall(string fileDirectory)
{ {
Logger.LogInformation($"Running npm install on {fileDirectory}"); Logger.LogInformation($"Running npm install on {fileDirectory}");
CmdHelper.RunCmd($"npm install", fileDirectory); CmdHelper.RunCmd($"npm install --ignore-scripts", fileDirectory);
} }
protected virtual List<string> GetPackageVersionList(JProperty package, string workingDirectory = null) protected virtual List<string> GetPackageVersionList(JProperty package, string workingDirectory = null)

4
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNpmPackageAdder.cs

@ -81,7 +81,7 @@ public class ProjectNpmPackageAdder : ITransientDependency
using (DirectoryHelper.ChangeCurrentDirectory(directory)) using (DirectoryHelper.ChangeCurrentDirectory(directory))
{ {
Logger.LogInformation("yarn add " + npmPackage.Name + versionPostfix); Logger.LogInformation("yarn add " + npmPackage.Name + versionPostfix);
CmdHelper.RunCmd("npx yarn add " + npmPackage.Name + versionPostfix); CmdHelper.RunCmd("npx yarn add " + npmPackage.Name + versionPostfix + " --ignore-scripts");
} }
} }
else else
@ -149,7 +149,7 @@ public class ProjectNpmPackageAdder : ITransientDependency
using (DirectoryHelper.ChangeCurrentDirectory(directory)) using (DirectoryHelper.ChangeCurrentDirectory(directory))
{ {
Logger.LogInformation("yarn add " + npmPackage.Name + versionPostfix); Logger.LogInformation("yarn add " + npmPackage.Name + versionPostfix);
CmdHelper.RunCmd("npx yarn add " + npmPackage.Name + versionPostfix); CmdHelper.RunCmd("npx yarn add " + npmPackage.Name + versionPostfix + " --ignore-scripts");
if (skipInstallingLibs) if (skipInstallingLibs)
{ {

8
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/NpmHelper.cs

@ -53,26 +53,26 @@ public class NpmHelper : ITransientDependency
public void RunNpmInstall(string directory, params string[] args) public void RunNpmInstall(string directory, params string[] args)
{ {
Logger.LogInformation($"Running npm install on {directory}"); Logger.LogInformation($"Running npm install on {directory}");
CmdHelper.RunCmd($"npm install {args.JoinAsString(" ")}", directory); CmdHelper.RunCmd($"npm install --ignore-scripts {args.JoinAsString(" ")}", directory);
} }
public void RunYarn(string directory) public void RunYarn(string directory)
{ {
Logger.LogInformation($"Running Yarn on {directory}"); Logger.LogInformation($"Running Yarn on {directory}");
CmdHelper.RunCmd($"npx yarn", directory); CmdHelper.RunCmd($"npx yarn --ignore-scripts", directory);
} }
[Obsolete("This method is deprecated. Use 'YarnAddPackage' instead (it uses 'npx', so there is no need for 'yarn' to be globally installed.")] [Obsolete("This method is deprecated. Use 'YarnAddPackage' instead (it uses 'npx', so there is no need for 'yarn' to be globally installed.")]
public void NpmInstallPackage(string package, string version, string directory) public void NpmInstallPackage(string package, string version, string directory)
{ {
var packageVersion = !string.IsNullOrWhiteSpace(version) ? $"@{version}" : string.Empty; var packageVersion = !string.IsNullOrWhiteSpace(version) ? $"@{version}" : string.Empty;
CmdHelper.RunCmd("npm install " + package + packageVersion, workingDirectory: directory); CmdHelper.RunCmd("npm install --ignore-scripts " + package + packageVersion, workingDirectory: directory);
} }
public void YarnAddPackage(string package, string version, string directory) public void YarnAddPackage(string package, string version, string directory)
{ {
var packageVersion = !string.IsNullOrWhiteSpace(version) ? $"@{version}" : string.Empty; var packageVersion = !string.IsNullOrWhiteSpace(version) ? $"@{version}" : string.Empty;
CmdHelper.RunCmd("npx yarn add " + package + packageVersion, workingDirectory: directory); CmdHelper.RunCmd("npx yarn add " + package + packageVersion + " --ignore-scripts", workingDirectory: directory);
} }
public string GetInstalledNpmPackages() public string GetInstalledNpmPackages()

Loading…
Cancel
Save