@storybook/react 6.5.0-alpha.7 → 6.5.0-beta.1

package/dist/esm/client/docs/react-argtypes.stories.js

@@ -0,0 +1,97 @@
+import "core-js/modules/es.object.assign.js";
+import "core-js/modules/es.array.map.js";
+import "core-js/modules/es.object.entries.js";
+import "core-js/modules/es.object.to-string.js";
+import "core-js/modules/es.symbol.js";
+import "core-js/modules/es.symbol.description.js";
+import "core-js/modules/es.symbol.iterator.js";
+import "core-js/modules/es.array.iterator.js";
+import "core-js/modules/es.string.iterator.js";
+import "core-js/modules/web.dom-collections.iterator.js";
+import "core-js/modules/es.array.slice.js";
+import "core-js/modules/es.function.name.js";
+import "core-js/modules/es.array.from.js";
+import "core-js/modules/es.regexp.exec.js";
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import React, { useState } from 'react';
+import mapValues from 'lodash/mapValues';
+import { ArgsTable } from '@storybook/components';
+import { inferControls } from '@storybook/store';
+import { storiesOf } from '..';
+import { extractArgTypes } from './extractArgTypes'; // FIXME
+
+var argsTableProps = function argsTableProps(component) {
+  var argTypes = extractArgTypes(component);
+  var parameters = {
+    __isArgsStory: true
+  };
+  var rows = inferControls({
+    argTypes: argTypes,
+    parameters: parameters
+  });
+  return {
+    rows: rows
+  };
+};
+
+var ArgsStory = function ArgsStory(_ref) {
+  var component = _ref.component;
+
+  var _argsTableProps = argsTableProps(component),
+      rows = _argsTableProps.rows;
+
+  var initialArgs = mapValues(rows, function (argType) {
+    return argType.defaultValue;
+  });
+
+  var _useState = useState(initialArgs),
+      _useState2 = _slicedToArray(_useState, 2),
+      args = _useState2[0],
+      setArgs = _useState2[1];
+
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("p", null, /*#__PURE__*/React.createElement("b", null, "NOTE:"), " these stories are to help visualise the snapshot tests in", ' ', /*#__PURE__*/React.createElement("code", null, "./react-properties.test.js"), "."), /*#__PURE__*/React.createElement(ArgsTable, {
+    rows: rows,
+    args: args,
+    updateArgs: function updateArgs(val) {
+      return setArgs(Object.assign({}, args, val));
+    }
+  }), /*#__PURE__*/React.createElement("table", null, /*#__PURE__*/React.createElement("thead", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("th", null, "arg name"), /*#__PURE__*/React.createElement("th", null, "argType"))), /*#__PURE__*/React.createElement("tbody", null, Object.entries(args).map(function (_ref2) {
+    var _ref3 = _slicedToArray(_ref2, 2),
+        key = _ref3[0],
+        val = _ref3[1];
+
+    return /*#__PURE__*/React.createElement("tr", {
+      key: key
+    }, /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("code", null, key)), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("pre", null, JSON.stringify(rows[key]))));
+  }))));
+};
+
+var issuesFixtures = ['js-class-component', 'js-function-component', 'js-function-component-inline-defaults', 'js-function-component-inline-defaults-no-propTypes', 'ts-function-component', 'ts-function-component-inline-defaults', '9399-js-proptypes-shape', '8663-js-styled-components', '9626-js-default-values', '9668-js-proptypes-no-jsdoc', '8143-ts-react-fc-generics', '8143-ts-imported-types', '8279-js-styled-docgen', '8140-js-prop-types-oneof', '9023-js-hoc', '8740-ts-multi-props', '9556-ts-react-default-exports', '9592-ts-styled-props', '9591-ts-import-types', '9721-ts-deprecated-jsdoc', '9827-ts-default-values', '9586-js-react-memo', '9575-ts-camel-case', '9493-ts-display-name', '8894-9511-ts-forward-ref', '9465-ts-type-props', '8428-js-static-prop-types', '9764-ts-extend-props', '9922-ts-component-props'];
+var issuesStories = storiesOf('ArgTypes/Issues', module);
+issuesFixtures.forEach(function (fixture) {
+  // eslint-disable-next-line import/no-dynamic-require, global-require
+  var _require = require("./__testfixtures__/".concat(fixture, "/input")),
+      component = _require.component;
+
+  issuesStories.add(fixture, function () {
+    return /*#__PURE__*/React.createElement(ArgsStory, {
+      component: component
+    });
+  }, {
+    chromatic: {
+      disable: true
+    }
+  });
+});

