Bump @storybook@6.4.22

package.json

@@ -219,7 +219,7 @@
     "@types/jsonwebtoken": "^8.5.6",
     "@types/mapbox__vector-tile": "1.3.0",
     "@types/moment-duration-format": "^2.2.3",
-    "@types/react-is": "^16.7.1",
+    "@types/react-is": "^16.7.2",
     "@types/rrule": "^2.2.9",
     "JSONStream": "1.3.5",
     "abort-controller": "^3.0.0",
@@ -358,16 +358,16 @@
     "rbush": "^3.0.1",
     "re-resizable": "^6.1.1",
     "re2": "1.17.4",
-    "react": "^16.12.0",
+    "react": "^16.14.0",
     "react-ace": "^7.0.5",
     "react-beautiful-dnd": "^13.1.0",
     "react-color": "^2.13.8",
-    "react-dom": "^16.12.0",
+    "react-dom": "^16.14.0",
     "react-dropzone": "^4.2.9",
     "react-fast-compare": "^2.0.4",
     "react-grid-layout": "^0.16.2",
     "react-intl": "^2.8.0",
-    "react-is": "^16.8.0",
+    "react-is": "^16.13.1",
     "react-markdown": "^4.3.1",
     "react-moment-proptypes": "^1.7.0",
     "react-monaco-editor": "^0.41.2",
@@ -527,25 +527,26 @@
     "@microsoft/api-extractor": "7.18.19",
     "@octokit/rest": "^16.35.0",
     "@percy/agent": "^0.28.6",
-    "@storybook/addon-a11y": "^6.3.12",
-    "@storybook/addon-actions": "^6.3.12",
-    "@storybook/addon-docs": "^6.3.12",
-    "@storybook/addon-essentials": "^6.3.12",
-    "@storybook/addon-knobs": "^6.3.1",
-    "@storybook/addon-storyshots": "^6.3.12",
-    "@storybook/addons": "^6.3.12",
-    "@storybook/api": "^6.3.12",
-    "@storybook/components": "^6.3.12",
-    "@storybook/core": "^6.3.12",
-    "@storybook/core-common": "^6.3.12",
-    "@storybook/core-events": "^6.3.12",
-    "@storybook/node-logger": "^6.3.12",
-    "@storybook/react": "^6.3.12",
-    "@storybook/testing-react": "^0.0.22",
-    "@storybook/theming": "^6.3.12",
+    "@storybook/addon-a11y": "^6.4.22",
+    "@storybook/addon-actions": "^6.4.22",
+    "@storybook/addon-controls": "^6.4.22",
+    "@storybook/addon-docs": "^6.4.22",
+    "@storybook/addon-essentials": "^6.4.22",
+    "@storybook/addon-knobs": "^6.4.0",
+    "@storybook/addon-storyshots": "^6.4.22",
+    "@storybook/addons": "^6.4.22",
+    "@storybook/api": "^6.4.22",
+    "@storybook/components": "^6.4.22",
+    "@storybook/core": "^6.4.22",
+    "@storybook/core-common": "^6.4.22",
+    "@storybook/core-events": "^6.4.22",
+    "@storybook/node-logger": "^6.4.22",
+    "@storybook/react": "^6.4.22",
+    "@storybook/testing-react": "^1.2.4",
+    "@storybook/theming": "^6.4.22",
     "@testing-library/dom": "^8.12.0",
     "@testing-library/jest-dom": "^5.16.3",
-    "@testing-library/react": "^12.1.4",
+    "@testing-library/react": "^12.1.5",
     "@testing-library/react-hooks": "^7.0.2",
     "@testing-library/user-event": "^13.5.0",
     "@types/apidoc": "^0.22.3",
@@ -707,6 +708,7 @@
     "@types/lz-string": "^1.3.34",
     "@types/markdown-it": "^12.2.3",
     "@types/md5": "^2.2.0",
+    "@types/micromatch": "^4.0.2",
     "@types/mime": "^2.0.1",
     "@types/mime-types": "^2.1.0",
     "@types/minimatch": "^2.0.29",
@@ -734,10 +736,9 @@
     "@types/pretty-ms": "^5.0.0",
     "@types/prop-types": "^15.7.3",
     "@types/rbush": "^3.0.0",
-    "@types/reach__router": "^1.2.6",
-    "@types/react": "^16.9.36",
+    "@types/react": "^16.14.25",
     "@types/react-beautiful-dnd": "^13.0.0",
-    "@types/react-dom": "^16.9.8",
+    "@types/react-dom": "^16.9.15",
     "@types/react-grid-layout": "^0.16.7",
     "@types/react-intl": "^2.3.15",
     "@types/react-redux": "^7.1.9",
@@ -818,6 +819,7 @@
     "cpy": "^8.1.1",
     "css-loader": "^3.4.2",
     "cssnano": "^4.1.11",
