@sap-ux/ui5-proxy-middleware 1.0.6 → 1.0.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/base/utils.js +10 -10
- package/dist/base/utils.js.map +1 -1
- package/dist/ui5/middleware.js +4 -1
- package/dist/ui5/middleware.js.map +1 -1
- package/package.json +7 -7
package/dist/base/utils.js
CHANGED
|
@@ -194,21 +194,21 @@ exports.getUI5VersionFromManifest = getUI5VersionFromManifest;
|
|
|
194
194
|
*/
|
|
195
195
|
function resolveUI5Version(version, log) {
|
|
196
196
|
return __awaiter(this, void 0, void 0, function* () {
|
|
197
|
-
let ui5Version
|
|
197
|
+
let ui5Version;
|
|
198
198
|
let ui5VersionInfo;
|
|
199
|
-
let ui5VersionLocation
|
|
200
|
-
if (
|
|
199
|
+
let ui5VersionLocation;
|
|
200
|
+
if (process.env.FIORI_TOOLS_UI5_VERSION || process.env.FIORI_TOOLS_UI5_VERSION === '') {
|
|
201
|
+
ui5Version = process.env.FIORI_TOOLS_UI5_VERSION;
|
|
202
|
+
ui5VersionLocation = 'CLI arguments / Run configuration';
|
|
203
|
+
}
|
|
204
|
+
else if (version !== undefined) {
|
|
201
205
|
ui5Version = version ? version : '';
|
|
202
|
-
ui5VersionLocation =
|
|
203
|
-
process.env.FIORI_TOOLS_UI5_VERSION || process.env.FIORI_TOOLS_UI5_VERSION === ''
|
|
204
|
-
? 'CLI arguments / Run configuration'
|
|
205
|
-
: exports.getYamlFile(process.argv);
|
|
206
|
+
ui5VersionLocation = exports.getYamlFile(process.argv);
|
|
206
207
|
}
|
|
207
208
|
else {
|
|
208
209
|
const minUI5Version = yield getUI5VersionFromManifest(process.argv);
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
}
|
|
210
|
+
ui5Version = minUI5Version && !isNaN(parseFloat(minUI5Version)) ? minUI5Version : '';
|
|
211
|
+
ui5VersionLocation = 'manifest.json';
|
|
212
212
|
}
|
|
213
213
|
if (log) {
|
|
214
214
|
ui5VersionInfo = ui5Version ? ui5Version : 'latest';
|
package/dist/base/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/base/utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/base/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,mDAA+C;AAG/C,2BAA8C;AAC9C,+BAA4B;AAC5B,2CAA2G;AAE3G,kCAA4B;AAE5B;;;;;;GAMG;AACU,QAAA,oBAAoB,GAAG,CAAC,QAAyB,EAAE,IAAY,EAAQ,EAAE;IAClF,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAChC,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,CAAC;AACnD,CAAC,CAAC;AAEF;;;;;;;;;GASG;AACU,QAAA,mBAAmB,GAAG,CAC/B,QAAuB,EACvB,GAAmB,EACnB,IAAY,EACZ,MAAmB,EACf,EAAE;IACN,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC3B,IAAI,QAAQ,CAAC,SAAS,CAAC,eAAe,CAAC,KAAK,IAAI,EAAE;QAC9C,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;QACrB,GAAG,CAAC,GAAG,EAAE,CAAC;KACb;AACL,CAAC,CAAC;AAEF;;;;;GAKG;AACU,QAAA,uBAAuB,GAAG,CAAC,eAAmC,EAAsB,EAAE;IAC/F,OAAO,CACH,eAAe;QACf,OAAO,CAAC,GAAG,CAAC,iBAAiB;QAC7B,OAAO,CAAC,GAAG,CAAC,UAAU;QACtB,OAAO,CAAC,GAAG,CAAC,UAAU;QACtB,OAAO,CAAC,GAAG,CAAC,WAAW;QACvB,OAAO,CAAC,GAAG,CAAC,WAAW;QACvB,OAAO,CAAC,GAAG,CAAC,gBAAgB;QAC5B,OAAO,CAAC,GAAG,CAAC,sBAAsB,CACrC,CAAC;AACN,CAAC,CAAC;AAEF;;;;;GAKG;AACU,QAAA,oBAAoB,GAAG,CAAC,KAAyB,EAAsB,EAAE;IAClF,IAAI,KAAK,EAAE;QACP,MAAM,iBAAiB,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAEnC,IAAI,iBAAiB,KAAK,CAAC,CAAC,IAAI,OAAO,KAAK,CAAC,CAAC,EAAE;YAC5C,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,iBAAiB,GAAG,CAAC,EAAE,OAAO,CAAC,EAAE,SAAS,CAAC,CAAC;SACjF;KACJ;IAED,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AAEF;;;;;;GAMG;AACU,QAAA,uBAAuB,GAAG,CAAC,aAAiC,EAAE,GAAW,EAAW,EAAE;IAC/F,IAAI,aAAa,KAAK,GAAG,EAAE;QACvB,OAAO,IAAI,CAAC;KACf;SAAM;QACH,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;QAC/B,MAAM,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClE,OAAO,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAChC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,CAC5E,CAAC;KACL;AACL,CAAC,CAAC;AAEF;;;;;GAKG;AACU,QAAA,WAAW,GAAG,CAAC,GAAW,EAAU,EAAE;IAC/C,IAAI,IAAI,GAAG,GAAG,CAAC;IACf,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;QAC1B,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;KAClD;SAAM,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;QACjC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;KAClD;SAAM;QACH,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;KACpC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF;;;;;GAKG;AACU,QAAA,WAAW,GAAG,CAAC,IAAc,EAAU,EAAE;IAClD,IAAI,IAAI,GAAG,UAAU,CAAC;IACtB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9F,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;QACd,IAAI,GAAG,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;KAC1B;IAED,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF;;;;;GAKG;AACU,QAAA,uBAAuB,GAAG,CAAO,WAAmB,EAAmB,EAAE;;IAClF,IAAI,eAAU,CAAC,WAAW,CAAC,EAAE;QACzB,MAAM,SAAS,GAAG,MAAM,sBAAS,CAAC,WAAW,CAAC,iBAAY,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAC/F,mBAAO,SAAS,CAAC,gBAAgB,EAAE,CAAC,KAAK,0CAAE,MAAM,mCAAI,QAAQ,CAAC;KACjE;SAAM;QACH,OAAO,QAAQ,CAAC;KACnB;AACL,CAAC,CAAA,CAAC;AAEF;;;;;GAKG;AACU,QAAA,eAAe,GAAG,CAAC,GAAQ,EAAE,IAAY,EAAQ,EAAE;IAC5D,IAAI,GAAG,CAAC,aAAa,CAAC,EAAE;QACpB,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChB,GAAG,CAAC,GAAG,EAAE,CAAC;KACb;SAAM;QACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KAClD;AACL,CAAC,CAAC;AAEF;;;;;GAKG;AACU,QAAA,WAAW,GAAG,CAAO,IAAc,EAAqB,EAAE;IACnE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAClC,MAAM,YAAY,GAAG,mBAAW,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,WAAW,GAAG,WAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,MAAM,+BAAuB,CAAC,WAAW,CAAC,CAAC;IAChE,MAAM,YAAY,GAAG,WAAI,CAAC,WAAW,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC;IACtE,MAAM,QAAQ,GAAa,IAAI,CAAC,KAAK,CAAC,iBAAY,CAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAExF,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAA,CAAC;AAEF;;;;;GAKG;AACH,SAAsB,yBAAyB,CAAC,IAAc;;;QAC1D,MAAM,QAAQ,GAAG,MAAM,mBAAW,CAAC,IAAI,CAAC,CAAC;QACzC,mBAAO,QAAQ,CAAC,SAAS,CAAC,0CAAE,YAAY,0CAAE,aAAa,CAAC;;CAC3D;AAHD,8DAGC;AAED;;;;;;GAMG;AACH,SAAsB,iBAAiB,CAAC,OAAgB,EAAE,GAAiB;;QACvE,IAAI,UAAkB,CAAC;QACvB,IAAI,cAAsB,CAAC;QAC3B,IAAI,kBAA0B,CAAC;QAE/B,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,KAAK,EAAE,EAAE;YACnF,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;YACjD,kBAAkB,GAAG,mCAAmC,CAAC;SAC5D;aAAM,IAAI,OAAO,KAAK,SAAS,EAAE;YAC9B,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YACpC,kBAAkB,GAAG,mBAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAClD;aAAM;YACH,MAAM,aAAa,GAAG,MAAM,yBAAyB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACpE,UAAU,GAAG,aAAa,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;YACrF,kBAAkB,GAAG,eAAe,CAAC;SACxC;QAED,IAAI,GAAG,EAAE;YACL,cAAc,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC;YACpD,GAAG,CAAC,IAAI,CAAC,QAAC,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC;SACjG;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;CAAA;AAvBD,8CAuBC;AAED;;;;;;GAMG;AACH,SAAgB,YAAY,CAAC,YAAoB,EAAE,UAAyB;IACxE,IAAI,eAAU,CAAC,YAAY,CAAC,EAAE;QAC1B,IAAI,IAAI,GAAG,iBAAY,CAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAC5D,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAChC,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACjD,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YAE/E,IAAI,SAAS,CAAC,IAAI,KAAK,YAAY,EAAE;gBACjC,MAAM,YAAY,GAAG,QAAQ,MAAM,IAAI,0BAAc,GAAG,CAAC;gBACzD,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,mCAAuB,EAAE,YAAY,CAAC,CAAC;aAC9D;YAED,IAAI,SAAS,CAAC,IAAI,KAAK,iBAAiB,EAAE;gBACtC,MAAM,gBAAgB,GAAG,QAAQ,MAAM,IAAI,wBAAY,GAAG,CAAC;gBAC3D,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,iCAAqB,EAAE,gBAAgB,CAAC,CAAC;aAChE;SACJ;QACD,OAAO,IAAI,CAAC;KACf;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AArBD,oCAqBC;AAED;;;;;;;GAOG;AACU,QAAA,aAAa,GAAG,CACzB,GAAY,EACZ,GAAa,EACb,IAAkB,EAClB,UAAyB,EACZ,EAAE;IACf,IAAI;QACA,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QAC1B,MAAM,YAAY,GAAG,mBAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,YAAY,GAAG,mBAAW,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,WAAW,GAAG,WAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QACpD,MAAM,YAAY,GAAG,MAAM,+BAAuB,CAAC,WAAW,CAAC,CAAC;QAChE,MAAM,YAAY,GAAG,WAAI,CAAC,WAAW,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;QACnE,MAAM,IAAI,GAAG,YAAY,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAEpD,IAAI,IAAI,EAAE;YACN,uBAAe,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;SAC9B;aAAM;YACH,IAAI,EAAE,CAAC;SACV;KACJ;IAAC,OAAO,KAAK,EAAE;QACZ,IAAI,CAAC,KAAK,CAAC,CAAC;KACf;AACL,CAAC,CAAA,CAAC;AAEF;;;;;;;;GAQG;AACU,QAAA,yBAAyB,GAAG,CAAC,SAAiB,EAAE,GAAoB,EAAW,EAAE;IAC1F,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACjD,IACI,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC;QAC9B,CAAC,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC,EACxF;QACE,OAAO,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,kDAAkD;KAC5F;IACD,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC"}
|
package/dist/ui5/middleware.js
CHANGED
|
@@ -16,13 +16,16 @@ const express_1 = __importDefault(require("express"));
|
|
|
16
16
|
const https_proxy_agent_1 = require("https-proxy-agent");
|
|
17
17
|
const logger_1 = require("@sap-ux/logger");
|
|
18
18
|
const base_1 = require("../base");
|
|
19
|
+
const dotenv_1 = __importDefault(require("dotenv"));
|
|
19
20
|
module.exports = ({ options }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
20
21
|
const logger = new logger_1.ToolsLogger({
|
|
21
22
|
transports: [new logger_1.UI5ToolingTransport({ moduleName: 'ui5-proxy-middleware' })]
|
|
22
23
|
});
|
|
24
|
+
dotenv_1.default.config();
|
|
23
25
|
const router = express_1.default.Router();
|
|
24
26
|
const config = options.configuration;
|
|
25
27
|
const ui5Version = yield base_1.resolveUI5Version(config.version, logger);
|
|
28
|
+
const envUI5Url = process.env.FIORI_TOOLS_UI5_URI;
|
|
26
29
|
const secure = config.secure !== undefined ? !!config.secure : true;
|
|
27
30
|
const debug = !!config.debug;
|
|
28
31
|
const directLoad = !!config.directLoad;
|
|
@@ -43,7 +46,7 @@ module.exports = ({ options }) => __awaiter(void 0, void 0, void 0, function* ()
|
|
|
43
46
|
for (const ui5Path of paths) {
|
|
44
47
|
const ui5Config = {
|
|
45
48
|
path: ui5Path,
|
|
46
|
-
url: ui5.url,
|
|
49
|
+
url: envUI5Url || ui5.url,
|
|
47
50
|
version: ui5Version
|
|
48
51
|
};
|
|
49
52
|
if (corporateProxyServer && !base_1.isHostExcludedFromProxy(noProxyVal, ui5Config.url)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/ui5/middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,sDAA8B;AAE9B,yDAAoD;AACpD,2CAAkE;AAElE,kCAQiB;
|
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/ui5/middleware.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"bugs": {
|
|
10
10
|
"url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aui5-proxy-middleware"
|
|
11
11
|
},
|
|
12
|
-
"version": "1.0.
|
|
12
|
+
"version": "1.0.9",
|
|
13
13
|
"license": "Apache-2.0",
|
|
14
14
|
"main": "dist/index.js",
|
|
15
15
|
"files": [
|
|
@@ -18,8 +18,9 @@
|
|
|
18
18
|
"ui5.yaml"
|
|
19
19
|
],
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@sap-ux/logger": "0.1.
|
|
22
|
-
"@sap-ux/ui5-config": "0.13.
|
|
21
|
+
"@sap-ux/logger": "0.1.6",
|
|
22
|
+
"@sap-ux/ui5-config": "0.13.3",
|
|
23
|
+
"dotenv": "16.0.0",
|
|
23
24
|
"express": "4.17.2",
|
|
24
25
|
"http-proxy-middleware": "2.0.1",
|
|
25
26
|
"https-proxy-agent": "5.0.0",
|
|
@@ -36,8 +37,8 @@
|
|
|
36
37
|
"dependencies": []
|
|
37
38
|
},
|
|
38
39
|
"engines": {
|
|
39
|
-
"pnpm": ">=6.26.1",
|
|
40
|
-
"node": ">=12.22.5 < 13.0.0 || >= 14.16.0 < 15.0.0 || >=16.1.0 < 17.0.0"
|
|
40
|
+
"pnpm": ">=6.26.1 < 7.0.0 || >=7.1.0",
|
|
41
|
+
"node": ">=12.22.5 < 13.0.0 || >= 14.16.0 < 15.0.0 || >=16.1.0 < 17.0.0 || >=18.0.0 < 19.0.0"
|
|
41
42
|
},
|
|
42
43
|
"scripts": {
|
|
43
44
|
"build": "pnpm clean && tsc",
|
|
@@ -47,6 +48,5 @@
|
|
|
47
48
|
"lint:fix": "eslint . --ext .ts --fix",
|
|
48
49
|
"test": "jest --ci --forceExit --detectOpenHandles --colors",
|
|
49
50
|
"watch": "tsc --watch"
|
|
50
|
-
}
|
|
51
|
-
"readme": "# `@sap-ux/ui5-proxy-middleware`\n\nThe `@sap-ux/ui5-proxy-middleware` is a [Custom UI5 Server Middleware](https://sap.github.io/ui5-tooling/pages/extensibility/CustomServerMiddleware) for loading the UI5 sources in your application. It can be used either with the `ui5 serve` or the `fiori run` commands.\n\n## Configuration Options\n| Option | Default Value | Description |\n| ------------ | ------------- | ----------- |\n| `ui5` | mandatory | List of mount paths and target urls that should be handled by the proxy |\n| `version` | `undefined` | The UI5 version. If this property is not defined, then the `minUI5Version` from the `manifest.json` will be used |\n| `secure` | true | Defines if SSL certs should be verified |\n| `debug` | false | Enables debug output |\n| `proxy` | `undefined` | Use for adding corporate proxy configuration |\n| `directLoad` | false | Defines whether the UI5 sources should be loaded directly from UI5 CDN |\n\n## Usage\nIn order to use the middleware this is the minimal configuration that you need to provide in the `ui5.yaml` of your application.\n\n```Yaml\nserver:\n customMiddleware:\n - name: ui5-proxy-middleware\n afterMiddleware: compression\n configuration:\n ui5:\n - path: /resources\n url: https://ui5.sap.com\n - path: /test-resources\n url: https://ui5.sap.com\n```\n\nAlternatively you can use the following syntax if all paths should be proxied to the same url.\n\n```Yaml\nserver:\n customMiddleware:\n - name: ui5-proxy-middleware\n afterMiddleware: compression\n configuration:\n ui5:\n path: \n - /resources\n - /test-resources\n url: https://ui5.sap.com\n```\n**NOTE: You can't mix both syntaxes!**\n\nFinally don't forget to add the following in your `package.json`.\n\n```JSON\n\"ui5\": {\n \"dependencies\": [\n \"@sap-ux/ui5-proxy-middleware\"\n ]\n}\n```\n\n## Examples\n### Loading a specific UI5 version\nTo load a specific a UI5 version in your application you can use the `version` parameter, e.g.\n\n```Yaml\nserver:\n customMiddleware:\n - name: ui5-proxy-middleware\n afterMiddleware: compression\n configuration:\n ui5:\n - path: /resources\n url: https://ui5.sap.com\n - path: /test-resources\n url: https://ui5.sap.com\n version: 1.96.1\n```\n\n### Loading UI5 sources directly from UI5 CDN\nIf you don't load all UI5 source through the `ui5-proxy-middleware`, then you can set `directLoad: true`. This will inject the absolute UI5 URL in the bootstrap of your HTML file, thus loading the libraries directly from UI5 CDN.\n\n**NOTE: this works only for the default HTML files created by the [Fiori generator](https://www.npmjs.com/package/@sap/generator-fiori) when a project is generated. Hence index.html, flpSandbox.html and flpSandboxMockServer.html!**\n\n```Yaml\nserver:\n customMiddleware:\n - name: ui5-proxy-middleware\n afterMiddleware: compression\n configuration:\n ui5:\n - path: /resources\n url: https://ui5.sap.com\n - path: /test-resources\n url: https://ui5.sap.com\n directLoad: true\n```\n\n### Adding corporate proxy configuration\nIf you are behind a corporate proxy then you can provide your corporate proxy configuration as follows.\n\n```Yaml\nserver:\n customMiddleware:\n - name: ui5-proxy-middleware\n afterMiddleware: compression\n configuration:\n ui5:\n - path: /resources\n url: https://ui5.sap.com\n - path: /test-resources\n url: https://ui5.sap.com\n proxy: https://my.corporate.proxy.example\n```\n\n## Programmatic Usage\nAlternatively you can only use the underlying proxy function, e.g. for the case when you want to incorporate the `ui5-proxy-middleware` functionality in your own middleware.\n\n```Typescript\nimport { ui5Proxy } from '@sap-ux/ui5-proxy-middleware';\nconst ui5ProxyMiddlewareFn = ui5Proxy(config, options, filter)\n```\n- **config** - The UI5 configuration\n- **options** - Options of the [http-proxy-middleware](https://www.npmjs.com/package/http-proxy-middleware#options)\n- **filter** - a custom function to determine which requests should be proxied or not, [example](https://www.npmjs.com/package/http-proxy-middleware#context-matching)\n\n## Keywords\nUI5 Proxy Middleware\n"
|
|
51
|
+
}
|
|
52
52
|
}
|