@storybook/core-webpack 7.0.0-alpha.8 → 7.0.0-beta.1

package/dist/index.d.ts

@@ -0,0 +1,53 @@
+import { StorybookConfig as StorybookConfig$1, Options, NormalizedStoriesSpecifier } from '@storybook/types';
+export { BuilderResult, Options, Preset, TypescriptOptions } from '@storybook/types';
+
+type RulesConfig = any;
+type ModuleConfig = {
+    rules?: RulesConfig[];
+};
+type ResolveConfig = {
+    extensions?: string[];
+    mainFields?: (string | string[])[] | undefined;
+    alias?: any;
+};
+interface WebpackConfiguration {
+    plugins?: any[];
+    module?: ModuleConfig;
+    resolve?: ResolveConfig;
+    optimization?: any;
+    devtool?: false | string;
+}
+type StorybookConfig<TWebpackConfiguration = WebpackConfiguration> = StorybookConfig$1 & {
+    /**
+     * Modify or return a custom Webpack config after the Storybook's default configuration
+     * has run (mostly used by addons).
+     */
+    webpack?: (config: TWebpackConfiguration, options: Options) => TWebpackConfiguration | Promise<TWebpackConfiguration>;
+    /**
+     * Modify or return a custom Webpack config after every addon has run.
+     */
+    webpackFinal?: (config: TWebpackConfiguration, options: Options) => TWebpackConfiguration | Promise<TWebpackConfiguration>;
+};
+
+declare const loadCustomWebpackConfig: (configDir: string) => any;
+
+declare const checkWebpackVersion: (webpack: {
+    version?: string;
+}, specifier: string, caption: string) => void;
+
+declare function mergeConfigs(config: WebpackConfiguration, customConfig: WebpackConfiguration): WebpackConfiguration;
+
+declare function webpackIncludeRegexp(specifier: NormalizedStoriesSpecifier): RegExp;
+declare function toImportFnPart(specifier: NormalizedStoriesSpecifier): string;
+declare function toImportFn(stories: NormalizedStoriesSpecifier[], { needPipelinedImport }?: {
+    needPipelinedImport?: boolean;
+}): string;
+
+declare const toRequireContext: (specifier: NormalizedStoriesSpecifier) => {
+    path: string;
+    recursive: boolean;
+    match: RegExp;
+};
+declare const toRequireContextString: (specifier: NormalizedStoriesSpecifier) => string;
+
+export { ModuleConfig, ResolveConfig, RulesConfig, StorybookConfig, WebpackConfiguration, checkWebpackVersion, loadCustomWebpackConfig, mergeConfigs, toImportFn, toImportFnPart, toRequireContext, toRequireContextString, webpackIncludeRegexp };

package/dist/index.js

