@storybook/builder-webpack5 6.4.0-beta.2 → 6.4.0-beta.20

package/dist/cjs/index.js

@@ -197,7 +197,7 @@ var build = async function ({
             return _nodeLogger.logger.error(e.message);
           });
           compiler.close(function () {
-            return fail(stats);
+            return options.debugWebpack ? fail(stats) : fail(new Error('=> Webpack failed, learn more with --debug-webpack'));
           });
           return;
         }

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

@@ -46,8 +46,7 @@ var storybookPaths = ['addons', 'api', 'channels', 'channel-postmessage', 'compo
 }, {});
 
 var _default = async function _default(options) {
-  var configDir = options.configDir,
-      babelOptions = options.babelOptions,
+  var babelOptions = options.babelOptions,
       _options$outputDir = options.outputDir,
       outputDir = _options$outputDir === void 0 ? _path.default.join('.', 'public') : _options$outputDir,
       quiet = options.quiet,
@@ -65,32 +64,35 @@ var _default = async function _default(options) {
   var headHtmlSnippet = await presets.apply('previewHead');
   var bodyHtmlSnippet = await presets.apply('previewBody');
   var template = await presets.apply('previewMainTemplate');
+  var coreOptions = await presets.apply('core');
   var babelLoader = (0, _babelLoaderPreview.createBabelLoader)(babelOptions, framework);
   var isProd = configType === 'PRODUCTION';
   var configs = [...(await presets.apply('config', [], options)), (0, _coreCommon.loadPreviewOrConfigFile)(options)].filter(Boolean);
   var entries = await presets.apply('entries', [], options);
+  var workingDir = process.cwd();
   var stories = (0, _coreCommon.normalizeStories)(await presets.apply('stories', [], options), {
     configDir: options.configDir,
-    workingDir: process.cwd()
+    workingDir: workingDir
   });
   var virtualModuleMapping = {};
 
   if (features !== null && features !== void 0 && features.storyStoreV7) {
     var storiesFilename = 'storybook-stories.js';
 
-    var storiesPath = _path.default.resolve(_path.default.join(configDir, storiesFilename));
+    var storiesPath = _path.default.resolve(_path.default.join(workingDir, storiesFilename));
 
     virtualModuleMapping[storiesPath] = (0, _coreCommon.toImportFn)(stories);
 
-    var configEntryPath = _path.default.resolve(_path.default.join(configDir, 'storybook-config-entry.js'));
+    var configEntryPath = _path.default.resolve(_path.default.join(workingDir, 'storybook-config-entry.js'));
 
     virtualModuleMapping[configEntryPath] = (0, _coreCommon.handlebars)(await (0, _coreCommon.readTemplate)(_path.default.join(__dirname, 'virtualModuleModernEntry.js.handlebars')), {
       storiesFilename: storiesFilename,
       configs: configs
-    });
+    } // We need to double escape `\` for webpack. We may have some in windows paths
+    ).replace(/\\/g, '\\\\');
     entries.push(configEntryPath);
   } else {
-    var frameworkInitEntry = _path.default.resolve(_path.default.join(configDir, 'storybook-init-framework-entry.js'));
+    var frameworkInitEntry = _path.default.resolve(_path.default.join(workingDir, 'storybook-init-framework-entry.js'));
 
     var frameworkImportPath = frameworkPath || `@storybook/${framework}`;
     virtualModuleMapping[frameworkInitEntry] = `import '${frameworkImportPath}';`;
@@ -110,14 +112,12 @@ var _default = async function _default(options) {
     if (stories.length > 0) {
       var storyTemplate = await (0, _coreCommon.readTemplate)(_path.default.join(__dirname, 'virtualModuleStory.template.js'));
 
-      var _storiesFilename = _path.default.resolve(_path.default.join(configDir, `generated-stories-entry.js`));
+      var _storiesFilename = _path.default.resolve(_path.default.join(workingDir, `generated-stories-entry.js`));
 
       virtualModuleMapping[_storiesFilename] = (0, _coreCommon.interpolate)(storyTemplate, {
         frameworkImportPath: frameworkImportPath
       }) // Make sure we also replace quotes for this one
-      .replace("'{{stories}}'", stories.map(function (s) {
-        return s.glob;
-      }).map(_coreCommon.toRequireContextString).join(','));
+      .replace("'{{stories}}'", stories.map(_coreCommon.toRequireContextString).join(','));
       entries.push(_storiesFilename);
     }
   }
@@ -158,10 +158,16 @@ var _default = async function _default(options) {
           options: templateOptions,
           version: packageJson.version,
           globals: {
+            CONFIG_TYPE: configType,
             LOGLEVEL: logLevel,
             FRAMEWORK_OPTIONS: frameworkOptions,
+            CHANNEL_OPTIONS: coreOptions === null || coreOptions === void 0 ? void 0 : coreOptions.channelOptions,
             FEATURES: features,
-            STORIES: stories
+            STORIES: stories.map(function (specifier) {
+              return _objectSpread(_objectSpread({}, specifier), {}, {
+                importPathMatcher: specifier.importPathMatcher.source
+              });
+            })
           },
           headHtmlSnippet: headHtmlSnippet,
           bodyHtmlSnippet: bodyHtmlSnippet

package/dist/cjs/preview/virtualModuleModernEntry.js.handlebars

@@ -14,27 +14,22 @@ const getProjectAnnotations = () =>
     {{/each}}
   ]);
 