+    "csstype": "^3.0.2",
     "cypress": "^9.6.1",
     "cypress-axe": "^0.14.0",
     "cypress-file-upload": "^5.0.8",
@@ -924,7 +926,7 @@
     "prettier": "^2.6.2",
     "pretty-format": "^27.5.1",
     "q": "^1.5.1",
-    "react-test-renderer": "^16.12.0",
+    "react-test-renderer": "^16.14.0",
     "read-pkg": "^5.2.0",
     "regenerate": "^1.4.0",
     "resolve": "^1.22.0",

packages/kbn-pm/dist/index.js

@@ -45125,82 +45125,6 @@ exports.wrapOutput = (input, state = {}, options = {}) => {
 };
 
 
-/***/ }),
-
-/***/ "../../node_modules/pify/index.js":
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-const processFn = (fn, options) => function (...args) {
-	const P = options.promiseModule;
-
-	return new P((resolve, reject) => {
-		if (options.multiArgs) {
-			args.push((...result) => {
-				if (options.errorFirst) {
-					if (result[0]) {
-						reject(result);
-					} else {
-						result.shift();
-						resolve(result);
-					}
-				} else {
-					resolve(result);
-				}
-			});
-		} else if (options.errorFirst) {
-			args.push((error, result) => {
-				if (error) {
-					reject(error);
-				} else {
-					resolve(result);
-				}
-			});
-		} else {
-			args.push(resolve);
-		}
-
-		fn.apply(this, args);
-	});
-};
-
-module.exports = (input, options) => {
-	options = Object.assign({
-		exclude: [/.+(Sync|Stream)$/],
-		errorFirst: true,
-		promiseModule: Promise
-	}, options);
-
-	const objType = typeof input;
-	if (!(input !== null && (objType === 'object' || objType === 'function'))) {
-		throw new TypeError(`Expected \`input\` to be a \`Function\` or \`Object\`, got \`${input === null ? 'null' : objType}\``);
-	}
-
-	const filter = key => {
-		const match = pattern => typeof pattern === 'string' ? key === pattern : pattern.test(key);
-		return options.include ? options.include.some(match) : !options.exclude.some(match);
-	};
-
-	let ret;
-	if (objType === 'function') {
-		ret = function (...args) {
-			return options.excludeMain ? input(...args) : processFn(input, options).apply(this, args);
-		};
-	} else {
-		ret = Object.create(Object.getPrototypeOf(input));
-	}
-
-	for (const key in input) { // eslint-disable-line guard-for-in
-		const property = input[key];
-		ret[key] = typeof property === 'function' && filter(key) ? processFn(property, options) : property;
-	}
-
-	return ret;
-};
-
-
 /***/ }),
 
 /***/ "../../node_modules/pump/index.js":
@@ -59599,7 +59523,7 @@ const fs = __webpack_require__("../../node_modules/graceful-fs/graceful-fs.js");
 const writeFileAtomic = __webpack_require__("../../node_modules/write-json-file/node_modules/write-file-atomic/index.js");
 const sortKeys = __webpack_require__("../../node_modules/sort-keys/index.js");
 const makeDir = __webpack_require__("../../node_modules/write-json-file/node_modules/make-dir/index.js");
-const pify = __webpack_require__("../../node_modules/pify/index.js");
+const pify = __webpack_require__("../../node_modules/write-json-file/node_modules/pify/index.js");
 const detectIndent = __webpack_require__("../../node_modules/write-json-file/node_modules/detect-indent/index.js");
 
 const init = (fn, filePath, data, options) => {
@@ -59810,7 +59734,7 @@ module.exports = str => {
 
 const fs = __webpack_require__("fs");
 const path = __webpack_require__("path");
-const pify = __webpack_require__("../../node_modules/pify/index.js");
+const pify = __webpack_require__("../../node_modules/write-json-file/node_modules/pify/index.js");
 const semver = __webpack_require__("../../node_modules/write-json-file/node_modules/semver/semver.js");
 
 const defaults = {
@@ -59948,6 +59872,82 @@ module.exports.sync = (input, options) => {
 };
 
 
+/***/ }),
+
+/***/ "../../node_modules/write-json-file/node_modules/pify/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const processFn = (fn, options) => function (...args) {
+	const P = options.promiseModule;
+
+	return new P((resolve, reject) => {
+		if (options.multiArgs) {
+			args.push((...result) => {
+				if (options.errorFirst) {
+					if (result[0]) {
+						reject(result);
+					} else {
+						result.shift();
+						resolve(result);
+					}
+				} else {
+					resolve(result);
+				}
+			});
+		} else if (options.errorFirst) {
+			args.push((error, result) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(result);
+				}
+			});
+		} else {
+			args.push(resolve);
+		}
+
+		fn.apply(this, args);
+	});
+};
+
+module.exports = (input, options) => {
+	options = Object.assign({
+		exclude: [/.+(Sync|Stream)$/],
+		errorFirst: true,
+		promiseModule: Promise
+	}, options);
+
+	const objType = typeof input;
+	if (!(input !== null && (objType === 'object' || objType === 'function'))) {
+		throw new TypeError(`Expected \`input\` to be a \`Function\` or \`Object\`, got \`${input === null ? 'null' : objType}\``);
+	}
+
+	const filter = key => {
+		const match = pattern => typeof pattern === 'string' ? key === pattern : pattern.test(key);
+		return options.include ? options.include.some(match) : !options.exclude.some(match);
+	};
+
+	let ret;
+	if (objType === 'function') {
+		ret = function (...args) {
+			return options.excludeMain ? input(...args) : processFn(input, options).apply(this, args);
+		};
+	} else {
+		ret = Object.create(Object.getPrototypeOf(input));
+	}
+
+	for (const key in input) { // eslint-disable-line guard-for-in
+		const property = input[key];
+		ret[key] = typeof property === 'function' && filter(key) ? processFn(property, options) : property;
+	}
+
+	return ret;
+};
+
+
 /***/ }),
 
 /***/ "../../node_modules/write-json-file/node_modules/semver/semver.js":