@@ -0,0 +1,42 @@
+"use strict";var h=Object.create;var n=Object.defineProperty;var v=Object.getOwnPropertyDescriptor;var R=Object.getOwnPropertyNames;var k=Object.getPrototypeOf,y=Object.prototype.hasOwnProperty;var S=(e,o)=>{for(var i in o)n(e,i,{get:o[i],enumerable:!0})},l=(e,o,i,r)=>{if(o&&typeof o=="object"||typeof o=="function")for(let t of R(o))!y.call(e,t)&&t!==i&&n(e,t,{get:()=>o[t],enumerable:!(r=v(o,t))||r.enumerable});return e};var $=(e,o,i)=>(i=e!=null?h(k(e)):{},l(o||!e||!e.__esModule?n(i,"default",{value:e,enumerable:!0}):i,e)),w=e=>l(n({},"__esModule",{value:!0}),e);var O={};S(O,{checkWebpackVersion:()=>F,loadCustomWebpackConfig:()=>P,mergeConfigs:()=>T,toImportFn:()=>j,toImportFnPart:()=>d,toRequireContext:()=>b,toRequireContextString:()=>A,webpackIncludeRegexp:()=>g});module.exports=w(O);var u=$(require("path")),a=require("@storybook/core-common"),z=["webpack.config","webpackfile"],P=e=>(0,a.serverRequire)(z.map(o=>u.default.resolve(e,o)));var p=require("@storybook/node-logger"),m=require("ts-dedent"),F=(e,o,i)=>{if(!e.version){p.logger.info("Skipping webpack version check, no version available");return}e.version!==o&&p.logger.warn(m.dedent`
+      Unexpected webpack version in ${i}:
+      - Received '${e.version}'
+      - Expected '${o}'
+
+      If you're using Webpack 5 in SB6.2 and upgrading, consider: https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#webpack-5-manager-build
+
+      For more info about Webpack 5 support: https://gist.github.com/shilman/8856ea1786dcd247139b47b270912324#troubleshooting
+    `)};function I(e=[],o=[]){return[...e,...o]}function M(e=[],o=[]){return[...e,...o]}function E({extensions:e=[]},{extensions:o=[]}){return[...e,...o]}function N({alias:e={}},{alias:o={}}){return{...e,...o}}function q(e,o){return{...e,...o,rules:M(e.rules||[],o.rules||[])}}function W({resolve:e={}},{resolve:o={}}){return{...e,...o,alias:N(e,o),extensions:E(e,o)}}function G({optimization:e={}},{optimization:o={}}){return{...e,...o}}function T(e,o){return{...o,...e,devtool:o.devtool||e.devtool,plugins:I(e.plugins,o.plugins),module:q(e.module||{},o.module||{}),resolve:W(e,o),optimization:G(e,o)}}var s=require("ts-dedent"),f=require("@storybook/core-common");function c(){let e=Promise.resolve();return async o=>{await e;let i=o();return e=e.then(async()=>{await i}),i}}function g(e){let{directory:o,files:i}=e,r=o.replace(/^(\.+\/)+/,"/"),t=[".",".."].includes(o)?i:`${r}/${i}`,C=(0,f.globToRegexp)(t);return new RegExp(C.source.replace(/^\^/,""))}function d(e){let{directory:o,importPathMatcher:i}=e;return s.dedent`
+      async (path) => {
+        if (!${i}.exec(path)) {
+          return;
+        }
+
+        const pathRemainder = path.substring(${o.length+1});
+        return import(
+          /* webpackChunkName: "[request]" */
+          /* webpackInclude: ${g(e)} */
+          '${o}/' + pathRemainder
+        );
+      }
+
+  `}function j(e,{needPipelinedImport:o}={}){let i="const pipeline = (x) => x();";return o&&(i=`
+      const importPipeline = ${c};
+      const pipeline = importPipeline();
+    `),s.dedent`
+    ${i}
+
+    const importers = [
+      ${e.map(d).join(`,
+`)}
+    ];
+
+    export async function importFn(path) {
+      for (let i = 0; i < importers.length; i++) {
+        const moduleExports = await pipeline(() => importers[i](path));
+        if (moduleExports) {
+          return moduleExports;
+        }
+      }
+    }
+  `}var x=require("@storybook/core-common"),b=e=>{let{directory:o,files:i}=e,r=(0,x.globToRegexp)(`./${i}`);return{path:o,recursive:i.includes("**")||i.split("/").length>1,match:r}},A=e=>{let{path:o,recursive:i,match:r}=b(e);return`require.context('${o}', ${i}, ${r})`};0&&(module.exports={checkWebpackVersion,loadCustomWebpackConfig,mergeConfigs,toImportFn,toImportFnPart,toRequireContext,toRequireContextString,webpackIncludeRegexp});

package/dist/index.mjs

