Bump react-apollo@3

package.json

@@ -84,6 +84,8 @@
     "**/@types/angular": "^1.6.56",
     "**/@types/hoist-non-react-statics": "^3.3.1",
     "**/typescript": "3.7.2",
+    "**/apollo-link": "^1.2.13",
+    "**/graphql-tools": "^4.0.7",
     "**/graphql-toolkit/lodash": "^4.17.13",
     "**/hoist-non-react-statics": "^3.3.2",
     "**/isomorphic-git/**/base64-js": "^1.2.1",
@@ -107,7 +109,6 @@
     ],
     "nohoist": [
       "**/@types/*",
-      "**/@types/*/**",
       "**/grunt-*",
       "**/grunt-*/**",
       "x-pack/typescript"
@@ -179,6 +180,7 @@
     "glob": "^7.1.2",
     "glob-all": "^3.1.0",
     "globby": "^8.0.1",
+    "graphql": "^14.6.0",
     "good-squeeze": "2.1.0",
     "h2o2": "^8.1.2",
     "handlebars": "4.5.3",
@@ -325,7 +327,6 @@
     "@types/getopts": "^2.0.1",
     "@types/glob": "^7.1.1",
     "@types/globby": "^8.0.0",
-    "@types/graphql": "^0.13.2",
     "@types/hapi": "^17.0.18",
     "@types/hapi-auth-cookie": "^9.1.0",
     "@types/has-ansi": "^3.0.0",
@@ -341,6 +342,7 @@
     "@types/listr": "^0.14.0",
     "@types/lodash": "^3.10.1",
     "@types/lodash.clonedeep": "^4.5.4",
+    "@types/long": "^4.0.0",
     "@types/lru-cache": "^5.1.0",
     "@types/markdown-it": "^0.0.7",
     "@types/minimatch": "^2.0.29",
@@ -379,6 +381,7 @@
     "@types/type-detect": "^4.0.1",
     "@types/uuid": "^3.4.4",
     "@types/vinyl-fs": "^2.4.11",
+    "@types/ws": "^5.1.0",
     "@types/zen-observable": "^0.8.0",
     "@typescript-eslint/eslint-plugin": "^2.15.0",
     "@typescript-eslint/parser": "^2.15.0",

packages/kbn-optimizer/src/worker/webpack.config.ts

@@ -213,11 +213,16 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
             loader: 'raw-loader',
           },
         },
+        {
+          test: /\.mjs$/,
+          include: /node_modules/,
+          type: 'javascript/auto',
+        },
       ],
     },
 
     resolve: {
-      extensions: ['.js', '.ts', '.tsx', '.json'],
+      extensions: ['.mjs', '.js', '.ts', '.tsx', '.json'],
       alias: {
         tinymath: require.resolve('tinymath/lib/tinymath.es5.js'),
       },

renovate.json5

@@ -547,6 +547,14 @@
           '@types/log-symbols',
         ],
       },
+      {
+        groupSlug: 'long',
+        groupName: 'long related packages',
+        packageNames: [
+          'long',
+          '@types/long',
+        ],
+      },
       {
         groupSlug: 'lru-cache',
         groupName: 'lru-cache related packages',
@@ -985,6 +993,14 @@
           '@types/write-pkg',
         ],
       },
+      {
+        groupSlug: 'ws',
+        groupName: 'ws related packages',
+        packageNames: [
+          'ws',
+          '@types/ws',
+        ],
+      },
       {
         groupSlug: 'xml-crypto',
         groupName: 'xml-crypto related packages',
@@ -1001,6 +1017,14 @@
           '@types/xml2js',
         ],
       },