-const fetchStoryIndex = async () => {
-  const result = await fetch('./stories.json');
-  return result.json();
-}
-
 const channel = createChannel({ page: 'preview' });
 addons.setChannel(channel);
 
-const preview = new PreviewWeb({ importFn, fetchStoryIndex });
+const preview = new PreviewWeb();
 
 window.__STORYBOOK_PREVIEW__ = preview;
 window.__STORYBOOK_STORY_STORE__ = preview.storyStore;
 window.__STORYBOOK_ADDONS_CHANNEL__ = channel;
 window.__STORYBOOK_CLIENT_API__ = new ClientApi({ storyStore: preview.storyStore });
 
-preview.initialize({ getProjectAnnotations });
+preview.initialize({ importFn, getProjectAnnotations });
 
 if (module.hot) {
   module.hot.accept('./{{storiesFilename}}', () => {
     // importFn has changed so we need to patch the new one in
-    preview.onImportFnChanged({ importFn });
+    preview.onStoriesChanged({ importFn });
   });
 
   module.hot.accept([{{#each configs}}'{{this}}',{{/each}}], () => {

package/dist/esm/index.js

@@ -160,7 +160,7 @@ export var build = async function ({
             return logger.error(e.message);
           });
           compiler.close(function () {
-            return fail(stats);
+            return options.debugWebpack ? fail(stats) : fail(new Error('=> Webpack failed, learn more with --debug-webpack'));
           });
           return;
         }

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

@@ -24,8 +24,7 @@ var storybookPaths = ['addons', 'api', 'channels', 'channel-postmessage', 'compo
   });
 }, {});
 export default (async function (options) {
-  var configDir = options.configDir,
-      babelOptions = options.babelOptions,
+  var babelOptions = options.babelOptions,
       _options$outputDir = options.outputDir,
       outputDir = _options$outputDir === void 0 ? path.join('.', 'public') : _options$outputDir,
       quiet = options.quiet,
@@ -43,28 +42,31 @@ export default (async function (options) {
   var headHtmlSnippet = await presets.apply('previewHead');
   var bodyHtmlSnippet = await presets.apply('previewBody');
   var template = await presets.apply('previewMainTemplate');
+  var coreOptions = await presets.apply('core');
   var babelLoader = createBabelLoader(babelOptions, framework);
   var isProd = configType === 'PRODUCTION';
   var configs = [...(await presets.apply('config', [], options)), loadPreviewOrConfigFile(options)].filter(Boolean);
   var entries = await presets.apply('entries', [], options);
+  var workingDir = process.cwd();
   var stories = normalizeStories(await presets.apply('stories', [], options), {
     configDir: options.configDir,
-    workingDir: process.cwd()
+    workingDir: workingDir
   });
   var virtualModuleMapping = {};
 
   if (features !== null && features !== void 0 && features.storyStoreV7) {
     var storiesFilename = 'storybook-stories.js';
-    var storiesPath = path.resolve(path.join(configDir, storiesFilename));
+    var storiesPath = path.resolve(path.join(workingDir, storiesFilename));
     virtualModuleMapping[storiesPath] = toImportFn(stories);
-    var configEntryPath = path.resolve(path.join(configDir, 'storybook-config-entry.js'));
+    var configEntryPath = path.resolve(path.join(workingDir, 'storybook-config-entry.js'));
     virtualModuleMapping[configEntryPath] = handlebars(await readTemplate(path.join(__dirname, 'virtualModuleModernEntry.js.handlebars')), {
       storiesFilename: storiesFilename,
       configs: configs
-    });
+    } // We need to double escape `\` for webpack. We may have some in windows paths
+    ).replace(/\\/g, '\\\\');
     entries.push(configEntryPath);
   } else {
-    var frameworkInitEntry = path.resolve(path.join(configDir, 'storybook-init-framework-entry.js'));
+    var frameworkInitEntry = path.resolve(path.join(workingDir, 'storybook-init-framework-entry.js'));
     var frameworkImportPath = frameworkPath || `@storybook/${framework}`;
     virtualModuleMapping[frameworkInitEntry] = `import '${frameworkImportPath}';`;
     entries.push(frameworkInitEntry);
@@ -83,14 +85,12 @@ export default (async function (options) {
     if (stories.length > 0) {
       var storyTemplate = await readTemplate(path.join(__dirname, 'virtualModuleStory.template.js'));
 
-      var _storiesFilename = path.resolve(path.join(configDir, `generated-stories-entry.js`));
+      var _storiesFilename = path.resolve(path.join(workingDir, `generated-stories-entry.js`));
 
       virtualModuleMapping[_storiesFilename] = interpolate(storyTemplate, {
         frameworkImportPath: frameworkImportPath
       }) // Make sure we also replace quotes for this one
-      .replace("'{{stories}}'", stories.map(function (s) {
-        return s.glob;
-      }).map(toRequireContextString).join(','));
+      .replace("'{{stories}}'", stories.map(toRequireContextString).join(','));
       entries.push(_storiesFilename);
     }
   }
@@ -131,10 +131,16 @@ export default (async function (options) {
           options: templateOptions,
           version: packageJson.version,
           globals: {
+            CONFIG_TYPE: configType,
             LOGLEVEL: logLevel,
             FRAMEWORK_OPTIONS: frameworkOptions,
+            CHANNEL_OPTIONS: coreOptions === null || coreOptions === void 0 ? void 0 : coreOptions.channelOptions,
             FEATURES: features,
-            STORIES: stories
+            STORIES: stories.map(function (specifier) {
+              return _objectSpread(_objectSpread({}, specifier), {}, {
+                importPathMatcher: specifier.importPathMatcher.source
+              });
+            })
           },
           headHtmlSnippet: headHtmlSnippet,
           bodyHtmlSnippet: bodyHtmlSnippet

package/dist/esm/preview/virtualModuleModernEntry.js.handlebars

@@ -14,27 +14,22 @@ const getProjectAnnotations = () =>
     {{/each}}
   ]);
 
-const fetchStoryIndex = async () => {
-  const result = await fetch('./stories.json');
-  return result.json();
-}
-
 const channel = createChannel({ page: 'preview' });
 addons.setChannel(channel);
 
-const preview = new PreviewWeb({ importFn, fetchStoryIndex });
+const preview = new PreviewWeb();
 
 window.__STORYBOOK_PREVIEW__ = preview;
 window.__STORYBOOK_STORY_STORE__ = preview.storyStore;
 window.__STORYBOOK_ADDONS_CHANNEL__ = channel;
 window.__STORYBOOK_CLIENT_API__ = new ClientApi({ storyStore: preview.storyStore });
 
-preview.initialize({ getProjectAnnotations });
+preview.initialize({ importFn, getProjectAnnotations });
 
 if (module.hot) {
   module.hot.accept('./{{storiesFilename}}', () => {
     // importFn has changed so we need to patch the new one in
-    preview.onImportFnChanged({ importFn });
+    preview.onStoriesChanged({ importFn });
   });
 
   module.hot.accept([{{#each configs}}'{{this}}',{{/each}}], () => {

package/dist/modern/index.js

@@ -160,7 +160,7 @@ export var build = async function ({
             return logger.error(e.message);
           });
           compiler.close(function () {
-            return fail(stats);
+            return options.debugWebpack ? fail(stats) : fail(new Error('=> Webpack failed, learn more with --debug-webpack'));
           });
           return;
         }

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

@@ -24,8 +24,7 @@ var storybookPaths = ['addons', 'api', 'channels', 'channel-postmessage', 'compo
   });
 }, {});
 export default (async function (options) {
-  var configDir = options.configDir,
-      babelOptions = options.babelOptions,
+  var babelOptions = options.babelOptions,
       _options$outputDir = options.outputDir,
       outputDir = _options$outputDir === void 0 ? path.join('.', 'public') : _options$outputDir,
       quiet = options.quiet,
@@ -43,28 +42,31 @@ export default (async function (options) {
   var headHtmlSnippet = await presets.apply('previewHead');
   var bodyHtmlSnippet = await presets.apply('previewBody');
   var template = await presets.apply('previewMainTemplate');
+  var coreOptions = await presets.apply('core');
   var babelLoader = createBabelLoader(babelOptions, framework);
   var isProd = configType === 'PRODUCTION';
   var configs = [...(await presets.apply('config', [], options)), loadPreviewOrConfigFile(options)].filter(Boolean);
   var entries = await presets.apply('entries', [], options);
+  var workingDir = process.cwd();
   var stories = normalizeStories(await presets.apply('stories', [], options), {
     configDir: options.configDir,
-    workingDir: process.cwd()
+    workingDir: workingDir
   });
   var virtualModuleMapping = {};
 
   if (features !== null && features !== void 0 && features.storyStoreV7) {
     var storiesFilename = 'storybook-stories.js';
-    var storiesPath = path.resolve(path.join(configDir, storiesFilename));
+    var storiesPath = path.resolve(path.join(workingDir, storiesFilename));
     virtualModuleMapping[storiesPath] = toImportFn(stories);
-    var configEntryPath = path.resolve(path.join(configDir, 'storybook-config-entry.js'));
+    var configEntryPath = path.resolve(path.join(workingDir, 'storybook-config-entry.js'));
     virtualModuleMapping[configEntryPath] = handlebars(await readTemplate(path.join(__dirname, 'virtualModuleModernEntry.js.handlebars')), {
       storiesFilename: storiesFilename,
       configs: configs
-    });
+    } // We need to double escape `\` for webpack. We may have some in windows paths
+    ).replace(/\\/g, '\\\\');
     entries.push(configEntryPath);
   } else {
-    var frameworkInitEntry = path.resolve(path.join(configDir, 'storybook-init-framework-entry.js'));
+    var frameworkInitEntry = path.resolve(path.join(workingDir, 'storybook-init-framework-entry.js'));
     var frameworkImportPath = frameworkPath || `@storybook/${framework}`;
     virtualModuleMapping[frameworkInitEntry] = `import '${frameworkImportPath}';`;
     entries.push(frameworkInitEntry);
@@ -83,14 +85,12 @@ export default (async function (options) {
     if (stories.length > 0) {
       var storyTemplate = await readTemplate(path.join(__dirname, 'virtualModuleStory.template.js'));
 
-      var _storiesFilename = path.resolve(path.join(configDir, `generated-stories-entry.js`));
+      var _storiesFilename = path.resolve(path.join(workingDir, `generated-stories-entry.js`));
 
       virtualModuleMapping[_storiesFilename] = interpolate(storyTemplate, {
         frameworkImportPath: frameworkImportPath
       }) // Make sure we also replace quotes for this one
-      .replace("'{{stories}}'", stories.map(function (s) {
-        return s.glob;
-      }).map(toRequireContextString).join(','));
+      .replace("'{{stories}}'", stories.map(toRequireContextString).join(','));
       entries.push(_storiesFilename);
     }
   }
@@ -131,10 +131,16 @@ export default (async function (options) {
           options: templateOptions,
           version: packageJson.version,
           globals: {
+            CONFIG_TYPE: configType,
             LOGLEVEL: logLevel,
             FRAMEWORK_OPTIONS: frameworkOptions,
+            CHANNEL_OPTIONS: coreOptions === null || coreOptions === void 0 ? void 0 : coreOptions.channelOptions,
             FEATURES: features,
-            STORIES: stories
+            STORIES: stories.map(function (specifier) {
+              return _objectSpread(_objectSpread({}, specifier), {}, {
+                importPathMatcher: specifier.importPathMatcher.source
+              });
+            })
           },
           headHtmlSnippet: headHtmlSnippet,
           bodyHtmlSnippet: bodyHtmlSnippet

package/dist/modern/preview/virtualModuleModernEntry.js.handlebars

@@ -14,27 +14,22 @@ const getProjectAnnotations = () =>
     {{/each}}
   ]);
 
-const fetchStoryIndex = async () => {
-  const result = await fetch('./stories.json');
-  return result.json();
-}
-
 const channel = createChannel({ page: 'preview' });
 addons.setChannel(channel);
 
-const preview = new PreviewWeb({ importFn, fetchStoryIndex });
+const preview = new PreviewWeb();
 
 window.__STORYBOOK_PREVIEW__ = preview;
 window.__STORYBOOK_STORY_STORE__ = preview.storyStore;
 window.__STORYBOOK_ADDONS_CHANNEL__ = channel;
 window.__STORYBOOK_CLIENT_API__ = new ClientApi({ storyStore: preview.storyStore });
 
-preview.initialize({ getProjectAnnotations });
+preview.initialize({ importFn, getProjectAnnotations });
 
 if (module.hot) {
   module.hot.accept('./{{storiesFilename}}', () => {
     // importFn has changed so we need to patch the new one in
-    preview.onImportFnChanged({ importFn });
+    preview.onStoriesChanged({ importFn });
   });
 
   module.hot.accept([{{#each configs}}'{{this}}',{{/each}}], () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/builder-webpack5",
-  "version": "6.4.0-beta.2",
+  "version": "6.4.0-beta.20",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -60,21 +60,21 @@
     "@babel/preset-env": "^7.12.11",
     "@babel/preset-react": "^7.12.10",
     "@babel/preset-typescript": "^7.12.7",
-    "@storybook/addons": "6.4.0-beta.2",
-    "@storybook/api": "6.4.0-beta.2",
-    "@storybook/channel-postmessage": "6.4.0-beta.2",
-    "@storybook/channels": "6.4.0-beta.2",
-    "@storybook/client-api": "6.4.0-beta.2",
-    "@storybook/client-logger": "6.4.0-beta.2",
-    "@storybook/components": "6.4.0-beta.2",
-    "@storybook/core-common": "6.4.0-beta.2",
-    "@storybook/core-events": "6.4.0-beta.2",
-    "@storybook/node-logger": "6.4.0-beta.2",
-    "@storybook/preview-web": "6.4.0-beta.2",
-    "@storybook/router": "6.4.0-beta.2",
+    "@storybook/addons": "6.4.0-beta.20",
+    "@storybook/api": "6.4.0-beta.20",
+    "@storybook/channel-postmessage": "6.4.0-beta.20",
+    "@storybook/channels": "6.4.0-beta.20",
+    "@storybook/client-api": "6.4.0-beta.20",
+    "@storybook/client-logger": "6.4.0-beta.20",
+    "@storybook/components": "6.4.0-beta.20",
+    "@storybook/core-common": "6.4.0-beta.20",
+    "@storybook/core-events": "6.4.0-beta.20",
+    "@storybook/node-logger": "6.4.0-beta.20",
+    "@storybook/preview-web": "6.4.0-beta.20",
+    "@storybook/router": "6.4.0-beta.20",
     "@storybook/semver": "^7.3.2",
-    "@storybook/store": "6.4.0-beta.2",
-    "@storybook/theming": "6.4.0-beta.2",
+    "@storybook/store": "6.4.0-beta.20",
+    "@storybook/theming": "6.4.0-beta.20",
     "@types/node": "^14.0.10",
     "babel-loader": "^8.0.0",
     "babel-plugin-macros": "^3.0.1",
@@ -117,6 +117,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3358e1e90c4e46dfd28e7ab822d5d20579463186",
+  "gitHead": "1a9315fd39f7e4abcdf3eb839dc29aedce346e01",
   "sbmodern": "dist/modern/index.js"
 }