@@ -0,0 +1,42 @@
+import path from"path";import{serverRequire}from"@storybook/core-common";var webpackConfigs=["webpack.config","webpackfile"],loadCustomWebpackConfig=configDir=>serverRequire(webpackConfigs.map(configName=>path.resolve(configDir,configName)));import{logger}from"@storybook/node-logger";import{dedent}from"ts-dedent";var checkWebpackVersion=(webpack,specifier,caption)=>{if(!webpack.version){logger.info("Skipping webpack version check, no version available");return}webpack.version!==specifier&&logger.warn(dedent`
+      Unexpected webpack version in ${caption}:
+      - Received '${webpack.version}'
+      - Expected '${specifier}'
+
+      If you're using Webpack 5 in SB6.2 and upgrading, consider: https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#webpack-5-manager-build
+
+      For more info about Webpack 5 support: https://gist.github.com/shilman/8856ea1786dcd247139b47b270912324#troubleshooting
+    `)};function mergePluginsField(defaultPlugins=[],customPlugins=[]){return[...defaultPlugins,...customPlugins]}function mergeRulesField(defaultRules=[],customRules=[]){return[...defaultRules,...customRules]}function mergeExtensionsField({extensions:defaultExtensions=[]},{extensions:customExtensions=[]}){return[...defaultExtensions,...customExtensions]}function mergeAliasField({alias:defaultAlias={}},{alias:customAlias={}}){return{...defaultAlias,...customAlias}}function mergeModuleField(a,b){return{...a,...b,rules:mergeRulesField(a.rules||[],b.rules||[])}}function mergeResolveField({resolve:defaultResolve={}},{resolve:customResolve={}}){return{...defaultResolve,...customResolve,alias:mergeAliasField(defaultResolve,customResolve),extensions:mergeExtensionsField(defaultResolve,customResolve)}}function mergeOptimizationField({optimization:defaultOptimization={}},{optimization:customOptimization={}}){return{...defaultOptimization,...customOptimization}}function mergeConfigs(config,customConfig){return{...customConfig,...config,devtool:customConfig.devtool||config.devtool,plugins:mergePluginsField(config.plugins,customConfig.plugins),module:mergeModuleField(config.module||{},customConfig.module||{}),resolve:mergeResolveField(config,customConfig),optimization:mergeOptimizationField(config,customConfig)}}import{dedent as dedent2}from"ts-dedent";import{globToRegexp}from"@storybook/core-common";function importPipeline(){let importGate=Promise.resolve();return async importFn=>{await importGate;let moduleExportsPromise=importFn();return importGate=importGate.then(async()=>{await moduleExportsPromise}),moduleExportsPromise}}function webpackIncludeRegexp(specifier){let{directory,files}=specifier,directoryWithoutLeadingDots=directory.replace(/^(\.+\/)+/,"/"),webpackIncludeGlob=[".",".."].includes(directory)?files:`${directoryWithoutLeadingDots}/${files}`,webpackIncludeRegexpWithCaret=globToRegexp(webpackIncludeGlob);return new RegExp(webpackIncludeRegexpWithCaret.source.replace(/^\^/,""))}function toImportFnPart(specifier){let{directory,importPathMatcher}=specifier;return dedent2`
+      async (path) => {
+        if (!${importPathMatcher}.exec(path)) {
+          return;
+        }
+
+        const pathRemainder = path.substring(${directory.length+1});
+        return import(
+          /* webpackChunkName: "[request]" */
+          /* webpackInclude: ${webpackIncludeRegexp(specifier)} */
+          '${directory}/' + pathRemainder
+        );
+      }
+
+  `}function toImportFn(stories,{needPipelinedImport}={}){let pipelinedImport="const pipeline = (x) => x();";return needPipelinedImport&&(pipelinedImport=`
+      const importPipeline = ${importPipeline};
+      const pipeline = importPipeline();
+    `),dedent2`
+    ${pipelinedImport}
+
+    const importers = [
+      ${stories.map(toImportFnPart).join(`,
+`)}
+    ];
+
+    export async function importFn(path) {
+      for (let i = 0; i < importers.length; i++) {
+        const moduleExports = await pipeline(() => importers[i](path));
+        if (moduleExports) {
+          return moduleExports;
+        }
+      }
+    }
+  `}import{globToRegexp as globToRegexp2}from"@storybook/core-common";var toRequireContext=specifier=>{let{directory,files}=specifier,match=globToRegexp2(`./${files}`);return{path:directory,recursive:files.includes("**")||files.split("/").length>1,match}},toRequireContextString=specifier=>{let{path:p,recursive:r,match:m}=toRequireContext(specifier);return`require.context('${p}', ${r}, ${m})`};export{checkWebpackVersion,loadCustomWebpackConfig,mergeConfigs,toImportFn,toImportFnPart,toRequireContext,toRequireContextString,webpackIncludeRegexp};

package/jest.config.js

@@ -0,0 +1,7 @@
+const path = require('path');
+const baseConfig = require('../../jest.config.node');
+
+module.exports = {
+  ...baseConfig,
+  displayName: __dirname.split(path.sep).slice(-2).join(path.posix.sep),
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-webpack",
-  "version": "7.0.0-alpha.8",
+  "version": "7.0.0-beta.1",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -19,9 +19,17 @@
     "url": "https://opencollective.com/storybook"
   },
   "license": "MIT",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "types": "dist/types/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