packages/kbn-storybook/src/index.ts

@@ -6,6 +6,13 @@
  * Side Public License, v 1.
  */
 
-export { defaultConfig, defaultConfigWebFinal, mergeWebpackFinal } from './lib/default_config';
+import {
+  defaultConfig,
+  defaultConfigWebFinal,
+  mergeWebpackFinal,
+  StorybookConfig,
+} from './lib/default_config';
+export { defaultConfig, defaultConfigWebFinal, mergeWebpackFinal };
+export type { StorybookConfig };
 export { runStorybookCli } from './lib/run_storybook_cli';
 export { default as WebpackConfig } from './webpack.config';

packages/kbn-storybook/src/lib/default_config.ts

@@ -7,12 +7,14 @@
  */
 
 import * as path from 'path';
-import { StorybookConfig } from '@storybook/core-common';
+import type { StorybookConfig } from '@storybook/core-common';
 import { Configuration } from 'webpack';
 import webpackMerge from 'webpack-merge';
 import { REPO_ROOT } from './constants';
 import { default as WebpackConfig } from '../webpack.config';
 
+export type { StorybookConfig };
+
 const toPath = (_path: string) => path.join(REPO_ROOT, _path);
 
 // This ignore pattern excludes all of node_modules EXCEPT for `@kbn`.  This allows for
@@ -81,7 +83,7 @@ export const defaultConfig: StorybookConfig = {
 // an issue with storybook typescript setup see this issue for more details
 // https://github.com/storybookjs/storybook/issues/9610
 
-export const defaultConfigWebFinal = {
+export const defaultConfigWebFinal: StorybookConfig = {
   ...defaultConfig,
   webpackFinal: (config: Configuration) => {
     return WebpackConfig({ config });

packages/kbn-storybook/templates/index.ejs

@@ -6,10 +6,10 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <title><%= options.title || 'Storybook'%></title>
+    <title><%= htmlWebpackPlugin.options.title || 'Storybook'%></title>
 
-    <% if (files.favicon) { %>
-    <link rel="shortcut icon" href="<%= files.favicon%>" />
+    <% if (htmlWebpackPlugin.files.favicon) { %>
+    <link rel="shortcut icon" href="<%= htmlWebpackPlugin.files.favicon%>" />
     <% } %>
 
     <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -26,7 +26,7 @@
     <!--                                      -->
 
     <% if (typeof headHtmlSnippet !== 'undefined') { %> <%= headHtmlSnippet %> <% } %> <%
-    files.css.forEach(file => { %>
+    htmlWebpackPlugin.files.css.forEach(file => { %>
     <link href="<%= file %>" rel="stylesheet" />
     <% }); %>
 
@@ -58,7 +58,7 @@
       </script>
     <% } %>
 
-    <% files.js.forEach(file => { %>
+    <% htmlWebpackPlugin.files.js.forEach(file => { %>
       <script src="<%= file %>"></script>
     <% }); %>
   </body>

renovate.json

@@ -157,6 +157,14 @@
       "matchBaseBranches": ["main"],
       "labels": ["Team:Operations", "release_note:skip"],
       "enabled": true
+    },
+    {
+      "groupName": "@storybook",
+      "reviewers": ["team:kibana-operations"],
+      "matchBaseBranches": ["main"],
+      "matchPackagePatterns": ["^@storybook"],
+      "labels": ["Team:Operations", "release_note:skip"],
+      "enabled": true
     }
   ]
 }