@sap-ux/ui5-application-writer 1.1.5 → 1.2.0

package/dist/data/defaults.d.ts

@@ -1,4 +1,5 @@
-import type { App, AppOptions, Package, UI5 } from '../types';
+import type { App, AppOptions, UI5 } from '../types';
+import type { Package } from '@sap-ux/project-access';
 /**
  * Returns a package instance with default properties.
  *

package/dist/data/index.d.ts

@@ -1,4 +1,5 @@
-import type { App, UI5, AppOptions, Package, Ui5App } from '../types';
+import type { App, UI5, AppOptions, Ui5App } from '../types';
+import type { Package } from '@sap-ux/project-access';
 /**
  * Merges Ui5App instance with default properties.
  * Replaces undefined mandatory properties with default values.

package/dist/data/index.js

@@ -23,6 +23,10 @@ function mergeWithDefaults(ui5App) {
     // Determine if the project type is 'EDMXBackend'.
     const isEdmxProjectType = ui5App.app.projectType === 'EDMXBackend';
     ui5App.package = (0, ui5_config_1.mergeObjects)((0, defaults_1.packageDefaults)(ui5App.package.version, ui5App.app.description, isEdmxProjectType), ui5App.package);
+    if (!isEdmxProjectType) {
+        // sapuxLayer is not defined for cap projects
+        ui5App.package.sapuxLayer = undefined;
+    }
     if (ui5App.appOptions.sapux && isEdmxProjectType) {
         // Add @sap/ux-specification to devDependencies only for non-CAP projects
         ui5App.package.devDependencies = ui5App.package.devDependencies || {};

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import type { Editor } from 'mem-fs-editor';
-import type { App, AppOptions, Package, UI5 } from './types';
+import type { App, AppOptions, UI5 } from './types';
+import { type Package } from '@sap-ux/project-access';
 import { Ui5App } from './types';
 /**
  * Writes the template to the memfs editor instance.

package/dist/index.js

@@ -54,6 +54,8 @@ async function generate(basePath, ui5AppConfig, fs) {
     });
     ui5Config.addFioriToolsAppReloadMiddleware();
     if (isEdmxProjectType) {
+        // add preview middleware to ui5Config
+        ui5Config.addFioriToolsPreviewMiddleware(ui5App.app.id, ui5App.ui5?.ui5Theme);
         const ui5LocalConfigPath = (0, path_1.join)(basePath, 'ui5-local.yaml');
         // write ui5-local.yaml only for non-CAP applications
         const ui5LocalConfig = await ui5_config_1.UI5Config.newInstance(fs.read(ui5LocalConfigPath));
@@ -61,6 +63,8 @@ async function generate(basePath, ui5AppConfig, fs) {
         ui5LocalConfig.addFioriToolsAppReloadMiddleware();
         // Add optional features
         await (0, options_1.applyOptionalFeatures)(ui5App, fs, basePath, tmplPath, [ui5Config, ui5LocalConfig]);
+        // add preview middleware to ui5LocalConfig
+        ui5LocalConfig.addFioriToolsPreviewMiddleware(ui5App.app.id, ui5App.ui5?.ui5Theme);
         // write ui5 local yaml
         fs.write(ui5LocalConfigPath, ui5LocalConfig.toString());
     }

package/dist/types.d.ts

@@ -1,15 +1,4 @@
-import type { ProjectType } from '@sap-ux/project-access';
-export interface Package {
-    name: string;
-    version?: string;
-    description?: string;
-    scripts?: Record<string, string>;
-    dependencies?: Record<string, string>;
-    devDependencies?: Record<string, string>;
-    ui5?: {
-        dependencies?: string[];
-    };
-}
+import type { ProjectType, Package } from '@sap-ux/project-access';
 export interface App {
     id: string;
     /**

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.5",
+  "version": "1.2.0",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [
@@ -27,7 +27,7 @@
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
     "semver": "7.5.4",
-    "@sap-ux/ui5-config": "0.24.1"
+    "@sap-ux/ui5-config": "0.25.0"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",
@@ -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.26.9"
+    "@sap-ux/project-access": "1.27.4"
   },
   "engines": {
     "node": ">=18.x"

package/templates/core/package.json

@@ -9,6 +9,9 @@
     ],
     "main": "webapp/index.html",
     "dependencies": {},
-    "devDependencies": <%- JSON.stringify(package.devDependencies, null, 8) -%>,
-    "scripts": <%- JSON.stringify(package.scripts, null, 4) -%>
-}
+    "devDependencies": <%- JSON.stringify(package.devDependencies, null, 8).trim() -%>,
+    "scripts": <%- JSON.stringify(package.scripts, null, 4).trim() -%>
+    <% if (package.sapuxLayer) { %>
+    ,"sapuxLayer": "<%= package.sapuxLayer %>"
+    <% } %>
+}

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

@@ -227,10 +227,15 @@ sap.registerComponentDependencyPaths(manifestUri)
         } else {
             sap.ui.getCore().attachInit(function () {
                 registerSAPFonts();
-                // initialize the ushell sandbox component
-                sap.ushell.Container.createRenderer(true).then(function (component) {
-                    component.placeAt("content");
-                });
+                try {
+                    // initialize the ushell sandbox component in ui5 v2
+                    sap.ushell.Container.createRenderer(true).then(function (component) {
+                        component.placeAt("content");
+                    });
+                } catch {
+                    // support older versions of ui5 
+                    sap.ushell.Container.createRenderer().placeAt("content");
+                }
             });
         }
     });