@sap-ux/fiori-elements-writer 2.7.15 → 2.7.17

package/dist/data/manifestSettings.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extendManifestJson = extendManifestJson;
 const types_1 = require("../types");
 const odata_service_writer_1 = require("@sap-ux/odata-service-writer");
-const path_1 = require("path");
+const node_path_1 = require("node:path");
 const ejs_1 = require("ejs");
 const semver_1 = __importDefault(require("semver"));
 /**
@@ -60,14 +60,14 @@ function extendManifestJson(fs, targetPath, rootTemplatesPath, feApp) {
     };
     // Manifest paths to be extended
     const extendTemplatePaths = [
-        (0, path_1.join)(rootTemplatesPath, 'common', 'extend', 'webapp'),
-        (0, path_1.join)(rootTemplatesPath, templatePath, 'extend', 'webapp'),
-        (0, path_1.join)(rootTemplatesPath, `v${feApp.service.version}`, templatePath, 'extend', 'webapp'),
-        (0, path_1.join)(rootTemplatesPath, `v${feApp.service.version}`, 'common', 'extend', 'webapp')
+        (0, node_path_1.join)(rootTemplatesPath, 'common', 'extend', 'webapp'),
+        (0, node_path_1.join)(rootTemplatesPath, templatePath, 'extend', 'webapp'),
+        (0, node_path_1.join)(rootTemplatesPath, `v${feApp.service.version}`, templatePath, 'extend', 'webapp'),
+        (0, node_path_1.join)(rootTemplatesPath, `v${feApp.service.version}`, 'common', 'extend', 'webapp')
     ];
-    const manifestPath = (0, path_1.join)(targetPath, 'webapp', 'manifest.json');
+    const manifestPath = (0, node_path_1.join)(targetPath, 'webapp', 'manifest.json');
     extendTemplatePaths.forEach((extendTemplatePath) => {
-        const manifestTemplatePath = (0, path_1.join)(extendTemplatePath, 'manifest.json');
+        const manifestTemplatePath = (0, node_path_1.join)(extendTemplatePath, 'manifest.json');
         if (fs.exists(manifestTemplatePath)) {
             fs.extendJSON(manifestPath, JSON.parse((0, ejs_1.render)(fs.read(manifestTemplatePath), templateSettings, {})));
         }

package/dist/index.js

@@ -19,7 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.minSupportedUI5VersionV4 = exports.minSupportedUI5Version = exports.TemplateTypeAttributes = exports.V2_FE_TYPES_AVAILABLE = void 0;
 exports.generate = generate;
-const path_1 = require("path");
+const node_path_1 = require("node:path");
 const ejs_1 = require("ejs");
 const ui5_application_writer_1 = require("@sap-ux/ui5-application-writer");
 const odata_service_writer_1 = require("@sap-ux/odata-service-writer");
@@ -119,7 +119,7 @@ async function generate(basePath, data, fs, log) {
     await (0, odata_service_writer_1.generate)(basePath, feApp.service, fs);
     const coercedUI5Version = semver_1.default.coerce(feApp.ui5?.version);
     // Add new files from templates e.g.
-    const rootTemplatesPath = (0, path_1.join)(__dirname, '..', 'templates');
+    const rootTemplatesPath = (0, node_path_1.join)(__dirname, '..', 'templates');
     // Add templates common to all template types
     const isTypeScriptEnabled = feApp.appOptions?.typescript === true;
     const ignore = [
@@ -145,13 +145,13 @@ async function generate(basePath, data, fs, log) {
         ui5Libs
     };
     // Copy templates with configuration
-    fs.copyTpl((0, path_1.join)(rootTemplatesPath, 'common', 'add', '**/*.*'), basePath, {
+    fs.copyTpl((0, node_path_1.join)(rootTemplatesPath, 'common', 'add', '**/*.*'), basePath, {
         ...appConfig,
         escapeFLPText: templateAttributes_1.escapeFLPText
     }, undefined, {
         globOptions: { ignore, dot: true }
     });