+    },
+    "./package.json": "./package.json"
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
   "files": [
     "dist/**/*",
     "types/**/*",
@@ -30,17 +38,28 @@
     "*.d.ts"
   ],
   "scripts": {
-    "prepare": "node ../../scripts/prepare.js"
+    "check": "../../../scripts/node_modules/.bin/tsc --noEmit",
+    "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/core-common": "7.0.0-alpha.8",
-    "@storybook/node-logger": "7.0.0-alpha.8",
-    "@types/node": "^14.0.10 || ^16.0.0",
-    "core-js": "^3.8.2",
+    "@storybook/core-common": "7.0.0-beta.1",
+    "@storybook/node-logger": "7.0.0-beta.1",
+    "@storybook/types": "7.0.0-beta.1",
+    "@types/node": "^16.0.0",
     "ts-dedent": "^2.0.0"
   },
+  "devDependencies": {
+    "typescript": "~4.9.3",
+    "webpack": "5"
+  },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "24725501c32a073cebc6bf2674a47357136fbe3a"
+  "bundler": {
+    "entries": [
+      "./src/index.ts"
+    ],
+    "platform": "node"
+  },
+  "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd"
 }

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.

package/dist/cjs/check-webpack-version.js

@@ -1,34 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.checkWebpackVersion = void 0;
-
-var _nodeLogger = require("@storybook/node-logger");
-
-var _tsDedent = _interopRequireDefault(require("ts-dedent"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const checkWebpackVersion = (webpack, specifier, caption) => {
-  if (!webpack.version) {
-    _nodeLogger.logger.info('Skipping webpack version check, no version available');
-
-    return;
-  }
-
-  if (webpack.version !== specifier) {
-    _nodeLogger.logger.warn((0, _tsDedent.default)`
-      Unexpected webpack version in ${caption}:
-      - Received '${webpack.version}'
-      - Expected '${specifier}'
-
-      If you're using Webpack 5 in SB6.2 and upgrading, consider: https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#webpack-5-manager-build
-
-      For more info about Webpack 5 support: https://gist.github.com/shilman/8856ea1786dcd247139b47b270912324#troubleshooting
-    `);
-  }
-};
-
-exports.checkWebpackVersion = checkWebpackVersion;

package/dist/cjs/importPipeline.js

@@ -1,24 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.importPipeline = importPipeline;
-
-// If an import is in flight when another import arrives, block it until the first completes.
-// This is to avoid a situation where webpack kicks off a second compilation whilst the
-// first is still completing, cf: https://github.com/webpack/webpack/issues/15541#issuecomment-1143138832
-// Note the way this code works if N futher `import()`s occur while the first is in flight,
-// they will all be kicked off in the same tick and not block each other. This is by design,
-// Webpack can handle multiple invalidations simutaneously, just not in quick succession.
-function importPipeline() {
-  let importGate = Promise.resolve();
-  return async importFn => {
-    await importGate;
-    const moduleExportsPromise = importFn();
-    importGate = importGate.then(async () => {
-      await moduleExportsPromise;
-    });
-    return moduleExportsPromise;
-  };
-}

package/dist/cjs/index.js

@@ -1,83 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _types = require("./types");
-
-Object.keys(_types).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _types[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _types[key];
-    }
-  });
-});
-
-var _loadCustomWebpackConfig = require("./load-custom-webpack-config");
-
-Object.keys(_loadCustomWebpackConfig).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _loadCustomWebpackConfig[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _loadCustomWebpackConfig[key];
-    }
-  });
-});
-
-var _checkWebpackVersion = require("./check-webpack-version");
-
-Object.keys(_checkWebpackVersion).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _checkWebpackVersion[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _checkWebpackVersion[key];
-    }
-  });
-});
-
-var _mergeWebpackConfig = require("./merge-webpack-config");
-
-Object.keys(_mergeWebpackConfig).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _mergeWebpackConfig[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _mergeWebpackConfig[key];
-    }
-  });
-});
-
-var _toImportFn = require("./to-importFn");
-
-Object.keys(_toImportFn).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _toImportFn[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _toImportFn[key];
-    }
-  });
-});
-
-var _toRequireContext = require("./to-require-context");
-
-Object.keys(_toRequireContext).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _toRequireContext[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _toRequireContext[key];
-    }
-  });
-});

package/dist/cjs/load-custom-webpack-config.js

