@sap-ux/fiori-freestyle-writer 0.23.2 → 1.0.1

package/dist/index.js

@@ -14,6 +14,7 @@ const types_1 = require("./types");
 const defaults_1 = require("./defaults");
 const ui5_config_1 = require("@sap-ux/ui5-config");
 const i18n_1 = require("./i18n");
+const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
 /**
  * Generate a UI5 application based on the specified Fiori Freestyle floorplan template.
  *
@@ -34,9 +35,20 @@ async function generate(basePath, data, fs) {
     fs = await (0, ui5_application_writer_1.generate)(basePath, ffApp, fs);
     // add new and overwrite files from templates e.g.
     const tmplPath = (0, path_1.join)(__dirname, '..', 'templates');
-    // Common files
     const ignore = [isTypeScriptEnabled ? '**/*.js' : '**/*.ts'];
-    fs.copyTpl((0, path_1.join)(tmplPath, 'common', 'add'), basePath, { ...ffApp, escapeFLPText: defaults_1.escapeFLPText }, undefined, {
+    // Determine if the project type is 'EDMXBackend'.
+    const isEdmxProjectType = ffApp.app.projectType === 'EDMXBackend';
+    // Get the resource URLs for the UShell bootstrap and UI bootstrap based on the project type and UI5 framework details
+    const { uShellBootstrapResourceUrl, uiBootstrapResourceUrl } = (0, fiori_generator_shared_1.getBootstrapResourceUrls)(isEdmxProjectType, ffApp.ui5?.frameworkUrl, ffApp.ui5?.version);
+    const appConfig = {
+        ...ffApp,
+        uShellBootstrapResourceUrl,
+        uiBootstrapResourceUrl
+    };
+    fs.copyTpl((0, path_1.join)(tmplPath, 'common', 'add'), basePath, {
+        ...appConfig,
+        escapeFLPText: defaults_1.escapeFLPText
+    }, undefined, {
         globOptions: { ignore, dot: true }
     });
     fs.copyTpl((0, path_1.join)(tmplPath, ffApp.template.type, 'add'), basePath, ffApp, undefined, {
@@ -58,20 +70,30 @@ async function generate(basePath, data, fs) {
     fs.append((0, path_1.join)(basePath, 'webapp', 'i18n', 'i18n.properties'), (0, ejs_1.render)(fs.read((0, path_1.join)(extRoot, 'i18n', 'i18n.properties')), ffApp, {}));
     // package.json
     const packagePath = (0, path_1.join)(basePath, 'package.json');
+    // extend package.json with scripts for non-CAP projects
     fs.extendJSON(packagePath, JSON.parse((0, ejs_1.render)(fs.read((0, path_1.join)(tmplPath, 'common', 'extend', 'package.json')), ffApp, {})));
     const packageJson = JSON.parse(fs.read(packagePath));
-    packageJson.scripts = {
-        ...packageJson.scripts,
-        ...(0, packageConfig_1.getPackageJsonTasks)({
-            localOnly: !!ffApp.service && !ffApp.service?.url,
-            addMock: !!ffApp.service?.metadata,
-            sapClient: ffApp.service?.client,
-            flpAppId: ffApp.app.flpAppId,
-            startFile: data?.app?.startFile,
-            localStartFile: data?.app?.localStartFile,
-            generateIndex: ffApp.appOptions?.generateIndex
-        })
-    };
+    if (isEdmxProjectType) {
+        // Add scripts for non-CAP applications
+        packageJson.scripts = {
+            ...packageJson.scripts,
+            ...(0, packageConfig_1.getPackageJsonTasks)({
+                localOnly: !!ffApp.service && !ffApp.service?.url,
+                addMock: !!ffApp.service?.metadata,
+                sapClient: ffApp.service?.client,
+                flpAppId: ffApp.app.flpAppId,
+                startFile: data?.app?.startFile,
+                localStartFile: data?.app?.localStartFile,
+                generateIndex: ffApp.appOptions?.generateIndex
+            })
+        };
+    }
+    else {
+        // Add deploy-config for CAP applications
+        packageJson.scripts = {
+            'deploy-config': 'npx -p @sap/ux-ui5-tooling fiori add deploy-config cf'
+        };
+    }
     fs.writeJSON(packagePath, packageJson);
     // Add service to the project if provided
     if (ffApp.service) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fiori-freestyle-writer",
   "description": "SAP Fiori freestyle application writer",
-  "version": "0.23.2",
+  "version": "1.0.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -26,9 +26,10 @@
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
     "read-pkg-up": "7.0.1",
-    "@sap-ux/odata-service-writer": "0.21.1",
-    "@sap-ux/ui5-application-writer": "0.27.2",
-    "@sap-ux/ui5-config": "0.23.1"
+    "@sap-ux/odata-service-writer": "0.22.0",
+    "@sap-ux/ui5-application-writer": "1.1.0",
+    "@sap-ux/ui5-config": "0.23.1",
+    "@sap-ux/fiori-generator-shared": "0.3.0"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",

package/templates/common/add/webapp/test/flpSandbox.html

@@ -55,10 +55,10 @@
         };
     </script>
 
-    <script src="../test-resources/sap/ushell/bootstrap/sandbox.js" id="sap-ushell-bootstrap"></script>
+    <script src="<%- locals.uShellBootstrapResourceUrl %>" id="sap-ushell-bootstrap"></script>
     <!-- Bootstrap the UI5 core library. 'data-sap-ui-frameOptions="allow"'' is a NON-SECURE setting for test environments -->
     <script id="sap-ui-bootstrap"
-        src="../resources/sap-ui-core.js"
+        src="<%- locals.uiBootstrapResourceUrl %>"
         data-sap-ui-libs="<%- ui5.ui5Libs %>"
         data-sap-ui-async="true"
         data-sap-ui-preload="async"