diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs index 9745d3c23f..a8c9994340 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs @@ -111,6 +111,8 @@ public class NewCommand : ProjectCreationCommandBase, IConsoleCommand, ITransien await RunGraphBuildForMicroserviceServiceTemplate(projectArgs); await CreateInitialMigrationsAsync(projectArgs); + await ConfigureAngularAfterMicroserviceServiceCreatedAsync(projectArgs, template); + var skipInstallLibs = commandLineArgs.Options.ContainsKey(Options.SkipInstallingLibs.Long) || commandLineArgs.Options.ContainsKey(Options.SkipInstallingLibs.Short); if (!skipInstallLibs) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs index b433926c67..db3710b257 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs @@ -1,13 +1,12 @@ using System; using System.IO; +using System.Text; using System.Linq; using System.Threading.Tasks; using ICSharpCode.SharpZipLib.Core; using ICSharpCode.SharpZipLib.Zip; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using NuGet.Versioning; -using NUglify.Helpers; using Volo.Abp.Cli.ProjectModification; using Volo.Abp.Cli.Args; using Volo.Abp.Cli.Bundling; @@ -43,7 +42,7 @@ public abstract class ProjectCreationCommandBase public ThemePackageAdder ThemePackageAdder { get; } public AngularThemeConfigurer AngularThemeConfigurer { get; } - + public CliVersionService CliVersionService { get; } public ProjectCreationCommandBase( @@ -436,15 +435,15 @@ public abstract class ProjectCreationCommandBase var isModuleTemplate = ModuleTemplateBase.IsModuleTemplate(projectArgs.TemplateName); var isWebassembly = projectArgs.UiFramework == UiFramework.Blazor; - - var message = isWebassembly || isModuleTemplate - ? "Generating bundles for Blazor Wasm" + + var message = isWebassembly || isModuleTemplate + ? "Generating bundles for Blazor Wasm" : "Generating bundles for MAUI Blazor"; - + var projectType = isWebassembly || isModuleTemplate - ? BundlingConsts.WebAssembly + ? BundlingConsts.WebAssembly : BundlingConsts.MauiBlazor; - + Logger.LogInformation(message + "..."); await EventBus.PublishAsync(new ProjectCreationProgressEvent @@ -454,7 +453,7 @@ public abstract class ProjectCreationCommandBase var searchPattern = isWebassembly ? "*.Blazor.csproj" : "*.MauiBlazor.csproj"; var path = projectArgs.OutputFolder; - + if (isModuleTemplate) { path = Path.Combine(path, "host"); @@ -471,7 +470,7 @@ public abstract class ProjectCreationCommandBase await _bundlingService.BundleAsync(directory, true, projectType); } - + protected virtual bool ShouldRunBundleCommand(ProjectBuildArgs projectArgs) { if ((AppTemplateBase.IsAppTemplate(projectArgs.TemplateName) || AppNoLayersTemplateBase.IsAppNoLayersTemplate(projectArgs.TemplateName)) @@ -711,7 +710,7 @@ public abstract class ProjectCreationCommandBase protected virtual ThemeStyle? GetThemeStyleOrNull(CommandLineArgs commandLineArgs, Theme theme) { - if(theme != Theme.LeptonX) + if (theme != Theme.LeptonX) { return null; } @@ -749,6 +748,59 @@ public abstract class ProjectCreationCommandBase } } + protected virtual async Task ConfigureAngularAfterMicroserviceServiceCreatedAsync(ProjectBuildArgs projectArgs, string template) + { + if (!MicroserviceServiceTemplateBase.IsMicroserviceServiceTemplate(projectArgs.TemplateName)) + { + return; + } + + var rootPath = Directory.GetCurrentDirectory(); + var uiFramework = FindMicroserviceSolutionUiFramework(rootPath); + + if (uiFramework != UiFramework.Angular) + { + return; + } + + Logger.LogInformation("Setting up the angular library..."); + + var libraryName = projectArgs.SolutionName.ProjectName.ToKebabCase(); + var angularAppPath = Path.Combine(rootPath, "apps", "angular"); + + var result = await CreateAngularLibraryAsync(libraryName, angularAppPath); + + Logger.LogInformation(result); + } + + protected virtual async Task CreateAngularLibraryAsync( + string libraryName, + string workingDirectory, + bool isSecondaryEndpoint = false, + bool isModuleTemplate = true, + bool isOverride = true) + { + //TODO: Can we improve this validations ? + if (string.IsNullOrWhiteSpace(libraryName)) + { + throw new CliUsageException("Angular library name can not be empty"); + } + + if (string.IsNullOrWhiteSpace(workingDirectory)) + { + throw new CliUsageException("Angular project path can not be empty"); + } + + var commandBuilder = new StringBuilder($"npx ng g @abp/ng.schematics:create-lib --package-name {libraryName}"); + + commandBuilder.Append($" --is-secondary-entrypoint {isSecondaryEndpoint.ToString().ToLower()}"); + commandBuilder.Append($" --is-module-template {isModuleTemplate.ToString().ToLower()}"); + commandBuilder.Append($" --override {isOverride.ToString().ToLower()}"); + + var result = CmdHelper.RunCmdAndGetOutput(commandBuilder.ToString(), workingDirectory); + return await Task.FromResult(result); + } + public static class Options { public static class Template diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/lib/__libraryName@kebab__-routing.module.ts.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/lib/__libraryName@kebab__-routing.module.ts.template index 4b9517b211..8c9afe6aa2 100644 --- a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/lib/__libraryName@kebab__-routing.module.ts.template +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/lib/__libraryName@kebab__-routing.module.ts.template @@ -1,12 +1,12 @@ import { NgModule } from '@angular/core'; -import { DynamicLayoutComponent } from '@abp/ng.core'; +import { RouterOutletComponent } from '@abp/ng.core'; import { Routes, RouterModule } from '@angular/router'; const routes: Routes = [ { path: '', pathMatch: 'full', - component: DynamicLayoutComponent, + component: RouterOutletComponent, children: [], }, ];