@@ -1,18 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.loadCustomWebpackConfig = void 0;
-
-var _path = _interopRequireDefault(require("path"));
-
-var _coreCommon = require("@storybook/core-common");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const webpackConfigs = ['webpack.config', 'webpackfile'];
-
-const loadCustomWebpackConfig = configDir => (0, _coreCommon.serverRequire)(webpackConfigs.map(configName => _path.default.resolve(configDir, configName)));
-
-exports.loadCustomWebpackConfig = loadCustomWebpackConfig;

package/dist/cjs/merge-webpack-config.js

@@ -1,65 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.mergeConfigs = mergeConfigs;
-
-function mergePluginsField(defaultPlugins = [], customPlugins = []) {
-  return [...defaultPlugins, ...customPlugins];
-}
-
-function mergeRulesField(defaultRules = [], customRules = []) {
-  return [...defaultRules, ...customRules];
-}
-
-function mergeExtensionsField({
-  extensions: defaultExtensions = []
-}, {
-  extensions: customExtensions = []
-}) {
-  return [...defaultExtensions, ...customExtensions];
-}
-
-function mergeAliasField({
-  alias: defaultAlias = {}
-}, {
-  alias: customAlias = {}
-}) {
-  return Object.assign({}, defaultAlias, customAlias);
-}
-
-function mergeModuleField(a, b) {
-  return Object.assign({}, a, b, {
-    rules: mergeRulesField(a.rules || [], b.rules || [])
-  });
-}
-
-function mergeResolveField({
-  resolve: defaultResolve = {}
-}, {
-  resolve: customResolve = {}
-}) {
-  return Object.assign({}, defaultResolve, customResolve, {
-    alias: mergeAliasField(defaultResolve, customResolve),
-    extensions: mergeExtensionsField(defaultResolve, customResolve)
-  });
-}
-
-function mergeOptimizationField({
-  optimization: defaultOptimization = {}
-}, {
-  optimization: customOptimization = {}
-}) {
-  return Object.assign({}, defaultOptimization, customOptimization);
-}
-
-function mergeConfigs(config, customConfig) {
-  return Object.assign({}, customConfig, config, {
-    devtool: customConfig.devtool || config.devtool,
-    plugins: mergePluginsField(config.plugins, customConfig.plugins),
-    module: mergeModuleField(config.module || {}, customConfig.module || {}),
-    resolve: mergeResolveField(config, customConfig),
-    optimization: mergeOptimizationField(config, customConfig)
-  });
-}

package/dist/cjs/to-importFn.js

@@ -1,86 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.toImportFn = toImportFn;
-exports.toImportFnPart = toImportFnPart;
-exports.webpackIncludeRegexp = webpackIncludeRegexp;
-
-var _tsDedent = _interopRequireDefault(require("ts-dedent"));
-
-var _coreCommon = require("@storybook/core-common");
-
-var _importPipeline = require("./importPipeline");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function webpackIncludeRegexp(specifier) {
-  const {
-    directory,
-    files
-  } = specifier; // It appears webpack passes *something* similar to the absolute path to the file
-  // on disk (prefixed with something unknown) to the matcher.
-  // We don't want to include the absolute path in our bundle, so we will just pull any leading
-  // `./` or `../` off our directory and match on that.
-  // It's imperfect as it could match extra things in extremely unusual cases, but it'll do for now.
-  // NOTE: directory is "slashed" so will contain only `/` (no `\`), even on windows
-
-  const directoryWithoutLeadingDots = directory.replace(/^(\.+\/)+/, '/');
-  const webpackIncludeGlob = ['.', '..'].includes(directory) ? files : `${directoryWithoutLeadingDots}/${files}`;
-  const webpackIncludeRegexpWithCaret = (0, _coreCommon.globToRegexp)(webpackIncludeGlob); // picomatch is creating an exact match, but we are only matching the end of the filename
-
-  return new RegExp(webpackIncludeRegexpWithCaret.source.replace(/^\^/, ''));
-}
-
-function toImportFnPart(specifier) {
-  const {
-    directory,
-    importPathMatcher
-  } = specifier;
-  return (0, _tsDedent.default)`
-      async (path) => {
-        if (!${importPathMatcher}.exec(path)) {
-          return;
-        }
-
-        const pathRemainder = path.substring(${directory.length + 1});
-        return import(
-          /* webpackChunkName: "[request]" */
-          /* webpackInclude: ${webpackIncludeRegexp(specifier)} */
-          '${directory}/' + pathRemainder
-        );
-      }
-
-  `;
-}
-
-function toImportFn(stories, {
-  needPipelinedImport
-} = {}) {
-  let pipelinedImport = `const pipeline = (x) => x();`;
-
-  if (needPipelinedImport) {
-    pipelinedImport = `
-      const importPipeline = ${_importPipeline.importPipeline};
-      const pipeline = importPipeline();
-    `;
-  }
-
-  return (0, _tsDedent.default)`
-    ${pipelinedImport}
-
-    const importers = [
-      ${stories.map(toImportFnPart).join(',\n')}
-    ];
-
-    export async function importFn(path) {
-      for (let i = 0; i < importers.length; i++) {
-        const moduleExports = await pipeline(() => importers[i](path));
-        if (moduleExports) {
-          return moduleExports;
-        }
-      }
-    }
-  `;
-}

