@storybook/builder-webpack5 7.0.0-alpha.2 → 7.0.0-alpha.23

package/dist/cjs/index.js

@@ -14,8 +14,6 @@ var _exportNames = {
 };
 exports.start = exports.overridePresets = exports.getConfig = exports.executor = exports.corePresets = exports.build = exports.bail = void 0;
 
-require("core-js/modules/es.promise.js");
-
 var _webpack = _interopRequireWildcard(require("webpack"));
 
 var _webpackDevMiddleware = _interopRequireDefault(require("webpack-dev-middleware"));
@@ -102,6 +100,7 @@ var bail = async function () {
 
 
   return new Promise(function (res, rej) {
+    // @ts-ignore
     if (process && compilation) {
       try {
         compilation.close(function () {
@@ -290,6 +289,7 @@ var builder = async function* builderGeneratorFn({
       });
 
       if (stats && stats.hasWarnings()) {
+        // @ts-ignore
         stats.toJson({
           warnings: true
         }).warnings.forEach(function (e) {

package/dist/cjs/presets/custom-webpack-preset.js

@@ -6,15 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.webpack = webpack;
 exports.webpackVersion = exports.webpackInstance = void 0;
 
-require("core-js/modules/es.promise.js");
-
 var webpackReal = _interopRequireWildcard(require("webpack"));
 
 var _nodeLogger = require("@storybook/node-logger");
 
 var _utilDeprecate = _interopRequireDefault(require("util-deprecate"));
 
-var _tsDedent = _interopRequireDefault(require("ts-dedent"));
+var _tsDedent = require("ts-dedent");
 
 var _coreWebpack = require("@storybook/core-webpack");
 
@@ -42,7 +40,7 @@ async function webpack(config, options) {
   var finalDefaultConfig = await presets.apply('webpackFinal', defaultConfig, options); // through standalone webpackConfig option
 
   if (webpackConfig) {
-    return (0, _utilDeprecate.default)(webpackConfig, (0, _tsDedent.default)`
+    return (0, _utilDeprecate.default)(webpackConfig, (0, _tsDedent.dedent)`
       You've provided a webpack config directly in CallOptions, this is not recommended. Please use presets instead. This feature will be removed in 7.0
       `)(finalDefaultConfig);
   } // Check whether user has a custom webpack config file and

package/dist/cjs/presets/preview-preset.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.webpack = exports.entries = exports.babel = void 0;
 
-require("core-js/modules/es.promise.js");
-
 var _iframeWebpack = _interopRequireDefault(require("../preview/iframe-webpack.config"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/dist/cjs/preview/base-webpack.config.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createDefaultWebpackConfig = createDefaultWebpackConfig;
 
-require("core-js/modules/es.promise.js");
-
 var _nodeLogger = require("@storybook/node-logger");
 
 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; }
@@ -16,15 +14,15 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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; }
 
 async function createDefaultWebpackConfig(storybookBaseConfig, options) {
-  var _coreOptions$builder, _storybookBaseConfig$;
+  var _options$presetsList, _options$presetsList2, _coreOptions$builder, _storybookBaseConfig$, _storybookBaseConfig$2;
 
-  if (options.presetsList.some(function (preset) {
+  if ((_options$presetsList = options.presetsList) !== null && _options$presetsList !== void 0 && _options$presetsList.some(function (preset) {
     return /@storybook(\/|\\)preset-create-react-app/.test(typeof preset === 'string' ? preset : preset.name);
   })) {
     return storybookBaseConfig;
   }
 
-  var hasPostcssAddon = options.presetsList.some(function (preset) {
+  var hasPostcssAddon = (_options$presetsList2 = options.presetsList) === null || _options$presetsList2 === void 0 ? void 0 : _options$presetsList2.some(function (preset) {
     return /@storybook(\/|\\)addon-postcss/.test(typeof preset === 'string' ? preset : preset.name);
   });
   var cssLoaders = {};
@@ -50,7 +48,7 @@ async function createDefaultWebpackConfig(storybookBaseConfig, options) {
 
   var isProd = storybookBaseConfig.mode !== 'development';
   var coreOptions = await options.presets.apply('core');
-  var builderOptions = ((_coreOptions$builder = coreOptions.builder) === null || _coreOptions$builder === void 0 ? void 0 : _coreOptions$builder.options) || {};
+  var builderOptions = typeof coreOptions.builder === 'string' ? {} : ((_coreOptions$builder = coreOptions.builder) === null || _coreOptions$builder === void 0 ? void 0 : _coreOptions$builder.options) || {};
   var cacheConfig = builderOptions.fsCache ? {
     cache: {
       type: 'filesystem'
@@ -63,7 +61,7 @@ async function createDefaultWebpackConfig(storybookBaseConfig, options) {
   } : {};
   return _objectSpread(_objectSpread(_objectSpread({}, storybookBaseConfig), {}, {
     module: _objectSpread(_objectSpread({}, storybookBaseConfig.module), {}, {
-      rules: [...storybookBaseConfig.module.rules, cssLoaders, {
+      rules: [...(((_storybookBaseConfig$ = storybookBaseConfig.module) === null || _storybookBaseConfig$ === void 0 ? void 0 : _storybookBaseConfig$.rules) || []), cssLoaders, {
         test: /\.(svg|ico|jpg|jpeg|png|apng|gif|eot|otf|webp|ttf|woff|woff2|cur|ani|pdf)(\?.*)?$/,
         type: 'asset/resource',
         generator: {
@@ -83,7 +81,7 @@ async function createDefaultWebpackConfig(storybookBaseConfig, options) {
       }]
     }),
     resolve: _objectSpread(_objectSpread({}, storybookBaseConfig.resolve), {}, {
-      fallback: _objectSpread(_objectSpread({}, (_storybookBaseConfig$ = storybookBaseConfig.resolve) === null || _storybookBaseConfig$ === void 0 ? void 0 : _storybookBaseConfig$.fallback), {}, {
+      fallback: _objectSpread(_objectSpread({}, (_storybookBaseConfig$2 = storybookBaseConfig.resolve) === null || _storybookBaseConfig$2 === void 0 ? void 0 : _storybookBaseConfig$2.fallback), {}, {
         crypto: false,
         assert: false
       })

package/dist/cjs/preview/iframe-webpack.config.js

@@ -5,11 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-require("core-js/modules/es.promise.js");
-
 var _path = _interopRequireDefault(require("path"));
 
-var _tsDedent = _interopRequireDefault(require("ts-dedent"));
+var _tsDedent = require("ts-dedent");
 
 var _webpack = require("webpack");
 
@@ -25,6 +23,8 @@ var _forkTsCheckerWebpackPlugin = _interopRequireDefault(require("fork-ts-checke
 
 var _coreCommon = require("@storybook/core-common");
 
+var _coreWebpack = require("@storybook/core-webpack");
+
 var _babelLoaderPreview = require("./babel-loader-preview");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -44,6 +44,8 @@ var storybookPaths = _objectSpread({
 }, {}));
 
 var _default = async function _default(options) {
+  var _coreOptions$builder;
+
   var _options$outputDir = options.outputDir,
       outputDir = _options$outputDir === void 0 ? _path.default.join('.', 'public') : _options$outputDir,
       quiet = options.quiet,
@@ -58,20 +60,15 @@ var _default = async function _default(options) {
   var framework = await presets.apply('framework', undefined);
 
   if (!framework) {
-    throw new Error((0, _tsDedent.default)`
+    throw new Error((0, _tsDedent.dedent)`
       You must to specify a framework in '.storybook/main.js' config.
 
       https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#framework-field-mandatory
     `);
   }
 
-  var _ref = typeof framework === 'string' ? {
-    name: framework,
-    options: {}
-  } : framework,
-      frameworkName = _ref.name,
-      frameworkOptions = _ref.options;
-
+  var frameworkName = typeof framework === 'string' ? framework : framework.name;
+  var frameworkOptions = await presets.apply('frameworkOptions');
   var isProd = configType === 'PRODUCTION';
   var envs = await presets.apply('env');
   var logLevel = await presets.apply('logLevel', undefined);
@@ -79,6 +76,8 @@ var _default = async function _default(options) {
   var bodyHtmlSnippet = await presets.apply('previewBody');
   var template = await presets.apply('previewMainTemplate');
   var coreOptions = await presets.apply('core');
+  var builderOptions = typeof coreOptions.builder === 'string' ? {} : ((_coreOptions$builder = coreOptions.builder) === null || _coreOptions$builder === void 0 ? void 0 : _coreOptions$builder.options) || {};
+  var docsOptions = await presets.apply('docs');
   var configs = [...(await presets.apply('config', [], options)), (0, _coreCommon.loadPreviewOrConfigFile)(options)].filter(Boolean);
   var entries = await presets.apply('entries', [], options);
   var workingDir = process.cwd();
@@ -93,7 +92,10 @@ var _default = async function _default(options) {
 
     var storiesPath = _path.default.resolve(_path.default.join(workingDir, storiesFilename));
 
-    virtualModuleMapping[storiesPath] = (0, _coreCommon.toImportFn)(stories);
+    var needPipelinedImport = !!builderOptions.lazyCompilation && !isProd;
+    virtualModuleMapping[storiesPath] = (0, _coreWebpack.toImportFn)(stories, {
+      needPipelinedImport: needPipelinedImport
+    });
 
     var configEntryPath = _path.default.resolve(_path.default.join(workingDir, 'storybook-config-entry.js'));
 
@@ -132,13 +134,17 @@ var _default = async function _default(options) {
       virtualModuleMapping[_storiesFilename] = (0, _coreCommon.interpolate)(storyTemplate, {
         frameworkName: frameworkName
       }) // Make sure we also replace quotes for this one
-      .replace("'{{stories}}'", stories.map(_coreCommon.toRequireContextString).join(','));
+      .replace("'{{stories}}'", stories.map(_coreWebpack.toRequireContextString).join(','));
       entries.push(_storiesFilename);
     }
   }
 
   var shouldCheckTs = typescriptOptions.check && !typescriptOptions.skipBabel;
   var tsCheckOptions = typescriptOptions.checkOptions || {};
+  var _process$env = process.env,
+      NODE_OPTIONS = _process$env.NODE_OPTIONS,
+      NODE_PRESERVE_SYMLINKS = _process$env.NODE_PRESERVE_SYMLINKS;
+  var isPreservingSymlinks = !!NODE_PRESERVE_SYMLINKS || (NODE_OPTIONS === null || NODE_OPTIONS === void 0 ? void 0 : NODE_OPTIONS.includes('--preserve-symlinks'));
   return {
     name: 'preview',
     mode: isProd ? 'production' : 'development',
@@ -173,7 +179,7 @@ var _default = async function _default(options) {
           CONFIG_TYPE: configType,
           LOGLEVEL: logLevel,
           FRAMEWORK_OPTIONS: frameworkOptions,
-          CHANNEL_OPTIONS: coreOptions === null || coreOptions === void 0 ? void 0 : coreOptions.channelOptions,
+          CHANNEL_OPTIONS: coreOptions.channelOptions,
           FEATURES: features,
           PREVIEW_URL: previewUrl,
           STORIES: stories.map(function (specifier) {
@@ -181,6 +187,7 @@ var _default = async function _default(options) {
               importPathMatcher: specifier.importPathMatcher.source
             });
           }),
+          DOCS_OPTIONS: docsOptions,
           SERVER_CHANNEL_URL: serverChannelUrl
         },
         headHtmlSnippet: headHtmlSnippet,
@@ -200,7 +207,15 @@ var _default = async function _default(options) {
       process: require.resolve('process/browser.js')
     }), isProd ? null : new _webpack.HotModuleReplacementPlugin(), new _caseSensitivePathsWebpackPlugin.default(), quiet ? null : new _webpack.ProgressPlugin({}), shouldCheckTs ? new _forkTsCheckerWebpackPlugin.default(tsCheckOptions) : null].filter(Boolean),
     module: {
-      rules: [(0, _babelLoaderPreview.createBabelLoader)(babelOptions, typescriptOptions), {
+      rules: [{
+        test: /\.m?js$/,
+        type: 'javascript/auto'
+      }, {
+        test: /\.m?js$/,
+        resolve: {
+          fullySpecified: false
+        }
+      }, (0, _babelLoaderPreview.createBabelLoader)(babelOptions, typescriptOptions), {
         test: /\.md$/,
         type: 'asset/source'
       }]
@@ -214,7 +229,10 @@ var _default = async function _default(options) {
         path: require.resolve('path-browserify'),
         assert: require.resolve('browser-assert'),
         util: require.resolve('util')
-      }
+      },
+      // Set webpack to resolve symlinks based on whether the user has asked node to.
+      // This feels like it should be default out-of-the-box in webpack :shrug:
+      symlinks: !isPreservingSymlinks
     },
     optimization: {
       splitChunks: {

package/dist/cjs/preview/virtualModuleEntry.template.js

@@ -1,62 +1,69 @@
+"use strict";
+
+var _clientApi = require("{{clientApi}}");
+
+var config = _interopRequireWildcard(require("{{configFilename}}"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 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; }
 
-/* eslint-disable import/no-unresolved */
-import { addDecorator, addParameters, addLoader, addArgs, addArgTypes, addArgsEnhancer, addArgTypesEnhancer, setGlobalRender } from '{{clientApi}}';
-import * as config from '{{configFilename}}';
 Object.keys(config).forEach(function (key) {
   var value = config[key];
 
   switch (key) {
     case 'args':
       {
-        return addArgs(value);
+        return (0, _clientApi.addArgs)(value);
       }
 
     case 'argTypes':
       {
-        return addArgTypes(value);
+        return (0, _clientApi.addArgTypes)(value);
       }
 
     case 'decorators':
       {
         return value.forEach(function (decorator) {
-          return addDecorator(decorator, false);
+          return (0, _clientApi.addDecorator)(decorator, false);
         });
       }
 
     case 'loaders':
       {
         return value.forEach(function (loader) {
-          return addLoader(loader, false);
+          return (0, _clientApi.addLoader)(loader, false);
         });
       }
 
     case 'parameters':
       {
-        return addParameters(_objectSpread({}, value), false);
+        return (0, _clientApi.addParameters)(_objectSpread({}, value), false);
       }
 
     case 'argTypesEnhancers':
       {
         return value.forEach(function (enhancer) {
-          return addArgTypesEnhancer(enhancer);
+          return (0, _clientApi.addArgTypesEnhancer)(enhancer);
         });
       }
 
     case 'argsEnhancers':
       {
         return value.forEach(function (enhancer) {
-          return addArgsEnhancer(enhancer);
+          return (0, _clientApi.addArgsEnhancer)(enhancer);
         });
       }
 
     case 'render':
       {
-        return setGlobalRender(value);
+        return (0, _clientApi.setGlobalRender)(value);
       }
 
     case 'globals':
@@ -64,7 +71,7 @@ Object.keys(config).forEach(function (key) {
       {
         var v = {};
         v[key] = value;
-        return addParameters(v, false);
+        return (0, _clientApi.addParameters)(v, false);
       }
 
     case '__namedExportsOrder':

package/dist/esm/index.js

@@ -4,7 +4,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 webpack, { ProgressPlugin } from 'webpack';
 import webpackDevMiddleware from 'webpack-dev-middleware';
 import webpackHotMiddleware from 'webpack-hot-middleware';
@@ -55,6 +54,7 @@ export var bail = async function () {
 
 
   return new Promise(function (res, rej) {
+    // @ts-ignore
     if (process && compilation) {
       try {
         compilation.close(function () {
@@ -230,6 +230,7 @@ var builder = async function* builderGeneratorFn({
       });
 
       if (stats && stats.hasWarnings()) {
+        // @ts-ignore
         stats.toJson({
           warnings: true
         }).warnings.forEach(function (e) {

package/dist/esm/presets/custom-webpack-preset.js

@@ -1,8 +1,7 @@
-import "core-js/modules/es.promise.js";
 import * as webpackReal from 'webpack';
 import { logger } from '@storybook/node-logger';
 import deprecate from 'util-deprecate';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { loadCustomWebpackConfig } from '@storybook/core-webpack';
 import { createDefaultWebpackConfig } from '../preview/base-webpack.config';
 export async function webpack(config, options) {

package/dist/esm/presets/preview-preset.js

@@ -4,7 +4,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 webpackConfig from '../preview/iframe-webpack.config';
 export var webpack = async function (_, options) {
   return webpackConfig(options);

package/dist/esm/preview/base-webpack.config.js

@@ -4,18 +4,17 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 { logger } from '@storybook/node-logger';
 export async function createDefaultWebpackConfig(storybookBaseConfig, options) {
-  var _coreOptions$builder, _storybookBaseConfig$;
+  var _options$presetsList, _options$presetsList2, _coreOptions$builder, _storybookBaseConfig$, _storybookBaseConfig$2;
 
-  if (options.presetsList.some(function (preset) {
+  if ((_options$presetsList = options.presetsList) !== null && _options$presetsList !== void 0 && _options$presetsList.some(function (preset) {
     return /@storybook(\/|\\)preset-create-react-app/.test(typeof preset === 'string' ? preset : preset.name);
   })) {
     return storybookBaseConfig;
   }
 
-  var hasPostcssAddon = options.presetsList.some(function (preset) {
+  var hasPostcssAddon = (_options$presetsList2 = options.presetsList) === null || _options$presetsList2 === void 0 ? void 0 : _options$presetsList2.some(function (preset) {
     return /@storybook(\/|\\)addon-postcss/.test(typeof preset === 'string' ? preset : preset.name);
   });
   var cssLoaders = {};
@@ -40,7 +39,7 @@ export async function createDefaultWebpackConfig(storybookBaseConfig, options) {
 
   var isProd = storybookBaseConfig.mode !== 'development';
   var coreOptions = await options.presets.apply('core');
-  var builderOptions = ((_coreOptions$builder = coreOptions.builder) === null || _coreOptions$builder === void 0 ? void 0 : _coreOptions$builder.options) || {};
+  var builderOptions = typeof coreOptions.builder === 'string' ? {} : ((_coreOptions$builder = coreOptions.builder) === null || _coreOptions$builder === void 0 ? void 0 : _coreOptions$builder.options) || {};
   var cacheConfig = builderOptions.fsCache ? {
     cache: {
       type: 'filesystem'
@@ -53,7 +52,7 @@ export async function createDefaultWebpackConfig(storybookBaseConfig, options) {
   } : {};
   return _objectSpread(_objectSpread(_objectSpread({}, storybookBaseConfig), {}, {
     module: _objectSpread(_objectSpread({}, storybookBaseConfig.module), {}, {
-      rules: [...storybookBaseConfig.module.rules, cssLoaders, {
+      rules: [...(((_storybookBaseConfig$ = storybookBaseConfig.module) === null || _storybookBaseConfig$ === void 0 ? void 0 : _storybookBaseConfig$.rules) || []), cssLoaders, {
         test: /\.(svg|ico|jpg|jpeg|png|apng|gif|eot|otf|webp|ttf|woff|woff2|cur|ani|pdf)(\?.*)?$/,
         type: 'asset/resource',
         generator: {
@@ -73,7 +72,7 @@ export async function createDefaultWebpackConfig(storybookBaseConfig, options) {
       }]
     }),
     resolve: _objectSpread(_objectSpread({}, storybookBaseConfig.resolve), {}, {
-      fallback: _objectSpread(_objectSpread({}, (_storybookBaseConfig$ = storybookBaseConfig.resolve) === null || _storybookBaseConfig$ === void 0 ? void 0 : _storybookBaseConfig$.fallback), {}, {
+      fallback: _objectSpread(_objectSpread({}, (_storybookBaseConfig$2 = storybookBaseConfig.resolve) === null || _storybookBaseConfig$2 === void 0 ? void 0 : _storybookBaseConfig$2.fallback), {}, {
         crypto: false,
         assert: false
       })

package/dist/esm/preview/iframe-webpack.config.js

@@ -1,5 +1,3 @@
-import "core-js/modules/es.promise.js";
-
 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; }
@@ -7,7 +5,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 path from 'path';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { DefinePlugin, HotModuleReplacementPlugin, ProgressPlugin, ProvidePlugin } from 'webpack';
 import HtmlWebpackPlugin from 'html-webpack-plugin'; // @ts-ignore // -- this has typings for webpack4 in it, won't work
 
@@ -15,7 +13,8 @@ import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import TerserWebpackPlugin from 'terser-webpack-plugin';
 import VirtualModulePlugin from 'webpack-virtual-modules';
 import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
-import { toRequireContextString, stringifyProcessEnvs, handlebars, interpolate, toImportFn, normalizeStories, readTemplate, loadPreviewOrConfigFile } from '@storybook/core-common';
+import { stringifyProcessEnvs, handlebars, interpolate, normalizeStories, readTemplate, loadPreviewOrConfigFile } from '@storybook/core-common';
+import { toRequireContextString, toImportFn } from '@storybook/core-webpack';
 import { createBabelLoader } from './babel-loader-preview';
 
 var storybookPaths = _objectSpread({
@@ -27,6 +26,8 @@ var storybookPaths = _objectSpread({
 }, {}));
 
 export default (async function (options) {
+  var _coreOptions$builder;
+
   var _options$outputDir = options.outputDir,
       outputDir = _options$outputDir === void 0 ? path.join('.', 'public') : _options$outputDir,
       quiet = options.quiet,
@@ -48,13 +49,8 @@ export default (async function (options) {
     `);
   }
 
-  var _ref = typeof framework === 'string' ? {
-    name: framework,
-    options: {}
-  } : framework,
-      frameworkName = _ref.name,
-      frameworkOptions = _ref.options;
-
+  var frameworkName = typeof framework === 'string' ? framework : framework.name;
+  var frameworkOptions = await presets.apply('frameworkOptions');
   var isProd = configType === 'PRODUCTION';
   var envs = await presets.apply('env');
   var logLevel = await presets.apply('logLevel', undefined);
@@ -62,6 +58,8 @@ export default (async function (options) {
   var bodyHtmlSnippet = await presets.apply('previewBody');
   var template = await presets.apply('previewMainTemplate');
   var coreOptions = await presets.apply('core');
+  var builderOptions = typeof coreOptions.builder === 'string' ? {} : ((_coreOptions$builder = coreOptions.builder) === null || _coreOptions$builder === void 0 ? void 0 : _coreOptions$builder.options) || {};
+  var docsOptions = await presets.apply('docs');
   var configs = [...(await presets.apply('config', [], options)), loadPreviewOrConfigFile(options)].filter(Boolean);
   var entries = await presets.apply('entries', [], options);
   var workingDir = process.cwd();
@@ -74,7 +72,10 @@ export default (async function (options) {
   if (features !== null && features !== void 0 && features.storyStoreV7) {
     var storiesFilename = 'storybook-stories.js';
     var storiesPath = path.resolve(path.join(workingDir, storiesFilename));
-    virtualModuleMapping[storiesPath] = toImportFn(stories);
+    var needPipelinedImport = !!builderOptions.lazyCompilation && !isProd;
+    virtualModuleMapping[storiesPath] = toImportFn(stories, {
+      needPipelinedImport: needPipelinedImport
+    });
     var configEntryPath = path.resolve(path.join(workingDir, 'storybook-config-entry.js'));
     virtualModuleMapping[configEntryPath] = handlebars(await readTemplate(require.resolve('@storybook/builder-webpack5/templates/virtualModuleModernEntry.js.handlebars')), {
       storiesFilename: storiesFilename,
@@ -117,6 +118,10 @@ export default (async function (options) {
 
   var shouldCheckTs = typescriptOptions.check && !typescriptOptions.skipBabel;
   var tsCheckOptions = typescriptOptions.checkOptions || {};
+  var _process$env = process.env,
+      NODE_OPTIONS = _process$env.NODE_OPTIONS,
+      NODE_PRESERVE_SYMLINKS = _process$env.NODE_PRESERVE_SYMLINKS;
+  var isPreservingSymlinks = !!NODE_PRESERVE_SYMLINKS || (NODE_OPTIONS === null || NODE_OPTIONS === void 0 ? void 0 : NODE_OPTIONS.includes('--preserve-symlinks'));
   return {
     name: 'preview',
     mode: isProd ? 'production' : 'development',
@@ -151,7 +156,7 @@ export default (async function (options) {
           CONFIG_TYPE: configType,
           LOGLEVEL: logLevel,
           FRAMEWORK_OPTIONS: frameworkOptions,
-          CHANNEL_OPTIONS: coreOptions === null || coreOptions === void 0 ? void 0 : coreOptions.channelOptions,
+          CHANNEL_OPTIONS: coreOptions.channelOptions,
           FEATURES: features,
           PREVIEW_URL: previewUrl,
           STORIES: stories.map(function (specifier) {
@@ -159,6 +164,7 @@ export default (async function (options) {
               importPathMatcher: specifier.importPathMatcher.source
             });
           }),
+          DOCS_OPTIONS: docsOptions,
           SERVER_CHANNEL_URL: serverChannelUrl
         },
         headHtmlSnippet: headHtmlSnippet,
@@ -178,7 +184,15 @@ export default (async function (options) {
       process: require.resolve('process/browser.js')
     }), isProd ? null : new HotModuleReplacementPlugin(), new CaseSensitivePathsPlugin(), quiet ? null : new ProgressPlugin({}), shouldCheckTs ? new ForkTsCheckerWebpackPlugin(tsCheckOptions) : null].filter(Boolean),
     module: {
-      rules: [createBabelLoader(babelOptions, typescriptOptions), {
+      rules: [{
+        test: /\.m?js$/,
+        type: 'javascript/auto'
+      }, {
+        test: /\.m?js$/,
+        resolve: {
+          fullySpecified: false
+        }
+      }, createBabelLoader(babelOptions, typescriptOptions), {
         test: /\.md$/,
         type: 'asset/source'
       }]
@@ -192,7 +206,10 @@ export default (async function (options) {
         path: require.resolve('path-browserify'),
         assert: require.resolve('browser-assert'),
         util: require.resolve('util')
-      }
+      },
+      // Set webpack to resolve symlinks based on whether the user has asked node to.
+      // This feels like it should be default out-of-the-box in webpack :shrug:
+      symlinks: !isPreservingSymlinks
     },
     optimization: {
       splitChunks: {

package/dist/types/index.d.ts

@@ -2,16 +2,16 @@ import webpack, { Stats, Configuration } from 'webpack';
 import type { Builder, Options } from '@storybook/core-common';
 export * from './types';
 declare type WebpackBuilder = Builder<Configuration, Stats>;
-declare type BuilderStartOptions = Partial<Parameters<WebpackBuilder['start']>['0']>;
+declare type BuilderStartOptions = Parameters<WebpackBuilder['start']>['0'];
 export declare const executor: {
     get: (options: Options) => Promise<typeof webpack>;
 };
 export declare const getConfig: WebpackBuilder['getConfig'];
 export declare const bail: WebpackBuilder['bail'];
 export declare const start: (options: BuilderStartOptions) => Promise<void | {
-    stats: webpack.Stats;
+    stats?: webpack.Stats | undefined;
     totalTime: [number, number];
-    bail: (e?: Error) => Promise<void>;
+    bail: (e?: Error | undefined) => Promise<void>;
 }>;
 export declare const build: (options: BuilderStartOptions) => Promise<void | webpack.Stats>;
 export declare const corePresets: string[];

package/dist/types/types.d.ts

@@ -1,30 +1,17 @@
-import type ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
-import type { PluginOptions } from '@storybook/react-docgen-typescript-plugin';
 import type { Configuration, Stats } from 'webpack';
-import type { Options, TypescriptOptions as BaseTypescriptOptions, BuilderResult as BaseBuilderResult } from '@storybook/core-common';
+import type { Options, BuilderResult as BuilderResultBase, StorybookConfig } from '@storybook/core-webpack';
+import type ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
+declare type TypeScriptOptionsBase = Required<StorybookConfig>['typescript'];
 /**
  * Options for TypeScript usage within Storybook.
  */
-export interface TypescriptOptions extends BaseTypescriptOptions {
+export interface TypescriptOptions extends TypeScriptOptionsBase {
     /**
      * Configures `fork-ts-checker-webpack-plugin`
      */
     checkOptions?: ForkTsCheckerWebpackPlugin['options'];
-    /**
-     * Sets the type of Docgen when working with React and TypeScript
-     *
-     * @default `'react-docgen-typescript'`
-     */
-    reactDocgen: 'react-docgen-typescript' | 'react-docgen' | false;
-    /**
-     * Configures `react-docgen-typescript-plugin`
-     *
-     * @default
-     * @see https://github.com/storybookjs/storybook/blob/next/lib/builder-webpack5/src/config/defaults.js#L4-L6
-     */
-    reactDocgenTypescriptOptions: PluginOptions;
 }
-export interface StorybookWebpackConfig {
+export interface StorybookConfigWebpack extends Pick<StorybookConfig, 'webpack' | 'webpackFinal'> {
     /**
      * Modify or return a custom Webpack config after the Storybook's default configuration
      * has run (mostly used by addons).
@@ -35,6 +22,11 @@ export interface StorybookWebpackConfig {
      */
     webpackFinal?: (config: Configuration, options: Options) => Configuration | Promise<Configuration>;
 }
-export interface BuilderResult extends BaseBuilderResult {
+export declare type BuilderOptions = {
+    fsCache?: boolean;
+    lazyCompilation?: boolean;
+};
+export interface BuilderResult extends BuilderResultBase {
     stats?: Stats;
 }
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/builder-webpack5",
-  "version": "7.0.0-alpha.2",
+  "version": "7.0.0-alpha.23",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -29,27 +29,28 @@
     "*.d.ts"
   ],
   "scripts": {
-    "prepare": "node ../../scripts/prepare.js"
+    "check": "tsc --noEmit",
+    "prepare": "node ../../../scripts/prepare.js"
   },
   "dependencies": {
     "@babel/core": "^7.12.10",
-    "@storybook/addons": "7.0.0-alpha.2",
-    "@storybook/api": "7.0.0-alpha.2",
-    "@storybook/channel-postmessage": "7.0.0-alpha.2",
-    "@storybook/channel-websocket": "7.0.0-alpha.2",
-    "@storybook/channels": "7.0.0-alpha.2",
-    "@storybook/client-api": "7.0.0-alpha.2",
-    "@storybook/client-logger": "7.0.0-alpha.2",
-    "@storybook/components": "7.0.0-alpha.2",
-    "@storybook/core-common": "7.0.0-alpha.2",
-    "@storybook/core-events": "7.0.0-alpha.2",
-    "@storybook/core-webpack": "7.0.0-alpha.2",
-    "@storybook/node-logger": "7.0.0-alpha.2",
-    "@storybook/preview-web": "7.0.0-alpha.2",
-    "@storybook/router": "7.0.0-alpha.2",
+    "@storybook/addons": "7.0.0-alpha.23",
+    "@storybook/api": "7.0.0-alpha.23",
+    "@storybook/channel-postmessage": "7.0.0-alpha.23",
+    "@storybook/channel-websocket": "7.0.0-alpha.23",
+    "@storybook/channels": "7.0.0-alpha.23",
+    "@storybook/client-api": "7.0.0-alpha.23",
+    "@storybook/client-logger": "7.0.0-alpha.23",
+    "@storybook/components": "7.0.0-alpha.23",
+    "@storybook/core-common": "7.0.0-alpha.23",
+    "@storybook/core-events": "7.0.0-alpha.23",
+    "@storybook/core-webpack": "7.0.0-alpha.23",
+    "@storybook/node-logger": "7.0.0-alpha.23",
+    "@storybook/preview-web": "7.0.0-alpha.23",
+    "@storybook/router": "7.0.0-alpha.23",
     "@storybook/semver": "^7.3.2",
-    "@storybook/store": "7.0.0-alpha.2",
-    "@storybook/theming": "7.0.0-alpha.2",
+    "@storybook/store": "7.0.0-alpha.23",
+    "@storybook/theming": "7.0.0-alpha.23",
     "@types/node": "^14.0.10 || ^16.0.0",
     "babel-loader": "^8.2.5",
     "babel-plugin-named-exports-order": "^0.0.2",
@@ -79,7 +80,8 @@
     "@types/terser-webpack-plugin": "^5.2.0",
     "@types/webpack-dev-middleware": "^5.3.0",
     "@types/webpack-hot-middleware": "^2.25.6",
-    "@types/webpack-virtual-modules": "^0.1.1"
+    "@types/webpack-virtual-modules": "^0.1.1",
+    "typescript": "~4.6.3"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
@@ -93,5 +95,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "44920e2b6bd51981bac5124743c29fb9f5517e44"
+  "gitHead": "0900e20acfbc12551c6a3f788b8de5dd6af5f80a"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2017 Kadira Inc. <hello@kadira.io>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.