From 1ba05cc38557505677665f33cc2b3f88a8b9d51d Mon Sep 17 00:00:00 2001 From: Engincan VESKE <43685404+EngincanV@users.noreply.github.com> Date: Wed, 4 Jan 2023 17:10:31 +0300 Subject: [PATCH 1/3] Closes #15322 --- .../src/commands/change-theme/index.ts | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts b/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts index 22f32be353..5c099c451b 100644 --- a/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts +++ b/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts @@ -2,7 +2,7 @@ import { Rule, SchematicContext, SchematicsException, Tree } from '@angular-devk import { isLibrary, updateWorkspace, WorkspaceDefinition } from '../../utils'; import { allStyles, styleMap } from './style-map'; import { ProjectDefinition } from '@angular-devkit/core/src/workspace'; -import { JsonArray, JsonValue } from '@angular-devkit/core'; +import { JsonArray, JsonValue, strings } from '@angular-devkit/core'; import { ChangeThemeOptions } from './model'; import { ThemeOptionsEnum } from './theme-options.enum'; @@ -25,7 +25,25 @@ function updateProjectStyle( workspace: WorkspaceDefinition, targetThemeName: ThemeOptionsEnum, ) { - const project = workspace.projects.get(projectName); + let project = workspace.projects.get(projectName); + + if (!project) + try { + projectName = strings.dasherize(projectName); + project = workspace.projects.get(projectName); + } catch (_) {} + + if (!project) + try { + projectName = strings.camelize(projectName); + project = workspace.projects.get(projectName); + } catch (_) {} + + if (!project) + try { + projectName = strings.classify(projectName); + project = workspace.projects.get(projectName); + } catch (_) {} if (!project) { throw new SchematicsException('The target project does not selected'); From e19ca73289cbbcac9e0b896383824e3a665c2369 Mon Sep 17 00:00:00 2001 From: Engincan VESKE <43685404+EngincanV@users.noreply.github.com> Date: Thu, 5 Jan 2023 15:05:50 +0300 Subject: [PATCH 2/3] Revert "Closes #15322" This reverts commit 1ba05cc38557505677665f33cc2b3f88a8b9d51d. --- .../src/commands/change-theme/index.ts | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts b/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts index 5c099c451b..22f32be353 100644 --- a/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts +++ b/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts @@ -2,7 +2,7 @@ import { Rule, SchematicContext, SchematicsException, Tree } from '@angular-devk import { isLibrary, updateWorkspace, WorkspaceDefinition } from '../../utils'; import { allStyles, styleMap } from './style-map'; import { ProjectDefinition } from '@angular-devkit/core/src/workspace'; -import { JsonArray, JsonValue, strings } from '@angular-devkit/core'; +import { JsonArray, JsonValue } from '@angular-devkit/core'; import { ChangeThemeOptions } from './model'; import { ThemeOptionsEnum } from './theme-options.enum'; @@ -25,25 +25,7 @@ function updateProjectStyle( workspace: WorkspaceDefinition, targetThemeName: ThemeOptionsEnum, ) { - let project = workspace.projects.get(projectName); - - if (!project) - try { - projectName = strings.dasherize(projectName); - project = workspace.projects.get(projectName); - } catch (_) {} - - if (!project) - try { - projectName = strings.camelize(projectName); - project = workspace.projects.get(projectName); - } catch (_) {} - - if (!project) - try { - projectName = strings.classify(projectName); - project = workspace.projects.get(projectName); - } catch (_) {} + const project = workspace.projects.get(projectName); if (!project) { throw new SchematicsException('The target project does not selected'); From 9d3d25e544c50f3748b2818f82f16627961f3d07 Mon Sep 17 00:00:00 2001 From: Engincan VESKE <43685404+EngincanV@users.noreply.github.com> Date: Thu, 5 Jan 2023 15:05:56 +0300 Subject: [PATCH 3/3] Update ProjectCreationCommandBase.cs --- .../Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f660e5ee53..16ae776ac9 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 @@ -693,7 +693,7 @@ public abstract class ProjectCreationCommandBase AngularThemeConfigurer.Configure(new AngularThemeConfigurationArgs( theme: projectArgs.Theme.Value, - projectName: projectArgs.SolutionName.FullName, + projectName: projectArgs.SolutionName.ProjectName, angularFolderPath: angularFolderPath )); }