@sap-ux/adp-tooling 0.18.78 → 0.18.80

package/dist/base/helper.js

@@ -18,6 +18,7 @@ const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const axios_extension_1 = require("@sap-ux/axios-extension");
 const project_access_1 = require("@sap-ux/project-access");
+const ADP_CLOUD_PROJECT_BUILD_TASK_NAME = 'app-variant-bundler-build';
 /**
  * Get the app descriptor variant.
  *
@@ -172,7 +173,8 @@ async function getExistingAdpProjectType(basePath) {
         }
         const yamlPath = (0, node_path_1.join)(basePath, project_access_1.FileName.Ui5Yaml);
         const ui5Config = await readUi5Config(basePath, yamlPath);
-        return ui5Config.hasBuilderKey() ? axios_extension_1.AdaptationProjectType.CLOUD_READY : axios_extension_1.AdaptationProjectType.ON_PREMISE;
+        const cloudProjectBuildTask = ui5Config.findCustomTask(ADP_CLOUD_PROJECT_BUILD_TASK_NAME);
+        return cloudProjectBuildTask ? axios_extension_1.AdaptationProjectType.CLOUD_READY : axios_extension_1.AdaptationProjectType.ON_PREMISE;
     }
     catch {
         // Expected: Project may not be an ADP project or configuration files may be missing/invalid

package/dist/cf/project/yaml.d.ts

@@ -44,11 +44,12 @@ export declare function getAppParamsFromUI5Yaml(projectPath: string): AppParamsE
  *
  * @param {AdjustMtaYamlParams} params - The parameters.
  * @param {Editor} memFs - The mem-fs editor instance.
+ * @param {string} timestamp - The timestamp.
  * @param {string} [templatePathOverwrite] - The template path overwrite.
  * @param {ToolsLogger} logger - The logger.
  * @returns {Promise<void>} The promise.
  */
-export declare function adjustMtaYaml({ projectPath, adpProjectName, appRouterType, businessSolutionName, businessService, serviceKeys }: AdjustMtaYamlParams, memFs: Editor, templatePathOverwrite?: string, logger?: ToolsLogger): Promise<void>;
+export declare function adjustMtaYaml({ projectPath, adpProjectName, appRouterType, businessSolutionName, businessService, serviceKeys }: AdjustMtaYamlParams, memFs: Editor, timestamp: string, templatePathOverwrite?: string, logger?: ToolsLogger): Promise<MtaYaml>;
 /**
  * Add fiori-tools-servestatic configuration to ui5.yaml and removes previously added configuration.
  *

package/dist/cf/project/yaml.js

@@ -413,12 +413,12 @@ function adjustMtaYamlFlpModule(yamlContent, projectName, businessService) {
  *
  * @param {AdjustMtaYamlParams} params - The parameters.
  * @param {Editor} memFs - The mem-fs editor instance.
+ * @param {string} timestamp - The timestamp.
  * @param {string} [templatePathOverwrite] - The template path overwrite.
  * @param {ToolsLogger} logger - The logger.
  * @returns {Promise<void>} The promise.
  */
