@storybook/core-webpack 7.6.0-alpha.6 → 7.6.0-alpha.7

package/dist/index.d.ts

@@ -17,6 +17,11 @@ interface WebpackConfiguration {
     optimization?: any;
     devtool?: false | string;
 }
+type BuilderOptions = {
+    fsCache?: boolean;
+    useSWC?: boolean;
+    lazyCompilation?: boolean;
+};
 type StorybookConfig<TWebpackConfiguration = WebpackConfiguration> = StorybookConfig$1 & {
     /**
      * Modify or return a custom Webpack config after the Storybook's default configuration
@@ -50,4 +55,6 @@ declare const toRequireContext: (specifier: NormalizedStoriesSpecifier) => {
 };
 declare const toRequireContextString: (specifier: NormalizedStoriesSpecifier) => string;
 
-export { ModuleConfig, ResolveConfig, RulesConfig, StorybookConfig, WebpackConfiguration, checkWebpackVersion, loadCustomWebpackConfig, mergeConfigs, toImportFn, toImportFnPart, toRequireContext, toRequireContextString, webpackIncludeRegexp };
+declare const getVirtualModuleMapping: (options: Options) => Promise<Record<string, string>>;
+
+export { BuilderOptions, ModuleConfig, ResolveConfig, RulesConfig, StorybookConfig, WebpackConfiguration, checkWebpackVersion, getVirtualModuleMapping, loadCustomWebpackConfig, mergeConfigs, toImportFn, toImportFnPart, toRequireContext, toRequireContextString, webpackIncludeRegexp };

package/dist/index.js

@@ -1,4 +1,4 @@
-"use strict";var __create=Object.create;var __defProp=Object.defineProperty;var __getOwnPropDesc=Object.getOwnPropertyDescriptor;var __getOwnPropNames=Object.getOwnPropertyNames;var __getProtoOf=Object.getPrototypeOf,__hasOwnProp=Object.prototype.hasOwnProperty;var __export=(target,all)=>{for(var name in all)__defProp(target,name,{get:all[name],enumerable:!0})},__copyProps=(to,from,except,desc)=>{if(from&&typeof from=="object"||typeof from=="function")for(let key of __getOwnPropNames(from))!__hasOwnProp.call(to,key)&&key!==except&&__defProp(to,key,{get:()=>from[key],enumerable:!(desc=__getOwnPropDesc(from,key))||desc.enumerable});return to};var __toESM=(mod,isNodeMode,target)=>(target=mod!=null?__create(__getProtoOf(mod)):{},__copyProps(isNodeMode||!mod||!mod.__esModule?__defProp(target,"default",{value:mod,enumerable:!0}):target,mod)),__toCommonJS=mod=>__copyProps(__defProp({},"__esModule",{value:!0}),mod);var src_exports={};__export(src_exports,{checkWebpackVersion:()=>checkWebpackVersion,loadCustomWebpackConfig:()=>loadCustomWebpackConfig,mergeConfigs:()=>mergeConfigs,toImportFn:()=>toImportFn,toImportFnPart:()=>toImportFnPart,toRequireContext:()=>toRequireContext,toRequireContextString:()=>toRequireContextString,webpackIncludeRegexp:()=>webpackIncludeRegexp});module.exports=__toCommonJS(src_exports);var import_path=__toESM(require("path")),import_core_common=require("@storybook/core-common"),webpackConfigs=["webpack.config","webpackfile"],loadCustomWebpackConfig=configDir=>(0,import_core_common.serverRequire)(webpackConfigs.map(configName=>import_path.default.resolve(configDir,configName)));var import_node_logger=require("@storybook/node-logger"),import_ts_dedent=require("ts-dedent"),checkWebpackVersion=(webpack,specifier,caption)=>{if(!webpack.version){import_node_logger.logger.info("Skipping webpack version check, no version available");return}webpack.version!==specifier&&import_node_logger.logger.warn(import_ts_dedent.dedent`
+"use strict";var __create=Object.create;var __defProp=Object.defineProperty;var __getOwnPropDesc=Object.getOwnPropertyDescriptor;var __getOwnPropNames=Object.getOwnPropertyNames;var __getProtoOf=Object.getPrototypeOf,__hasOwnProp=Object.prototype.hasOwnProperty;var __export=(target,all)=>{for(var name in all)__defProp(target,name,{get:all[name],enumerable:!0})},__copyProps=(to,from,except,desc)=>{if(from&&typeof from=="object"||typeof from=="function")for(let key of __getOwnPropNames(from))!__hasOwnProp.call(to,key)&&key!==except&&__defProp(to,key,{get:()=>from[key],enumerable:!(desc=__getOwnPropDesc(from,key))||desc.enumerable});return to};var __toESM=(mod,isNodeMode,target)=>(target=mod!=null?__create(__getProtoOf(mod)):{},__copyProps(isNodeMode||!mod||!mod.__esModule?__defProp(target,"default",{value:mod,enumerable:!0}):target,mod)),__toCommonJS=mod=>__copyProps(__defProp({},"__esModule",{value:!0}),mod);var src_exports={};__export(src_exports,{checkWebpackVersion:()=>checkWebpackVersion,getVirtualModuleMapping:()=>getVirtualModuleMapping,loadCustomWebpackConfig:()=>loadCustomWebpackConfig,mergeConfigs:()=>mergeConfigs,toImportFn:()=>toImportFn,toImportFnPart:()=>toImportFnPart,toRequireContext:()=>toRequireContext,toRequireContextString:()=>toRequireContextString,webpackIncludeRegexp:()=>webpackIncludeRegexp});module.exports=__toCommonJS(src_exports);var import_path=__toESM(require("path")),import_core_common=require("@storybook/core-common"),webpackConfigs=["webpack.config","webpackfile"],loadCustomWebpackConfig=configDir=>(0,import_core_common.serverRequire)(webpackConfigs.map(configName=>import_path.default.resolve(configDir,configName)));var import_node_logger=require("@storybook/node-logger"),import_ts_dedent=require("ts-dedent"),checkWebpackVersion=(webpack,specifier,caption)=>{if(!webpack.version){import_node_logger.logger.info("Skipping webpack version check, no version available");return}webpack.version!==specifier&&import_node_logger.logger.warn(import_ts_dedent.dedent`
       Unexpected webpack version in ${caption}:
       - Received '${webpack.version}'
       - Expected '${specifier}'
@@ -39,4 +39,4 @@
         }
       }
     }
-  `}var import_core_common3=require("@storybook/core-common"),toRequireContext=specifier=>{let{directory,files}=specifier,match=(0,import_core_common3.globToRegexp)(`./${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})`};0&&(module.exports={checkWebpackVersion,loadCustomWebpackConfig,mergeConfigs,toImportFn,toImportFnPart,toRequireContext,toRequireContextString,webpackIncludeRegexp});
+  `}var import_core_common3=require("@storybook/core-common"),toRequireContext=specifier=>{let{directory,files}=specifier,match=(0,import_core_common3.globToRegexp)(`./${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})`};var import_path2=require("path"),import_core_common4=require("@storybook/core-common");function slash(path2){return path2.startsWith("\\\\?\\")?path2:path2.replace(/\\/g,"/")}var getVirtualModuleMapping=async options=>{var _a;let virtualModuleMapping={},builderOptions=await(0,import_core_common4.getBuilderOptions)(options),workingDir=process.cwd(),isProd=options.configType==="PRODUCTION",nonNormalizedStories=await options.presets.apply("stories",[]),stories=(0,import_core_common4.normalizeStories)(nonNormalizedStories,{configDir:options.configDir,workingDir}),previewAnnotations=[...(await options.presets.apply("previewAnnotations",[],options)).map(entry=>typeof entry=="object"?entry.absolute:(0,import_path2.isAbsolute)(entry)?entry:slash(entry)),(0,import_core_common4.loadPreviewOrConfigFile)(options)].filter(Boolean);if((_a=options.features)!=null&&_a.storyStoreV7){let storiesFilename="storybook-stories.js",storiesPath=(0,import_path2.resolve)((0,import_path2.join)(workingDir,storiesFilename)),needPipelinedImport=!!builderOptions.lazyCompilation&&!isProd;virtualModuleMapping[storiesPath]=toImportFn(stories,{needPipelinedImport});let configEntryPath=(0,import_path2.resolve)((0,import_path2.join)(workingDir,"storybook-config-entry.js"));virtualModuleMapping[configEntryPath]=(0,import_core_common4.handlebars)(await(0,import_core_common4.readTemplate)(require.resolve("@storybook/builder-webpack5/templates/virtualModuleModernEntry.js.handlebars")),{storiesFilename,previewAnnotations}).replace(/\\/g,"\\\\")}else{let rendererName=await(0,import_core_common4.getRendererName)(options),rendererInitEntry=(0,import_path2.resolve)((0,import_path2.join)(workingDir,"storybook-init-renderer-entry.js"));virtualModuleMapping[rendererInitEntry]=`import '${slash(rendererName)}';`;let entryTemplate=await(0,import_core_common4.readTemplate)((0,import_path2.join)(__dirname,"..","templates","virtualModuleEntry.template.js"));if(previewAnnotations.forEach(previewAnnotationFilename=>{if(!previewAnnotationFilename)return;let entryFilename=previewAnnotationFilename.startsWith(".")?`${previewAnnotationFilename.replace(/(\w)(\/|\\)/g,"$1-")}-generated-config-entry.js`:`${previewAnnotationFilename}-generated-config-entry.js`;virtualModuleMapping[entryFilename]=(0,import_core_common4.interpolate)(entryTemplate,{previewAnnotationFilename})}),stories.length>0){let storyTemplate=await(0,import_core_common4.readTemplate)((0,import_path2.join)(__dirname,"..","templates","virtualModuleStory.template.js")),storiesFilename=(0,import_path2.resolve)((0,import_path2.join)(workingDir,"generated-stories-entry.cjs"));virtualModuleMapping[storiesFilename]=(0,import_core_common4.interpolate)(storyTemplate,{rendererName}).replace("'{{stories}}'",stories.map(toRequireContextString).join(","))}}return virtualModuleMapping};0&&(module.exports={checkWebpackVersion,getVirtualModuleMapping,loadCustomWebpackConfig,mergeConfigs,toImportFn,toImportFnPart,toRequireContext,toRequireContextString,webpackIncludeRegexp});

package/dist/index.mjs

@@ -1,9 +1,9 @@
-import path from 'path';
-import { serverRequire, globToRegexp } from '@storybook/core-common';
+import path, { isAbsolute, resolve, join } from 'path';
+import { serverRequire, globToRegexp, getBuilderOptions, normalizeStories, loadPreviewOrConfigFile, handlebars, readTemplate, getRendererName, interpolate } from '@storybook/core-common';
 import { logger } from '@storybook/node-logger';
 import { dedent } from 'ts-dedent';
 
-var webpackConfigs=["webpack.config","webpackfile"],loadCustomWebpackConfig=configDir=>serverRequire(webpackConfigs.map(configName=>path.resolve(configDir,configName)));var checkWebpackVersion=(webpack,specifier,caption)=>{if(!webpack.version){logger.info("Skipping webpack version check, no version available");return}webpack.version!==specifier&&logger.warn(dedent`
+var __require=(x=>typeof require<"u"?require:typeof Proxy<"u"?new Proxy(x,{get:(a,b)=>(typeof require<"u"?require:a)[b]}):x)(function(x){if(typeof require<"u")return require.apply(this,arguments);throw Error('Dynamic require of "'+x+'" is not supported')});var webpackConfigs=["webpack.config","webpackfile"],loadCustomWebpackConfig=configDir=>serverRequire(webpackConfigs.map(configName=>path.resolve(configDir,configName)));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}'
@@ -44,6 +44,6 @@ var webpackConfigs=["webpack.config","webpackfile"],loadCustomWebpackConfig=conf
         }
       }
     }
-  `}var toRequireContext=specifier=>{let{directory,files}=specifier,match=globToRegexp(`./${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})`};
+  `}var toRequireContext=specifier=>{let{directory,files}=specifier,match=globToRegexp(`./${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})`};function slash(path2){return path2.startsWith("\\\\?\\")?path2:path2.replace(/\\/g,"/")}var getVirtualModuleMapping=async options=>{let virtualModuleMapping={},builderOptions=await getBuilderOptions(options),workingDir=process.cwd(),isProd=options.configType==="PRODUCTION",nonNormalizedStories=await options.presets.apply("stories",[]),stories=normalizeStories(nonNormalizedStories,{configDir:options.configDir,workingDir}),previewAnnotations=[...(await options.presets.apply("previewAnnotations",[],options)).map(entry=>typeof entry=="object"?entry.absolute:isAbsolute(entry)?entry:slash(entry)),loadPreviewOrConfigFile(options)].filter(Boolean);if(options.features?.storyStoreV7){let storiesFilename="storybook-stories.js",storiesPath=resolve(join(workingDir,storiesFilename)),needPipelinedImport=!!builderOptions.lazyCompilation&&!isProd;virtualModuleMapping[storiesPath]=toImportFn(stories,{needPipelinedImport});let configEntryPath=resolve(join(workingDir,"storybook-config-entry.js"));virtualModuleMapping[configEntryPath]=handlebars(await readTemplate(__require.resolve("@storybook/builder-webpack5/templates/virtualModuleModernEntry.js.handlebars")),{storiesFilename,previewAnnotations}).replace(/\\/g,"\\\\");}else {let rendererName=await getRendererName(options),rendererInitEntry=resolve(join(workingDir,"storybook-init-renderer-entry.js"));virtualModuleMapping[rendererInitEntry]=`import '${slash(rendererName)}';`;let entryTemplate=await readTemplate(join(__dirname,"..","templates","virtualModuleEntry.template.js"));if(previewAnnotations.forEach(previewAnnotationFilename=>{if(!previewAnnotationFilename)return;let entryFilename=previewAnnotationFilename.startsWith(".")?`${previewAnnotationFilename.replace(/(\w)(\/|\\)/g,"$1-")}-generated-config-entry.js`:`${previewAnnotationFilename}-generated-config-entry.js`;virtualModuleMapping[entryFilename]=interpolate(entryTemplate,{previewAnnotationFilename});}),stories.length>0){let storyTemplate=await readTemplate(join(__dirname,"..","templates","virtualModuleStory.template.js")),storiesFilename=resolve(join(workingDir,"generated-stories-entry.cjs"));virtualModuleMapping[storiesFilename]=interpolate(storyTemplate,{rendererName}).replace("'{{stories}}'",stories.map(toRequireContextString).join(","));}}return virtualModuleMapping};
 
-export { checkWebpackVersion, loadCustomWebpackConfig, mergeConfigs, toImportFn, toImportFnPart, toRequireContext, toRequireContextString, webpackIncludeRegexp };
+export { checkWebpackVersion, getVirtualModuleMapping, loadCustomWebpackConfig, mergeConfigs, toImportFn, toImportFnPart, toRequireContext, toRequireContextString, webpackIncludeRegexp };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-webpack",
-  "version": "7.6.0-alpha.6",
+  "version": "7.6.0-alpha.7",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -40,17 +40,18 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "../../../scripts/prepare/check.ts",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "check": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/check.ts",
+    "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/core-common": "7.6.0-alpha.6",
-    "@storybook/node-logger": "7.6.0-alpha.6",
-    "@storybook/types": "7.6.0-alpha.6",
+    "@storybook/core-common": "7.6.0-alpha.7",
+    "@storybook/node-logger": "7.6.0-alpha.7",
+    "@storybook/types": "7.6.0-alpha.7",
     "@types/node": "^18.0.0",
     "ts-dedent": "^2.0.0"
   },
   "devDependencies": {
+    "slash": "^5.1.0",
     "typescript": "~4.9.3",
     "webpack": "5"
   },

package/templates/virtualModuleEntry.template.js

@@ -0,0 +1,65 @@
+/* eslint-disable import/no-unresolved */
+import {
+  addDecorator,
+  addParameters,
+  addLoader,
+  addArgs,
+  addArgTypes,
+  addStepRunner,
+  addArgsEnhancer,
+  addArgTypesEnhancer,
+  setGlobalRender,
+} from '@storybook/preview-api';
+import * as previewAnnotations from '{{previewAnnotationFilename}}';
+
+const config = previewAnnotations.default ?? previewAnnotations;
+
+Object.keys(config).forEach((key) => {
+  const value = config[key];
+  switch (key) {
+    case 'args': {
+      return addArgs(value);
+    }
+    case 'argTypes': {
+      return addArgTypes(value);
+    }
+    case 'decorators': {
+      return value.forEach((decorator) => addDecorator(decorator, false));
+    }
+    case 'loaders': {
+      return value.forEach((loader) => addLoader(loader, false));
+    }
+    case 'parameters': {
+      return addParameters({ ...value }, false);
+    }
+    case 'argTypesEnhancers': {
+      return value.forEach((enhancer) => addArgTypesEnhancer(enhancer));
+    }
+    case 'argsEnhancers': {
+      return value.forEach((enhancer) => addArgsEnhancer(enhancer));
+    }
+    case 'render': {
+      return setGlobalRender(value);
+    }
+    case 'globals':
+    case 'globalTypes': {
+      const v = {};
+      v[key] = value;
+      return addParameters(v, false);
+    }
+    case '__namedExportsOrder':
+    case 'decorateStory':
+    case 'renderToDOM': // deprecated
+    case 'renderToCanvas': {
+      return null; // This key is not handled directly in v6 mode.
+    }
+    case 'runStep': {
+      return addStepRunner(value);
+    }
+    default: {
+      return console.log(
+        `Unknown key '${key}' exported by preview annotation file '{{previewAnnotationFilename}}'`
+      );
+    }
+  }
+});

package/templates/virtualModuleStory.template.js

@@ -0,0 +1,3 @@
+const { configure } = require('{{rendererName}}');
+
+configure(['{{stories}}'], module, false);