Skip to content

Commit 17fe124

Browse files
rshen91rshen91
authored
Merge branch 'main' into reporting-share-menu
2 parents 8402beb + 83d9644 commit 17fe124

70 files changed

Lines changed: 1035 additions & 818 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
"@elastic/datemath": "5.0.3",
9999
"@elastic/elasticsearch": "npm:@elastic/elasticsearch@8.9.0",
100100
"@elastic/ems-client": "8.4.0",
101-
"@elastic/eui": "85.1.0",
101+
"@elastic/eui": "86.0.0",
102102
"@elastic/filesaver": "1.1.2",
103103
"@elastic/node-crypto": "1.2.1",
104104
"@elastic/numeral": "^2.5.1",
@@ -123,6 +123,7 @@
123123
"@hapi/hoek": "^9.2.1",
124124
"@hapi/inert": "^6.0.4",
125125
"@hapi/wreck": "^17.1.0",
126+
"@hello-pangea/dnd": "^16.3.0",
126127
"@juggle/resize-observer": "^3.4.0",
127128
"@kbn/aad-fixtures-plugin": "link:x-pack/test/alerting_api_integration/common/plugins/aad",
128129
"@kbn/ace": "link:packages/kbn-ace",
@@ -825,6 +826,7 @@
825826
"copy-to-clipboard": "^3.0.8",
826827
"core-js": "^3.31.0",
827828
"cronstrue": "^1.51.0",
829+
"css-box-model": "^1.2.1",
828830
"cuid": "^2.1.8",
829831
"cytoscape": "^3.10.0",
830832
"cytoscape-dagre": "^2.2.2",
@@ -944,7 +946,6 @@
944946
"re2": "1.20.1",
945947
"react": "^17.0.2",
946948
"react-ace": "^7.0.5",
947-
"react-beautiful-dnd": "^13.1.0",
948949
"react-color": "^2.13.8",
949950
"react-dom": "^17.0.2",
950951
"react-dropzone": "^4.2.9",
@@ -1330,7 +1331,6 @@
13301331
"@types/prop-types": "^15.7.5",
13311332
"@types/rbush": "^3.0.0",
13321333
"@types/react": "^17.0.45",
1333-
"@types/react-beautiful-dnd": "^13.0.0",
13341334
"@types/react-dom": "^17.0.17",
13351335
"@types/react-grid-layout": "^1.3.2",
13361336
"@types/react-intl": "^2.3.15",

‎packages/core/integrations/core-integrations-browser-internal/src/styles/disable_animations.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* `react-beautiful-dnd` relies on `transition` for functionality
2+
* `@hello-pangea/dnd` relies on `transition` for functionality
33
* https://github.com/elastic/kibana/issues/95133
44
*/
55
*:not(.essentialAnimation):not([data-rbd-draggable-context-id]):not([data-rbd-droppable-context-id]),

‎packages/kbn-securitysolution-t-grid/src/utils/drag_and_drop/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Side Public License, v 1.
77
*/
88

9-
import type { DropResult } from 'react-beautiful-dnd';
9+
import type { DropResult } from '@hello-pangea/dnd';
1010

1111
export const draggableIdPrefix = 'draggableId';
1212