-async function adjustMtaYaml({ projectPath, adpProjectName, appRouterType, businessSolutionName, businessService, serviceKeys }, memFs, templatePathOverwrite, logger) {
-    const timestamp = Date.now().toString();
+async function adjustMtaYaml({ projectPath, adpProjectName, appRouterType, businessSolutionName, businessService, serviceKeys }, memFs, timestamp, templatePathOverwrite, logger) {
     const mtaYamlPath = path.join(projectPath, 'mta.yaml');
     const loadedYamlContent = (0, yaml_loader_1.getYamlContent)(mtaYamlPath);
     const defaultYaml = {
@@ -452,6 +452,7 @@ async function adjustMtaYaml({ projectPath, adpProjectName, appRouterType, busin
     });
     memFs.write(mtaYamlPath, updatedYamlContent);
     logger?.debug(`Adjusted MTA YAML for project ${projectPath}`);
+    return yamlContent;
 }
 /**
  * Add fiori-tools-servestatic configuration to ui5.yaml and removes previously added configuration.
@@ -469,10 +470,15 @@ async function addServeStaticMiddleware(basePath, ui5Config, logger) {
         // Add reusable library paths from ui5AppInfo.json if it exists
         paths.push(...(0, ui5_app_info_1.getReusableLibraryPaths)(basePath, logger));
         const variant = await (0, helper_1.getVariant)(basePath);
+        const builtVariantId = variant.id.replaceAll('.', '_');
         paths.push({
-            path: `/changes/${variant.id.replaceAll('.', '_')}`,
+            path: `/changes/${builtVariantId}`,
             src: './webapp/changes',
             fallthrough: true
+        }, {
+            path: `/${builtVariantId}/i18n`,
+            src: './webapp/i18n',
+            fallthrough: true
         });
         ui5Config.addCustomMiddleware([
             {

package/dist/types.d.ts

@@ -987,6 +987,7 @@ export interface CfAdpWriterConfig {
         name: string;
         path: string;
         folder: string;
+        xsSecurityAppName?: string;
     };
     customConfig?: CustomConfig;
     ui5: {

package/dist/writer/cf.js

@@ -31,21 +31,23 @@ async function generateCf(basePath, config, logger, fs) {
     if (!fs) {
         fs = (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
     }
+    const timestamp = Date.now().toString();
     const fullConfig = setDefaults(config);
     const { app, cf, ui5, project } = fullConfig;
-    await (0, cf_1.adjustMtaYaml)({
+    const yamlContent = await (0, cf_1.adjustMtaYaml)({
         projectPath: basePath,
         adpProjectName: project.name,
         appRouterType: cf.approuter,
         businessSolutionName: cf.businessSolutionName ?? '',
         businessService: cf.businessService,
         serviceKeys: cf.serviceInfo?.serviceKeys
-    }, fs, config.options?.templatePathOverwrite, logger);
+    }, fs, timestamp, config.options?.templatePathOverwrite, logger);
     if (fullConfig.app.i18nModels) {
         (0, i18n_1.writeI18nModels)(basePath, fullConfig.app.i18nModels, fs);
     }
     const variant = (0, project_utils_1.getCfVariant)(fullConfig);
     (0, manifest_1.fillDescriptorContent)(variant.content, app.appType, ui5.version, app.i18nModels);
+    fullConfig.project.xsSecurityAppName = (0, cf_1.getProjectNameForXsSecurity)(yamlContent, timestamp);
     await (0, project_utils_1.writeCfTemplates)(basePath, variant, fullConfig, fs);
     await (0, project_utils_1.writeCfUI5Yaml)(fullConfig.project.folder, fullConfig, fs);
     return fs;

package/dist/writer/project-utils.js

@@ -221,7 +221,7 @@ async function writeCfTemplates(basePath, variant, config, fs) {
     }
     if (!fs.exists((0, node_path_1.join)(basePath, 'xs-security.json'))) {
         fs.copyTpl((0, node_path_1.join)(templatePath, 'cf/xs-security.json'), (0, node_path_1.join)(basePath, 'xs-security.json'), {
-            projectName: project.name
+            projectName: project.xsSecurityAppName
         });
     }
 }

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aadp-tooling"
   },
-  "version": "0.18.78",
+  "version": "0.18.80",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -39,15 +39,15 @@
     "@sap-ux/axios-extension": "1.25.18",
     "@sap-ux/btp-utils": "1.1.9",
     "@sap-ux/i18n": "0.3.9",
-    "@sap-ux/inquirer-common": "0.11.16",
+    "@sap-ux/inquirer-common": "0.11.17",
     "@sap-ux/logger": "0.8.1",
     "@sap-ux/nodejs-utils": "0.2.16",
-    "@sap-ux/odata-service-writer": "0.29.28",
-    "@sap-ux/project-access": "1.35.10",
-    "@sap-ux/project-input-validator": "0.6.64",
+    "@sap-ux/odata-service-writer": "0.29.29",
+    "@sap-ux/project-access": "1.35.11",
+    "@sap-ux/project-input-validator": "0.6.65",
     "@sap-ux/store": "1.5.8",
     "@sap-ux/system-access": "0.6.60",
-    "@sap-ux/ui5-config": "0.29.19",
+    "@sap-ux/ui5-config": "0.29.20",
     "@sap-ux/ui5-info": "0.13.13"
   },
   "devDependencies": {

package/templates/cf/package.json

@@ -13,7 +13,7 @@
 		"zip": "cd dist && npx bestzip ../<%= module %>.zip *",
 		"clean": "npx rimraf <%= module %>.zip dist",
 		"build-ui5": "npm explore @ui5/task-adaptation -- npm run rollup",
-		"build-mta": "rimraf resources mta_archives && mbt build --mtar archive --source ../",
+		"build-mta": "rimraf ../resources ../mta_archives && mbt build --mtar archive --source ../",
 		"deploy": "cf deploy ../mta_archives/archive.mtar"
 	},
 	"repository": {