@sap-ux/ui5-proxy-middleware 1.0.2 → 1.0.5

package/dist/base/index.d.ts

@@ -2,5 +2,4 @@ export { ui5Proxy } from './proxy';
 export * from './constants';
 export * from './types';
 export * from './utils';
-export * from './manifest';
 //# sourceMappingURL=index.d.ts.map

package/dist/base/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/base/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/base/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC"}

package/dist/base/index.js

@@ -16,5 +16,4 @@ Object.defineProperty(exports, "ui5Proxy", { enumerable: true, get: function ()
 __exportStar(require("./constants"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./utils"), exports);
-__exportStar(require("./manifest"), exports);
 //# sourceMappingURL=index.js.map

package/dist/base/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/base/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,iCAAmC;AAA1B,iGAAA,QAAQ,OAAA;AACjB,8CAA4B;AAC5B,0CAAwB;AACxB,0CAAwB;AACxB,6CAA2B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/base/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,iCAAmC;AAA1B,iGAAA,QAAQ,OAAA;AACjB,8CAA4B;AAC5B,0CAAwB;AACxB,0CAAwB"}

package/dist/base/proxy.d.ts

@@ -1,5 +1,5 @@
-import type { Filter, Options } from 'http-proxy-middleware';
-import type { UI5Config } from './types';
+import type { Options } from 'http-proxy-middleware';
+import type { ProxyConfig } from './types';
 /**
  * Function for proxying UI5 sources.
  *
@@ -8,5 +8,5 @@ import type { UI5Config } from './types';
  * @param filter - custom filter function which will be applied to all requests
  * @returns Proxy function to use
  */
-export declare const ui5Proxy: (config: UI5Config, options?: Options | undefined, filter?: Filter | undefined) => import("http-proxy-middleware").RequestHandler;
+export declare const ui5Proxy: (config: ProxyConfig, options?: Options | undefined, filter?: string | string[] | ((pathname: string, req: import("http-proxy-middleware/dist/types").Request) => boolean) | undefined) => import("http-proxy-middleware").RequestHandler;
 //# sourceMappingURL=proxy.d.ts.map

package/dist/base/proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/base/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAG7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAIzC;;;;;;;GAOG;AACH,eAAO,MAAM,QAAQ,WAAY,SAAS,+GA0BzC,CAAC"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/base/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAU,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAG7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAI3C;;;;;;;GAOG;AACH,eAAO,MAAM,QAAQ,WAAY,WAAW,qNA0B3C,CAAC"}

package/dist/base/proxy.js

@@ -12,7 +12,7 @@ const logger_1 = require("@sap-ux/logger");
  * @param filter - custom filter function which will be applied to all requests
  * @returns Proxy function to use
  */
-const ui5Proxy = (config, options, filter) => {
+exports.ui5Proxy = (config, options, filter) => {
     const logger = new logger_1.ToolsLogger({
         transports: [new logger_1.UI5ToolingTransport({ moduleName: 'ui5-proxy-middleware' })]
     });
@@ -23,11 +23,11 @@ const ui5Proxy = (config, options, filter) => {
         target: config.url,
         changeOrigin: true,
         onProxyReq: (proxyReq, _req, res) => {
-            (0, utils_1.proxyRequestHandler)(proxyReq, res, etag, logger);
+            utils_1.proxyRequestHandler(proxyReq, res, etag, logger);
         },
         pathRewrite: { [config.path]: ui5Ver + config.path },
         onProxyRes: (proxyRes) => {
-            (0, utils_1.proxyResponseHandler)(proxyRes, etag);
+            utils_1.proxyResponseHandler(proxyRes, etag);
         }
     };
     Object.assign(proxyConfig, options);
@@ -35,7 +35,6 @@ const ui5Proxy = (config, options, filter) => {
     if (filter) {
         proxyFilter = filter;
     }
-    return (0, http_proxy_middleware_1.createProxyMiddleware)(proxyFilter, proxyConfig);
+    return http_proxy_middleware_1.createProxyMiddleware(proxyFilter, proxyConfig);
 };
-exports.ui5Proxy = ui5Proxy;
 //# sourceMappingURL=proxy.js.map

package/dist/base/proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/base/proxy.ts"],"names":[],"mappings":";;;AACA,iEAA8D;AAG9D,mCAA+F;AAC/F,2CAAkE;AAElE;;;;;;;GAOG;AACI,MAAM,QAAQ,GAAG,CAAC,MAAiB,EAAE,OAAiB,EAAE,MAAe,EAAE,EAAE;IAC9E,MAAM,MAAM,GAAG,IAAI,oBAAW,CAAC;QAC3B,UAAU,EAAE,CAAC,IAAI,4BAAmB,CAAC,EAAE,UAAU,EAAE,sBAAsB,EAAE,CAAC,CAAC;KAChF,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC;IACzB,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,IAAI,aAAa,GAAG,KAAK,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,QAAQ,EAAE,GAAG,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC;IACjH,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1D,MAAM,WAAW,GAAY;QACzB,MAAM,EAAE,MAAM,CAAC,GAAG;QAClB,YAAY,EAAE,IAAI;QAClB,UAAU,EAAE,CAAC,QAAuB,EAAE,IAAqB,EAAE,GAAmB,EAAQ,EAAE;YACtF,IAAA,2BAAmB,EAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QACrD,CAAC;QACD,WAAW,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,IAAI,EAAE;QACpD,UAAU,EAAE,CAAC,QAAyB,EAAQ,EAAE;YAC5C,IAAA,4BAAoB,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACzC,CAAC;KACJ,CAAC;IACF,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACpC,IAAI,WAAW,GAAW,iCAAyB,CAAC;IAEpD,IAAI,MAAM,EAAE;QACR,WAAW,GAAG,MAAM,CAAC;KACxB;IAED,OAAO,IAAA,6CAAqB,EAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAC3D,CAAC,CAAC;AA1BW,QAAA,QAAQ,YA0BnB"}
+{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/base/proxy.ts"],"names":[],"mappings":";;;AACA,iEAA8D;AAG9D,mCAA+F;AAC/F,2CAAkE;AAElE;;;;;;;GAOG;AACU,QAAA,QAAQ,GAAG,CAAC,MAAmB,EAAE,OAAiB,EAAE,MAAe,EAAE,EAAE;IAChF,MAAM,MAAM,GAAG,IAAI,oBAAW,CAAC;QAC3B,UAAU,EAAE,CAAC,IAAI,4BAAmB,CAAC,EAAE,UAAU,EAAE,sBAAsB,EAAE,CAAC,CAAC;KAChF,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC;IACzB,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,IAAI,aAAa,GAAG,KAAK,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,QAAQ,EAAE,GAAG,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC;IACjH,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1D,MAAM,WAAW,GAAY;QACzB,MAAM,EAAE,MAAM,CAAC,GAAG;QAClB,YAAY,EAAE,IAAI;QAClB,UAAU,EAAE,CAAC,QAAuB,EAAE,IAAqB,EAAE,GAAmB,EAAQ,EAAE;YACtF,2BAAmB,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QACrD,CAAC;QACD,WAAW,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,IAAI,EAAE;QACpD,UAAU,EAAE,CAAC,QAAyB,EAAQ,EAAE;YAC5C,4BAAoB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACzC,CAAC;KACJ,CAAC;IACF,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACpC,IAAI,WAAW,GAAW,iCAAyB,CAAC;IAEpD,IAAI,MAAM,EAAE;QACR,WAAW,GAAG,MAAM,CAAC;KACxB;IAED,OAAO,6CAAqB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAC3D,CAAC,CAAC"}

package/dist/base/types.d.ts

@@ -1,24 +1,13 @@
 /// <reference types="node" />
 import type { NextFunction } from 'express';
 import type { IncomingMessage } from 'http';
-export interface UI5Config {
+import type { UI5ProxyConfig } from '@sap-ux/ui5-config';
+export declare type Ui5MiddlewareConfig = UI5ProxyConfig;
+export interface ProxyConfig {
     path: string;
     url: string;
     version?: string;
 }
-export interface UI5ConfigObject {
-    path: string[];
-    url: string;
-    version?: string;
-}
-export interface ProxyConfig {
-    ui5: UI5Config[] | UI5ConfigObject;
-    proxy?: string;
-    debug?: boolean;
-    secure?: boolean;
-    directLoad?: boolean;
-    version?: string;
-}
 export interface MiddlewareParameters<T> {
     resources: object;
     options: {

package/dist/base/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/base/types.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAE5C,MAAM,WAAW,SAAS;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC5B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AACD,MAAM,WAAW,WAAW;IACxB,GAAG,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB,CAAC,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE;QACL,aAAa,EAAE,CAAC,CAAC;KACpB,CAAC;CACL;AAED,MAAM,WAAW,eAAe;IAC5B,IAAI,CAAC,EAAE,YAAY,CAAC;CACvB;AACD,oBAAY,YAAY,GAAG,eAAe,GAAG,eAAe,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/base/types.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAE5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,oBAAY,mBAAmB,GAAG,cAAc,CAAC;AAEjD,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB,CAAC,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE;QACL,aAAa,EAAE,CAAC,CAAC;KACpB,CAAC;CACL;AAED,MAAM,WAAW,eAAe;IAC5B,IAAI,CAAC,EAAE,YAAY,CAAC;CACvB;AACD,oBAAY,YAAY,GAAG,eAAe,GAAG,eAAe,CAAC"}

package/dist/base/utils.d.ts

@@ -1,8 +1,8 @@
 import type { ClientRequest, IncomingMessage, ServerResponse } from 'http';
 import type { ToolsLogger } from '@sap-ux/logger';
+import type { Manifest } from '@sap-ux/ui5-config';
 import type { NextFunction, Request, Response } from 'express';
-import type { UI5Config } from './types';
-import type { SAPJSONSchemaForWebApplicationManifestFile } from './manifest';
+import type { ProxyConfig } from './types';
 /**
  * Handler for the proxy response event.
  * Sets an Etag which will be used for re-validation of the cached UI5 sources.
@@ -78,7 +78,7 @@ export declare const setHtmlResponse: (res: any, html: string) => void;
  * @param args list of runtime arguments
  * @returns The content of the manifest.json
  */
-export declare const getManifest: (args: string[]) => Promise<SAPJSONSchemaForWebApplicationManifestFile>;
+export declare const getManifest: (args: string[]) => Promise<Manifest>;
 /**
  * Gets the minUI5Version from the manifest.json.
  *
@@ -93,7 +93,7 @@ export declare function getUI5VersionFromManifest(args: string[]): Promise<strin
  * @param log logger for outputing information from where ui5 version config is coming
  * @returns The UI5 version with which the application will be started
  */
-export declare function resolveUI5Version(version: string | undefined, log?: ToolsLogger): Promise<string>;
+export declare function resolveUI5Version(version?: string, log?: ToolsLogger): Promise<string>;
 /**
  * Injects the absolute UI5 urls into the html file, which is used to preview the application.
  *
@@ -101,7 +101,7 @@ export declare function resolveUI5Version(version: string | undefined, log?: Too
  * @param ui5Configs - the configuration of the ui5-proxy-middleware
  * @returns The modified html file content
  */
-export declare const injectUI5Url: (htmlFilePath: string, ui5Configs: UI5Config[]) => Promise<string | undefined>;
+export declare function injectUI5Url(htmlFilePath: string, ui5Configs: ProxyConfig[]): string | undefined;
 /**
  * Injects scripts into the html file, which is used to preview the application.
  *
@@ -110,7 +110,7 @@ export declare const injectUI5Url: (htmlFilePath: string, ui5Configs: UI5Config[
  * @param next - the next function, used to forward the request to the next available handler
  * @param ui5Configs - the UI5 configuration of the ui5-proxy-middleware
  */
-export declare const injectScripts: (req: Request, res: Response, next: NextFunction, ui5Configs: UI5Config[]) => Promise<void>;
+export declare const injectScripts: (req: Request, res: Response, next: NextFunction, ui5Configs: ProxyConfig[]) => Promise<void>;
 /**
  * Filters comressed html files from UI5 CDN.
  * Avoid ERR_CONTENT_DECODING_FAILED on http request for gzip'd html files.

package/dist/base/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/base/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAKzC,OAAO,KAAK,EAAE,0CAA0C,EAAE,MAAM,YAAY,CAAC;AAG7E;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,aAAc,eAAe,QAAQ,MAAM,KAAG,IAG9E,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,mBAAmB,aAClB,aAAa,OAClB,cAAc,QACb,MAAM,UACJ,WAAW,KACpB,IAMF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,oBAAqB,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAWtF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,UAAW,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAWzE,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,kBAAmB,MAAM,GAAG,SAAS,OAAO,MAAM,KAAG,OAgBxF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,WAAW,QAAS,MAAM,KAAG,MAWzC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,WAAW,SAAU,MAAM,EAAE,KAAG,MAS5C,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,gBAAuB,MAAM,KAAG,QAAQ,MAAM,CAYjF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,QAAS,GAAG,QAAQ,MAAM,KAAG,IAOxD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,WAAW,SAAgB,MAAM,EAAE,KAAG,QAAQ,0CAA0C,CAWpG,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAG3F;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAuBvG;AAED;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,iBAAwB,MAAM,cAAc,SAAS,EAAE,KAAG,QAAQ,MAAM,GAAG,SAAS,CAqB5G,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,QACjB,OAAO,OACP,QAAQ,QACP,YAAY,cACN,SAAS,EAAE,KACxB,QAAQ,IAAI,CAmBd,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB,cAAe,MAAM,OAAO,eAAe,KAAG,OASnF,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/base/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAO3C;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,aAAc,eAAe,QAAQ,MAAM,KAAG,IAG9E,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,mBAAmB,aAClB,aAAa,OAClB,cAAc,QACb,MAAM,UACJ,WAAW,KACpB,IAMF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,oBAAqB,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAWtF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,UAAW,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAWzE,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,kBAAmB,MAAM,GAAG,SAAS,OAAO,MAAM,KAAG,OAUxF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,WAAW,QAAS,MAAM,KAAG,MAWzC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,WAAW,SAAU,MAAM,EAAE,KAAG,MAS5C,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,gBAAuB,MAAM,KAAG,QAAQ,MAAM,CAOjF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,QAAS,GAAG,QAAQ,MAAM,KAAG,IAOxD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,WAAW,SAAgB,MAAM,EAAE,KAAG,QAAQ,QAAQ,CASlE,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAG3F;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAuB5F;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,MAAM,GAAG,SAAS,CAqBhG;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,QACjB,OAAO,OACP,QAAQ,QACP,YAAY,cACN,WAAW,EAAE,KAC1B,QAAQ,IAAI,CAmBd,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB,cAAe,MAAM,OAAO,eAAe,KAAG,OASnF,CAAC"}

package/dist/base/utils.js

@@ -10,8 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.filterCompressedHtmlFiles = exports.injectScripts = exports.injectUI5Url = exports.resolveUI5Version = exports.getUI5VersionFromManifest = exports.getManifest = exports.setHtmlResponse = exports.getWebAppFolderFromYaml = exports.getYamlFile = exports.getHtmlFile = exports.isHostExcludedFromProxy = exports.hideProxyCredentials = exports.getCorporateProxyServer = exports.proxyRequestHandler = exports.proxyResponseHandler = void 0;
+const ui5_config_1 = require("@sap-ux/ui5-config");
 const fs_1 = require("fs");
-const yaml_1 = require("yaml");
 const path_1 = require("path");
 const constants_1 = require("./constants");
 const i18n_1 = require("../i18n");
@@ -22,11 +22,10 @@ const i18n_1 = require("../i18n");
  * @param proxyRes - proxy response object
  * @param etag - ETag for the cached sources, normally the UI5 version
  */
-const proxyResponseHandler = (proxyRes, etag) => {
+exports.proxyResponseHandler = (proxyRes, etag) => {
     proxyRes.headers['Etag'] = etag;
     proxyRes.headers['cache-control'] = 'no-cache';
 };
-exports.proxyResponseHandler = proxyResponseHandler;
 /**
  * Handler for the proxy request event.
  * Re-validates the cached UI5 sources based on the ETag.
@@ -37,21 +36,20 @@ exports.proxyResponseHandler = proxyResponseHandler;
  * @param etag - Etag of the cached UI5 sources, normally the UI5 version
  * @param logger - Logger for loging the requests
  */
-const proxyRequestHandler = (proxyReq, res, etag, logger) => {
+exports.proxyRequestHandler = (proxyReq, res, etag, logger) => {
     logger.info(proxyReq.path);
     if (proxyReq.getHeader('if-none-match') === etag) {
         res.statusCode = 304;
         res.end();
     }
 };
-exports.proxyRequestHandler = proxyRequestHandler;
 /**
  * Get user's proxy configuration.
  *
  * @param yamlProxyServer - proxy server config from yaml file
  * @returns User's proxy configuration or undefined
  */
-const getCorporateProxyServer = (yamlProxyServer) => {
+exports.getCorporateProxyServer = (yamlProxyServer) => {
     return (yamlProxyServer ||
         process.env.FIORI_TOOLS_PROXY ||
         process.env.http_proxy ||
@@ -61,14 +59,13 @@ const getCorporateProxyServer = (yamlProxyServer) => {
         process.env.npm_config_proxy ||
         process.env.npm_config_https_proxy);
 };
-exports.getCorporateProxyServer = getCorporateProxyServer;
 /**
  * Hides the proxy credentials for displaying the proxy configuration in the console.
  *
  * @param proxy - user's proxy server
  * @returns proxy with hidden credentials for displaying in the console
  */
-const hideProxyCredentials = (proxy) => {
+exports.hideProxyCredentials = (proxy) => {
     if (proxy) {
         const forwardSlashIndex = proxy.indexOf('//');
         const atIndex = proxy.indexOf('@');
@@ -78,7 +75,6 @@ const hideProxyCredentials = (proxy) => {
     }
     return proxy;
 };
-exports.hideProxyCredentials = hideProxyCredentials;
 /**
  * Checks if a host is excluded from user's corporate proxy.
  *
@@ -86,31 +82,23 @@ exports.hideProxyCredentials = hideProxyCredentials;
  * @param url - url to be checked
  * @returns true if host is excluded from user's corporate server, false otherwise
  */
-const isHostExcludedFromProxy = (noProxyConfig, url) => {
+exports.isHostExcludedFromProxy = (noProxyConfig, url) => {
     if (noProxyConfig === '*') {
         return true;
     }
-    let isExcluded = false;
-    const host = new URL(url).host;
-    const noProxyList = noProxyConfig ? noProxyConfig.split(',') : [];
-    for (const entry of noProxyList) {
-        if (entry.startsWith('.') && host.endsWith(entry)) {
-            isExcluded = true;
-        }
-        else if (`.${host}`.endsWith(`.${entry}`)) {
-            isExcluded = true;
-        }
+    else {
+        const host = new URL(url).host;
+        const noProxyList = noProxyConfig ? noProxyConfig.split(',') : [];
+        return !!noProxyList.find((entry) => entry.startsWith('.') ? host.endsWith(entry) : host.endsWith(`.${entry}`));
     }
-    return isExcluded;
 };
-exports.isHostExcludedFromProxy = isHostExcludedFromProxy;
 /**
  * Returns the name of html file, which is used to preview the application, from the URL.
  *
  * @param url - html request url
  * @returns Name of the html file
  */
-const getHtmlFile = (url) => {
+exports.getHtmlFile = (url) => {
     let html = url;
     if (html.indexOf('?') !== -1) {
         html = html.split('?')[0].replace(/["']/g, '');
@@ -123,14 +111,13 @@ const getHtmlFile = (url) => {
     }
     return html;
 };
-exports.getHtmlFile = getHtmlFile;
 /**
  * Returns the name of the yaml file, which is used to for the server configuration, from the runtime arguments.
  *
  * @param args - runtime arguments
  * @returns Name of the YAML file
  */
-const getYamlFile = (args) => {
+exports.getYamlFile = (args) => {
     let yaml = 'ui5.yaml';
     const index = args.indexOf('--config') !== -1 ? args.indexOf('--config') : args.indexOf('-c');
     if (index !== -1) {
@@ -138,32 +125,29 @@ const getYamlFile = (args) => {
     }
     return yaml;
 };
-exports.getYamlFile = getYamlFile;
 /**
  * Gets the path to the webapp folder from the YAML file.
  *
  * @param ui5YamlPath - path to the yaml file
  * @returns Path to the webapp folder
  */
-const getWebAppFolderFromYaml = (ui5YamlPath) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c;
-    let webAppFolder = 'webapp';
-    if ((0, fs_1.existsSync)(ui5YamlPath)) {
-        const ui5Yaml = (0, yaml_1.parseDocument)(yield fs_1.promises.readFile(ui5YamlPath, { encoding: 'utf8' })).toJSON();
-        if ((_c = (_b = (_a = ui5Yaml.resources) === null || _a === void 0 ? void 0 : _a.configuration) === null || _b === void 0 ? void 0 : _b.paths) === null || _c === void 0 ? void 0 : _c.webapp) {
-            webAppFolder = ui5Yaml.resources.configuration.paths.webapp;
-        }
+exports.getWebAppFolderFromYaml = (ui5YamlPath) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
+    if (fs_1.existsSync(ui5YamlPath)) {
+        const ui5Config = yield ui5_config_1.UI5Config.newInstance(fs_1.readFileSync(ui5YamlPath, { encoding: 'utf8' }));
+        return (_b = (_a = ui5Config.getConfiguration().paths) === null || _a === void 0 ? void 0 : _a.webapp) !== null && _b !== void 0 ? _b : 'webapp';
+    }
+    else {
+        return 'webapp';
     }
-    return webAppFolder;
 });
-exports.getWebAppFolderFromYaml = getWebAppFolderFromYaml;
 /**
  * Sends HTML content as a response.
  *
  * @param res - The http response object
  * @param html - The HTML content
  */
-const setHtmlResponse = (res, html) => {
+exports.setHtmlResponse = (res, html) => {
     if (res['_livereload']) {
         res.write(html);
         res.end();
@@ -172,23 +156,21 @@ const setHtmlResponse = (res, html) => {
         res.status(200).contentType('html').send(html);
     }
 };
-exports.setHtmlResponse = setHtmlResponse;
 /**
  * Gets the manifest.json for a given application.
  *
  * @param args list of runtime arguments
  * @returns The content of the manifest.json
  */
-const getManifest = (args) => __awaiter(void 0, void 0, void 0, function* () {
+exports.getManifest = (args) => __awaiter(void 0, void 0, void 0, function* () {
     const projectRoot = process.cwd();
-    const yamlFileName = (0, exports.getYamlFile)(args);
-    const ui5YamlPath = (0, path_1.join)(projectRoot, yamlFileName);
-    const webAppFolder = yield (0, exports.getWebAppFolderFromYaml)(ui5YamlPath);
-    const manifestPath = (0, path_1.join)(projectRoot, webAppFolder, 'manifest.json');
-    const manifest = JSON.parse(yield fs_1.promises.readFile(manifestPath, { encoding: 'utf8' }));
+    const yamlFileName = exports.getYamlFile(args);
+    const ui5YamlPath = path_1.join(projectRoot, yamlFileName);
+    const webAppFolder = yield exports.getWebAppFolderFromYaml(ui5YamlPath);
+    const manifestPath = path_1.join(projectRoot, webAppFolder, 'manifest.json');
+    const manifest = JSON.parse(fs_1.readFileSync(manifestPath, { encoding: 'utf8' }));
     return manifest;
 });
-exports.getManifest = getManifest;
 /**
  * Gets the minUI5Version from the manifest.json.
  *
@@ -198,7 +180,7 @@ exports.getManifest = getManifest;
 function getUI5VersionFromManifest(args) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
-        const manifest = yield (0, exports.getManifest)(args);
+        const manifest = yield exports.getManifest(args);
         return (_b = (_a = manifest['sap.ui5']) === null || _a === void 0 ? void 0 : _a.dependencies) === null || _b === void 0 ? void 0 : _b.minUI5Version;
     });
 }
@@ -220,7 +202,7 @@ function resolveUI5Version(version, log) {
             ui5VersionLocation =
                 process.env.FIORI_TOOLS_UI5_VERSION || process.env.FIORI_TOOLS_UI5_VERSION === ''
                     ? 'CLI arguments / Run configuration'
-                    : (0, exports.getYamlFile)(process.argv);
+                    : exports.getYamlFile(process.argv);
         }
         else {
             const minUI5Version = yield getUI5VersionFromManifest(process.argv);
@@ -230,7 +212,7 @@ function resolveUI5Version(version, log) {
         }
         if (log) {
             ui5VersionInfo = ui5Version ? ui5Version : 'latest';
-            log.info((0, i18n_1.t)('info.ui5VersionSource', { version: ui5VersionInfo, source: ui5VersionLocation }));
+            log.info(i18n_1.t('info.ui5VersionSource', { version: ui5VersionInfo, source: ui5VersionLocation }));
         }
         return ui5Version;
     });
@@ -243,9 +225,9 @@ exports.resolveUI5Version = resolveUI5Version;
  * @param ui5Configs - the configuration of the ui5-proxy-middleware
  * @returns The modified html file content
  */
-const injectUI5Url = (htmlFilePath, ui5Configs) => __awaiter(void 0, void 0, void 0, function* () {
-    if ((0, fs_1.existsSync)(htmlFilePath)) {
-        let html = yield fs_1.promises.readFile(htmlFilePath, { encoding: 'utf8' });
+function injectUI5Url(htmlFilePath, ui5Configs) {
+    if (fs_1.existsSync(htmlFilePath)) {
+        let html = fs_1.readFileSync(htmlFilePath, { encoding: 'utf8' });
         for (const ui5Config of ui5Configs) {
             const ui5Host = ui5Config.url.replace(/\/$/, '');
             const ui5Url = ui5Config.version ? `${ui5Host}/${ui5Config.version}` : ui5Host;
@@ -260,8 +242,10 @@ const injectUI5Url = (htmlFilePath, ui5Configs) => __awaiter(void 0, void 0, voi
         }
         return html;
     }
-    return undefined;
-});
+    else {
+        return undefined;
+    }
+}
 exports.injectUI5Url = injectUI5Url;
 /**
  * Injects scripts into the html file, which is used to preview the application.
@@ -271,18 +255,18 @@ exports.injectUI5Url = injectUI5Url;
  * @param next - the next function, used to forward the request to the next available handler
  * @param ui5Configs - the UI5 configuration of the ui5-proxy-middleware
  */
-const injectScripts = (req, res, next, ui5Configs) => __awaiter(void 0, void 0, void 0, function* () {
+exports.injectScripts = (req, res, next, ui5Configs) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const projectRoot = process.cwd();
         const args = process.argv;
-        const htmlFileName = (0, exports.getHtmlFile)(req.baseUrl);
-        const yamlFileName = (0, exports.getYamlFile)(args);
-        const ui5YamlPath = (0, path_1.join)(projectRoot, yamlFileName);
-        const webAppFolder = yield (0, exports.getWebAppFolderFromYaml)(ui5YamlPath);
-        const htmlFilePath = (0, path_1.join)(projectRoot, webAppFolder, htmlFileName);
-        const html = yield (0, exports.injectUI5Url)(htmlFilePath, ui5Configs);
+        const htmlFileName = exports.getHtmlFile(req.baseUrl);
+        const yamlFileName = exports.getYamlFile(args);
+        const ui5YamlPath = path_1.join(projectRoot, yamlFileName);
+        const webAppFolder = yield exports.getWebAppFolderFromYaml(ui5YamlPath);
+        const htmlFilePath = path_1.join(projectRoot, webAppFolder, htmlFileName);
+        const html = injectUI5Url(htmlFilePath, ui5Configs);
         if (html) {
-            (0, exports.setHtmlResponse)(res, html);
+            exports.setHtmlResponse(res, html);
         }
         else {
             next();
@@ -292,7 +276,6 @@ const injectScripts = (req, res, next, ui5Configs) => __awaiter(void 0, void 0,
         next(error);
     }
 });
-exports.injectScripts = injectScripts;
 /**
  * Filters comressed html files from UI5 CDN.
  * Avoid ERR_CONTENT_DECODING_FAILED on http request for gzip'd html files.
@@ -302,7 +285,7 @@ exports.injectScripts = injectScripts;
  * @param req - the http request object
  * @returns True, indicating that the request should be proxied
  */
-const filterCompressedHtmlFiles = (_pathname, req) => {
+exports.filterCompressedHtmlFiles = (_pathname, req) => {
     const acceptHeader = req.headers['accept'] || '';
     if (req.headers['accept-encoding'] &&
         (acceptHeader.includes('text/html') || acceptHeader.includes('application/xhtml+xml'))) {
@@ -310,5 +293,4 @@ const filterCompressedHtmlFiles = (_pathname, req) => {
     }
     return true;
 };
-exports.filterCompressedHtmlFiles = filterCompressedHtmlFiles;
 //# sourceMappingURL=utils.js.map

package/dist/base/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/base/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/base/utils.ts"],"names":[],"mappings":"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"}

package/dist/ui5/middleware.js

@@ -22,46 +22,40 @@ module.exports = ({ options }) => __awaiter(void 0, void 0, void 0, function* ()
     });
     const router = express_1.default.Router();
     const config = options.configuration;
-    const ui5Version = yield (0, base_1.resolveUI5Version)(config.version, logger);
+    const ui5Version = yield base_1.resolveUI5Version(config.version, logger);
     const secure = !!config.secure;
     const debug = !!config.debug;
     const directLoad = !!config.directLoad;
     const noProxyVal = process.env.no_proxy || process.env.npm_config_noproxy;
-    const corporateProxyServer = (0, base_1.getCorporateProxyServer)(config.proxy);
+    const corporateProxyServer = base_1.getCorporateProxyServer(config.proxy);
     // hide user and pass from proxy configuration for displaying it in the terminal
-    const proxyInfo = (0, base_1.hideProxyCredentials)(corporateProxyServer);
+    const proxyInfo = base_1.hideProxyCredentials(corporateProxyServer);
     const proxyOptions = {
         secure,
         logLevel: debug ? 'debug' : 'info',
-        logProvider: () => {
-            return logger;
-        }
+        logProvider: () => logger
     };
-    logger.info(`Starting ui5-proxy-middleware using following configuration:\nproxy: '${proxyInfo}'\nsecure: '${secure ? 'true' : 'false'}'\ndebug: '${debug ? 'true' : 'false'}''\ndebug: '${directLoad ? 'true' : 'false'}'`);
-    let ui5Configs = [];
-    if (Array.isArray(config.ui5)) {
-        ui5Configs = config.ui5;
-    }
-    else {
-        for (const ui5Path of config.ui5.path) {
+    logger.info(`Starting ui5-proxy-middleware using following configuration:\nproxy: '${proxyInfo}'\nsecure: '${secure}'\ndebug: '${debug}''\ndirectLoad: '${directLoad}'`);
+    const configs = Array.isArray(config.ui5) ? config.ui5 : [config.ui5];
+    const ui5Configs = [];
+    for (const ui5 of configs) {
+        const paths = Array.isArray(ui5.path) ? ui5.path : [ui5.path];
+        for (const ui5Path of paths) {
             const ui5Config = {
                 path: ui5Path,
-                url: config.ui5.url,
+                url: ui5.url,
                 version: ui5Version
             };
+            if (corporateProxyServer && !base_1.isHostExcludedFromProxy(noProxyVal, ui5Config.url)) {
+                proxyOptions.agent = new https_proxy_agent_1.HttpsProxyAgent(corporateProxyServer);
+            }
+            router.use(ui5Config.path, base_1.ui5Proxy(ui5Config, proxyOptions));
             ui5Configs.push(ui5Config);
         }
     }
-    for (const ui5Config of ui5Configs) {
-        ui5Config.version = ui5Version;
-        if (corporateProxyServer && !(0, base_1.isHostExcludedFromProxy)(noProxyVal, ui5Config.url)) {
-            proxyOptions.agent = new https_proxy_agent_1.HttpsProxyAgent(corporateProxyServer);
-        }
-        router.use(ui5Config.path, (0, base_1.ui5Proxy)(ui5Config, proxyOptions));
-    }
     if (directLoad) {
         router.use(base_1.HTML_MOUNT_PATHS, (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-            yield (0, base_1.injectScripts)(req, res, next, ui5Configs);
+            yield base_1.injectScripts(req, res, next, ui5Configs);
         }));
     }
     return router;

package/dist/ui5/middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/ui5/middleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/ui5/middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,sDAA8B;AAE9B,yDAAoD;AACpD,2CAAkE;AAElE,kCAQiB;AAEjB,MAAM,CAAC,OAAO,GAAG,CAAO,EAAE,OAAO,EAA6C,EAA2B,EAAE;IACvG,MAAM,MAAM,GAAG,IAAI,oBAAW,CAAC;QAC3B,UAAU,EAAE,CAAC,IAAI,4BAAmB,CAAC,EAAE,UAAU,EAAE,sBAAsB,EAAE,CAAC,CAAC;KAChF,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;IAChC,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IACrC,MAAM,UAAU,GAAG,MAAM,wBAAiB,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;IAC/B,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;IAC7B,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;IACvC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;IAC1E,MAAM,oBAAoB,GAAG,8BAAuB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnE,gFAAgF;IAChF,MAAM,SAAS,GAAG,2BAAoB,CAAC,oBAAoB,CAAC,CAAC;IAC7D,MAAM,YAAY,GAAY;QAC1B,MAAM;QACN,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;QAClC,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM;KAC5B,CAAC;IAEF,MAAM,CAAC,IAAI,CACP,yEAAyE,SAAS,eAAe,MAAM,cAAc,KAAK,oBAAoB,UAAU,GAAG,CAC9J,CAAC;IAEF,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACtE,MAAM,UAAU,GAAkB,EAAE,CAAC;IACrC,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;QACvB,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC9D,KAAK,MAAM,OAAO,IAAI,KAAK,EAAE;YACzB,MAAM,SAAS,GAAgB;gBAC3B,IAAI,EAAE,OAAO;gBACb,GAAG,EAAE,GAAG,CAAC,GAAG;gBACZ,OAAO,EAAE,UAAU;aACtB,CAAC;YACF,IAAI,oBAAoB,IAAI,CAAC,8BAAuB,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE;gBAC7E,YAAY,CAAC,KAAK,GAAG,IAAI,mCAAe,CAAC,oBAAoB,CAAC,CAAC;aAClE;YACD,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,eAAQ,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC;YAC9D,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC9B;KACJ;IAED,IAAI,UAAU,EAAE;QACZ,MAAM,CAAC,GAAG,CAAC,uBAAgB,EAAE,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAiB,EAAE;YAClG,MAAM,oBAAa,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;QACpD,CAAC,CAAA,CAAC,CAAC;KACN;IAED,OAAO,MAAM,CAAC;AAClB,CAAC,CAAA,CAAC"}

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-proxy-middleware"
   },
-  "version": "1.0.2",
+  "version": "1.0.5",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [
@@ -18,20 +18,19 @@
     "ui5.yaml"
   ],
   "dependencies": {
-    "@sap-ux/logger": "0.1.4",
+    "@sap-ux/logger": "0.1.5",
+    "@sap-ux/ui5-config": "0.13.1",
     "express": "4.17.2",
     "http-proxy-middleware": "2.0.1",
     "https-proxy-agent": "5.0.0",
-    "i18next": "20.3.2",
-    "yaml": "2.0.0-10"
+    "i18next": "20.3.2"
   },
   "devDependencies": {
     "@types/express": "4.17.13",
-    "@ui5/server": "2.4.0",
-    "@ui5/project": "2.6.0",
-    "mock-http-server": "1.4.5",
-    "request": "2.88.2",
-    "request-promise": "4.2.6"
+    "nock": "13.2.4",
+    "supertest": "6.2.2",
+    "@types/supertest": "2.0.12",
+    "yaml": "2.0.0-10"
   },
   "ui5": {
     "dependencies": []