@storybook/core-webpack 7.0.0-alpha.42 → 7.0.0-alpha.44

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { StorybookConfig as StorybookConfig$1, Options, NormalizedStoriesSpecifier } from '@storybook/core-common';
-export { BuilderResult, Options, Preset, TypescriptOptions } from '@storybook/core-common';
+import { StorybookConfig as StorybookConfig$1, Options, CoreCommon_NormalizedStoriesSpecifier } from '@storybook/types';
+export { BuilderResult, Options, Preset, TypescriptOptions } from '@storybook/types';
 
 declare type RulesConfig = any;
 declare type ModuleConfig = {
@@ -37,17 +37,17 @@ declare const checkWebpackVersion: (webpack: {
 
 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 }?: {
+declare function webpackIncludeRegexp(specifier: CoreCommon_NormalizedStoriesSpecifier): RegExp;
+declare function toImportFnPart(specifier: CoreCommon_NormalizedStoriesSpecifier): string;
+declare function toImportFn(stories: CoreCommon_NormalizedStoriesSpecifier[], { needPipelinedImport }?: {
     needPipelinedImport?: boolean;
 }): string;
 
-declare const toRequireContext: (specifier: NormalizedStoriesSpecifier) => {
+declare const toRequireContext: (specifier: CoreCommon_NormalizedStoriesSpecifier) => {
     path: string;
     recursive: boolean;
     match: RegExp;
 };
-declare const toRequireContextString: (specifier: NormalizedStoriesSpecifier) => string;
+declare const toRequireContextString: (specifier: CoreCommon_NormalizedStoriesSpecifier) => string;
 
 export { ModuleConfig, ResolveConfig, RulesConfig, StorybookConfig, WebpackConfiguration, checkWebpackVersion, loadCustomWebpackConfig, mergeConfigs, toImportFn, toImportFnPart, toRequireContext, toRequireContextString, webpackIncludeRegexp };

package/dist/index.js

@@ -1,14 +1,14 @@
-"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}:
+"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 r in o)n(e,r,{get:o[r],enumerable:!0})},l=(e,o,r,i)=>{if(o&&typeof o=="object"||typeof o=="function")for(let t of R(o))!y.call(e,t)&&t!==r&&n(e,t,{get:()=>o[t],enumerable:!(i=v(o,t))||i.enumerable});return e};var $=(e,o,r)=>(r=e!=null?h(k(e)):{},l(o||!e||!e.__esModule?n(r,"default",{value:e,enumerable:!0}):r,e)),w=e=>l(n({},"__esModule",{value:!0}),e);var A={};S(A,{checkWebpackVersion:()=>F,loadCustomWebpackConfig:()=>P,mergeConfigs:()=>G,toImportFn:()=>T,toImportFnPart:()=>d,toRequireContext:()=>x,toRequireContextString:()=>j,webpackIncludeRegexp:()=>g});module.exports=w(A);var u=$(require("path")),m=require("@storybook/core-common"),z=["webpack.config","webpackfile"],P=e=>(0,m.serverRequire)(z.map(o=>u.default.resolve(e,o)));var p=require("@storybook/node-logger"),a=require("ts-dedent"),F=(e,o,r)=>{if(!e.version){p.logger.info("Skipping webpack version check, no version available");return}e.version!==o&&p.logger.warn(a.dedent`
+      Unexpected webpack version in ${r}:
       - 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`
+    `)};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 _({optimization:e={}},{optimization:o={}}){return{...e,...o}}function G(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:_(e,o)}}var s=require("ts-dedent"),f=require("@storybook/core-common");function c(){let e=Promise.resolve();return async o=>{await e;let r=o();return e=e.then(async()=>{await r}),r}}function g(e){let{directory:o,files:r}=e,i=o.replace(/^(\.+\/)+/,"/"),t=[".",".."].includes(o)?r:`${i}/${r}`,b=(0,f.globToRegexp)(t);return new RegExp(b.source.replace(/^\^/,""))}function d(e){let{directory:o,importPathMatcher:r}=e;return s.dedent`
       async (path) => {
-        if (!${i}.exec(path)) {
+        if (!${r}.exec(path)) {
           return;
         }
 
@@ -20,11 +20,11 @@
         );
       }
 
-  `}function j(e,{needPipelinedImport:o}={}){let i="const pipeline = (x) => x();";return o&&(i=`
+  `}function T(e,{needPipelinedImport:o}={}){let r="const pipeline = (x) => x();";return o&&(r=`
       const importPipeline = ${c};
       const pipeline = importPipeline();
     `),s.dedent`
-    ${i}
+    ${r}
 
     const importers = [
       ${e.map(d).join(`,
@@ -39,4 +39,4 @@
         }
       }
     }
-  `}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});
+  `}var C=require("@storybook/core-common"),x=e=>{let{directory:o,files:r}=e,i=(0,C.globToRegexp)(`./${r}`);return{path:o,recursive:r.includes("**")||r.split("/").length>1,match:i}},j=e=>{let{path:o,recursive:r,match:i}=x(e);return`require.context('${o}', ${r}, ${i})`};0&&(module.exports={checkWebpackVersion,loadCustomWebpackConfig,mergeConfigs,toImportFn,toImportFnPart,toRequireContext,toRequireContextString,webpackIncludeRegexp});

package/dist/index.mjs

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

package/package.json

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