From 635a3e90faaced86cf46456276d89c3d03ddea4d Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 17 May 2021 14:14:15 +0300 Subject: [PATCH] Fix cli: AngularSourceCodeAdder tsconfig paths --- .../ProjectModification/AngularSourceCodeAdder.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs index 93626d682d..ec9e5345ee 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs @@ -52,7 +52,7 @@ namespace Volo.Abp.Cli.ProjectModification var projects = new List { - package.Name.RemovePreFix("@").Replace("/","-") + package.Name.RemovePreFix("@").Replace("/", "-") }; await AddPathsToTsConfigAsync(angularPath, angularProjectsPath, projects); @@ -125,13 +125,15 @@ namespace Volo.Abp.Cli.ProjectModification var scriptsJobject = (JObject) json["scripts"]; - if (scriptsJobject == null || scriptsJobject["postinstall"] != null || scriptsJobject["compile:ivy"] != null) + if (scriptsJobject == null || scriptsJobject["postinstall"] != null || + scriptsJobject["compile:ivy"] != null) { return; } scriptsJobject["postinstall"] = "npm run compile:ivy"; - scriptsJobject["compile:ivy"] = "yarn ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points --tsconfig './tsconfig.prod.json' --source node_modules"; + scriptsJobject["compile:ivy"] = + "yarn ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points --tsconfig './tsconfig.prod.json' --source node_modules"; File.WriteAllText(packageJsonFilePath, json.ToString(Formatting.Indented)); } @@ -195,12 +197,17 @@ namespace Volo.Abp.Cli.ProjectModification foreach (var publicApi in publicApis) { - var subFolderName = publicApi.RemovePreFix($"projects/{project}/").Split("/")[0]; + var foldersAndFileName = publicApi.RemovePreFix($"projects/{project}/").Split("/"); + var subFolderName = string.Join("/", foldersAndFileName.Take(foldersAndFileName.Length - 1)); if (subFolderName == "src") { subFolderName = ""; } + else if (subFolderName.EndsWith("/src")) + { + subFolderName = $"/{subFolderName}".RemovePostFix("/src"); + } else { subFolderName = $"/{subFolderName}";