@sap-ux/fiori-elements-writer 1.1.7 → 1.1.8

package/dist/data/defaults.d.ts

@@ -19,6 +19,15 @@ export declare function setDefaultTemplateSettings<T extends {}>(template: Templ
  * @returns The UI5 libs required by the specified template type and OData version and UI5 annotation libs
  */
 export declare function getUi5Libs(type: TemplateType, version: OdataVersion, ui5Libs?: string | string[]): string[];
+/**
+ * Gets the required manifest libs for the specified template type and OData version.
+ *
+ * @param type - The template type of the required base component
+ * @param version - The odata service version determines the appropriate base component to use
+ * @param libs - manifest libs
+ * @returns The manifest libs required by the specified template type and OData version and UI5 annotation libs
+ */
+export declare function getManifestLibs(type: TemplateType, version: OdataVersion, libs?: string | string[]): string[];
 /**
  * Sets defaults for the specified Fiori elements application.
  *

package/dist/data/defaults.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTemplateOptions = exports.setAppDefaults = exports.getUi5Libs = exports.setDefaultTemplateSettings = void 0;
+exports.getTemplateOptions = exports.setAppDefaults = exports.getManifestLibs = exports.getUi5Libs = exports.setDefaultTemplateSettings = void 0;
 const odata_service_writer_1 = require("@sap-ux/odata-service-writer");
 const read_pkg_up_1 = __importDefault(require("read-pkg-up"));
 const types_1 = require("../types");
@@ -68,6 +68,19 @@ function getUi5Libs(type, version, ui5Libs) {
     return [...templateLibs].concat(ui5Libs ?? []);
 }
 exports.getUi5Libs = getUi5Libs;
+/**
+ * Gets the required manifest libs for the specified template type and OData version.
+ *
+ * @param type - The template type of the required base component
+ * @param version - The odata service version determines the appropriate base component to use
+ * @param libs - manifest libs
+ * @returns The manifest libs required by the specified template type and OData version and UI5 annotation libs
+ */
+function getManifestLibs(type, version, libs) {
+    const templateLibs = (0, templateAttributes_1.getTemplateManifestLibs)(type, version);
+    return [...templateLibs].concat(libs ?? []);
+}
+exports.getManifestLibs = getManifestLibs;
 /**
  * Sets defaults for the specified Fiori elements application.
  *
@@ -95,6 +108,7 @@ function setAppDefaults(feApp) {
     feApp.ui5 = {
         ...feApp.ui5,
         ui5Libs: getUi5Libs(feApp.template.type, feApp.service.version, feApp.ui5?.ui5Libs),
+        manifestLibs: getManifestLibs(feApp.template.type, feApp.service.version, feApp.ui5?.manifestLibs),
         customUi5Libs: customUi5Libs
     };
     // Assign a default annotation name if the service type is EDMX and no local annotation name is provided

package/dist/data/templateAttributes.d.ts

@@ -23,6 +23,14 @@ export declare function getBaseComponent(type: TemplateType, version: OdataVersi
  * @returns The Ui5 libs required by the specified template type and OData version
  */
 export declare function getTemplateUi5Libs(type: TemplateType, version: OdataVersion): string[];
+/**
+ * Gets the required manifest libs for the specified template type and OData version.
+ *
+ * @param type - The template type of the required base component
+ * @param version - The odata service version determines the appropriate base component to use
+ * @returns The manifest libs required by the specified template type and OData version
+ */
+export declare function getTemplateManifestLibs(type: TemplateType, version: OdataVersion): string[];
 type TemplateAttributes = {
     [K in TemplateType]: {
         supportedODataVersions: OdataVersion[];

package/dist/data/templateAttributes.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TemplateTypeAttributes = exports.getTemplateUi5Libs = exports.getBaseComponent = exports.escapeFLPText = exports.changesPreviewToVersion = exports.minSupportedUI5VersionV4 = exports.minSupportedUI5Version = void 0;
+exports.TemplateTypeAttributes = exports.getTemplateManifestLibs = exports.getTemplateUi5Libs = exports.getBaseComponent = exports.escapeFLPText = exports.changesPreviewToVersion = exports.minSupportedUI5VersionV4 = exports.minSupportedUI5Version = void 0;
 const types_1 = require("../types");
 // first version with SAP Fiori 3 theme
 exports.minSupportedUI5Version = '1.65.0';
@@ -23,7 +23,7 @@ const commonUi5Libs = {
         'sap.ui.generic.app',
         'sap.suite.ui.generic.template'
     ],
-    [types_1.OdataVersion.v4]: ['sap.m']
+    [types_1.OdataVersion.v4]: ['sap.m', 'sap.fe.templates']
 };
 const templateLibs = {
     [types_1.OdataVersion.v2]: {
@@ -47,27 +47,33 @@ const templateLibs = {
     [types_1.OdataVersion.v4]: {
         [types_1.TemplateType.ListReportObjectPage]: {
             baseComponent: appComponentLibFioriElements,
-            ui5Libs: [...commonUi5Libs[types_1.OdataVersion.v4], 'sap.fe.templates']
+            ui5Libs: [...commonUi5Libs[types_1.OdataVersion.v4], 'sap.ushell'],
+            manifestLibs: [...commonUi5Libs[types_1.OdataVersion.v4]]
         },
         [types_1.TemplateType.FormEntryObjectPage]: {
             baseComponent: appComponentLibFioriElements,
-            ui5Libs: [...commonUi5Libs[types_1.OdataVersion.v4], 'sap.fe.templates']
+            ui5Libs: [...commonUi5Libs[types_1.OdataVersion.v4], 'sap.ushell'],
+            manifestLibs: [...commonUi5Libs[types_1.OdataVersion.v4]]
         },
         [types_1.TemplateType.AnalyticalListPage]: {
             baseComponent: appComponentLibFioriElements,
-            ui5Libs: [...commonUi5Libs[types_1.OdataVersion.v4], 'sap.fe.templates']
+            ui5Libs: [...commonUi5Libs[types_1.OdataVersion.v4], 'sap.ushell'],
+            manifestLibs: [...commonUi5Libs[types_1.OdataVersion.v4]]
         },
         [types_1.TemplateType.Worklist]: {
             baseComponent: appComponentLibFioriElements,
-            ui5Libs: [...commonUi5Libs[types_1.OdataVersion.v4], 'sap.fe.templates']
+            ui5Libs: [...commonUi5Libs[types_1.OdataVersion.v4], 'sap.ushell'],
+            manifestLibs: [...commonUi5Libs[types_1.OdataVersion.v4]]
         },
         [types_1.TemplateType.OverviewPage]: {
             baseComponent: appComponentLibOVP,
-            ui5Libs: [...commonUi5Libs[types_1.OdataVersion.v4], 'sap.fe.templates', 'sap.ovp', 'sap.ui.rta', 'sap.ui.layout']
+            ui5Libs: [...commonUi5Libs[types_1.OdataVersion.v4], 'sap.ushell', 'sap.ovp', 'sap.ui.rta', 'sap.ui.layout'],
+            manifestLibs: [...commonUi5Libs[types_1.OdataVersion.v4], 'sap.ovp', 'sap.ui.rta', 'sap.ui.layout']
         },
         [types_1.TemplateType.FlexibleProgrammingModel]: {
             baseComponent: appComponentLibFioriElements,
-            ui5Libs: [...commonUi5Libs[types_1.OdataVersion.v4], 'sap.fe.core']
+            ui5Libs: [...commonUi5Libs[types_1.OdataVersion.v4], 'sap.fe.core', 'sap.ushell'],
+            manifestLibs: ['sap.m', 'sap.fe.core']
         }
     }
 };
@@ -93,6 +99,17 @@ function getTemplateUi5Libs(type, version) {
     return templateLibs[version][type]?.ui5Libs ?? [];
 }
 exports.getTemplateUi5Libs = getTemplateUi5Libs;
+/**
+ * Gets the required manifest libs for the specified template type and OData version.
+ *
+ * @param type - The template type of the required base component
+ * @param version - The odata service version determines the appropriate base component to use
+ * @returns The manifest libs required by the specified template type and OData version
+ */
+function getTemplateManifestLibs(type, version) {
+    return templateLibs[version][type]?.manifestLibs ?? [];
+}
+exports.getTemplateManifestLibs = getTemplateManifestLibs;
 exports.TemplateTypeAttributes = {
     [types_1.TemplateType.Worklist]: {
         supportedODataVersions: [types_1.OdataVersion.v2, types_1.OdataVersion.v4],

package/dist/fpmConfig.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateFpmConfig = void 0;
-const path_1 = require("path");
 const fe_fpm_writer_1 = require("@sap-ux/fe-fpm-writer");
-const ui5_config_1 = require("@sap-ux/ui5-config");
 /**
  * Processes the template for the Flexible Programming Model (FPM).
  * Generates a custom page and updates the UI5 local yaml.
@@ -21,10 +19,6 @@ async function generateFpmConfig(feApp, basePath, fs) {
         minUI5Version: feApp.ui5?.minUI5Version,
         typescript: feApp.appOptions?.typescript
     }, fs);
-    const ui5LocalConfigPath = (0, path_1.join)(basePath, 'ui5-local.yaml');
-    const ui5LocalConfig = await ui5_config_1.UI5Config.newInstance(fs.read(ui5LocalConfigPath));
-    ui5LocalConfig.addUI5Libs(['sap.fe.templates']);
-    fs.write(ui5LocalConfigPath, ui5LocalConfig.toString());
 }
 exports.generateFpmConfig = generateFpmConfig;
 //# sourceMappingURL=fpmConfig.js.map

package/dist/index.js

@@ -66,24 +66,6 @@ function getTypeScriptIgnoreGlob(feApp, coercedUI5Version) {
     }
     return ignore;
 }
-/**
- * Configures the UI5 libraries based on the project type and template type.
- *
- * @param feApp - The FE app config.
- * @param isEdmxProjectType - Whether the project is of EDMX type.
- * @returns The configured UI5 libraries, or undefined if not applicable.
- */
-function configureUi5Libs(feApp, isEdmxProjectType) {
-    let ui5Libs;
-    if (isEdmxProjectType) {
-        ui5Libs = feApp.ui5?.ui5Libs;
-        // FPM to preload sap.fe.templates for FLP template
-        if (feApp.template.type === types_1.TemplateType.FlexibleProgrammingModel) {
-            ui5Libs.push('sap.fe.templates');
-        }
-    }
-    return ui5Libs;
-}
 /**
  * Generate a UI5 application based on the specified Fiori Elements floorplan template.
  *
@@ -119,7 +101,7 @@ async function generate(basePath, data, fs) {
     const isEdmxProjectType = feApp.app.projectType === 'EDMXBackend';
     // Get resource bootstrap URLs based on the project type
     const { uShellBootstrapResourceUrl, uiBootstrapResourceUrl } = (0, fiori_generator_shared_1.getBootstrapResourceUrls)(isEdmxProjectType, feApp.ui5?.frameworkUrl, feApp.ui5?.version);
-    const ui5Libs = configureUi5Libs(feApp, isEdmxProjectType);
+    const ui5Libs = isEdmxProjectType ? feApp.ui5?.ui5Libs : undefined;
     // Define template options with changes preview and loader settings based on project type
     const templateOptions = (0, defaults_1.getTemplateOptions)(isEdmxProjectType, feApp.service.version, feApp.ui5?.version);
     const appConfig = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fiori-elements-writer",
   "description": "SAP Fiori elements application writer",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -27,12 +27,12 @@
     "mem-fs-editor": "9.4.0",
     "read-pkg-up": "7.0.1",
     "semver": "7.5.4",
-    "@sap-ux/odata-service-writer": "0.22.3",
-    "@sap-ux/ui5-application-writer": "1.1.4",
-    "@sap-ux/fe-fpm-writer": "0.27.6",
-    "@sap-ux/ui5-config": "0.24.0",
+    "@sap-ux/odata-service-writer": "0.22.4",
+    "@sap-ux/ui5-application-writer": "1.1.5",
+    "@sap-ux/fe-fpm-writer": "0.27.7",
+    "@sap-ux/ui5-config": "0.24.1",
     "@sap-ux/ui5-test-writer": "0.4.1",
-    "@sap-ux/fiori-generator-shared": "0.3.16"
+    "@sap-ux/fiori-generator-shared": "0.3.17"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",