@sap-ux/ui5-proxy-middleware 1.3.15 → 1.4.0

package/dist/base/utils.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.proxyErrorHandler = exports.filterCompressedHtmlFiles = exports.injectScripts = exports.injectUI5Url = exports.resolveUI5Version = exports.setHtmlResponse = exports.getWebAppFolderFromYaml = exports.getYamlFile = exports.getHtmlFile = exports.updateProxyEnv = exports.hideProxyCredentials = exports.getCorporateProxyServer = exports.proxyRequestHandler = exports.proxyResponseHandler = void 0;
 const ui5_config_1 = require("@sap-ux/ui5-config");
@@ -157,16 +148,15 @@ exports.getYamlFile = getYamlFile;
  * @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;
+const getWebAppFolderFromYaml = async (ui5YamlPath) => {
     if ((0, fs_1.existsSync)(ui5YamlPath)) {
-        const ui5Config = yield ui5_config_1.UI5Config.newInstance((0, 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';
+        const ui5Config = await ui5_config_1.UI5Config.newInstance((0, fs_1.readFileSync)(ui5YamlPath, { encoding: 'utf8' }));
+        return ui5Config.getConfiguration().paths?.webapp ?? 'webapp';
     }
     else {
         return 'webapp';
     }
-});
+};
 exports.getWebAppFolderFromYaml = getWebAppFolderFromYaml;
 /**
  * Sends HTML content as a response.
@@ -196,31 +186,28 @@ exports.setHtmlResponse = setHtmlResponse;
  * @param manifest optional already loaded manifest.json
  * @returns The UI5 version with which the application will be started
  */
