@sap/ux-ui5-tooling 1.7.4 → 1.7.5

package/dist/tasks/cf-deploy/index.js

@@ -11906,7 +11906,7 @@ var require_package4 = __commonJS({
   "../lib/telemetry/dist/package.json"(exports2, module2) {
     module2.exports = {
       name: "@sap/ux-telemetry",
-      version: "1.7.4",
+      version: "1.7.5",
       description: "SAP Fiori tools telemetry library",
       main: "dist/src/index.js",
       author: "SAP SE",
@@ -11931,10 +11931,10 @@ var require_package4 = __commonJS({
       },
       dependencies: {
         "@sap-ux/store": "0.3.0",
-        "@sap/ux-cds": "1.7.4",
-        "@sap/ux-common-utils": "1.7.4",
-        "@sap/ux-feature-toggle": "1.7.4",
-        "@sap/ux-project-access": "1.7.4",
+        "@sap/ux-cds": "1.7.5",
+        "@sap/ux-common-utils": "1.7.5",
+        "@sap/ux-feature-toggle": "1.7.5",
+        "@sap/ux-project-access": "1.7.5",
         applicationinsights: "1.4.1",
         "performance-now": "2.1.0",
         yaml: "2.0.0-10"
@@ -23029,6 +23029,7 @@ var require_page = __commonJS({
       PageType2["ListReport"] = "ListReport";
       PageType2["OverviewPage"] = "OverviewPage";
       PageType2["CustomPage"] = "CustomPage";
+      PageType2["FPMCustomPage"] = "FPMCustomPage";
       PageType2["AnalyticalListPage"] = "AnalyticalListPage";
     })(PageType = exports2.PageType || (exports2.PageType = {}));
   }
@@ -28539,6 +28540,9 @@ var require_commandRunner = __commonJS({
           spawnedCmd.stderr.on("data", (data2) => {
             stack.push(data2.toString());
           });
+          spawnedCmd.on("error", (error3) => {
+            reject(`Command failed with error: ${error3.message}`);
+          });
           spawnedCmd.on("close", (errorCode) => {
             if (errorCode !== 0) {
               reject(`Command failed, \`${cmd} ${args.join(" ")}\`, ${stack.join(", ")}`);
@@ -57725,7 +57729,9 @@ var require_ui5_info = __commonJS({
       if (ui5SelectedVersion && ui5SelectedVersion.length) {
         const latestMinIdx = latestVersions.findIndex((v) => v === ui5SelectedVersion);
         if (latestMinIdx === -1) {
-          if (ui5SelectedVersion < latestVersions.slice(-1)[0]) {
+          if (semver_compare_1.default(ui5SelectedVersion, latestVersions.slice(-1)[0]) > 0 || ui5SelectedVersion === "Latest" || !semver_1.valid(ui5SelectedVersion)) {
+            latestVersions = latestVersions.slice(0);
+          } else {
             latestVersions = latestVersions.slice(-1);
           }
         } else {
@@ -57791,7 +57797,7 @@ var require_dist6 = __commonJS({
   "../lib/ui5-info/core/dist/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.UI5Info = exports2.minUI5VersionForLocalDev = exports2.FioriElementsVersion = exports2.getSpecTagVersion = exports2.getLatestSapui5Version = exports2.parseUI5VersionsOverview = exports2.getUI5VersionsEnhanced = exports2.getSapSystemUI5Version = exports2.parseUI5Versions = exports2.uI5VersionsWithCodeAssist = exports2.getManifestVersion = exports2.getDefaultTheme = exports2.getUi5Themes = exports2.retrieveUI5Versions = exports2.MIN_UI5_VERSION_FPM_TEMPLATE = exports2.MIN_UI5_VERSION_OVERVIEW_V4_TEMPLATE = exports2.MIN_UI5_VERSION_WORKLIST_V4_TEMPLATE = exports2.MIN_UI5_VERSION_FORM_ENTRY_TEMPLATE = exports2.MIN_UI5_VERSION_ALP_V4_TEMPLATE = exports2.MIN_UI5_VERSION = exports2.MIN_UI5_VERSION_V4_TEMPLATE = exports2.CommandRunner = void 0;
+    exports2.UI5Info = exports2.minUI5VersionForLocalDev = exports2.FioriElementsVersion = exports2.ThemeIds = exports2.getSpecTagVersion = exports2.getLatestSapui5Version = exports2.parseUI5VersionsOverview = exports2.getUI5VersionsEnhanced = exports2.getSapSystemUI5Version = exports2.parseUI5Versions = exports2.uI5VersionsWithCodeAssist = exports2.getManifestVersion = exports2.getDefaultTheme = exports2.getUi5Themes = exports2.retrieveUI5Versions = exports2.MIN_UI5_VERSION_FPM_TEMPLATE = exports2.MIN_UI5_VERSION_OVERVIEW_V4_TEMPLATE = exports2.MIN_UI5_VERSION_WORKLIST_V4_TEMPLATE = exports2.MIN_UI5_VERSION_FORM_ENTRY_TEMPLATE = exports2.MIN_UI5_VERSION_ALP_V4_TEMPLATE = exports2.MIN_UI5_VERSION = exports2.MIN_UI5_VERSION_V4_TEMPLATE = exports2.CommandRunner = void 0;
     var commandRunner_1 = require_commandRunner();
     Object.defineProperty(exports2, "CommandRunner", { enumerable: true, get: function() {
       return commandRunner_1.CommandRunner;
@@ -57851,6 +57857,9 @@ var require_dist6 = __commonJS({
     Object.defineProperty(exports2, "getSpecTagVersion", { enumerable: true, get: function() {
       return ui5_info_1.getSpecTagVersion;
     } });
+    Object.defineProperty(exports2, "ThemeIds", { enumerable: true, get: function() {
+      return ui5_info_1.ThemeIds;
+    } });
     var types_1 = require_types4();
     Object.defineProperty(exports2, "FioriElementsVersion", { enumerable: true, get: function() {
       return types_1.FioriElementsVersion;
@@ -58348,6 +58357,25 @@ var require_utils9 = __commonJS({
       throw new Error(i18n_1.i18n.t("ERROR_DETAIL_PROJECT_TYPE", { appRoot, projectRoot }));
     }
     exports2.getDetailedProjectType = getDetailedProjectType;
+    function findRootsWithSapux(sapux, path, root) {
+      if (typeof sapux === "boolean" && sapux === true) {
+        return {
+          appRoot: root,
+          projectRoot: root
+        };
+      } else if (Array.isArray(sapux)) {
+        const pathWithSep = path.endsWith(path_1.sep) ? path : path + path_1.sep;
+        const relAppPaths = sapux.map((a) => path_1.join(...a.split(/\\|\//)));
+        const relApp = relAppPaths.find((app) => pathWithSep.startsWith(path_1.join(root, app) + path_1.sep));
+        if (relApp) {
+          return {
+            appRoot: path_1.join(root, relApp),
+            projectRoot: root
+          };
+        }
+      }
+      return null;
+    }
     async function findRootsForPath(path) {
       try {
         const appRoot = await findProjectRoot(path, false);
@@ -58355,23 +58383,8 @@ var require_utils9 = __commonJS({
           return null;
         }
         const appPckJson = await file_1.readJSON(path_1.join(appRoot, project_spec_1.FileName.Package));
-        if (appPckJson == null ? void 0 : appPckJson.sapux) {
-          if (typeof appPckJson.sapux === "boolean" && appPckJson.sapux === true) {
-            return {
-              appRoot,
-              projectRoot: appRoot
-            };
-          } else if (Array.isArray(appPckJson.sapux)) {
-            const relAppPaths = appPckJson.sapux.map((a) => path_1.join(...a.split(/\\|\//)));
-            const relApp = relAppPaths.find((app) => path.startsWith(path_1.join(appRoot, app) + path_1.sep));
-            if (relApp) {
-              return {
-                appRoot: path_1.join(appRoot, relApp),
-                projectRoot: appRoot
-              };
-            }
-          }
-          return null;
+        if (appPckJson.sapux) {
+          return findRootsWithSapux(appPckJson.sapux, path, appRoot);
         }
         if (await capProject_1.isCapProject(appRoot, appPckJson)) {
           return null;
@@ -58386,13 +58399,11 @@ var require_utils9 = __commonJS({
           const { root } = path_1.parse(appRoot);
           let projectRoot = path_1.dirname(appRoot);
           while (projectRoot !== root) {
-            if (await capProject_1.isCapProject(projectRoot)) {
-              if (path_1.join(projectRoot, "app") !== appRoot) {
-                return {
-                  appRoot,
-                  projectRoot
-                };
-              }
+            if (await capProject_1.isCapProject(projectRoot) && path_1.join(projectRoot, "app") !== appRoot) {
+              return {
+                appRoot,
+                projectRoot
+              };
             }
             projectRoot = path_1.dirname(projectRoot);
           }
@@ -83403,9 +83414,9 @@ var require_align2 = __commonJS({
   }
 });
 
-// ../../node_modules/aproba/index.js
+// ../../node_modules/@ui5/logger/node_modules/aproba/index.js
 var require_aproba = __commonJS({
-  "../../node_modules/aproba/index.js"(exports2, module2) {
+  "../../node_modules/@ui5/logger/node_modules/aproba/index.js"(exports2, module2) {
     "use strict";
     function isArguments(thingy) {
       return thingy != null && typeof thingy === "object" && thingy.hasOwnProperty("callee");

package/dist/tasks/deploy/index.js

@@ -34962,9 +34962,9 @@ var require_align = __commonJS({
   }
 });
 
-// ../../node_modules/aproba/index.js
+// ../../node_modules/@ui5/logger/node_modules/aproba/index.js
 var require_aproba = __commonJS({
-  "../../node_modules/aproba/index.js"(exports2, module2) {
+  "../../node_modules/@ui5/logger/node_modules/aproba/index.js"(exports2, module2) {
     "use strict";
     function isArguments(thingy) {
       return thingy != null && typeof thingy === "object" && thingy.hasOwnProperty("callee");
@@ -49587,6 +49587,7 @@ var require_page = __commonJS({
       PageType2["ListReport"] = "ListReport";
       PageType2["OverviewPage"] = "OverviewPage";
       PageType2["CustomPage"] = "CustomPage";
+      PageType2["FPMCustomPage"] = "FPMCustomPage";
       PageType2["AnalyticalListPage"] = "AnalyticalListPage";
     })(PageType = exports2.PageType || (exports2.PageType = {}));
   }
@@ -61628,7 +61629,7 @@ var require_package5 = __commonJS({
   "../lib/telemetry/dist/package.json"(exports2, module2) {
     module2.exports = {
       name: "@sap/ux-telemetry",
-      version: "1.7.4",
+      version: "1.7.5",
       description: "SAP Fiori tools telemetry library",
       main: "dist/src/index.js",
       author: "SAP SE",
@@ -61653,10 +61654,10 @@ var require_package5 = __commonJS({
       },
       dependencies: {
         "@sap-ux/store": "0.3.0",
-        "@sap/ux-cds": "1.7.4",
-        "@sap/ux-common-utils": "1.7.4",
-        "@sap/ux-feature-toggle": "1.7.4",
-        "@sap/ux-project-access": "1.7.4",
+        "@sap/ux-cds": "1.7.5",
+        "@sap/ux-common-utils": "1.7.5",
+        "@sap/ux-feature-toggle": "1.7.5",
+        "@sap/ux-project-access": "1.7.5",
         applicationinsights: "1.4.1",
         "performance-now": "2.1.0",
         yaml: "2.0.0-10"
@@ -65238,6 +65239,9 @@ var require_commandRunner = __commonJS({
           spawnedCmd.stderr.on("data", (data2) => {
             stack.push(data2.toString());
           });
+          spawnedCmd.on("error", (error3) => {
+            reject(`Command failed with error: ${error3.message}`);
+          });
           spawnedCmd.on("close", (errorCode) => {
             if (errorCode !== 0) {
               reject(`Command failed, \`${cmd} ${args.join(" ")}\`, ${stack.join(", ")}`);
@@ -68061,7 +68065,9 @@ var require_ui5_info = __commonJS({
       if (ui5SelectedVersion && ui5SelectedVersion.length) {
         const latestMinIdx = latestVersions.findIndex((v) => v === ui5SelectedVersion);
         if (latestMinIdx === -1) {
-          if (ui5SelectedVersion < latestVersions.slice(-1)[0]) {
+          if (semver_compare_1.default(ui5SelectedVersion, latestVersions.slice(-1)[0]) > 0 || ui5SelectedVersion === "Latest" || !semver_1.valid(ui5SelectedVersion)) {
+            latestVersions = latestVersions.slice(0);
+          } else {
             latestVersions = latestVersions.slice(-1);
           }
         } else {
@@ -68127,7 +68133,7 @@ var require_dist7 = __commonJS({
   "../lib/ui5-info/core/dist/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.UI5Info = exports2.minUI5VersionForLocalDev = exports2.FioriElementsVersion = exports2.getSpecTagVersion = exports2.getLatestSapui5Version = exports2.parseUI5VersionsOverview = exports2.getUI5VersionsEnhanced = exports2.getSapSystemUI5Version = exports2.parseUI5Versions = exports2.uI5VersionsWithCodeAssist = exports2.getManifestVersion = exports2.getDefaultTheme = exports2.getUi5Themes = exports2.retrieveUI5Versions = exports2.MIN_UI5_VERSION_FPM_TEMPLATE = exports2.MIN_UI5_VERSION_OVERVIEW_V4_TEMPLATE = exports2.MIN_UI5_VERSION_WORKLIST_V4_TEMPLATE = exports2.MIN_UI5_VERSION_FORM_ENTRY_TEMPLATE = exports2.MIN_UI5_VERSION_ALP_V4_TEMPLATE = exports2.MIN_UI5_VERSION = exports2.MIN_UI5_VERSION_V4_TEMPLATE = exports2.CommandRunner = void 0;
+    exports2.UI5Info = exports2.minUI5VersionForLocalDev = exports2.FioriElementsVersion = exports2.ThemeIds = exports2.getSpecTagVersion = exports2.getLatestSapui5Version = exports2.parseUI5VersionsOverview = exports2.getUI5VersionsEnhanced = exports2.getSapSystemUI5Version = exports2.parseUI5Versions = exports2.uI5VersionsWithCodeAssist = exports2.getManifestVersion = exports2.getDefaultTheme = exports2.getUi5Themes = exports2.retrieveUI5Versions = exports2.MIN_UI5_VERSION_FPM_TEMPLATE = exports2.MIN_UI5_VERSION_OVERVIEW_V4_TEMPLATE = exports2.MIN_UI5_VERSION_WORKLIST_V4_TEMPLATE = exports2.MIN_UI5_VERSION_FORM_ENTRY_TEMPLATE = exports2.MIN_UI5_VERSION_ALP_V4_TEMPLATE = exports2.MIN_UI5_VERSION = exports2.MIN_UI5_VERSION_V4_TEMPLATE = exports2.CommandRunner = void 0;
     var commandRunner_1 = require_commandRunner();
     Object.defineProperty(exports2, "CommandRunner", { enumerable: true, get: function() {
       return commandRunner_1.CommandRunner;
@@ -68187,6 +68193,9 @@ var require_dist7 = __commonJS({
     Object.defineProperty(exports2, "getSpecTagVersion", { enumerable: true, get: function() {
       return ui5_info_1.getSpecTagVersion;
     } });
+    Object.defineProperty(exports2, "ThemeIds", { enumerable: true, get: function() {
+      return ui5_info_1.ThemeIds;
+    } });
     var types_1 = require_types4();
     Object.defineProperty(exports2, "FioriElementsVersion", { enumerable: true, get: function() {
       return types_1.FioriElementsVersion;
@@ -68684,6 +68693,25 @@ var require_utils9 = __commonJS({
       throw new Error(i18n_1.i18n.t("ERROR_DETAIL_PROJECT_TYPE", { appRoot, projectRoot }));
     }
     exports2.getDetailedProjectType = getDetailedProjectType;
+    function findRootsWithSapux(sapux, path3, root) {
+      if (typeof sapux === "boolean" && sapux === true) {
+        return {
+          appRoot: root,
+          projectRoot: root
+        };
+      } else if (Array.isArray(sapux)) {
+        const pathWithSep = path3.endsWith(path_1.sep) ? path3 : path3 + path_1.sep;
+        const relAppPaths = sapux.map((a) => path_1.join(...a.split(/\\|\//)));
+        const relApp = relAppPaths.find((app) => pathWithSep.startsWith(path_1.join(root, app) + path_1.sep));
+        if (relApp) {
+          return {
+            appRoot: path_1.join(root, relApp),
+            projectRoot: root
+          };
+        }
+      }
+      return null;
+    }
     async function findRootsForPath(path3) {
       try {
         const appRoot = await findProjectRoot(path3, false);
@@ -68691,23 +68719,8 @@ var require_utils9 = __commonJS({
           return null;
         }
         const appPckJson = await file_1.readJSON(path_1.join(appRoot, project_spec_1.FileName.Package));
-        if (appPckJson == null ? void 0 : appPckJson.sapux) {
-          if (typeof appPckJson.sapux === "boolean" && appPckJson.sapux === true) {
-            return {
-              appRoot,
-              projectRoot: appRoot
-            };
-          } else if (Array.isArray(appPckJson.sapux)) {
-            const relAppPaths = appPckJson.sapux.map((a) => path_1.join(...a.split(/\\|\//)));
-            const relApp = relAppPaths.find((app) => path3.startsWith(path_1.join(appRoot, app) + path_1.sep));
-            if (relApp) {
-              return {
-                appRoot: path_1.join(appRoot, relApp),
-                projectRoot: appRoot
-              };
-            }
-          }
-          return null;
+        if (appPckJson.sapux) {
+          return findRootsWithSapux(appPckJson.sapux, path3, appRoot);
         }
         if (await capProject_1.isCapProject(appRoot, appPckJson)) {
           return null;
@@ -68722,13 +68735,11 @@ var require_utils9 = __commonJS({
           const { root } = path_1.parse(appRoot);
           let projectRoot = path_1.dirname(appRoot);
           while (projectRoot !== root) {
-            if (await capProject_1.isCapProject(projectRoot)) {
-              if (path_1.join(projectRoot, "app") !== appRoot) {
-                return {
-                  appRoot,
-                  projectRoot
-                };
-              }
+            if (await capProject_1.isCapProject(projectRoot) && path_1.join(projectRoot, "app") !== appRoot) {
+              return {
+                appRoot,
+                projectRoot
+              };
             }
             projectRoot = path_1.dirname(projectRoot);
           }
@@ -93698,7 +93709,7 @@ async function requestWithRetry(requestFn, retryErrorCodes, config2, log3) {
       await requestFn(config2, log3);
     } catch (e) {
       retryErrorCode = identifyRetryError(e, retryErrorCodes);
-      if (retryErrorCode > 0) {
+      if (retryErrorCode > 0 && !originalConfig.failFast) {
         throw e;
       } else {
         bail(e);