‎packages/kbn-ui-shared-deps-npm/BUILD.bazel‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ SRCS = glob(
2424

2525
# deps needed when importing this module from another location
2626
RUNTIME_DEPS = [
27+
"@npm//babel-loader",
28+
"@npm//@babel/plugin-proposal-optional-chaining",
2729
"@npm//loader-utils",
2830
"@npm//val-loader",
2931
"//packages/kbn-repo-info",
@@ -40,6 +42,7 @@ RUNTIME_DEPS = [
4042
"@npm//@elastic/numeral",
4143
"@npm//@emotion/cache",
4244
"@npm//@emotion/react",
45+
"@npm//@hello-pangea/dnd",
4346
"@npm//@tanstack/react-query",
4447
"@npm//@tanstack/react-query-devtools",
4548
"@npm//classnames",
@@ -49,7 +52,6 @@ RUNTIME_DEPS = [
4952
"@npm//lodash",
5053
"@npm//moment-timezone",
5154
"@npm//react-ace",
52-
"@npm//react-beautiful-dnd",
5355
"@npm//react-dom",
5456
"@npm//react-router-dom",
5557
"@npm//react-router-dom-v5-compat",

‎packages/kbn-ui-shared-deps-npm/webpack.config.js‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ module.exports = (_, argv) => {
8383
'@elastic/numeral',
8484
'@emotion/cache',
8585
'@emotion/react',
86+
'@hello-pangea/dnd/dist/dnd.js',
8687
'@tanstack/react-query',
8788
'@tanstack/react-query-devtools',
8889
'classnames',
@@ -96,7 +97,6 @@ module.exports = (_, argv) => {
9697
'moment-timezone/data/packed/latest.json',
9798
'moment',
9899
'react-ace',
99-
'react-beautiful-dnd',
100100
'react-dom',
101101
'react-dom/server',
102102
'react-router-dom',
@@ -138,6 +138,19 @@ module.exports = (_, argv) => {
138138
},
139139
],
140140
},
141+
// @hello-pangea/dnd emits optional chaining that confuses webpack.
142+
// We need to transform it using babel before going further
143+
{
144+
test: /@hello-pangea\/dnd\/dist\/dnd\.js$/,
145+
use: [
146+
{
147+
loader: 'babel-loader',
148+
options: {
149+
plugins: [require.resolve('@babel/plugin-proposal-optional-chaining')],
150+
},
151+
},
152+
],
153+
},
141154
{
142155
test: /\.css$/,
143156
use: [MiniCssExtractPlugin.loader, 'css-loader'],

‎packages/kbn-ui-shared-deps-src/src/definitions.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const externals = {
7272
'@elastic/eui/dist/eui_charts_theme': '__kbnSharedDeps__.ElasticEuiChartsTheme',
7373

7474
// transient dep of eui
75-
'react-beautiful-dnd': '__kbnSharedDeps__.ReactBeautifulDnD',
75+
'@hello-pangea/dnd': '__kbnSharedDeps__.HelloPangeaDnd',
7676
lodash: '__kbnSharedDeps__.Lodash',
7777
'lodash/fp': '__kbnSharedDeps__.LodashFp',
7878
fflate: '__kbnSharedDeps__.Fflate',

‎packages/kbn-ui-shared-deps-src/src/entry.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export const ElasticEuiLibServices = require('@elastic/eui/optimize/es/services'
4646
export const ElasticEuiLibServicesFormat = require('@elastic/eui/optimize/es/services/format');
4747
export const ElasticEuiChartsTheme = require('@elastic/eui/dist/eui_charts_theme');
4848
export const KbnDatemath = require('@kbn/datemath');
49-
export const ReactBeautifulDnD = require('react-beautiful-dnd');
49+
export const HelloPangeaDnd = require('@hello-pangea/dnd/dist/dnd');
5050

5151
export const Lodash = require('lodash');
5252
export const LodashFp = require('lodash/fp');

‎packages/kbn-visualization-ui-components/components/drag_drop_bucket/types.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import React from 'react';
10-
import type { DraggableProvided } from 'react-beautiful-dnd';
10+
import type { DraggableProvided } from '@hello-pangea/dnd';
1111

1212
export interface BucketContainerProps {
1313
children: React.ReactNode;

‎packages/shared-ux/markdown/impl/__snapshots__/markdown.test.tsx.snap‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/dev/license_checker/config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export const LICENSE_OVERRIDES = {
8585
'jsts@1.6.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
8686
'@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
8787
'@elastic/ems-client@8.4.0': ['Elastic License 2.0'],
88-
'@elastic/eui@85.1.0': ['SSPL-1.0 OR Elastic License 2.0'],
88+
'@elastic/eui@86.0.0': ['SSPL-1.0 OR Elastic License 2.0'],
8989
'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry
9090
'buffers@0.1.1': ['MIT'], // license in importing module https://www.npmjs.com/package/binary
9191
};

0 commit comments

Comments
 (0)