From f34ac5b70346c3639b388e7ce5156cc7677cbc61 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 2 Jul 2020 19:10:25 +0300 Subject: [PATCH] Update NpmPackagesUpdater.cs https://github.com/abpframework/abp/issues/4598 --- .../ProjectModification/NpmPackagesUpdater.cs | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs index 07fcbdbc1d..12b79cfc88 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs @@ -70,14 +70,18 @@ namespace Volo.Abp.Cli.ProjectModification if (includePreviews) { await CreateNpmrcFileAsync(Path.GetDirectoryName(file.Key)); + } + else if (switchToStable) + { + await DeleteNpmrcFileAsync(Path.GetDirectoryName(file.Key)); + } + + if (await NpmrcFileExistAsync(fileDirectory)) + { RunNpmInstall(fileDirectory); } else { - if (switchToStable) - { - await DeleteNpmrcFileAsync(Path.GetDirectoryName(file.Key)); - } RunYarn(fileDirectory); } @@ -96,15 +100,20 @@ namespace Volo.Abp.Cli.ProjectModification await Task.CompletedTask; } - private async Task CreateNpmrcFileAsync(string directoryName) + private static async Task NpmrcFileExistAsync(string directoryName) { - var fileName = Path.Combine(directoryName, ".npmrc"); + return File.Exists(Path.Combine(directoryName, ".npmrc")); + } + private async Task CreateNpmrcFileAsync(string directoryName) + { var abpRegistry = "@abp:registry=https://www.myget.org/F/abp-nightly/npm"; var voloRegistry = await GetVoloRegistryAsync(); - if (File.Exists(fileName)) + if (await NpmrcFileExistAsync(directoryName)) { + var fileName = Path.Combine(directoryName, ".npmrc"); + var fileContent = File.ReadAllText(fileName); if (!fileContent.Contains(abpRegistry))