Chore: Updates yarn.lock (#19919)

* Chore: Updates yarn.lock

* Chore: Fixes @types/webpack conflict

packages/grafana-toolkit/src/cli/tasks/plugin/bundle.ts

@@ -1,7 +1,7 @@
 import webpack = require('webpack');
-import { getWebpackConfig } from '../../../config/webpack.plugin.config';
 import formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
 import clearConsole = require('react-dev-utils/clearConsole');
+import { getWebpackConfig } from '../../../config/webpack.plugin.config';
 
 export interface PluginBundleOptions {
   watch: boolean;
@@ -28,9 +28,10 @@ export const bundlePlugin = async ({ watch, production }: PluginBundleOptions) =
         console.log('Compiling...');
       });
 
-      compiler.hooks.done.tap('done', stats => {
+      compiler.hooks.done.tap('done', (stats: webpack.Stats) => {
         clearConsole();
-        const output = formatWebpackMessages(stats.toJson());
+        const json: any = stats.toJson(); // different @types/webpack between react-dev-utils and grafana-toolkit
+        const output = formatWebpackMessages(json);
 
         if (!output.errors.length && !output.warnings.length) {
           console.log('Compiled successfully!\n');

public/app/core/components/connectWithCleanUp.tsx

@@ -1,5 +1,5 @@
-import { MapStateToPropsParam, MapDispatchToPropsParam, connect, useDispatch } from 'react-redux';
-import { StateSelector, cleanUpAction } from '../actions/cleanUp';
+import { connect, MapDispatchToPropsParam, MapStateToPropsParam, useDispatch } from 'react-redux';
+import { cleanUpAction, StateSelector } from '../actions/cleanUp';
 import React, { ComponentType, FunctionComponent, useEffect } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 
@@ -18,6 +18,7 @@ export const connectWithCleanUp = <
   const ConnectedComponent = connect(
     mapStateToProps,
     mapDispatchToProps
+    // @ts-ignore
   )(Component);
 
   const ConnectedComponentWithCleanUp: FunctionComponent = props => {