+      {
+        groupSlug: 'yargs',
+        groupName: 'yargs related packages',
+        packageNames: [
+          'yargs',
+          '@types/yargs',
+        ],
+      },
       {
         groupSlug: 'zen-observable',
         groupName: 'zen-observable related packages',

x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.test.tsx

@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import React from 'react';
-import { MockedProvider } from 'react-apollo/test-utils';
+import { MockedProvider } from '@apollo/react-testing';
 
 import { mockBrowserFields, mocksSource } from '../../containers/source/mock';
 import { TestProviders } from '../../mock';
@@ -20,7 +20,7 @@ describe('DragDropContextWrapper', () => {
 
       const wrapper = shallow(
         <TestProviders>
-          <MockedProvider mocks={{}} addTypename={false}>
+          <MockedProvider mocks={[]} addTypename={false}>
             <DragDropContextWrapper browserFields={mockBrowserFields}>
               {message}
             </DragDropContextWrapper>

x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx

@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import React from 'react';
-import { MockedProvider } from 'react-apollo/test-utils';
+import { MockedProvider } from '@apollo/react-testing';
 
 import { mockBrowserFields, mocksSource } from '../../containers/source/mock';
 import { TestProviders } from '../../mock';
@@ -24,7 +24,7 @@ describe('DraggableWrapper', () => {
     test('it renders against the snapshot', () => {
       const wrapper = shallow(
         <TestProviders>
-          <MockedProvider mocks={{}} addTypename={false}>
+          <MockedProvider mocks={[]} addTypename={false}>
             <DragDropContextWrapper browserFields={mockBrowserFields}>
               <DraggableWrapper dataProvider={dataProvider} render={() => message} />
             </DragDropContextWrapper>

x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.test.tsx

@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import React from 'react';
-import { MockedProvider } from 'react-apollo/test-utils';
+import { MockedProvider } from '@apollo/react-testing';
 
 import { mockBrowserFields, mocksSource } from '../../containers/source/mock';
 import { TestProviders } from '../../mock';
@@ -24,7 +24,7 @@ describe('DroppableWrapper', () => {
 
       const wrapper = shallow(
         <TestProviders>
-          <MockedProvider mocks={{}} addTypename={false}>
+          <MockedProvider mocks={[]} addTypename={false}>
             <DragDropContextWrapper browserFields={mockBrowserFields}>
               <DroppableWrapper droppableId="testing">{message}</DroppableWrapper>
             </DragDropContextWrapper>

x-pack/legacy/plugins/siem/public/components/events_viewer/events_viewer.test.tsx

@@ -5,7 +5,8 @@
  */
 
 import React from 'react';
-import { MockedProvider } from 'react-apollo/test-utils';
+import { act } from 'react-dom/test-utils';
+import { MockedProvider } from '@apollo/react-testing';
 import useResizeObserver from 'use-resize-observer/polyfilled';
 
 import { mockIndexPattern, TestProviders } from '../../mock';
@@ -52,7 +53,7 @@ describe('EventsViewer', () => {
       </TestProviders>
     );
 
-    await wait();
+    await act(() => wait());
     wrapper.update();
 
     expect(
@@ -77,7 +78,7 @@ describe('EventsViewer', () => {
       </TestProviders>
     );
 
-    await wait();
+    await act(() => wait());
     wrapper.update();
 
     expect(
@@ -102,7 +103,7 @@ describe('EventsViewer', () => {
       </TestProviders>
     );
 
-    await wait();
+    await act(() => wait());
     wrapper.update();
 
     expect(
@@ -128,7 +129,7 @@ describe('EventsViewer', () => {
         </TestProviders>
       );
 
-      await wait();
+      await act(() => wait());
       wrapper.update();
 
       defaultHeaders.forEach(h =>

x-pack/legacy/plugins/siem/public/components/events_viewer/index.test.tsx

@@ -5,7 +5,8 @@
  */
 
 import React from 'react';
-import { MockedProvider } from 'react-apollo/test-utils';
+import { act } from 'react-dom/test-utils';
+import { MockedProvider } from '@apollo/react-testing';
 import useResizeObserver from 'use-resize-observer/polyfilled';
 
 import { wait } from '../../lib/helpers';
@@ -51,7 +52,7 @@ describe('StatefulEventsViewer', () => {
       </TestProviders>
     );
 
-    await wait();
+    await act(() => wait());
     wrapper.update();
 
     expect(
@@ -77,7 +78,7 @@ describe('StatefulEventsViewer', () => {
       </TestProviders>
     );
 
-    await wait();
+    await act(() => wait());
     wrapper.update();
 
     expect(wrapper.find(`InspectButtonContainer`).exists()).toBe(true);

x-pack/legacy/plugins/siem/public/components/open_timeline/index.test.tsx

@@ -6,7 +6,8 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount } from 'enzyme';
-import { MockedProvider } from 'react-apollo/test-utils';
+import { act } from 'react-dom/test-utils';
+import { MockedProvider } from '@apollo/react-testing';
 import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
@@ -104,7 +105,7 @@ describe('StatefulOpenTimeline', () => {
         </ThemeProvider>
       );
 
-      await wait();
+      await act(() => wait());
 
       wrapper
         .find('[data-test-subj="search-bar"] input')
@@ -134,7 +135,7 @@ describe('StatefulOpenTimeline', () => {
         </ThemeProvider>
       );
 
-      await wait();
+      await act(() => wait());
 
       wrapper
         .find('[data-test-subj="search-bar"] input')
@@ -166,7 +167,7 @@ describe('StatefulOpenTimeline', () => {
         </ThemeProvider>
       );
 
-      await wait();
+      await act(() => wait());
 
       expect(
         wrapper
@@ -197,7 +198,7 @@ describe('StatefulOpenTimeline', () => {
         </ThemeProvider>
       );
 
-      await wait();
+      await act(() => wait());
 
       wrapper
         .find('.euiCheckbox__input')
@@ -243,7 +244,7 @@ describe('StatefulOpenTimeline', () => {
         </ThemeProvider>
       );
 
-      await wait();
+      await act(() => wait());
 
       wrapper
         .find('.euiCheckbox__input')
@@ -287,7 +288,7 @@ describe('StatefulOpenTimeline', () => {
         </ThemeProvider>
       );
 
-      await wait();
+      await act(() => wait());
 
       wrapper
         .find('.euiCheckbox__input')
@@ -399,7 +400,7 @@ describe('StatefulOpenTimeline', () => {
         </ThemeProvider>
       );
 
-      await wait();
+      await act(() => wait());
       wrapper.update();
 
       expect(
@@ -451,7 +452,7 @@ describe('StatefulOpenTimeline', () => {
         </ThemeProvider>
       );
 
-      await wait();
+      await act(() => wait());
 
       wrapper.update();
 
@@ -487,7 +488,7 @@ describe('StatefulOpenTimeline', () => {
       </ThemeProvider>
     );
 
-    await wait();
+    await act(() => wait());
 
     expect(
       wrapper
@@ -519,7 +520,7 @@ describe('StatefulOpenTimeline', () => {
           .find('[data-test-subj="open-timeline"]')
           .last()
           .prop('selectedItems');
-      await wait();
+      await act(() => wait());
       expect(getSelectedItem().length).toEqual(0);
       wrapper
         .find('.euiCheckbox__input')
@@ -551,7 +552,7 @@ describe('StatefulOpenTimeline', () => {
       </ThemeProvider>
     );
 
-    await wait();
+    await act(() => wait());
 
     wrapper.update();
 
@@ -583,7 +584,7 @@ describe('StatefulOpenTimeline', () => {
       </ThemeProvider>
     );
 
-    await wait();
+    await act(() => wait());
 
     wrapper
       .find(
@@ -621,7 +622,7 @@ describe('StatefulOpenTimeline', () => {
       </ThemeProvider>
     );
 
-    await wait();
+    await act(() => wait());
 
     wrapper
       .find('[data-test-subj="open-duplicate"]')

x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/index.test.tsx

@@ -7,7 +7,8 @@
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount } from 'enzyme';
 import React from 'react';
-import { MockedProvider } from 'react-apollo/test-utils';
+import { act } from 'react-dom/test-utils';
+import { MockedProvider } from '@apollo/react-testing';
 import { ThemeProvider } from 'styled-components';
 
 import { wait } from '../../../lib/helpers';
@@ -35,7 +36,7 @@ describe('OpenTimelineModal', () => {
       </ThemeProvider>
     );
 
-    await wait();
+    await act(() => wait());
 
     wrapper.update();