package/dist/cjs/to-require-context.js

@@ -1,37 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.toRequireContextString = exports.toRequireContext = void 0;
-
-var _coreCommon = require("@storybook/core-common");
-
-const toRequireContext = specifier => {
-  const {
-    directory,
-    files
-  } = specifier; // The importPathMatcher is a `./`-prefixed matcher that includes the directory
-  // For `require.context()` we want the same thing, relative to directory
-
-  const match = (0, _coreCommon.globToRegexp)(`./${files}`);
-  return {
-    path: directory,
-    recursive: files.includes('**') || files.split('/').length > 1,
-    match
-  };
-};
-
-exports.toRequireContext = toRequireContext;
-
-const toRequireContextString = specifier => {
-  const {
-    path: p,
-    recursive: r,
-    match: m
-  } = toRequireContext(specifier);
-  const result = `require.context('${p}', ${r}, ${m})`;
-  return result;
-};
-
-exports.toRequireContextString = toRequireContextString;

package/dist/cjs/types.js

@@ -1,5 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});

package/dist/esm/check-webpack-version.js

@@ -1,20 +0,0 @@
-import { logger } from '@storybook/node-logger';
-import dedent from 'ts-dedent';
-export const checkWebpackVersion = (webpack, specifier, caption) => {
-  if (!webpack.version) {
-    logger.info('Skipping webpack version check, no version available');
-    return;
-  }
-
-  if (webpack.version !== specifier) {
-    logger.warn(dedent`
-      Unexpected webpack version in ${caption}:
-      - Received '${webpack.version}'
-      - Expected '${specifier}'
-
-      If you're using Webpack 5 in SB6.2 and upgrading, consider: https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#webpack-5-manager-build
-
-      For more info about Webpack 5 support: https://gist.github.com/shilman/8856ea1786dcd247139b47b270912324#troubleshooting
-    `);
-  }
-};

package/dist/esm/importPipeline.js

@@ -1,17 +0,0 @@
-// If an import is in flight when another import arrives, block it until the first completes.
-// This is to avoid a situation where webpack kicks off a second compilation whilst the
-// first is still completing, cf: https://github.com/webpack/webpack/issues/15541#issuecomment-1143138832
-// Note the way this code works if N futher `import()`s occur while the first is in flight,
-// they will all be kicked off in the same tick and not block each other. This is by design,
-// Webpack can handle multiple invalidations simutaneously, just not in quick succession.
-export function importPipeline() {
-  let importGate = Promise.resolve();
-  return async importFn => {
-    await importGate;
-    const moduleExportsPromise = importFn();
-    importGate = importGate.then(async () => {
-      await moduleExportsPromise;
-    });
-    return moduleExportsPromise;
-  };
-}

package/dist/esm/index.js

@@ -1,6 +0,0 @@
-export * from './types';
-export * from './load-custom-webpack-config';
-export * from './check-webpack-version';
-export * from './merge-webpack-config';
-export * from './to-importFn';
-export * from './to-require-context';

package/dist/esm/load-custom-webpack-config.js

@@ -1,4 +0,0 @@
-import path from 'path';
-import { serverRequire } from '@storybook/core-common';
-const webpackConfigs = ['webpack.config', 'webpackfile'];
-export const loadCustomWebpackConfig = configDir => serverRequire(webpackConfigs.map(configName => path.resolve(configDir, configName)));

package/dist/esm/merge-webpack-config.js

