Merge branch 'main' into 3399/resolve-merge-conflicts

longieirl · web-flow · commit ad099e3acad1 · 2025-10-03T11:11:02.000+01:00
diff --git a/packages/abap-deploy-config-sub-generator/CHANGELOG.md b/packages/abap-deploy-config-sub-generator/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @sap-ux/abap-deploy-config-sub-generator
 
+## 0.1.72
+
+### Patch Changes
+
+-   4b0b8fb: fix: Missing build script for ADP onPremise projects leads to error during deployment
+-   Updated dependencies [4b0b8fb]
+    -   @sap-ux/abap-deploy-config-writer@0.2.18
+
 ## 0.1.71
 
 ### Patch Changes
diff --git a/packages/abap-deploy-config-sub-generator/package.json b/packages/abap-deploy-config-sub-generator/package.json
@@ -6,7 +6,7 @@
         "url": "https://github.com/SAP/open-ux-tools.git",
         "directory": "packages/abap-deploy-config-sub-generator"
     },
-    "version": "0.1.71",
+    "version": "0.1.72",
     "license": "Apache-2.0",
     "main": "generators/app/index.js",
     "scripts": {
diff --git a/packages/abap-deploy-config-sub-generator/src/app/index.ts b/packages/abap-deploy-config-sub-generator/src/app/index.ts
@@ -56,6 +56,7 @@ export default class extends DeploymentGenerator {
     private configExists: boolean;
     private answers: AbapDeployConfigAnswersInternal;
     private projectType: DeployProjectType;
+    private isAdp: boolean;
 
     /**
      * Constructor for the ABAP deploy config generator.
@@ -174,24 +175,24 @@ export default class extends DeploymentGenerator {
         }
         if (!this.launchDeployConfigAsSubGenerator) {
             const appType = await getAppType(this.destinationPath());
-            const isAdp = appType === 'Fiori Adaptation';
+            this.isAdp = appType === 'Fiori Adaptation';
             const packageAdditionalValidation = {
-                shouldValidatePackageForStartingPrefix: isAdp,
-                shouldValidatePackageType: isAdp,
-                shouldValidateFormatAndSpecialCharacters: isAdp
+                shouldValidatePackageForStartingPrefix: this.isAdp,
+                shouldValidatePackageType: this.isAdp,
+                shouldValidateFormatAndSpecialCharacters: this.isAdp
             };
             const promptOptions: AbapDeployConfigPromptOptions = {
-                ui5AbapRepo: { hideIfOnPremise: isAdp },
-                transportInputChoice: { hideIfOnPremise: isAdp },
+                ui5AbapRepo: { hideIfOnPremise: this.isAdp },
+                transportInputChoice: { hideIfOnPremise: this.isAdp },
                 packageAutocomplete: {
                     additionalValidation: packageAdditionalValidation
                 },
                 packageManual: {
                     additionalValidation: packageAdditionalValidation
                 },
-                targetSystem: { additionalValidation: { shouldRestrictDifferentSystemType: isAdp } }
+                targetSystem: { additionalValidation: { shouldRestrictDifferentSystemType: this.isAdp } }
             };
-            const indexGenerationAllowed = this.indexGenerationAllowed && !isAdp;
+            const indexGenerationAllowed = this.indexGenerationAllowed && !this.isAdp;
             const { prompts: abapDeployConfigPrompts, answers: abapAnswers = {} } = await getAbapQuestions({
                 appRootPath: this.destinationRoot(),
                 connectedSystem: this.options.connectedSystem,
@@ -311,7 +312,8 @@ export default class extends DeploymentGenerator {
             } as AbapDeployConfig,
             {
                 baseFile: this.options.base,
-                deployFile: this.options.config
+                deployFile: this.options.config,
+                addBuildToUndeployScript: !this.isAdp
             },
             this.fs
         );
diff --git a/packages/abap-deploy-config-writer/CHANGELOG.md b/packages/abap-deploy-config-writer/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sap-ux/abap-deploy-config-writer
 
+## 0.2.18
+
+### Patch Changes
+
+-   4b0b8fb: fix: Missing build script for ADP onPremise projects leads to error during deployment
+
 ## 0.2.17
 
 ### Patch Changes
diff --git a/packages/abap-deploy-config-writer/package.json b/packages/abap-deploy-config-writer/package.json
@@ -6,7 +6,7 @@
         "url": "https://github.com/SAP/open-ux-tools.git",
         "directory": "packages/abap-deploy-config-writer"
     },
-    "version": "0.2.17",
+    "version": "0.2.18",
     "license": "Apache-2.0",
     "main": "dist/index.js",
     "scripts": {
diff --git a/packages/abap-deploy-config-writer/src/file.ts b/packages/abap-deploy-config-writer/src/file.ts
@@ -1,7 +1,6 @@
 import { join } from 'path';
 import fg from 'fast-glob';
 import { platform } from 'os';
-import { existsSync } from 'fs';
 import { FileName, type Package, getReuseLibs } from '@sap-ux/project-access';
 import { UI5_CLI_LIB, UI5_CLI_MIN_VERSION, UI5_REPO_IGNORE, UI5_REPO_TEXT_FILES } from './constants';
 import { coerce, satisfies } from 'semver';
@@ -118,15 +117,3 @@ export async function writeUi5RepositoryIgnore(fs: Editor, path?: string): Promi
         }
     }
 }
-
-/**
- * Checks if the project is a TypeScript project.
- *
- * @param fs - the memfs editor instance
- * @param basePath - the base path
- * @returns true if the project is a TypeScript project, false otherwise
- */
-export function isTsProject(fs: Editor, basePath: string): boolean {
-    const tsconfigPath = join(basePath, FileName.Tsconfig);
-    return fs.exists(tsconfigPath) || existsSync(tsconfigPath);
-}
diff --git a/packages/abap-deploy-config-writer/src/index.ts b/packages/abap-deploy-config-writer/src/index.ts
@@ -4,13 +4,7 @@ import { create } from 'mem-fs-editor';
 import cloneDeep from 'lodash/cloneDeep';
 import { addPackageDevDependency, FileName, getWebappPath, readUi5Yaml } from '@sap-ux/project-access';
 import { getDeployConfig, updateBaseConfig } from './config';
-import {
-    addUi5Dependency,
-    getLibraryPath,
-    isTsProject,
-    writeUi5RepositoryFiles,
-    writeUi5RepositoryIgnore
-} from './file';
+import { addUi5Dependency, getLibraryPath, writeUi5RepositoryFiles, writeUi5RepositoryIgnore } from './file';
 import { UI5_TASK_FLATTEN_LIB, UI5_TASK_FLATTEN_LIB_VERSION } from './constants';
 import type { DeployConfigOptions } from './types';
 import type { Editor } from 'mem-fs-editor';
@@ -51,8 +45,7 @@ async function generate(
     const deployConfig = await getDeployConfig(abapConfig, baseConfig);
     fs.write(deployFilePath, deployConfig.toString());
 
-    const includeBuildScript = !abapConfig.lrep || isTsProject(fs, basePath);
-    await updateScripts(basePath, deployConfigFile, fs, includeBuildScript);
+    await updateScripts(basePath, deployConfigFile, fs, options);
 
     if (isLib) {
         // ui5 repo ignore file
diff --git a/packages/abap-deploy-config-writer/src/scripts.ts b/packages/abap-deploy-config-writer/src/scripts.ts
@@ -2,6 +2,7 @@ import type { Editor } from 'mem-fs-editor';
 
 import { addPackageDevDependency, updatePackageScript } from '@sap-ux/project-access';
 
+import type { DeployConfigOptions } from './types';
 import { BUILD_SCRIPT, DEPLOY_SCRIPT, RIMRAF, RIMRAF_VERSION, UNDEPLOY_SCRIPT } from './constants';
 
 /**
@@ -10,26 +11,26 @@ import { BUILD_SCRIPT, DEPLOY_SCRIPT, RIMRAF, RIMRAF_VERSION, UNDEPLOY_SCRIPT }
  * @param {string} basePath - The path to the base directory.
  * @param {string} deployConfigFile - The path to the deploy config file.
  * @param {Editor} fs - The file system editor.
- * @param {boolean} includeBuildScript - Whether to include build script in deploy commands.
+ * @param {DeployConfigOptions} options - The deploy config options.
  */
 export async function updateScripts(
     basePath: string,
     deployConfigFile: string,
     fs: Editor,
-    includeBuildScript: boolean = true
+    options?: DeployConfigOptions
 ): Promise<void> {
-    const buildPrefix = includeBuildScript ? `${BUILD_SCRIPT} && ` : '';
+    const buildPrefix = options?.addBuildToUndeployScript ?? true ? `${BUILD_SCRIPT} && ` : '';
 
     // deploy script
-    const deployScript = `${buildPrefix}${DEPLOY_SCRIPT} --config ${deployConfigFile}`;
+    const deployScript = `${BUILD_SCRIPT} && ${DEPLOY_SCRIPT} --config ${deployConfigFile}`;
     await updatePackageScript(basePath, 'deploy', deployScript, fs);
 
     // undeploy script
     const undeployScript = `${buildPrefix}${UNDEPLOY_SCRIPT} --config ${deployConfigFile}`;
     await updatePackageScript(basePath, 'undeploy', undeployScript, fs);
 
     // test mode script
-    const deployTestModeScript = `${buildPrefix}${DEPLOY_SCRIPT} --config ${deployConfigFile} --testMode true`;
+    const deployTestModeScript = `${BUILD_SCRIPT} && ${DEPLOY_SCRIPT} --config ${deployConfigFile} --testMode true`;
     await updatePackageScript(basePath, 'deploy-test', deployTestModeScript, fs);
 
     // dependencies
diff --git a/packages/abap-deploy-config-writer/src/types.ts b/packages/abap-deploy-config-writer/src/types.ts
@@ -1,4 +1,8 @@
 export interface DeployConfigOptions {
     baseFile?: string; // e.g ui5.yaml
     deployFile?: string; // e.g ui5-deploy.yaml
+    /**
+     * Default is true. If true, the build script will be added to the undeploy script
+     */
+    addBuildToUndeployScript?: boolean;
 }
diff --git a/packages/abap-deploy-config-writer/test/unit/__snapshots__/index.test.ts.snap b/packages/abap-deploy-config-writer/test/unit/__snapshots__/index.test.ts.snap
@@ -219,9 +219,9 @@ Object {
         \\"start\\": \\"start script\\",
         \\"build\\": \\"build script\\",
         \\"test\\": \\"test script\\",
-        \\"deploy\\": \\"fiori deploy --config ui5-deploy.yaml\\",
+        \\"deploy\\": \\"npm run build && fiori deploy --config ui5-deploy.yaml\\",
         \\"undeploy\\": \\"fiori undeploy --config ui5-deploy.yaml\\",
-        \\"deploy-test\\": \\"fiori deploy --config ui5-deploy.yaml --testMode true\\"
+        \\"deploy-test\\": \\"npm run build && fiori deploy --config ui5-deploy.yaml --testMode true\\"
     },
     \\"devDependencies\\": {
         \\"rimraf\\": \\"^5.0.5\\"
@@ -345,7 +345,7 @@ Object {
         \\"build\\": \\"build script\\",
         \\"test\\": \\"test script\\",
         \\"deploy\\": \\"npm run build && fiori deploy --config ui5-deploy.yaml\\",
-        \\"undeploy\\": \\"npm run build && fiori undeploy --config ui5-deploy.yaml\\",
+        \\"undeploy\\": \\"fiori undeploy --config ui5-deploy.yaml\\",
         \\"deploy-test\\": \\"npm run build && fiori deploy --config ui5-deploy.yaml --testMode true\\"
     },
     \\"devDependencies\\": {
diff --git a/packages/abap-deploy-config-writer/test/unit/file.test.ts b/packages/abap-deploy-config-writer/test/unit/file.test.ts
@@ -1,18 +1,7 @@
 import { create as createStorage } from 'mem-fs';
 import { create } from 'mem-fs-editor';
-import { join } from 'path';
-import { existsSync } from 'fs';
 
-import { FileName } from '@sap-ux/project-access';
-
-import { addUi5Dependency, isTsProject } from '../../src/file';
-
-jest.mock('fs', () => ({
-    ...jest.requireActual('fs'),
-    existsSync: jest.fn()
-}));
-
-const existsSyncMock = existsSync as jest.Mock;
+import { addUi5Dependency } from '../../src/file';
 
 describe('File utils', () => {
     test('should return when @ui5/cli version is greater or equal to 3.0.0', () => {
@@ -24,43 +13,4 @@ describe('File utils', () => {
         });
         expect(addUi5Dependency(fs, 'base/path', 'dep')).toBeUndefined();
     });
-
-    describe('isTsProject', () => {
-        test('should return true when tsconfig.json exists in memory', () => {
-            const fs = create(createStorage());
-            const basePath = '/test/project';
-            const tsconfigPath = join(basePath, FileName.Tsconfig);
-
-            jest.spyOn(fs, 'exists').mockReturnValue(true);
-
-            expect(isTsProject(fs, basePath)).toBe(true);
-            expect(fs.exists).toHaveBeenCalledWith(tsconfigPath);
-        });
-
-        test('should return true when tsconfig.json exists on disk', () => {
-            const fs = create(createStorage());
-            const basePath = '/test/project';
-            const tsconfigPath = join(basePath, FileName.Tsconfig);
-
-            jest.spyOn(fs, 'exists').mockReturnValue(false);
-            existsSyncMock.mockReturnValue(true);
-
-            expect(isTsProject(fs, basePath)).toBe(true);
-            expect(fs.exists).toHaveBeenCalledWith(tsconfigPath);
-            expect(existsSync).toHaveBeenCalledWith(tsconfigPath);
-        });
-
-        test('should return false when tsconfig.json does not exist', () => {
-            const fs = create(createStorage());
-            const basePath = '/test/project';
-            const tsconfigPath = join(basePath, FileName.Tsconfig);
-
-            jest.spyOn(fs, 'exists').mockReturnValue(false);
-            existsSyncMock.mockReturnValue(false);
-
-            expect(isTsProject(fs, basePath)).toBe(false);
-            expect(fs.exists).toHaveBeenCalledWith(tsconfigPath);
-            expect(existsSync).toHaveBeenCalledWith(tsconfigPath);
-        });
-    });
 });
diff --git a/packages/abap-deploy-config-writer/test/unit/index.test.ts b/packages/abap-deploy-config-writer/test/unit/index.test.ts
@@ -57,6 +57,9 @@ describe('generate', () => {
                 },
                 lrep: 'MOCK_LREP'
             },
+            options: {
+                addBuildToUndeployScript: false
+            },
             isAppStudio: false
         },
         {
@@ -68,6 +71,9 @@ describe('generate', () => {
                     destination: 'MOCK_DESTINATION'
                 }
             },
+            options: {
+                addBuildToUndeployScript: false
+            },
             isAppStudio: false
         },
         {
diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @sap-ux/create
 
+## 0.13.123
+
+### Patch Changes
+
+-   4b0b8fb: fix: Missing build script for ADP onPremise projects leads to error during deployment
+-   Updated dependencies [4b0b8fb]
+    -   @sap-ux/abap-deploy-config-writer@0.2.18
+
 ## 0.13.122
 
 ### Patch Changes
diff --git a/packages/create/package.json b/packages/create/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@sap-ux/create",
     "description": "SAP Fiori tools module to add or remove features",
-    "version": "0.13.122",
+    "version": "0.13.123",
     "repository": {
         "type": "git",
         "url": "https://github.com/SAP/open-ux-tools.git",
diff --git a/packages/create/src/cli/add/deploy-config.ts b/packages/create/src/cli/add/deploy-config.ts
@@ -149,7 +149,8 @@ async function addDeployConfig(
             logger.debug(`Adding deployment configuration : ${JSON.stringify(config, null, 2)}`);
             const fs = await generateDeployConfig(basePath, config, {
                 baseFile,
-                deployFile
+                deployFile,
+                addBuildToUndeployScript: !isAdp
             });
             await traceChanges(fs);
 
diff --git a/packages/deploy-config-sub-generator/CHANGELOG.md b/packages/deploy-config-sub-generator/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @sap-ux/deploy-config-sub-generator
 
+## 0.4.16
+
+### Patch Changes
+
+-   Updated dependencies [4b0b8fb]
+    -   @sap-ux/abap-deploy-config-sub-generator@0.1.72
+
 ## 0.4.15
 
 ### Patch Changes
diff --git a/packages/deploy-config-sub-generator/package.json b/packages/deploy-config-sub-generator/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@sap-ux/deploy-config-sub-generator",
     "description": "Main generator for configuring ABAP or Cloud Foundry deployment configuration",
-    "version": "0.4.15",
+    "version": "0.4.16",
     "repository": {
         "type": "git",
         "url": "https://github.com/SAP/open-ux-tools.git",
diff --git a/packages/repo-app-import-sub-generator/CHANGELOG.md b/packages/repo-app-import-sub-generator/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @sap-ux/repo-app-download-sub-generator
 
+## 0.3.114
+
+### Patch Changes
+
+-   Updated dependencies [4b0b8fb]
+    -   @sap-ux/abap-deploy-config-writer@0.2.18
+
 ## 0.3.113
 
 ### Patch Changes
diff --git a/packages/repo-app-import-sub-generator/package.json b/packages/repo-app-import-sub-generator/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@sap-ux/repo-app-import-sub-generator",
     "description": "Generator to download LROP Fiori applications deployed from an ABAP repository.",
-    "version": "0.3.113",
+    "version": "0.3.114",
     "repository": {
         "type": "git",
         "url": "https://github.com/SAP/open-ux-tools.git",
diff --git a/packages/ui5-library-inquirer/CHANGELOG.md b/packages/ui5-library-inquirer/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sap-ux/ui5-library-inquirer
 
+## 0.5.0
+
+### Minor Changes
+
+-   0a9af29: Resolve UI5 versions against npm registry and @sapui5/distribution-metadata to ensure dropdown options match published packages.
+
 ## 0.4.48
 
 ### Patch Changes
diff --git a/packages/ui5-library-inquirer/package.json b/packages/ui5-library-inquirer/package.json
diff --git a/packages/ui5-library-inquirer/src/index.ts b/packages/ui5-library-inquirer/src/index.ts
diff --git a/packages/ui5-library-inquirer/test/unit/prompts/enhanced-prompts.test.ts b/packages/ui5-library-inquirer/test/unit/prompts/enhanced-prompts.test.ts
diff --git a/packages/ui5-library-inquirer/test/unit/ui5-library-inquirer.test.ts b/packages/ui5-library-inquirer/test/unit/ui5-library-inquirer.test.ts
diff --git a/packages/ui5-library-inquirer/tsconfig.json b/packages/ui5-library-inquirer/tsconfig.json
diff --git a/packages/ui5-library-sub-generator/CHANGELOG.md b/packages/ui5-library-sub-generator/CHANGELOG.md
diff --git a/packages/ui5-library-sub-generator/package.json b/packages/ui5-library-sub-generator/package.json
diff --git a/packages/ui5-library-sub-generator/test/unit/app.test.ts b/packages/ui5-library-sub-generator/test/unit/app.test.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,8 @@`
`1`	`1`	`export interface DeployConfigOptions {`
`2`	`2`	`baseFile?: string; // e.g ui5.yaml`
`3`	`3`	`deployFile?: string; // e.g ui5-deploy.yaml`
	`4`	`+ /**`
	`5`	`+ * Default is true. If true, the build script will be added to the undeploy script`
	`6`	`+ */`
	`7`	`+ addBuildToUndeployScript?: boolean;`
`4`	`8`	`}`