@sap-ux/adp-tooling 0.11.0 → 0.11.1

package/dist/writer/changes/writer-factory.d.ts

@@ -9,11 +9,11 @@ export declare class WriterFactory {
     /**
      * Creates an instance of a writer based on the specified generator type.
      *
-     * @param {T} type - The type of the change which will be handled by the writer.
-     * @param {Editor} fs - The filesystem editor instance.
-     * @param {string} projectPath - The path to the project for which the writer is created.
-     * @returns {IWriterData<T>} An instance of the writer associated with the specified generator type.
-     * @throws {Error} If the specified generator type is not supported.
+     * @param type - The type of the change which will be handled by the writer.
+     * @param fs - The filesystem editor instance.
+     * @param projectPath - The path to the project for which the writer is created.
+     * @returns An instance of the writer associated with the specified generator type.
+     * @throws If the specified generator type is not supported.
      */
     static createWriter<T extends ChangeType>(type: T, fs: Editor, projectPath: string): IWriterData<T>;
 }

package/dist/writer/changes/writer-factory.js

@@ -9,11 +9,11 @@ class WriterFactory {
     /**
      * Creates an instance of a writer based on the specified generator type.
      *
-     * @param {T} type - The type of the change which will be handled by the writer.
-     * @param {Editor} fs - The filesystem editor instance.
-     * @param {string} projectPath - The path to the project for which the writer is created.
-     * @returns {IWriterData<T>} An instance of the writer associated with the specified generator type.
-     * @throws {Error} If the specified generator type is not supported.
+     * @param type - The type of the change which will be handled by the writer.
+     * @param fs - The filesystem editor instance.
+     * @param projectPath - The path to the project for which the writer is created.
+     * @returns An instance of the writer associated with the specified generator type.
+     * @throws If the specified generator type is not supported.
      */
     static createWriter(type, fs, projectPath) {
         const WriterClass = this.writers.get(type);

package/dist/writer/options.js

@@ -9,9 +9,13 @@ exports.enhanceManifestChangeContentWithFlpConfig = exports.enhanceUI5DeployYaml
  */
 function enhanceUI5Yaml(ui5Config, config) {
     var _a;
-    const middlewares = ((_a = config.options) === null || _a === void 0 ? void 0 : _a.fioriTools) ? getFioriToolsMiddlwares(config) : getOpenSourceMiddlewares(config);
     ui5Config.setConfiguration({ propertiesFileSourceEncoding: 'UTF-8' });
-    ui5Config.addCustomMiddleware(middlewares);
+    if ((_a = config.options) === null || _a === void 0 ? void 0 : _a.fioriTools) {
+        addFioriToolsMiddlwares(ui5Config, config);
+    }
+    else {
+        addOpenSourceMiddlewares(ui5Config, config);
+    }
 }
 exports.enhanceUI5Yaml = enhanceUI5Yaml;
 /**
@@ -62,21 +66,16 @@ exports.enhanceUI5DeployYaml = enhanceUI5DeployYaml;
 /**
  * Get a list of required middlewares using the Fiori tools.
  *
+ * @param ui5Config configuration representing the ui5.yaml
  * @param config full project configuration
- * @returns list of required middlewares.
  */
-function getFioriToolsMiddlwares(config) {
+function addFioriToolsMiddlwares(ui5Config, config) {
     var _a, _b, _c, _d;
-    return [
-        {
-            name: 'fiori-tools-appreload',
-            afterMiddleware: 'compression',
-            configuration: {
-                port: 35729,
-                path: 'webapp',
-                delay: 300
-            }
-        },
+    const backendConfig = Object.assign({}, config.target);
+    (_a = backendConfig.url) !== null && _a !== void 0 ? _a : (backendConfig.url = 'https://REQUIRED_FOR_VSCODE.example');
+    backendConfig.path = '/sap';
+    ui5Config.addFioriToolsAppReloadMiddleware();
+    ui5Config.addCustomMiddleware([
         {
             name: 'fiori-tools-preview',
             afterMiddleware: 'fiori-tools-appreload',
@@ -86,32 +85,24 @@ function getFioriToolsMiddlwares(config) {
                     ignoreCertErrors: false
                 }
             }
-        },
-        {
-            name: 'fiori-tools-proxy',
-            afterMiddleware: 'fiori-tools-preview',
-            configuration: {
-                ignoreCertErrors: false,
-                ui5: {
-                    version: (_b = (_a = config === null || config === void 0 ? void 0 : config.ui5) === null || _a === void 0 ? void 0 : _a.minVersion) !== null && _b !== void 0 ? _b : '', //default to latest if version is not set
-                    path: ['/resources', '/test-resources'],
-                    url: (_d = (_c = config === null || config === void 0 ? void 0 : config.ui5) === null || _c === void 0 ? void 0 : _c.frameworkUrl) !== null && _d !== void 0 ? _d : 'https://ui5.sap.com'
-                },
-                backend: [
-                    Object.assign(Object.assign({}, config.target), { path: '/sap' })
-                ]
-            }
         }
-    ];
+    ]);
+    ui5Config.addFioriToolsProxydMiddleware({
+        ui5: {
+            url: (_b = config === null || config === void 0 ? void 0 : config.ui5) === null || _b === void 0 ? void 0 : _b.frameworkUrl,
+            version: (_d = (_c = config === null || config === void 0 ? void 0 : config.ui5) === null || _c === void 0 ? void 0 : _c.minVersion) !== null && _d !== void 0 ? _d : '' //default to latest if version is not set
+        },
+        backend: [backendConfig]
+    });
 }
 /**
  * Get a list of required middlewares using the open source middlewares.
  *
+ * @param ui5Config configuration representing the ui5.yaml
  * @param config full project configuration
- * @returns list of required middlewares.
  */
-function getOpenSourceMiddlewares(config) {
-    return [
+function addOpenSourceMiddlewares(ui5Config, config) {
+    ui5Config.addCustomMiddleware([
         {
             name: 'reload-middleware',
             afterMiddleware: 'compression',
@@ -153,7 +144,7 @@ function getOpenSourceMiddlewares(config) {
                 }
             }
         }
-    ];
+    ]);
 }
 /**
  * Get a list of required custom tasks for Cloud application.

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%3Aadp-tooling"
   },
-  "version": "0.11.0",
+  "version": "0.11.1",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -30,10 +30,10 @@
     "prompts": "2.4.2",
     "adm-zip": "0.5.10",
     "@sap-ux/axios-extension": "1.13.1",
-    "@sap-ux/project-access": "1.22.0",
+    "@sap-ux/project-access": "1.22.1",
     "@sap-ux/logger": "0.5.1",
     "@sap-ux/system-access": "0.4.1",
-    "@sap-ux/ui5-config": "0.22.7",
+    "@sap-ux/ui5-config": "0.22.8",
     "@sap-ux/btp-utils": "0.14.4"
   },
   "devDependencies": {