@@ -1,58 +0,0 @@
-function mergePluginsField(defaultPlugins = [], customPlugins = []) {
-  return [...defaultPlugins, ...customPlugins];
-}
-
-function mergeRulesField(defaultRules = [], customRules = []) {
-  return [...defaultRules, ...customRules];
-}
-
-function mergeExtensionsField({
-  extensions: defaultExtensions = []
-}, {
-  extensions: customExtensions = []
-}) {
-  return [...defaultExtensions, ...customExtensions];
-}
-
-function mergeAliasField({
-  alias: defaultAlias = {}
-}, {
-  alias: customAlias = {}
-}) {
-  return Object.assign({}, defaultAlias, customAlias);
-}
-
-function mergeModuleField(a, b) {
-  return Object.assign({}, a, b, {
-    rules: mergeRulesField(a.rules || [], b.rules || [])
-  });
-}
-
-function mergeResolveField({
-  resolve: defaultResolve = {}
-}, {
-  resolve: customResolve = {}
-}) {
-  return Object.assign({}, defaultResolve, customResolve, {
-    alias: mergeAliasField(defaultResolve, customResolve),
-    extensions: mergeExtensionsField(defaultResolve, customResolve)
-  });
-}
-
-function mergeOptimizationField({
-  optimization: defaultOptimization = {}
-}, {
-  optimization: customOptimization = {}
-}) {
-  return Object.assign({}, defaultOptimization, customOptimization);
-}
-
-export function mergeConfigs(config, customConfig) {
-  return Object.assign({}, customConfig, config, {
-    devtool: customConfig.devtool || config.devtool,
-    plugins: mergePluginsField(config.plugins, customConfig.plugins),
-    module: mergeModuleField(config.module || {}, customConfig.module || {}),
-    resolve: mergeResolveField(config, customConfig),
-    optimization: mergeOptimizationField(config, customConfig)
-  });
-}

package/dist/esm/to-importFn.js

@@ -1,70 +0,0 @@
-import dedent from 'ts-dedent';
-import { globToRegexp } from '@storybook/core-common';
-import { importPipeline } from './importPipeline';
-export function webpackIncludeRegexp(specifier) {
-  const {
-    directory,
-    files
-  } = specifier; // It appears webpack passes *something* similar to the absolute path to the file
-  // on disk (prefixed with something unknown) to the matcher.
-  // We don't want to include the absolute path in our bundle, so we will just pull any leading
-  // `./` or `../` off our directory and match on that.
-  // It's imperfect as it could match extra things in extremely unusual cases, but it'll do for now.
-  // NOTE: directory is "slashed" so will contain only `/` (no `\`), even on windows
-
-  const directoryWithoutLeadingDots = directory.replace(/^(\.+\/)+/, '/');
-  const webpackIncludeGlob = ['.', '..'].includes(directory) ? files : `${directoryWithoutLeadingDots}/${files}`;
-  const webpackIncludeRegexpWithCaret = globToRegexp(webpackIncludeGlob); // picomatch is creating an exact match, but we are only matching the end of the filename
-
-  return new RegExp(webpackIncludeRegexpWithCaret.source.replace(/^\^/, ''));
-}
-export function toImportFnPart(specifier) {
-  const {
-    directory,
-    importPathMatcher
-  } = specifier;
-  return dedent`
-      async (path) => {
-        if (!${importPathMatcher}.exec(path)) {
-          return;
-        }
-
-        const pathRemainder = path.substring(${directory.length + 1});
-        return import(
-          /* webpackChunkName: "[request]" */
-          /* webpackInclude: ${webpackIncludeRegexp(specifier)} */
-          '${directory}/' + pathRemainder
-        );
-      }
-
-  `;
-}
-export function toImportFn(stories, {
-  needPipelinedImport
-} = {}) {
-  let pipelinedImport = `const pipeline = (x) => x();`;
-
-  if (needPipelinedImport) {
-    pipelinedImport = `
-      const importPipeline = ${importPipeline};
-      const pipeline = importPipeline();
-    `;
-  }
-
-  return dedent`
-    ${pipelinedImport}
-
-    const importers = [
-      ${stories.map(toImportFnPart).join(',\n')}
-    ];
-
-    export async function importFn(path) {
-      for (let i = 0; i < importers.length; i++) {
-        const moduleExports = await pipeline(() => importers[i](path));
-        if (moduleExports) {
-          return moduleExports;
-        }
-      }
-    }
-  `;
-}

