Browse Source

Fix cli: AngularSourceCodeAdder tsconfig paths

pull/9052/head
Yunus Emre Kalkan 5 years ago
parent
commit
635a3e90fa
  1. 15
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs

15
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<string> var projects = new List<string>
{ {
package.Name.RemovePreFix("@").Replace("/","-") package.Name.RemovePreFix("@").Replace("/", "-")
}; };
await AddPathsToTsConfigAsync(angularPath, angularProjectsPath, projects); await AddPathsToTsConfigAsync(angularPath, angularProjectsPath, projects);
@ -125,13 +125,15 @@ namespace Volo.Abp.Cli.ProjectModification
var scriptsJobject = (JObject) json["scripts"]; 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; return;
} }
scriptsJobject["postinstall"] = "npm run compile:ivy"; 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)); File.WriteAllText(packageJsonFilePath, json.ToString(Formatting.Indented));
} }
@ -195,12 +197,17 @@ namespace Volo.Abp.Cli.ProjectModification
foreach (var publicApi in publicApis) 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") if (subFolderName == "src")
{ {
subFolderName = ""; subFolderName = "";
} }
else if (subFolderName.EndsWith("/src"))
{
subFolderName = $"/{subFolderName}".RemovePostFix("/src");
}
else else
{ {
subFolderName = $"/{subFolderName}"; subFolderName = $"/{subFolderName}";

Loading…
Cancel
Save