package/dist/esm/client/docs/typeScript/handleProp.js

@@ -0,0 +1,27 @@
+import "core-js/modules/es.array.map.js";
+import { createDefaultValue, createDefaultValueFromRawDefaultProp } from '../lib/defaultValues';
+export function enhanceTypeScriptProp(extractedProp, rawDefaultProp) {
+  var propDef = extractedProp.propDef;
+  var defaultValue = extractedProp.docgenInfo.defaultValue;
+
+  if (defaultValue != null && defaultValue.value != null) {
+    var newDefaultValue = createDefaultValue(defaultValue.value);
+
+    if (newDefaultValue != null) {
+      propDef.defaultValue = newDefaultValue;
+    }
+  } else if (rawDefaultProp != null) {
+    var _newDefaultValue = createDefaultValueFromRawDefaultProp(rawDefaultProp, propDef);
+
+    if (_newDefaultValue != null) {
+      propDef.defaultValue = _newDefaultValue;
+    }
+  }
+
+  return propDef;
+}
+export function enhanceTypeScriptProps(extractedProps) {
+  return extractedProps.map(function (prop) {
+    return enhanceTypeScriptProp(prop);
+  });
+}

package/dist/esm/client/index.js

@@ -1,4 +1,5 @@
 export { storiesOf, setAddon, addDecorator, addParameters, configure, getStorybook, raw, forceReRender } from './preview';
