Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.17] Upgrade express 4.19.2→4.21.0 (#192862) #193130

Merged
merged 4 commits into from
Sep 17, 2024

Conversation

jeramysoucy
Copy link
Contributor

Backport

This will backport the following commits from main to 7.17:

Questions ?

Please refer to the Backport tool documentation

## Summary

Upgrades `express` from v4.19.2 to v4.21.0, and `@types/express` from
v4.17.13 to v4.17.21. This PR also moves the dev-only dependency
`@mswjs/http-middleware` into the `devDependencies` section.

---------

Co-authored-by: kibanamachine <[email protected]>
(cherry picked from commit 7939f60)

# Conflicts:
#	package.json
#	yarn.lock
@jeramysoucy
Copy link
Contributor Author

@elasticmachine merge upstream

@jeramysoucy
Copy link
Contributor Author

@elasticmachine merge upstream

Copy link
Contributor

@kc13greiner kc13greiner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

yarn.lock Show resolved Hide resolved
@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

Module Count

Fewer modules leads to a faster build time

id before after diff
enterpriseSearch 1519 1528 +9
securitySolution 2578 2586 +8
total +17

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
enterpriseSearch 1.4MB 1.4MB +6.1KB
ml 3.3MB 3.3MB +1.0B
securitySolution 4.7MB 4.7MB +3.9KB
total +10.0KB

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@jeramysoucy jeramysoucy merged commit 8a4948a into elastic:7.17 Sep 17, 2024
27 checks passed
jeramysoucy referenced this pull request Sep 18, 2024
# Backport

This will backport the following commits from `main` to `8.15`:
- [Upgrade express 4.19.2→4.21.0
(#192862)](#192862)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Jeramy
Soucy","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-09-17T09:03:26Z","message":"Upgrade
express 4.19.2→4.21.0 (#192862)\n\n## Summary\r\n\r\nUpgrades `express`
from v4.19.2 to v4.21.0, and `@types/express` from\r\nv4.17.13 to
v4.17.21. This PR also moves the dev-only
dependency\r\n`@mswjs/http-middleware` into the `devDependencies`
section.\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<[email protected]>","sha":"7939f60f563af7c3f5402fcc70a7bb3578644e62","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Security","release_note:skip","v9.0.0","backport:all-open","v8.16.0"],"number":192862,"url":"https://github.com/elastic/kibana/pull/192862","mergeCommit":{"message":"Upgrade
express 4.19.2→4.21.0 (#192862)\n\n## Summary\r\n\r\nUpgrades `express`
from v4.19.2 to v4.21.0, and `@types/express` from\r\nv4.17.13 to
v4.17.21. This PR also moves the dev-only
dependency\r\n`@mswjs/http-middleware` into the `devDependencies`
section.\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<[email protected]>","sha":"7939f60f563af7c3f5402fcc70a7bb3578644e62"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/192862","number":192862,"mergeCommit":{"message":"Upgrade
express 4.19.2→4.21.0 (#192862)\n\n## Summary\r\n\r\nUpgrades `express`
from v4.19.2 to v4.21.0, and `@types/express` from\r\nv4.17.13 to
v4.17.21. This PR also moves the dev-only
dependency\r\n`@mswjs/http-middleware` into the `devDependencies`
section.\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<[email protected]>","sha":"7939f60f563af7c3f5402fcc70a7bb3578644e62"}},{"branch":"8.x","label":"v8.16.0","labelRegex":"^v8.16.0$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/193124","number":193124,"state":"MERGED","mergeCommit":{"sha":"ec719e0c2adbf707701892198743dd7b263a5b67","message":"[8.x]
Upgrade express 4.19.2→4.21.0 (#192862) (#193124)\n\n# Backport\n\nThis
will backport the following commits from `main` to `8.x`:\n- [Upgrade
express
4.19.2→4.21.0\n(#192862)](https://github.com/elastic/kibana/pull/192862)\n\n<!---
Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Jeramy\nSoucy\",\"email\":\"[email protected]\"},\"sourceCommit\":{\"committedDate\":\"2024-09-17T09:03:26Z\",\"message\":\"Upgrade\nexpress
4.19.2→4.21.0 (#192862)\\n\\n## Summary\\r\\n\\r\\nUpgrades
`express`\nfrom v4.19.2 to v4.21.0, and `@types/express`
from\\r\\nv4.17.13 to\nv4.17.21. This PR also moves the
dev-only\ndependency\\r\\n`@mswjs/http-middleware` into the
`devDependencies`\nsection.\\r\\n\\r\\n---------\\r\\n\\r\\nCo-authored-by:
kibanamachine\n<[email protected]>\",\"sha\":\"7939f60f563af7c3f5402fcc70a7bb3578644e62\",\"branchLabelMapping\":{\"^v9.0.0$\":\"main\",\"^v8.16.0$\":\"8.x\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"Team:Security\",\"release_note:skip\",\"v9.0.0\",\"backport:all-open\",\"v8.16.0\"],\"title\":\"Upgrade\nexpress\n4.19.2→4.21.0\",\"number\":192862,\"url\":\"https://github.com/elastic/kibana/pull/192862\",\"mergeCommit\":{\"message\":\"Upgrade\nexpress
4.19.2→4.21.0 (#192862)\\n\\n## Summary\\r\\n\\r\\nUpgrades
`express`\nfrom v4.19.2 to v4.21.0, and `@types/express`
from\\r\\nv4.17.13 to\nv4.17.21. This PR also moves the
dev-only\ndependency\\r\\n`@mswjs/http-middleware` into the
`devDependencies`\nsection.\\r\\n\\r\\n---------\\r\\n\\r\\nCo-authored-by:
kibanamachine\n<[email protected]>\",\"sha\":\"7939f60f563af7c3f5402fcc70a7bb3578644e62\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[\"8.x\"],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v9.0.0\",\"branchLabelMappingKey\":\"^v9.0.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/192862\",\"number\":192862,\"mergeCommit\":{\"message\":\"Upgrade\nexpress
4.19.2→4.21.0 (#192862)\\n\\n## Summary\\r\\n\\r\\nUpgrades
`express`\nfrom v4.19.2 to v4.21.0, and `@types/express`
from\\r\\nv4.17.13 to\nv4.17.21. This PR also moves the
dev-only\ndependency\\r\\n`@mswjs/http-middleware` into the
`devDependencies`\nsection.\\r\\n\\r\\n---------\\r\\n\\r\\nCo-authored-by:
kibanamachine\n<[email protected]>\",\"sha\":\"7939f60f563af7c3f5402fcc70a7bb3578644e62\"}},{\"branch\":\"8.x\",\"label\":\"v8.16.0\",\"branchLabelMappingKey\":\"^v8.16.0$\",\"isSourceBranch\":false,\"state\":\"NOT_CREATED\"}]}]\nBACKPORT-->\n\nCo-authored-by:
Jeramy Soucy
<[email protected]>"}},{"url":"https://github.com/elastic/kibana/pull/193130","number":193130,"branch":"7.17","state":"OPEN"}]}]
BACKPORT-->
jeramysoucy added a commit that referenced this pull request Sep 18, 2024
## Summary

This PR consolidates versions of `has-property-descriptors` in the yarn
lock file. It's a follow-up to
#193130, which auto-merged before
fixing this.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants