@sap-ux/ui5-application-writer 1.1.0 → 1.1.2

package/dist/index.js

@@ -5,6 +5,7 @@ const path_1 = require("path");
 const mem_fs_1 = require("mem-fs");
 const mem_fs_editor_1 = require("mem-fs-editor");
 const ui5_config_1 = require("@sap-ux/ui5-config");
+const project_access_1 = require("@sap-ux/project-access");
 const data_1 = require("./data");
 const ui5Libs_1 = require("./data/ui5Libs");
 const options_1 = require("./options");
@@ -117,7 +118,8 @@ async function enableTypescript(basePath, fs) {
     const manifest = fs.readJSON(manifestPath);
     const ui5Config = await ui5_config_1.UI5Config.newInstance(fs.read(ui5ConfigPath));
     const tmplPath = (0, path_1.join)(__dirname, '..', 'templates');
-    const typesVersion = (0, ui5_config_1.getEsmTypesVersion)(manifest['sap.ui5']?.dependencies?.minUI5Version);
+    //By chosing getMinimumUI5Version we assume that the esm type is compatible if there are multiple versions.
+    const typesVersion = (0, ui5_config_1.getEsmTypesVersion)((0, project_access_1.getMinimumUI5Version)(manifest));
     const typesPackage = (0, ui5_config_1.getTypesPackage)(typesVersion);
     const ui5App = {
         app: manifest['sap.app'],

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%3Aui5-application-writer"
   },
-  "version": "1.1.0",
+  "version": "1.1.2",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [
@@ -20,7 +20,7 @@
     "!dist/**/*.map"
   ],
   "dependencies": {
-    "@ui5/manifest": "1.61.0",
+    "@ui5/manifest": "1.66.0",
     "ejs": "3.1.10",
     "i18next": "21.10.0",
     "lodash": "4.17.21",
@@ -38,7 +38,7 @@
     "@types/semver": "7.5.2",
     "fs-extra": "10.0.0",
     "@sap-ux/eslint-plugin-fiori-tools": "0.5.0",
-    "@sap-ux/project-access": "1.25.4"
+    "@sap-ux/project-access": "1.25.7"
   },
   "engines": {
     "node": ">=18.x"

package/templates/optional/loadReuseLibs/webapp/test/locate-reuse-libs.js

@@ -41,6 +41,23 @@
             });
             return libOrCompKeysStringTmp;
         }
+        function getComponentUsageNames(compUsages, libOrCompKeysString) {
+            var libOrCompKeysStringTmp = libOrCompKeysString;
+            var compNames = Object.keys(compUsages).map(function (compUsageKey) {
+                return compUsages[compUsageKey].name;
+            });
+            compNames.forEach(function (compName) {
+                // ignore libs or Components that start with SAPUI5 delivered namespaces
+                if (!ui5Libs.some(function (substring) { return compName === substring || compName.startsWith(substring + "."); })) {
+                    if (libOrCompKeysStringTmp.length > 0) {
+                        libOrCompKeysStringTmp = libOrCompKeysStringTmp + "," + compName;
+                    } else {
+                        libOrCompKeysStringTmp = compName;
+                    }
+                }
+            });
+            return libOrCompKeysStringTmp;
+        }
         return new Promise(function (resolve, reject) {
             $.ajax(url)
                 .done(function (manifest) {
@@ -60,7 +77,7 @@
                             manifest["sap.ui5"] &&
                             manifest["sap.ui5"].componentUsages
                         ) {
-                            result = getKeys(manifest["sap.ui5"].componentUsages, result);
+                            result = getComponentUsageNames(manifest["sap.ui5"].componentUsages, result);
                         }
                     }
                     resolve(result);
@@ -211,7 +228,9 @@ sap.registerComponentDependencyPaths(manifestUri)
             sap.ui.getCore().attachInit(function () {
                 registerSAPFonts();
                 // initialize the ushell sandbox component
-                sap.ushell.Container.createRenderer().placeAt("content");
+                sap.ushell.Container.createRenderer(true).then(function (component) {
+                    component.placeAt("content");
+                });
             });
         }
     });