@sap-ux/generator-adp 0.7.28 → 0.7.29

package/generators/app/index.js

@@ -180,9 +180,7 @@ class default_1 extends yeoman_generator_1.default {
     }
     async initializing() {
         // Force the generator to overwrite existing files without additional prompting
-        if (this.env.conflicter) {
-            this.env.conflicter.force = this.options.force ?? true;
-        }
+        (0, fiori_generator_shared_1.setYeomanEnvConflicterForce)(this.env, this.options.force);
         await (0, i18n_1.initI18n)();
         this.isCli = (0, fiori_generator_shared_1.isCli)();
         this.layer = (0, layer_1.getFlexLayer)();
@@ -254,7 +252,7 @@ class default_1 extends yeoman_generator_1.default {
             this.logger.info(`Project Attributes: ${JSON.stringify(this.attributeAnswers, null, 2)}`);
             if (this.attributeAnswers.addDeployConfig) {
                 const system = await this.systemLookup.getSystemByName(this.configAnswers.system);
-                (0, subgenHelpers_1.addDeployGen)({
+                await (0, subgenHelpers_1.addDeployGen)({
                     projectName: this.attributeAnswers.projectName,
                     projectPath: this.attributeAnswers.targetFolder,
                     connectedSystem: this.configAnswers.system,
@@ -262,7 +260,7 @@ class default_1 extends yeoman_generator_1.default {
                 }, this.composeWith.bind(this), this.logger, this.appWizard);
             }
             if (this.attributeAnswers?.addFlpConfig) {
-                (0, subgenHelpers_1.addFlpGen)({
+                await (0, subgenHelpers_1.addFlpGen)({
                     vscode: this.vscode,
                     projectRootPath: this._getProjectPath(),
                     inbounds: this.prompter.baseAppInbounds,

package/generators/utils/subgenHelpers.d.ts

@@ -41,7 +41,7 @@ interface DeployGenOptions {
  * @param {ToolsLogger} logger - Logger instance for tracking operations and errors.
  * @param {AppWizard} appWizard - AppWizard instance for interacting with the UI (optional).
  */
-export declare function addFlpGen({ projectRootPath, vscode, inbounds, layer, prompts }: FlpGenProps, composeWith: Generator['composeWith'], logger: ToolsLogger, appWizard: AppWizard): void;
+export declare function addFlpGen({ projectRootPath, vscode, inbounds, layer, prompts }: FlpGenProps, composeWith: Generator['composeWith'], logger: ToolsLogger, appWizard: AppWizard): Promise<void>;
 /**
  * Composes the Fiori deploy-config sub-generator using `composeWith`. This sub-generator configures
  * deployment for Fiori applications, such as to ABAP or Cloud Foundry environments.
@@ -55,7 +55,7 @@ export declare function addFlpGen({ projectRootPath, vscode, inbounds, layer, pr
  * @param {ToolsLogger} logger - Logger for info and error output
  * @param {AppWizard} appWizard - Optional AppWizard instance for displaying UI messages
  */
-export declare function addDeployGen({ projectName, projectPath, connectedSystem, system }: DeployGenOptions, composeWith: Generator['composeWith'], logger: ToolsLogger, appWizard: AppWizard): void;
+export declare function addDeployGen({ projectName, projectPath, connectedSystem, system }: DeployGenOptions, composeWith: Generator['composeWith'], logger: ToolsLogger, appWizard: AppWizard): Promise<void>;
 /**
  * Composes the extension project sub-generator if the base app is unsupported.
  *

package/generators/utils/subgenHelpers.js

@@ -24,12 +24,12 @@ const PACKAGE_ADDITIONAL_VALIDATION = {
  * @param {ToolsLogger} logger - Logger instance for tracking operations and errors.
  * @param {AppWizard} appWizard - AppWizard instance for interacting with the UI (optional).
  */
-function addFlpGen({ projectRootPath, vscode, inbounds, layer, prompts }, composeWith, logger, appWizard) {
+async function addFlpGen({ projectRootPath, vscode, inbounds, layer, prompts }, composeWith, logger, appWizard) {
     try {
         /**
          * We are using this namespace for now because '@sap/fiori:adp-flp-config' is not yet bundled in '@sap/generator-fiori'.
          */
-        composeWith('@sap/fiori:adp-flp-config', {
+        await composeWith('@sap/fiori:adp-flp-config', {
             launchAsSubGen: true,
             vscode,
             inbounds,
@@ -58,7 +58,7 @@ function addFlpGen({ projectRootPath, vscode, inbounds, layer, prompts }, compos
  * @param {ToolsLogger} logger - Logger for info and error output
  * @param {AppWizard} appWizard - Optional AppWizard instance for displaying UI messages
  */
-function addDeployGen({ projectName, projectPath, connectedSystem, system }, composeWith, logger, appWizard) {
+async function addDeployGen({ projectName, projectPath, connectedSystem, system }, composeWith, logger, appWizard) {
     try {
         const subGenPromptOptions = {
             ui5AbapRepo: { hideIfOnPremise: true },
@@ -86,7 +86,7 @@ function addDeployGen({ projectName, projectPath, connectedSystem, system }, com
             ...(system?.Client && { appGenClient: system.Client }),
             ...(system?.Url && { appGenServiceHost: system.Url })
         };
-        composeWith('@sap/fiori:deploy-config', generatorOptions);
+        await composeWith('@sap/fiori:deploy-config', generatorOptions);
         logger.info(`'@sap/fiori:deploy-config' was called.`);
     }
     catch (e) {
@@ -108,7 +108,7 @@ function addDeployGen({ projectName, projectPath, connectedSystem, system }, com
 async function addExtProjectGen({ configAnswers, attributeAnswers, systemLookup }, composeWith, logger, appWizard) {
     try {
         const data = await (0, extension_project_1.getExtensionProjectData)(configAnswers, attributeAnswers, systemLookup);
-        composeWith('@bas-dev/extensibility-sub', {
+        await composeWith('@bas-dev/extensibility-sub', {
             arguments: [JSON.stringify(data)],
             appWizard
         });

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "SAPUI5 Adaptation Project",
   "homepage": "https://help.sap.com/viewer/584e0bcbfd4a4aff91c815cefa0bce2d/Cloud/en-US/ada9567b767941aba8d49fdb4fdedea7.html",
   "description": "Adaptation project allows you to create an app variant for an existing SAP Fiori elements-based or SAPUI5 freestyle application, without changing the original application.",
-  "version": "0.7.28",
+  "version": "0.7.29",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,17 +30,17 @@
     "i18next": "25.3.0",
     "yeoman-generator": "5.10.0",
     "uuid": "10.0.0",
-    "@sap-ux/adp-tooling": "0.18.28",
+    "@sap-ux/adp-tooling": "0.18.29",
     "@sap-ux/axios-extension": "1.25.3",
     "@sap-ux/btp-utils": "1.1.6",
     "@sap-ux/feature-toggle": "0.3.5",
-    "@sap-ux/inquirer-common": "0.10.3",
+    "@sap-ux/inquirer-common": "0.10.4",
     "@sap-ux/logger": "0.8.0",
     "@sap-ux/project-access": "1.33.0",
     "@sap-ux/store": "1.4.2",
     "@sap-ux/system-access": "0.6.37",
     "@sap-ux/project-input-validator": "0.6.40",
-    "@sap-ux/fiori-generator-shared": "0.13.46",
+    "@sap-ux/fiori-generator-shared": "0.13.47",
     "@sap-ux/odata-service-writer": "0.29.2",
     "@sap-ux/telemetry": "0.6.50"
   },
@@ -57,7 +57,7 @@
     "fs-extra": "10.0.0",
     "rimraf": "6.0.1",
     "yeoman-test": "6.3.0",
-    "@sap-ux/deploy-config-sub-generator": "0.5.27"
+    "@sap-ux/deploy-config-sub-generator": "0.5.28"
   },
   "engines": {
     "node": ">=20.x"