Skip to content

Commit

Permalink
feat: general dependencies update (#1162)
Browse files Browse the repository at this point in the history
* feat: general dependencies update

* fix(ui5-tooling-modules): update to new @rollup/plugin-commonjs

* fix(ui5-tooling-modules): final polishing after commonjs update

* fix(ui5-middleware-approuter): get rid of test issues

* fix: revert nock to v13
  • Loading branch information
petermuessig authored Feb 6, 2025
1 parent bd2045f commit 5375d76
Show file tree
Hide file tree
Showing 182 changed files with 157,800 additions and 122,950 deletions.
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,21 +71,21 @@
"ncu": "ncu -ws --root"
},
"devDependencies": {
"@commitlint/cli": "^19.5.0",
"@commitlint/config-conventional": "^19.5.0",
"@commitlint/cli": "^19.7.1",
"@commitlint/config-conventional": "^19.7.1",
"@prettier/plugin-xml": "^3.4.1",
"cz-conventional-changelog": "^3.3.0",
"eslint": "^9.13.0",
"eslint-plugin-jsdoc": "^50.4.3",
"globals": "^15.11.0",
"husky": "^9.1.6",
"eslint": "^9.19.0",
"eslint-plugin-jsdoc": "^50.6.3",
"globals": "^15.14.0",
"husky": "^9.1.7",
"lerna": "^8.1.9",
"lint-staged": "^15.2.10",
"lint-staged": "^15.4.3",
"npm-run-all": "^4.1.5",
"prettier": "^3.3.3",
"prettier": "^3.4.2",
"prettier-plugin-properties": "^0.3.0",
"pretty-quick": "^4.0.0",
"wait-on": "^8.0.1"
"wait-on": "^8.0.2"
},
"pnpm": {
"overrides": {
Expand Down
4 changes: 2 additions & 2 deletions packages/cds-plugin-ui5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"@ui5/project": "^4",
"@ui5/server": "^4",
"js-yaml": "^4.1.0",
"node-html-parser": "^6.1.13",
"semver": "^7.6.3"
"node-html-parser": "^7.0.1",
"semver": "^7.7.1"
},
"devDependencies": {
"@sap/cds": "*",
Expand Down
4 changes: 2 additions & 2 deletions packages/dev-approuter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"directory": "packages/dev-approuter"
},
"dependencies": {
"@sap/approuter": ">=17.0.0",
"@sap/approuter": ">=19.0.0",
"@sap/xsenv": "5.4.0",
"cds-plugin-ui5": "workspace:^",
"express": "^4.21.1",
"express": "^4.21.2",
"ui5-middleware-cap": "workspace:^"
},
"peerDependencies": {
Expand Down
17 changes: 15 additions & 2 deletions packages/ui5-middleware-approuter/lib/middleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,19 @@ const nextFreePort = async (basePort) => {
}
}

/**
* Replaces the oldUrl with the newUrl in the text.
*
* @param {string} text text to replace the url in
* @param {string} oldUrl old url to replace
* @param {string} newUrl new url to replace with
* @returns replaced text
*/
function replaceUrl(text, oldUrl, newUrl) {
const regex = new RegExp(oldUrl.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&"), "gi")
return text.replace(regex, newUrl)
}

/**
* Custom UI5 Server middleware "approuter"
*
Expand Down Expand Up @@ -311,10 +324,10 @@ module.exports = async ({ log, options, middlewareUtil }) => {
req.baseUrl
}`
const referrerUrl = new URL(route.path, referrer).toString()
data = data.replaceAll(route.url, referrerUrl)
data = replaceUrl(data, `https://${route.url.substr(8)}`, referrerUrl)
// in some cases, the odata servers respond http instead of https in the content
if (route.url?.startsWith("https://")) {
data = data.replaceAll(`http://${route.url.substr(8)}`, referrerUrl)
data = replaceUrl(data, `http://${route.url.substr(8)}`, referrerUrl)
}
return new Buffer.from(data)
} else {
Expand Down
10 changes: 5 additions & 5 deletions packages/ui5-middleware-approuter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"timeout": "20s"
},
"dependencies": {
"@sap/approuter": "^17.0.0",
"@sap/approuter": "^19.0.0",
"content-type": "^1.0.5",
"dotenv": "^16.4.5",
"dotenv": "^16.4.7",
"http-proxy-middleware": "^2.0.7",
"mime-types": "^2.1.35",
"portfinder": "^1.0.32",
Expand All @@ -38,10 +38,10 @@
"ava": "^6.2.0",
"envfile": "7.1.0",
"get-port": "^7.1.0",
"nock": "^13.5.5",
"replace-in-file": "^8.2.0",
"nock": "^13.5.6",
"replace-in-file": "^8.3.0",
"supertest": "^7.0.0",
"ui5-middleware-websocket": "workspace:^",
"wait-on": "^8.0.1"
"wait-on": "^8.0.2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
type: application
framework:
name: OpenUI5
version: "1.129.0"
version: "1.132.1"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
type: application
framework:
name: OpenUI5
version: "1.129.0"
version: "1.132.1"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
2 changes: 1 addition & 1 deletion packages/ui5-middleware-approuter/test/crud/ui5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
type: application
framework:
name: OpenUI5
version: "1.129.0"
version: "1.132.1"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
type: application
framework:
name: OpenUI5
version: "1.129.0"
version: "1.132.1"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
type: application
framework:
name: OpenUI5
version: "1.129.0"
version: "1.132.1"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
type: application
framework:
name: OpenUI5
version: "1.129.0"
version: "1.132.1"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
2 changes: 1 addition & 1 deletion packages/ui5-middleware-approuter/test/no-auth/ui5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
type: application
framework:
name: OpenUI5
version: "1.129.0"
version: "1.132.1"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
type: application
framework:
name: OpenUI5
version: "1.129.0"
version: "1.132.1"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
type: application
framework:
name: OpenUI5
version: "1.129.0"
version: "1.132.1"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
4 changes: 2 additions & 2 deletions packages/ui5-middleware-approuter/test/rewrite.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ test("no rewrite content", async (t) => {
const respMetadata = await app.get("/backendv2/Categories?$format=atom")
t.is(respMetadata.status, 200, "http 200 on categories")
t.true(
respMetadata.text.indexOf(`<feed xml:base="https://services.odata.org/V2/Northwind/Northwind.svc/"`) !== -1,
respMetadata.text.indexOf(`<feed xml:base="https://services.odata.org/V2/northwind/Northwind.svc/"`) !== -1,
"OData context not rewritten"
)

Expand Down Expand Up @@ -148,7 +148,7 @@ test("partial rewrite content", async (t) => {
const respMetadata = await app.get("/backendv2/Categories?$format=atom")
t.is(respMetadata.status, 200, "http 200 on categories")
t.true(
respMetadata.text.indexOf(`<feed xml:base="https://services.odata.org/V2/Northwind/Northwind.svc/"`) !== -1,
respMetadata.text.indexOf(`<feed xml:base="https://services.odata.org/V2/northwind/Northwind.svc/"`) !== -1,
"OData context not rewritten"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
type: application
framework:
name: OpenUI5
version: "1.129.0"
version: "1.132.1"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
type: application
framework:
name: OpenUI5
version: "1.129.0"
version: "1.132.1"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
2 changes: 1 addition & 1 deletion packages/ui5-middleware-approuter/test/rewrite/ui5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
type: application
framework:
name: OpenUI5
version: "1.129.0"
version: "1.132.1"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
16 changes: 8 additions & 8 deletions packages/ui5-middleware-onelogin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@
},
"dependencies": {
"async-prompt": "^1.0.1",
"cookie": "^1.0.1",
"dotenv": "^16.4.5",
"playwright-chromium": "^1.48.2",
"playwright-core": "^1.48.2",
"cookie": "^1.0.2",
"dotenv": "^16.4.7",
"playwright-chromium": "^1.50.1",
"playwright-core": "^1.50.1",
"sleep-promise": "^9.1.0"
},
"devDependencies": {
"@playwright/test": "^1.48.2",
"@playwright/test": "^1.50.1",
"@types/cookie": "^1.0.0",
"@types/express": "^5.0.0",
"@types/prompt": "^1.1.9",
"eslint": "^9.13.0",
"globals": "^15.11.0",
"typescript-eslint": "^8.12.2"
"eslint": "^9.19.0",
"globals": "^15.14.0",
"typescript-eslint": "^8.23.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resources:

framework:
name: OpenUI5
version: "1.129.0"
version: "1.132.1"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resources:

framework:
name: OpenUI5
version: "1.129.0"
version: "1.132.1"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
4 changes: 2 additions & 2 deletions packages/ui5-middleware-serveframework/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"lint": "eslint lib"
},
"dependencies": {
"dotenv": "^16.4.5",
"dotenv": "^16.4.7",
"etag": "^1.8.1",
"fresh": "^0.5.2",
"https-proxy-agent": "^7.0.5",
"https-proxy-agent": "^7.0.6",
"js-yaml": "^4.1.0",
"node-fetch": "^2.7.0",
"proxy-from-env": "^1.1.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/ui5-middleware-servestatic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"lint": "eslint lib"
},
"dependencies": {
"dotenv": "^16.4.5",
"dotenv": "^16.4.7",
"serve-static": "^1.16.2"
}
}
6 changes: 3 additions & 3 deletions packages/ui5-middleware-simpleproxy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
"timeout": "20s"
},
"dependencies": {
"dotenv": "^16.4.5",
"dotenv": "^16.4.7",
"http-proxy-agent": "^7.0.2",
"http-proxy-middleware": "^2.0.7",
"https-proxy-agent": "^7.0.5",
"https-proxy-agent": "^7.0.6",
"minimatch": "^7.4.6",
"proxy-from-env": "^1.1.0",
"ui5-utils-express": "workspace:^"
Expand All @@ -35,7 +35,7 @@
"@ui5/server": "^3",
"ava": "^6.2.0",
"get-port": "^7.1.0",
"nock": "^13.5.5",
"nock": "^13.5.6",
"node-tcp-proxy": "^0.0.28",
"supertest": "^7.0.0",
"superwstest": "^2.0.4",
Expand Down
4 changes: 2 additions & 2 deletions packages/ui5-middleware-ui5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"lint": "eslint lib"
},
"dependencies": {
"express": "^4.21.1",
"express": "^4.21.2",
"js-yaml": "^4.1.0",
"node-html-parser": "^6.1.13",
"node-html-parser": "^7.0.1",
"ui5-utils-express": "workspace:^"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
type: application
framework:
name: OpenUI5
version: "1.129.0"
version: "1.132.1"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
type: application
framework:
name: OpenUI5
version: "1.129.0"
version: "1.132.1"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
type: application
framework:
name: OpenUI5
version: "1.129.0"
version: "1.132.1"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
type: application
framework:
name: OpenUI5
version: "1.129.0"
version: "1.132.1"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
4 changes: 2 additions & 2 deletions packages/ui5-task-copyright/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"ava": "^6.2.0"
},
"dependencies": {
"@typescript-eslint/typescript-estree": "^8.12.2",
"fast-xml-parser": "^4.5.0",
"@typescript-eslint/typescript-estree": "^8.23.0",
"fast-xml-parser": "^4.5.1",
"js-yaml": "^4.1.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
type: application
framework:
name: OpenUI5
version: "1.129.0"
version: "1.132.1"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
Loading

0 comments on commit 5375d76

Please sign in to comment.