-function resolveUI5Version(version, log, manifest) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        let ui5Version;
-        let ui5VersionInfo;
-        let ui5VersionLocation;
-        if (process.env.FIORI_TOOLS_UI5_VERSION || process.env.FIORI_TOOLS_UI5_VERSION === '') {
-            ui5Version = process.env.FIORI_TOOLS_UI5_VERSION;
-            ui5VersionLocation = 'CLI arguments / Run configuration';
-        }
-        else if (version !== undefined) {
-            ui5Version = version ? version : '';
-            ui5VersionLocation = (0, exports.getYamlFile)(process.argv);
-        }
-        else {
-            const minUI5Version = (_b = (_a = manifest === null || manifest === void 0 ? void 0 : manifest['sap.ui5']) === null || _a === void 0 ? void 0 : _a.dependencies) === null || _b === void 0 ? void 0 : _b.minUI5Version;
-            ui5Version = minUI5Version && !isNaN(parseFloat(minUI5Version)) ? minUI5Version : '';
-            ui5VersionLocation = 'manifest.json';
-        }
-        if (log) {
-            ui5VersionInfo = ui5Version ? ui5Version : 'latest';
-            log.info((0, i18n_1.t)('info.ui5VersionSource', { version: ui5VersionInfo, source: ui5VersionLocation }));
-        }
-        return ui5Version;
-    });
+async function resolveUI5Version(version, log, manifest) {
+    let ui5Version;
+    let ui5VersionInfo;
+    let ui5VersionLocation;
+    if (process.env.FIORI_TOOLS_UI5_VERSION || process.env.FIORI_TOOLS_UI5_VERSION === '') {
+        ui5Version = process.env.FIORI_TOOLS_UI5_VERSION;
+        ui5VersionLocation = 'CLI arguments / Run configuration';
+    }
+    else if (version !== undefined) {
+        ui5Version = version ? version : '';
+        ui5VersionLocation = (0, exports.getYamlFile)(process.argv);
+    }
+    else {
+        const minUI5Version = manifest?.['sap.ui5']?.dependencies?.minUI5Version;
+        ui5Version = minUI5Version && !isNaN(parseFloat(minUI5Version)) ? minUI5Version : '';
+        ui5VersionLocation = 'manifest.json';
+    }
+    if (log) {
+        ui5VersionInfo = ui5Version ? ui5Version : 'latest';
+        log.info((0, i18n_1.t)('info.ui5VersionSource', { version: ui5VersionInfo, source: ui5VersionLocation }));
+    }
+    return ui5Version;
 }
 exports.resolveUI5Version = resolveUI5Version;
 /**
@@ -260,14 +247,14 @@ 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* () {
+const injectScripts = async (req, res, next, ui5Configs) => {
     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 webAppFolder = await (0, exports.getWebAppFolderFromYaml)(ui5YamlPath);
         const htmlFilePath = (0, path_1.join)(projectRoot, webAppFolder, htmlFileName);
         const html = injectUI5Url(htmlFilePath, ui5Configs);
         if (html) {
@@ -280,7 +267,7 @@ const injectScripts = (req, res, next, ui5Configs) => __awaiter(void 0, void 0,
     catch (error) {
         next(error);
     }
-});
+};
 exports.injectScripts = injectScripts;
 /**
  * Filters comressed html files from UI5 CDN.
@@ -310,8 +297,7 @@ exports.filterCompressedHtmlFiles = filterCompressedHtmlFiles;
  * @param _target (not used)
  */
 function proxyErrorHandler(err, req, logger, _res, _target) {
-    var _a;
-    if (err && ((_a = err.stack) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== 'error') {
+    if (err && err.stack?.toLowerCase() !== 'error') {
         if (typeof req.next === 'function') {
             req.next(err);
         }

package/dist/i18n.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -19,19 +10,17 @@ const NS = 'ui5-proxy-middleware';
 /**
  * Initialize i18next with the translations for this module.
  */
-function initI18n() {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield i18next_1.default.init({
-            resources: {
-                en: {
-                    [NS]: ui5_proxy_middleware_i18n_json_1.default
-                }
-            },
-            lng: 'en',
-            fallbackLng: 'en',
-            defaultNS: NS,
-            ns: [NS]
-        });
+async function initI18n() {
+    await i18next_1.default.init({
+        resources: {
+            en: {
+                [NS]: ui5_proxy_middleware_i18n_json_1.default
+            }
+        },
+        lng: 'en',
+        fallbackLng: 'en',
+        defaultNS: NS,
+        ns: [NS]
     });
 }
 exports.initI18n = initI18n;

package/dist/ui5/middleware.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -49,30 +40,31 @@ function createRequestHandler(routes) {
  * @param rootProject @ui5/fs reader collection with access to the project files
  * @returns manifest.json as object or undefined if not found
  */
-function loadManifest(rootProject) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const files = yield rootProject.byGlob('**/manifest.json');
-        if ((files === null || files === void 0 ? void 0 : files.length) > 0) {
-            return JSON.parse(yield files[0].getString());
-        }
-        else {
-            return undefined;
-        }
-    });
+async function loadManifest(rootProject) {
+    const files = await rootProject.byGlob('**/manifest.json');
+    if (files?.length > 0) {
+        return JSON.parse(await files[0].getString());
+    }
+    else {
+        return undefined;
+    }
 }
-module.exports = ({ resources, options }) => __awaiter(void 0, void 0, void 0, function* () {
+module.exports = async ({ resources, options }) => {
     const logger = new logger_1.ToolsLogger({
         transports: [new logger_1.UI5ToolingTransport({ moduleName: 'ui5-proxy-middleware' })]
     });
     dotenv_1.default.config();
-    const config = Object.assign({ ui5: {
+    const config = {
+        ui5: {
             path: ['/resources', '/test-resources'],
             url: 'https://ui5.sap.com'
-        } }, options.configuration);
+        },
+        ...options.configuration
+    };
     let ui5Version = '';
     try {
-        const manifest = yield loadManifest(resources.rootProject);
-        ui5Version = yield (0, base_1.resolveUI5Version)(config.version, logger, manifest);
+        const manifest = await loadManifest(resources.rootProject);
+        ui5Version = await (0, base_1.resolveUI5Version)(config.version, logger, manifest);
     }
     catch (error) {
         logger.warn('Retrieving UI5 version failed, using latest version instead.');
@@ -102,19 +94,19 @@ module.exports = ({ resources, options }) => __awaiter(void 0, void 0, void 0, f
         }
     }
     if (directLoad) {
-        const directLoadProxy = ((req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
+        const directLoadProxy = (async (req, res, next) => {
             try {
-                yield (0, base_1.injectScripts)(req, res, next, ui5Configs);
+                await (0, base_1.injectScripts)(req, res, next, ui5Configs);
             }
             catch (error) {
                 logger.error(error);
                 next(error);
             }
-        }));
+        });
         base_1.HTML_MOUNT_PATHS.forEach((path) => {
             routes.push({ route: path, handler: directLoadProxy });
         });
     }
     return createRequestHandler(routes);
-});
+};
 //# sourceMappingURL=middleware.js.map

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.3.15",
+  "version": "1.4.0",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -26,8 +26,8 @@
     "https-proxy-agent": "5.0.1",
     "i18next": "20.6.1",
     "proxy-from-env": "1.1.0",
-    "@sap-ux/logger": "0.5.1",
-    "@sap-ux/ui5-config": "0.22.9"
+    "@sap-ux/logger": "0.6.0",
+    "@sap-ux/ui5-config": "0.23.0"
   },
   "devDependencies": {
     "@types/express": "4.17.21",
@@ -37,7 +37,7 @@
     "nock": "13.4.0",
     "supertest": "6.3.3",
     "yaml": "2.2.2",
-    "@sap-ux/project-access": "1.22.2"
+    "@sap-ux/project-access": "1.23.0"
   },
   "ui5": {
     "dependencies": []