Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/7.17' into backport/173461/7.17
Browse files Browse the repository at this point in the history
  • Loading branch information
jbudz committed Jan 2, 2024
2 parents 38b1b09 + 2d2833d commit 4d3b7a5
Show file tree
Hide file tree
Showing 7 changed files with 3,533 additions and 3,116 deletions.
2 changes: 1 addition & 1 deletion NOTICE.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Kibana source code with Kibana X-Pack source code
Copyright 2012-2023 Elasticsearch B.V.
Copyright 2012-2024 Elasticsearch B.V.

---
Pretty handling of logarithmic axes.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This guide introduces you to three of {kib}'s security features: spaces, roles,
[float]
=== Spaces

Do you have multiple teams or tenants using {kib}? Do you want a “playground” to experiment with new visualizations or alerts? If so, then <<xpack-spaces,{kib} Spaces>> can help.
Do you have multiple teams using {kib}? Do you want a “playground” to experiment with new visualizations or alerts? If so, then <<xpack-spaces,{kib} Spaces>> can help.

Think of a space as another instance of {kib}. A space allows you to organize your <<dashboard, dashboards>>, <<alerting-getting-started, alerts>>, <<xpack-ml, machine learning jobs>>, and much more into their own categories. For example, you might have a Marketing space for your marketeers to track the results of their campaigns, and an Engineering space for your developers to {apm-guide-ref}/apm-overview.html[monitor application performance].

Expand Down
40 changes: 17 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,6 @@
"yarn": "^1.21.1"
},
"resolutions": {
"**/@babel/core": "^7.21.0",
"**/@babel/preset-env": "^7.20.2",
"**/@babel/runtime": "^7.21.0",
"**/@babel/traverse": "^7.21.2",
"**/@babel/types": "^7.21.2",
"**/@types/babel__generator/@babel/types": "^7.21.0",
"**/@types/node": "20.10.0",
"**/@types/react": "^16.14.25",
"**/@types/react-dom": "^16.9.8",
Expand All @@ -96,7 +90,7 @@
"wrap-ansi": "7.0.0"
},
"dependencies": {
"@babel/runtime": "^7.21.0",
"@babel/runtime": "^7.23.6",
"@dnd-kit/core": "^3.1.1",
"@dnd-kit/sortable": "^4.0.0",
"@dnd-kit/utilities": "^2.0.0",
Expand Down Expand Up @@ -193,7 +187,7 @@
"ansi-regex": "^5.0.1",
"antlr4ts": "^0.5.0-alpha.3",
"archiver": "^5.3.1",
"axios": "^1.6.0",
"axios": "^1.6.3",
"base64-js": "^1.3.1",
"bluebird": "3.5.5",
"brace": "0.11.1",
Expand Down Expand Up @@ -420,24 +414,24 @@
"yauzl": "^2.10.0"
},
"devDependencies": {
"@babel/cli": "^7.21.0",
"@babel/core": "^7.21.0",
"@babel/eslint-parser": "^7.19.1",
"@babel/eslint-plugin": "^7.19.1",
"@babel/generator": "^7.21.1",
"@babel/parser": "^7.21.2",
"@babel/cli": "^7.23.4",
"@babel/core": "^7.23.6",
"@babel/eslint-parser": "^7.23.3",
"@babel/eslint-plugin": "^7.23.5",
"@babel/generator": "^7.23.6",
"@babel/parser": "^7.23.6",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-export-namespace-from": "^7.18.9",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
"@babel/plugin-proposal-object-rest-spread": "^7.20.7",
"@babel/plugin-proposal-optional-chaining": "^7.21.0",
"@babel/plugin-proposal-private-methods": "^7.18.6",
"@babel/plugin-transform-runtime": "^7.21.0",
"@babel/preset-env": "^7.20.2",
"@babel/preset-react": "^7.18.6",
"@babel/preset-typescript": "^7.21.0",
"@babel/register": "^7.21.0",
"@babel/traverse": "^7.21.2",
"@babel/plugin-transform-runtime": "^7.23.6",
"@babel/preset-env": "^7.23.6",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@babel/register": "^7.22.15",
"@babel/traverse": "^7.23.6",
"@babel/types": "^7.21.2",
"@bazel/ibazel": "^0.16.2",
"@bazel/typescript": "^3.8.0",
Expand Down Expand Up @@ -506,8 +500,8 @@
"@testing-library/react-hooks": "^5.1.1",
"@testing-library/user-event": "^13.1.1",
"@types/archiver": "^5.1.0",
"@types/babel__core": "^7.20.0",
"@types/babel__generator": "^7.6.4",
"@types/babel__core": "^7.20.5",
"@types/babel__generator": "^7.6.8",
"@types/base64-js": "^1.2.5",
"@types/bluebird": "^3.1.1",
"@types/chance": "^1.0.0",
Expand Down Expand Up @@ -665,7 +659,7 @@
"babel-plugin-add-module-exports": "^1.0.4",
"babel-plugin-istanbul": "^6.1.1",
"babel-plugin-require-context-hook": "^1.0.0",
"babel-plugin-styled-components": "^2.0.7",
"babel-plugin-styled-components": "^2.1.4",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"backport": "^5.6.6",
"blob-polyfill": "^7.0.20220408",
Expand Down
4 changes: 2 additions & 2 deletions packages/kbn-babel-preset/common_preset.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

module.exports = {
module.exports = () => ({
presets: [
// plugins always run before presets, but in this case we need the
// @babel/preset-typescript preset to run first so we have to move
Expand Down Expand Up @@ -59,4 +59,4 @@ module.exports = {
},
],
],
};
});
Loading

0 comments on commit 4d3b7a5

Please sign in to comment.