@storybook/core-webpack 7.0.0-alpha.53 → 7.0.0-alpha.54

package/dist/index.mjs

@@ -1,33 +1,33 @@
-import u from"path";import{serverRequire as m}from"@storybook/core-common";var a=["webpack.config","webpackfile"],z=e=>m(a.map(o=>u.resolve(e,o)));import{logger as n}from"@storybook/node-logger";import{dedent as c}from"ts-dedent";var M=(e,o,r)=>{if(!e.version){n.info("Skipping webpack version check, no version available");return}e.version!==o&&n.warn(c`
-      Unexpected webpack version in ${r}:
-      - Received '${e.version}'
-      - Expected '${o}'
+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 f(e=[],o=[]){return[...e,...o]}function g(e=[],o=[]){return[...e,...o]}function d({extensions:e=[]},{extensions:o=[]}){return[...e,...o]}function C({alias:e={}},{alias:o={}}){return{...e,...o}}function x(e,o){return{...e,...o,rules:g(e.rules||[],o.rules||[])}}function b({resolve:e={}},{resolve:o={}}){return{...e,...o,alias:C(e,o),extensions:d(e,o)}}function h({optimization:e={}},{optimization:o={}}){return{...e,...o}}function N(e,o){return{...o,...e,devtool:o.devtool||e.devtool,plugins:f(e.plugins,o.plugins),module:x(e.module||{},o.module||{}),resolve:b(e,o),optimization:h(e,o)}}import{dedent as s}from"ts-dedent";import{globToRegexp as v}from"@storybook/core-common";function p(){let e=Promise.resolve();return async o=>{await e;let r=o();return e=e.then(async()=>{await r}),r}}function R(e){let{directory:o,files:r}=e,i=o.replace(/^(\.+\/)+/,"/"),t=[".",".."].includes(o)?r:`${i}/${r}`,l=v(t);return new RegExp(l.source.replace(/^\^/,""))}function k(e){let{directory:o,importPathMatcher:r}=e;return s`
+    `)};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 (!${r}.exec(path)) {
+        if (!${importPathMatcher}.exec(path)) {
           return;
         }
 
-        const pathRemainder = path.substring(${o.length+1});
+        const pathRemainder = path.substring(${directory.length+1});
         return import(
           /* webpackChunkName: "[request]" */
-          /* webpackInclude: ${R(e)} */
-          '${o}/' + pathRemainder
+          /* webpackInclude: ${webpackIncludeRegexp(specifier)} */
+          '${directory}/' + pathRemainder
         );
       }
 
-  `}function j(e,{needPipelinedImport:o}={}){let r="const pipeline = (x) => x();";return o&&(r=`
-      const importPipeline = ${p};
+  `}function toImportFn(stories,{needPipelinedImport}={}){let pipelinedImport="const pipeline = (x) => x();";return needPipelinedImport&&(pipelinedImport=`
+      const importPipeline = ${importPipeline};
       const pipeline = importPipeline();
-    `),s`
-    ${r}
+    `),dedent2`
+    ${pipelinedImport}
 
     const importers = [
-      ${e.map(k).join(`,
+      ${stories.map(toImportFnPart).join(`,
 `)}
     ];
 
@@ -39,4 +39,4 @@ import u from"path";import{serverRequire as m}from"@storybook/core-common";var a
         }
       }
     }
-  `}import{globToRegexp as y}from"@storybook/core-common";var S=e=>{let{directory:o,files:r}=e,i=y(`./${r}`);return{path:o,recursive:r.includes("**")||r.split("/").length>1,match:i}},B=e=>{let{path:o,recursive:r,match:i}=S(e);return`require.context('${o}', ${r}, ${i})`};export{M as checkWebpackVersion,z as loadCustomWebpackConfig,N as mergeConfigs,j as toImportFn,k as toImportFnPart,S as toRequireContext,B as toRequireContextString,R as webpackIncludeRegexp};
+  `}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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-webpack",
-  "version": "7.0.0-alpha.53",
+  "version": "7.0.0-alpha.54",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -42,9 +42,9 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/core-common": "7.0.0-alpha.53",
-    "@storybook/node-logger": "7.0.0-alpha.53",
-    "@storybook/types": "7.0.0-alpha.53",
+    "@storybook/core-common": "7.0.0-alpha.54",
+    "@storybook/node-logger": "7.0.0-alpha.54",
+    "@storybook/types": "7.0.0-alpha.54",
     "@types/node": "^16.0.0",
     "ts-dedent": "^2.0.0"
   },
@@ -61,5 +61,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "fd1cf81615a5ddac3369e7bb567a1a43081fdc23"
+  "gitHead": "91177d4e27daec556a24ae6223c3cbe17a998d9b"
 }