package/dist/esm/to-require-context.js

@@ -1,24 +0,0 @@
-import { globToRegexp } from '@storybook/core-common';
-export const toRequireContext = specifier => {
-  const {
-    directory,
-    files
-  } = specifier; // The importPathMatcher is a `./`-prefixed matcher that includes the directory
-  // For `require.context()` we want the same thing, relative to directory
-
-  const match = globToRegexp(`./${files}`);
-  return {
-    path: directory,
-    recursive: files.includes('**') || files.split('/').length > 1,
-    match
-  };
-};
-export const toRequireContextString = specifier => {
-  const {
-    path: p,
-    recursive: r,
-    match: m
-  } = toRequireContext(specifier);
-  const result = `require.context('${p}', ${r}, ${m})`;
-  return result;
-};

package/dist/esm/types.js

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

package/dist/types/check-webpack-version.d.ts

@@ -1,3 +0,0 @@
-export declare const checkWebpackVersion: (webpack: {
-    version?: string;
-}, specifier: string, caption: string) => void;

package/dist/types/importPipeline.d.ts

@@ -1,3 +0,0 @@
-declare type ModuleExports = Record<string, any>;
-export declare function importPipeline(): (importFn: () => Promise<ModuleExports>) => Promise<ModuleExports>;
-export {};

package/dist/types/index.d.ts

@@ -1,6 +0,0 @@
-export * from './types';
-export * from './load-custom-webpack-config';
-export * from './check-webpack-version';
-export * from './merge-webpack-config';
-export * from './to-importFn';
-export * from './to-require-context';

package/dist/types/load-custom-webpack-config.d.ts

@@ -1 +0,0 @@
-export declare const loadCustomWebpackConfig: (configDir: string) => any;

package/dist/types/merge-webpack-config.d.ts

@@ -1,2 +0,0 @@
-import type { WebpackConfiguration as Configuration } from './types';
-export declare function mergeConfigs(config: Configuration, customConfig: Configuration): Configuration;

package/dist/types/to-importFn.d.ts

@@ -1,6 +0,0 @@
-import type { NormalizedStoriesSpecifier } from '@storybook/core-common';
-export declare function webpackIncludeRegexp(specifier: NormalizedStoriesSpecifier): RegExp;
-export declare function toImportFnPart(specifier: NormalizedStoriesSpecifier): string;
-export declare function toImportFn(stories: NormalizedStoriesSpecifier[], { needPipelinedImport }?: {
-    needPipelinedImport?: boolean;
-}): string;

package/dist/types/to-require-context.d.ts

@@ -1,7 +0,0 @@
-import type { NormalizedStoriesSpecifier } from '@storybook/core-common';
-export declare const toRequireContext: (specifier: NormalizedStoriesSpecifier) => {
-    path: string;
-    recursive: boolean;
-    match: RegExp;
-};
-export declare const toRequireContextString: (specifier: NormalizedStoriesSpecifier) => string;

package/dist/types/types.d.ts

@@ -1,29 +0,0 @@
-import type { Options, StorybookConfig as StorybookConfigBase } from '@storybook/core-common';
-export type { Options, Preset, BuilderResult, TypescriptOptions } from '@storybook/core-common';
-export declare type RulesConfig = any;
-export declare type ModuleConfig = {
-    rules?: RulesConfig[];
-};
-export declare type ResolveConfig = {
-    extensions?: string[];
-    mainFields?: (string | string[])[] | undefined;
-    alias?: any;
-};
-export interface WebpackConfiguration {
-    plugins?: any[];
-    module?: ModuleConfig;
-    resolve?: ResolveConfig;
-    optimization?: any;
-    devtool?: false | string;
-}
-export declare type StorybookConfig<TWebpackConfiguration = WebpackConfiguration> = StorybookConfigBase & {
-    /**
-     * Modify or return a custom Webpack config after the Storybook's default configuration
-     * has run (mostly used by addons).
-     */
-    webpack?: (config: TWebpackConfiguration, options: Options) => TWebpackConfiguration | Promise<TWebpackConfiguration>;
-    /**
-     * Modify or return a custom Webpack config after every addon has run.
-     */
-    webpackFinal?: (config: TWebpackConfiguration, options: Options) => TWebpackConfiguration | Promise<TWebpackConfiguration>;
-};