Update NpmPackagesUpdater.cs

#4598
abpframework · Jul 2, 2020 · f34ac5b · f34ac5b
1 parent c7e105e
commit f34ac5b
Showing 1 changed file with 16 additions and 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
@@ -70,14 +70,18 @@ async Task UpdateAsync(string file)
                 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 @@ private static async Task DeleteNpmrcFileAsync(string directoryName)
             await Task.CompletedTask;
         }
 
-        private async Task CreateNpmrcFileAsync(string directoryName)
+        private static async Task<bool> 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))