+export * from './testing';
 export * from './preview/types-6-3';
 
 if (module && module.hot && module.hot.decline) {

package/dist/esm/client/preview/index.js

@@ -1,7 +1,7 @@
 import "core-js/modules/es.array.concat.js";
 
 /* eslint-disable prefer-destructuring */
-import { start } from '@storybook/core/client';
+import { start } from '@storybook/core';
 import './globals';
 import { renderToDOM, render } from './render';
 var framework = 'react';

package/dist/esm/client/preview/render.js

@@ -1,18 +1,18 @@
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
@@ -21,26 +21,30 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 import "regenerator-runtime/runtime.js";
-import "core-js/modules/es.promise.js";
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+import "core-js/modules/es.array.iterator.js";
+import "core-js/modules/es.map.js";
 import "core-js/modules/es.object.to-string.js";
+import "core-js/modules/es.string.iterator.js";
+import "core-js/modules/web.dom-collections.iterator.js";
+import "core-js/modules/es.promise.js";
+import "core-js/modules/es.string.starts-with.js";
 import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.object.get-prototype-of.js";
 import "core-js/modules/es.reflect.construct.js";
 import "core-js/modules/es.symbol.js";
 import "core-js/modules/es.symbol.description.js";
 import "core-js/modules/es.symbol.iterator.js";
-import "core-js/modules/es.string.iterator.js";
-import "core-js/modules/es.array.iterator.js";
-import "core-js/modules/web.dom-collections.iterator.js";
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 import global from 'global';
 import React, { Component as ReactComponent, StrictMode, Fragment } from 'react';
-import ReactDOM from 'react-dom';
-var FRAMEWORK_OPTIONS = global.FRAMEWORK_OPTIONS;
+import ReactDOM, { version as reactDomVersion } from 'react-dom';
+var FRAMEWORK_OPTIONS = global.FRAMEWORK_OPTIONS; // A map of all rendered React 18 nodes
+
+var nodes = new Map();
 export var render = function render(args, context) {
   var id = context.id,
       Component = context.component;
@@ -54,17 +58,30 @@ export var render = function render(args, context) {
 
 var renderElement = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(node, el) {
+    var root;
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
+            _context.next = 2;
+            return getReactRoot(el);
+
+          case 2:
+            root = _context.sent;
             return _context.abrupt("return", new Promise(function (resolve) {
-              ReactDOM.render(node, el, function () {
-                return resolve(null);
-              });
+              if (root) {
+                root.render(node);
+                setTimeout(function () {
+                  resolve(null);
+                }, 0);
+              } else {
+                ReactDOM.render(node, el, function () {
+                  return resolve(null);
+                });
+              }
             }));
 
-          case 1:
+          case 4:
           case "end":
             return _context.stop();
         }
@@ -77,6 +94,67 @@ var renderElement = /*#__PURE__*/function () {
   };
 }();
 
+var canUseNewReactRootApi = reactDomVersion.startsWith('18') || reactDomVersion.startsWith('0.0.0');
+var shouldUseNewRootApi = (FRAMEWORK_OPTIONS === null || FRAMEWORK_OPTIONS === void 0 ? void 0 : FRAMEWORK_OPTIONS.legacyRootApi) !== true;
+var isUsingNewReactRootApi = shouldUseNewRootApi && canUseNewReactRootApi;
+
+var unmountElement = function unmountElement(el) {
+  var root = nodes.get(el);
+
+  if (root && isUsingNewReactRootApi) {
+    root.unmount();
+    nodes.delete(el);
+  } else {
+    ReactDOM.unmountComponentAtNode(el);
+  }
+};
+
+var getReactRoot = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(el) {
+    var root, reactDomClient;
+    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            if (isUsingNewReactRootApi) {
+              _context2.next = 2;
+              break;
+            }
+
+            return _context2.abrupt("return", null);
+
+          case 2:
+            root = nodes.get(el);
+
+            if (root) {
+              _context2.next = 9;
+              break;
+            }
+
+            _context2.next = 6;
+            return import('react-dom/client');
+
+          case 6:
+            reactDomClient = _context2.sent.default;
+            root = reactDomClient.createRoot(el);
+            nodes.set(el, root);
+
+          case 9:
+            return _context2.abrupt("return", root);
+
+          case 10:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+
+  return function getReactRoot(_x3) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
 var ErrorBoundary = /*#__PURE__*/function (_ReactComponent) {
   _inherits(ErrorBoundary, _ReactComponent);
 
@@ -135,18 +213,18 @@ var ErrorBoundary = /*#__PURE__*/function (_ReactComponent) {
 }(ReactComponent);
 
 var Wrapper = FRAMEWORK_OPTIONS !== null && FRAMEWORK_OPTIONS !== void 0 && FRAMEWORK_OPTIONS.strictMode ? StrictMode : Fragment;
-export function renderToDOM(_x3, _x4) {
+export function renderToDOM(_x4, _x5) {
   return _renderToDOM.apply(this, arguments);
 }
 
 function _renderToDOM() {
-  _renderToDOM = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(_ref2, domElement) {
+  _renderToDOM = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(_ref3, domElement) {
     var storyContext, unboundStoryFn, showMain, showException, forceRemount, Story, content, element;
-    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+    return regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) {
-        switch (_context2.prev = _context2.next) {
+        switch (_context3.prev = _context3.next) {
           case 0:
-            storyContext = _ref2.storyContext, unboundStoryFn = _ref2.unboundStoryFn, showMain = _ref2.showMain, showException = _ref2.showException, forceRemount = _ref2.forceRemount;
+            storyContext = _ref3.storyContext, unboundStoryFn = _ref3.unboundStoryFn, showMain = _ref3.showMain, showException = _ref3.showException, forceRemount = _ref3.forceRemount;
             Story = unboundStoryFn;
             content = /*#__PURE__*/React.createElement(ErrorBoundary, {
               showMain: showMain,
@@ -160,18 +238,18 @@ function _renderToDOM() {
             // (This is not the case when we change args or globals to the story however)
 
             if (forceRemount) {
-              ReactDOM.unmountComponentAtNode(domElement);
+              unmountElement(domElement);
             }
 
-            _context2.next = 7;
+            _context3.next = 7;
             return renderElement(element, domElement);
 
           case 7:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
       }
-    }, _callee2);
+    }, _callee3);
   }));
   return _renderToDOM.apply(this, arguments);
 }

package/dist/esm/client/preview/types-6-0.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/client/preview/types-6-3.js

@@ -5,4 +5,6 @@ export * from './types-6-0';
  * ```tsx
  * export default { ... } as ComponentMeta<typeof Button>;
  * ```
- */
+ */
+
+export {};

package/dist/esm/client/preview/types-7-0.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/client/preview/types.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/client/testing/index.js

@@ -0,0 +1,96 @@
+import { composeStory as originalComposeStory, composeStories as originalComposeStories, setProjectAnnotations as originalSetProjectAnnotations } from '@storybook/store';
+import { once } from '@storybook/client-logger';
+import { render } from '../preview/render';
+
+/** Function that sets the globalConfig of your storybook. The global config is the preview module of your .storybook folder.
+ *
+ * It should be run a single time, so that your global config (e.g. decorators) is applied to your stories when using `composeStories` or `composeStory`.
+ *
+ * Example:
+ *```jsx
+ * // setup.js (for jest)
+ * import { setProjectAnnotations } from '@storybook/react';
+ * import * as projectAnnotations from './.storybook/preview';
+ *
+ * setProjectAnnotations(projectAnnotations);
+ *```
+ *
+ * @param projectAnnotations - e.g. (import * as projectAnnotations from '../.storybook/preview')
+ */
+export function setProjectAnnotations(projectAnnotations) {
+  originalSetProjectAnnotations(projectAnnotations);
+}
+/** Preserved for users migrating from `@storybook/testing-react`.
+ *
+ * @deprecated Use setProjectAnnotations instead
+ */
+
+export function setGlobalConfig(projectAnnotations) {
+  once.warn("setGlobalConfig is deprecated. Use setProjectAnnotations instead.");
+  setProjectAnnotations(projectAnnotations);
+} // This will not be necessary once we have auto preset loading
+
+var defaultProjectAnnotations = {
+  render: render
+};
+/**
+ * Function that will receive a story along with meta (e.g. a default export from a .stories file)
+ * and optionally projectAnnotations e.g. (import * from '../.storybook/preview)
+ * and will return a composed component that has all args/parameters/decorators/etc combined and applied to it.
+ *
+ *
+ * It's very useful for reusing a story in scenarios outside of Storybook like unit testing.
+ *
+ * Example:
+ *```jsx
+ * import { render } from '@testing-library/react';
+ * import { composeStory } from '@storybook/react';
+ * import Meta, { Primary as PrimaryStory } from './Button.stories';
+ *
+ * const Primary = composeStory(PrimaryStory, Meta);
+ *
+ * test('renders primary button with Hello World', () => {
+ *   const { getByText } = render(<Primary>Hello world</Primary>);
+ *   expect(getByText(/Hello world/i)).not.toBeNull();
+ * });
+ *```
+ *
+ * @param story
+ * @param componentAnnotations - e.g. (import Meta from './Button.stories')
+ * @param [projectAnnotations] - e.g. (import * as projectAnnotations from '../.storybook/preview') this can be applied automatically if you use `setProjectAnnotations` in your setup files.
+ * @param [exportsName] - in case your story does not contain a name and you want it to have a name.
+ */
+
+export function composeStory(story, componentAnnotations, projectAnnotations, exportsName) {
+  return originalComposeStory(story, componentAnnotations, projectAnnotations, defaultProjectAnnotations, exportsName);
+}
+/**
+ * Function that will receive a stories import (e.g. `import * as stories from './Button.stories'`)
+ * and optionally projectAnnotations (e.g. `import * from '../.storybook/preview`)
+ * and will return an object containing all the stories passed, but now as a composed component that has all args/parameters/decorators/etc combined and applied to it.
+ *
+ *
+ * It's very useful for reusing stories in scenarios outside of Storybook like unit testing.
+ *
+ * Example:
+ *```jsx
+ * import { render } from '@testing-library/react';
+ * import { composeStories } from '@storybook/react';
+ * import * as stories from './Button.stories';
+ *
+ * const { Primary, Secondary } = composeStories(stories);
+ *
+ * test('renders primary button with Hello World', () => {
+ *   const { getByText } = render(<Primary>Hello world</Primary>);
+ *   expect(getByText(/Hello world/i)).not.toBeNull();
+ * });
+ *```
+ *
+ * @param csfExports - e.g. (import * as stories from './Button.stories')
+ * @param [projectAnnotations] - e.g. (import * as projectAnnotations from '../.storybook/preview') this can be applied automatically if you use `setProjectAnnotations` in your setup files.
+ */
+
+export function composeStories(csfExports, projectAnnotations) {
+  var composedStories = originalComposeStories(csfExports, projectAnnotations, composeStory);
+  return composedStories;
+}

package/dist/esm/demo/Welcome.js

@@ -1,6 +1,9 @@
-import "core-js/modules/es.object.assign.js";
 import "core-js/modules/es.object.keys.js";
 import "core-js/modules/es.symbol.js";
+var _excluded = ["children"],
+    _excluded2 = ["children", "href", "target", "rel"],
+    _excluded3 = ["children", "onClick"];
+import "core-js/modules/es.object.assign.js";
 
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
@@ -24,7 +27,7 @@ var Main = function Main(props) {
 
 var Title = function Title(_ref) {
   var children = _ref.children,
-      props = _objectWithoutProperties(_ref, ["children"]);
+      props = _objectWithoutProperties(_ref, _excluded);
 
   return /*#__PURE__*/React.createElement("h1", props, children);
 };
@@ -56,7 +59,7 @@ var Link = function Link(_ref2) {
       href = _ref2.href,
       target = _ref2.target,
       rel = _ref2.rel,
-      props = _objectWithoutProperties(_ref2, ["children", "href", "target", "rel"]);
+      props = _objectWithoutProperties(_ref2, _excluded2);
 
   return /*#__PURE__*/React.createElement("a", _extends({
     href: href
@@ -75,7 +78,7 @@ var Link = function Link(_ref2) {
 var NavButton = function NavButton(_ref3) {
   var children = _ref3.children,
       onClick = _ref3.onClick,
-      props = _objectWithoutProperties(_ref3, ["children", "onClick"]);
+      props = _objectWithoutProperties(_ref3, _excluded3);
 
   return /*#__PURE__*/React.createElement("button", _extends({}, props, {
     type: "button",

package/dist/{modern/server/framework-preset-react-docgen.js → esm/server/framework-preset-react-docs.js}

@@ -1,15 +1,16 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import "core-js/modules/es.promise.js";
+import { findDistEsm } from '@storybook/core-common';
 import ReactDocgenTypescriptPlugin from '@storybook/react-docgen-typescript-plugin';
-export async function babel(config, {
-  presets: presets
-}) {
-  var typescriptOptions = await presets.apply('typescript', {});
+import { hasDocsOrControls } from '@storybook/docs-tools';
+export async function babel(config, options) {
+  if (!hasDocsOrControls(options)) return config;
+  var typescriptOptions = await options.presets.apply('typescript', {});
   var reactDocgen = typescriptOptions.reactDocgen;
 
   if (typeof reactDocgen !== 'string') {
@@ -25,10 +26,9 @@ export async function babel(config, {
     }]
   });
 }
-export async function webpackFinal(config, {
-  presets: presets
-}) {
-  var typescriptOptions = await presets.apply('typescript', {});
+export async function webpackFinal(config, options) {
+  if (!hasDocsOrControls(options)) return config;
+  var typescriptOptions = await options.presets.apply('typescript', {});
   var reactDocgen = typescriptOptions.reactDocgen,
       reactDocgenTypescriptOptions = typescriptOptions.reactDocgenTypescriptOptions;
 
@@ -42,4 +42,8 @@ export async function webpackFinal(config, {
       savePropValueAsString: true
     }))]
   });
-}
+}
+export var previewAnnotations = function (entry = [], options) {
+  if (!hasDocsOrControls(options)) return entry;
+  return [...entry, findDistEsm(__dirname, 'client/docs/config')];
+};

package/dist/esm/server/framework-preset-react-dom-hack.js

@@ -0,0 +1,21 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+import "core-js/modules/es.promise.js";
+import { readJSON } from 'fs-extra';
+import { IgnorePlugin } from 'webpack'; // this is a hack to allow importing react-dom/client even when it's not available
+// this should be removed once we drop support for react-dom < 18
+
+export async function webpackFinal(config) {
+  var reactDomPkg = await readJSON(require.resolve('react-dom/package.json'));
+  return _objectSpread(_objectSpread({}, config), {}, {
+    plugins: [...config.plugins, reactDomPkg.version.startsWith('18') || reactDomPkg.version.startsWith('0.0.0') ? null : new IgnorePlugin({
+      resourceRegExp: /react-dom\/client$/,
+      contextRegExp: /(app\/react|app\\react|@storybook\/react|@storybook\\react)/ // TODO this needs to work for both in our MONOREPO and in the user's NODE_MODULES
+
+    })].filter(Boolean)
+  });
+}

package/dist/esm/server/framework-preset-react.js

@@ -1,6 +1,6 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 

package/dist/esm/server/preset.js

@@ -1,5 +1,5 @@
 import { findDistEsm } from '@storybook/core-common';
-export var config = function (entries = []) {
+export var previewAnnotations = function (entries = []) {
   return [...entries, findDistEsm(__dirname, 'client/preview/config')];
 };
-export var addons = [require.resolve('./framework-preset-react'), require.resolve('./framework-preset-cra'), require.resolve('./framework-preset-react-docgen')];
+export var addons = [require.resolve('./framework-preset-react'), require.resolve('./framework-preset-react-dom-hack'), require.resolve('./framework-preset-cra'), require.resolve('./framework-preset-react-docs')];

package/dist/modern/client/docs/config.js

@@ -0,0 +1,14 @@
+import { extractComponentDescription, enhanceArgTypes } from '@storybook/docs-tools';
+import { extractArgTypes } from './extractArgTypes';
+import { jsxDecorator } from './jsxDecorator';
+export const parameters = {
+  docs: {
+    inlineStories: true,
+    // NOTE: that the result is a react element. Hooks support is provided by the outer code.
+    prepareForInline: storyFn => storyFn(),
+    extractArgTypes,
+    extractComponentDescription
+  }
+};
+export const decorators = [jsxDecorator];
+export const argTypesEnhancers = [enhanceArgTypes];