-    fs.copyTpl((0, path_1.join)(rootTemplatesPath, 'common', 'add', '**/*.*'), basePath, {
+    fs.copyTpl((0, node_path_1.join)(rootTemplatesPath, 'common', 'add', '**/*.*'), basePath, {
         ...appConfig,
         templateOptions,
         escapeFLPText: templateAttributes_1.escapeFLPText
@@ -159,18 +159,18 @@ async function generate(basePath, data, fs, log) {
         globOptions: { ignore, dot: true }
     });
     // Extend common files
-    const packagePath = (0, path_1.join)(basePath, 'package.json');
+    const packagePath = (0, node_path_1.join)(basePath, 'package.json');
     // Extend package.json
-    fs.extendJSON(packagePath, JSON.parse((0, ejs_1.render)(fs.read((0, path_1.join)(rootTemplatesPath, 'common', 'extend', 'package.json')), feApp, {})));
+    fs.extendJSON(packagePath, JSON.parse((0, ejs_1.render)(fs.read((0, node_path_1.join)(rootTemplatesPath, 'common', 'extend', 'package.json')), feApp, {})));
     // Special handling for FPM because it is not based on template files but used the fpm writer
     if (feApp.template.type === types_1.TemplateType.FlexibleProgrammingModel) {
         await (0, fpmConfig_1.generateFpmConfig)(feApp, basePath, fs);
     }
     else {
         // Copy odata version specific common templates and version specific, floorplan specific templates
-        const templateVersionPath = (0, path_1.join)(rootTemplatesPath, `v${feApp.service?.version}`);
-        [(0, path_1.join)(templateVersionPath, 'common', 'add'), (0, path_1.join)(templateVersionPath, feApp.template.type, 'add')].forEach((templatePath) => {
-            fs.copyTpl((0, path_1.join)(templatePath, '**/*.*'), basePath, feApp, {}, { ignoreNoMatch: true, globOptions: { ignore, dot: true } });
+        const templateVersionPath = (0, node_path_1.join)(rootTemplatesPath, `v${feApp.service?.version}`);
+        [(0, node_path_1.join)(templateVersionPath, 'common', 'add'), (0, node_path_1.join)(templateVersionPath, feApp.template.type, 'add')].forEach((templatePath) => {
+            fs.copyTpl((0, node_path_1.join)(templatePath, '**/*.*'), basePath, feApp, {}, { ignoreNoMatch: true, globOptions: { ignore, dot: true } });
         });
     }
     // Update manifest.json with template specific settings

package/dist/writeAnnotations.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeAnnotations = writeAnnotations;
-const path_1 = require("path");
+const node_path_1 = require("node:path");
 const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
 const types_1 = require("./types");
 const annotation_generator_1 = require("@sap-ux/annotation-generator");
@@ -17,9 +17,9 @@ const i18n_1 = require("./i18n");
 function getAnnotationFilePath(appName, capService) {
     if (capService) {
         const appPath = capService.appPath ?? (0, fiori_generator_shared_1.getCapFolderPathsSync)(capService.projectPath).app;
-        return `${appPath}${path_1.sep}${appName}${path_1.sep}annotations.cds`;
+        return `${appPath}${node_path_1.sep}${appName}${node_path_1.sep}annotations.cds`;
     }
-    return `webapp${path_1.sep}annotations${path_1.sep}annotation.xml`;
+    return `webapp${node_path_1.sep}annotations${node_path_1.sep}annotation.xml`;
 }
 /**
  * Writes annotation files for the given application configuration.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fiori-elements-writer",
   "description": "SAP Fiori elements application writer",
-  "version": "2.7.15",
+  "version": "2.7.17",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -27,14 +27,14 @@
     "mem-fs-editor": "9.4.0",
     "read-pkg-up": "7.0.1",
     "semver": "7.5.4",
-    "@sap-ux/odata-service-writer": "0.27.23",
-    "@sap-ux/ui5-application-writer": "1.5.17",
-    "@sap-ux/fe-fpm-writer": "0.39.3",
-    "@sap-ux/ui5-config": "0.29.6",
-    "@sap-ux/ui5-test-writer": "0.7.27",
-    "@sap-ux/fiori-generator-shared": "0.13.19",
-    "@sap-ux/cap-config-writer": "0.12.10",
-    "@sap-ux/annotation-generator": "0.3.64",
+    "@sap-ux/odata-service-writer": "0.27.24",
+    "@sap-ux/ui5-application-writer": "1.5.18",
+    "@sap-ux/fe-fpm-writer": "0.39.4",
+    "@sap-ux/ui5-config": "0.29.7",
+    "@sap-ux/ui5-test-writer": "0.7.28",
+    "@sap-ux/fiori-generator-shared": "0.13.21",
+    "@sap-ux/cap-config-writer": "0.12.12",
+    "@sap-ux/annotation-generator": "0.3.65",
     "@sap-ux/logger": "0.7.0"
   },
   "devDependencies": {
@@ -45,7 +45,7 @@
     "@types/mem-fs": "1.1.2",
     "@types/semver": "7.5.2",
     "fs-extra": "10.0.0",
-    "@sap-ux/eslint-plugin-fiori-tools": "0.6.0"
+    "@sap-ux/eslint-plugin-fiori-tools": "0.6.1"
   },
   "engines": {
     "node": ">=20.x"

package/templates/v2/common/add/webapp/test/changes_loader.js

@@ -4,7 +4,7 @@ const parsedUI5Version = sap.ui.version.split('.');
 
 //For UI5 version >= 1.80, the location of the FileListBaseConnector is different
 const connectorPath =
-    parseInt(parsedUI5Version[0], 10) >= 1 && parseInt(parsedUI5Version[1], 10) >= 80
+    Number.parseInt(parsedUI5Version[0], 10) >= 1 && Number.parseInt(parsedUI5Version[1], 10) >= 80
         ? 'sap/ui/fl/write/api/connectors/FileListBaseConnector'
         : 'sap/ui/fl/initial/api/connectors/FileListBaseConnector';
 

package/templates/v2/common/add/webapp/test/changes_loader.ts

@@ -6,7 +6,7 @@ const parsedUI5Version = sap.ui.version.split('.');
 
 //For UI5 version >= 1.80, the location of the FileListBaseConnector is different
 const connectorPath =
-    parseInt(parsedUI5Version[0], 10) >= 1 && parseInt(parsedUI5Version[1], 10) >= 80
+    Number.parseInt(parsedUI5Version[0], 10) >= 1 && Number.parseInt(parsedUI5Version[1], 10) >= 80
         ? 'sap/ui/fl/write/api/connectors/FileListBaseConnector'
         : 'sap/ui/fl/initial/api/connectors/FileListBaseConnector';
 

package/templates/v2/common/add/webapp/test/changes_preview.js

@@ -1,6 +1,6 @@
 //Load the fake lrep connector only if ui5 version < 1.78
 var version = sap.ui.version.split(".");
-if (parseInt(version[0], 10) <= 1 && parseInt(version[1], 10) < 78) {
+if (Number.parseInt(version[0], 10) <= 1 && Number.parseInt(version[1], 10) < 78) {
     sap.ui.getCore().loadLibraries(["sap/ui/fl"]);
     sap.ui.require(["sap/ui/fl/FakeLrepConnector"], function (FakeLrepConnector) {
         jQuery.extend(FakeLrepConnector.prototype, {

package/templates/v2/common/add/webapp/test/changes_preview.ts

@@ -2,7 +2,7 @@
 // @ts-nocheck
 //Load the fake lrep connector only if ui5 version < 1.78
 const version = sap.ui.version.split(".");
-if (parseInt(version[0], 10) <= 1 && parseInt(version[1], 10) < 78) {
+if (Number.parseInt(version[0], 10) <= 1 && Number.parseInt(version[1], 10) < 78) {
     sap.ui.getCore().loadLibraries(["sap/ui/fl"]);
     sap.ui.require(["sap/ui/fl/FakeLrepConnector"], function (FakeLrepConnector) {
         jQuery.extend(FakeLrepConnector.prototype, {