@storybook/core-server 7.0.0-alpha.0 → 7.0.0-alpha.11

package/dist/cjs/build-dev.js

@@ -143,7 +143,7 @@ async function buildDevStandalone(options) {
 
   if (options.webpackStatsJson) {
     var target = options.webpackStatsJson === true ? options.outputDir : options.webpackStatsJson;
-    await (0, _outputStats.outputStats)(target, previewStats, managerStats);
+    await (0, _outputStats.outputStats)(target, previewStats);
   }
 
   if (options.smokeTest) {

package/dist/cjs/build-static.js

@@ -11,13 +11,11 @@ require("core-js/modules/es.promise.js");
 
 var _chalk = _interopRequireDefault(require("chalk"));
 
-var _cpy = _interopRequireDefault(require("cpy"));
+var _fsExtra = require("fs-extra");
 
-var _fsExtra = _interopRequireDefault(require("fs-extra"));
+var _path = require("path");
 
-var _path = _interopRequireWildcard(require("path"));
-
-var _tsDedent = _interopRequireDefault(require("ts-dedent"));
+var _tsDedent = require("ts-dedent");
 
 var _global = _interopRequireDefault(require("global"));
 
@@ -59,10 +57,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 async function buildStaticStandalone(options) {
   var _options$staticDir;
 
@@ -77,25 +71,18 @@ async function buildStaticStandalone(options) {
     throw new Error("Won't copy root directory. Check your staticDirs!");
   }
 
-  options.outputDir = _path.default.isAbsolute(options.outputDir) ? options.outputDir : _path.default.join(process.cwd(), options.outputDir);
-  options.configDir = _path.default.resolve(options.configDir);
+  options.outputDir = (0, _path.isAbsolute)(options.outputDir) ? options.outputDir : (0, _path.join)(process.cwd(), options.outputDir);
+  options.configDir = (0, _path.resolve)(options.configDir);
   /* eslint-enable no-param-reassign */
 
-  var defaultFavIcon = require.resolve('@storybook/core-server/public/favicon.ico');
-
-  _nodeLogger.logger.info((0, _chalk.default)`=> Cleaning outputDir: {cyan ${options.outputDir}}`);
+  _nodeLogger.logger.info((0, _chalk.default)`=> Cleaning outputDir: {cyan ${options.outputDir.replace(process.cwd(), '')}}`);
 
   if (options.outputDir === '/') {
     throw new Error("Won't remove directory '/'. Check your outputDir!");
   }
 
-  await _fsExtra.default.emptyDir(options.outputDir);
-  await (0, _cpy.default)(defaultFavIcon, options.outputDir);
-
-  var _await$import = await Promise.resolve().then(function () {
-    return _interopRequireWildcard(require('@storybook/manager-webpack5/prebuilt-manager'));
-  }),
-      getPrebuiltDir = _await$import.getPrebuiltDir;
+  await (0, _fsExtra.emptyDir)(options.outputDir);
+  await (0, _fsExtra.ensureDir)(options.outputDir);
 
   var _loadMainConfig = (0, _coreCommon.loadMainConfig)(options),
       framework = _loadMainConfig.framework;
@@ -124,13 +111,25 @@ async function buildStaticStandalone(options) {
       managerBuilder = _await$getBuilders2[1];
 
   presets = (0, _coreCommon.loadAllPresets)(_objectSpread({
-    corePresets: [require.resolve('./presets/common-preset'), ...managerBuilder.corePresets, ...previewBuilder.corePresets, ...corePresets, require.resolve('./presets/babel-cache-preset')],
-    overridePresets: previewBuilder.overridePresets
+    corePresets: [require.resolve('./presets/common-preset'), ...(managerBuilder.corePresets || []), ...(previewBuilder.corePresets || []), ...corePresets, require.resolve('./presets/babel-cache-preset')],
+    overridePresets: previewBuilder.overridePresets || []
   }, options));
-  var staticDirs = await presets.apply('staticDirs');
+
+  var _await$Promise$all = await Promise.all([presets.apply('features'), presets.apply('core'), presets.apply('staticDirs'), presets.apply('storyIndexers', []), presets.apply('stories')]),
+      _await$Promise$all2 = _slicedToArray(_await$Promise$all, 5),
+      features = _await$Promise$all2[0],
+      core = _await$Promise$all2[1],
+      staticDirs = _await$Promise$all2[2],
+      storyIndexers = _await$Promise$all2[3],
+      stories = _await$Promise$all2[4];
+
+  var fullOptions = _objectSpread(_objectSpread({}, options), {}, {
+    presets: presets,
+    features: features
+  });
 
   if (staticDirs && options.staticDir) {
-    throw new Error((0, _tsDedent.default)`
+    throw new Error((0, _tsDedent.dedent)`
       Conflict when trying to read staticDirs:
       * Storybook's configuration option: 'staticDirs'
       * Storybook's CLI flag: '--staticDir' or '-s'
@@ -139,17 +138,23 @@ async function buildStaticStandalone(options) {
     `);
   }
 
+  var effects = [];
+  _global.default.FEATURES = features;
+  await managerBuilder.build({
+    startTime: process.hrtime(),
+    options: fullOptions
+  });
+
   if (staticDirs) {
-    await (0, _copyAllStaticFiles.copyAllStaticFilesRelativeToMain)(staticDirs, options.outputDir, options.configDir);
+    effects.push((0, _copyAllStaticFiles.copyAllStaticFilesRelativeToMain)(staticDirs, options.outputDir, options.configDir));
   }
 
   if (options.staticDir) {
-    await (0, _copyAllStaticFiles.copyAllStaticFiles)(options.staticDir, options.outputDir);
+    effects.push((0, _copyAllStaticFiles.copyAllStaticFiles)(options.staticDir, options.outputDir));
   }
 
-  var features = await presets.apply('features');
-  _global.default.FEATURES = features;
-  var extractTasks = [];
+  var coreServerPublicDir = (0, _path.join)((0, _path.dirname)(require.resolve('@storybook/core-server/package.json')), 'public');
+  effects.push((0, _fsExtra.copy)(coreServerPublicDir, options.outputDir));
   var initializedStoryIndexGenerator = Promise.resolve(undefined);
 
   if ((features !== null && features !== void 0 && features.buildStoriesJson || features !== null && features !== void 0 && features.storyStoreV7) && !options.ignorePreview) {
@@ -158,23 +163,21 @@ async function buildStaticStandalone(options) {
       configDir: options.configDir,
       workingDir: workingDir
     };
-    var normalizedStories = (0, _coreCommon.normalizeStories)(await presets.apply('stories'), directories);
-    var storyIndexers = await presets.apply('storyIndexers', []);
+    var normalizedStories = (0, _coreCommon.normalizeStories)(stories, directories);
     var generator = new _StoryIndexGenerator.StoryIndexGenerator(normalizedStories, _objectSpread(_objectSpread({}, directories), {}, {
       storyIndexers: storyIndexers,
       storiesV2Compatibility: !(features !== null && features !== void 0 && features.breakingChangesV7) && !(features !== null && features !== void 0 && features.storyStoreV7),
-      storyStoreV7: features === null || features === void 0 ? void 0 : features.storyStoreV7
+      storyStoreV7: !!(features !== null && features !== void 0 && features.storyStoreV7)
     }));
     initializedStoryIndexGenerator = generator.initialize().then(function () {
       return generator;
     });
-    extractTasks.push((0, _storiesJson.extractStoriesJson)(_path.default.join(options.outputDir, 'stories.json'), initializedStoryIndexGenerator));
+    effects.push((0, _storiesJson.extractStoriesJson)((0, _path.join)(options.outputDir, 'stories.json'), initializedStoryIndexGenerator, _storiesJson.convertToIndexV3));
+    effects.push((0, _storiesJson.extractStoriesJson)((0, _path.join)(options.outputDir, 'index.json'), initializedStoryIndexGenerator));
   }
 
-  var core = await presets.apply('core');
-
   if (!(core !== null && core !== void 0 && core.disableTelemetry)) {
-    initializedStoryIndexGenerator.then(async function (generator) {
+    effects.push(initializedStoryIndexGenerator.then(async function (generator) {
       if (!generator) {
         return;
       }
@@ -182,65 +185,37 @@ async function buildStaticStandalone(options) {
       var storyIndex = await generator.getIndex();
       var payload = storyIndex ? {
         storyIndex: {
-          storyCount: Object.keys(storyIndex.stories).length,
+          storyCount: Object.keys(storyIndex.entries).length,
           version: storyIndex.v
         }
       } : undefined;
-      (0, _telemetry.telemetry)('build', payload, {
+      await (0, _telemetry.telemetry)('build', payload, {
         configDir: options.configDir
       });
-    });
+    }));
   }
 
   if (!(core !== null && core !== void 0 && core.disableProjectJson)) {
-    extractTasks.push((0, _metadata.extractStorybookMetadata)(_path.default.join(options.outputDir, 'project.json'), options.configDir));
+    effects.push((0, _metadata.extractStorybookMetadata)((0, _path.join)(options.outputDir, 'project.json'), options.configDir));
   }
 
-  var fullOptions = _objectSpread(_objectSpread({}, options), {}, {
-    presets: presets,
-    features: features
-  });
-
   if (options.debugWebpack) {
     (0, _coreCommon.logConfig)('Preview webpack config', await previewBuilder.getConfig(fullOptions));
-    (0, _coreCommon.logConfig)('Manager webpack config', await managerBuilder.getConfig(fullOptions));
   }
 
-  var prebuiltDir = await getPrebuiltDir(fullOptions);
-  var startTime = process.hrtime(); // When using the prebuilt manager, we straight up copy it into the outputDir instead of building it
-
-  var manager = prebuiltDir ? (0, _cpy.default)('**', options.outputDir, {
-    cwd: prebuiltDir,
-    parents: true
-  }).then(function () {}) : managerBuilder.build({
-    startTime: startTime,
-    options: fullOptions
-  });
-
   if (options.ignorePreview) {
     _nodeLogger.logger.info(`=> Not building preview`);
   }
 
-  var preview = options.ignorePreview ? Promise.resolve() : previewBuilder.build({
-    startTime: startTime,
+  await Promise.all([...(options.ignorePreview ? [] : [previewBuilder.build({
+    startTime: process.hrtime(),
     options: fullOptions
-  });
-
-  var _await$Promise$all = await Promise.all([manager.catch(async function (err) {
-    await (previewBuilder === null || previewBuilder === void 0 ? void 0 : previewBuilder.bail());
-    throw err;
-  }), preview.catch(async function (err) {
-    await (managerBuilder === null || managerBuilder === void 0 ? void 0 : managerBuilder.bail());
-    throw err;
-  }), ...extractTasks]),
-      _await$Promise$all2 = _slicedToArray(_await$Promise$all, 2),
-      managerStats = _await$Promise$all2[0],
-      previewStats = _await$Promise$all2[1];
-
-  if (options.webpackStatsJson) {
-    var target = options.webpackStatsJson === true ? options.outputDir : options.webpackStatsJson;
-    await (0, _outputStats.outputStats)(target, previewStats, managerStats);
-  }
+  }).then(async function (previewStats) {
+    if (options.webpackStatsJson) {
+      var target = options.webpackStatsJson === true ? options.outputDir : options.webpackStatsJson;
+      await (0, _outputStats.outputStats)(target, previewStats);
+    }
+  })]), ...effects]);
 
   _nodeLogger.logger.info(`=> Output directory: ${options.outputDir}`);
 }

package/dist/cjs/dev-server.js

@@ -121,7 +121,7 @@ async function storybookDevServer(options) {
       var storyIndex = await generator.getIndex();
       var payload = storyIndex ? {
         storyIndex: {
-          storyCount: Object.keys(storyIndex.stories).length,
+          storyCount: Object.keys(storyIndex.entries).length,
           version: storyIndex.v
         }
       } : undefined;
@@ -191,7 +191,6 @@ async function storybookDevServer(options) {
 
   if (options.debugWebpack) {
     (0, _coreCommon.logConfig)('Preview webpack config', await previewBuilder.getConfig(options));
-    (0, _coreCommon.logConfig)('Manager webpack config', await managerBuilder.getConfig(options));
   }
 
   var preview = options.ignorePreview ? Promise.resolve() : previewBuilder.start({

package/dist/cjs/index.js

@@ -5,23 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {
   getPreviewHeadTemplate: true,
-  getManagerHeadTemplate: true,
-  getManagerMainTemplate: true,
   getPreviewBodyTemplate: true,
   getPreviewMainTemplate: true
 };
-Object.defineProperty(exports, "getManagerHeadTemplate", {
-  enumerable: true,
-  get: function () {
-    return _coreCommon.getManagerHeadTemplate;
-  }
-});
-Object.defineProperty(exports, "getManagerMainTemplate", {
-  enumerable: true,
-  get: function () {
-    return _coreCommon.getManagerMainTemplate;
-  }
-});
 Object.defineProperty(exports, "getPreviewBodyTemplate", {
   enumerable: true,
   get: function () {

package/dist/cjs/presets/common-preset.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.typescript = exports.storyIndexers = exports.previewMainTemplate = exports.previewHead = exports.previewEntries = exports.previewBody = exports.managerMainTemplate = exports.logLevel = exports.features = exports.env = exports.core = exports.config = exports.babel = void 0;
+exports.typescript = exports.title = exports.storyIndexers = exports.previewMainTemplate = exports.previewHead = exports.previewEntries = exports.previewBody = exports.logLevel = exports.features = exports.env = exports.core = exports.config = exports.babel = void 0;
 
 require("core-js/modules/es.promise.js");
 
@@ -22,18 +22,17 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var babel = async function (_, options) {
-  var _options$features;
-
   var presets = options.presets;
+  return presets.apply('babelDefault', {}, options);
+};
 
-  if ((_options$features = options.features) !== null && _options$features !== void 0 && _options$features.babelModeV7) {
-    return presets.apply('babelDefault', {}, options);
-  }
+exports.babel = babel;
 
-  return presets.apply('babelDefault', (0, _coreCommon.getStorybookBabelConfig)(), options);
+var title = function (previous, options) {
+  return previous || options.packageJson.name || false;
 };
 
-exports.babel = babel;
+exports.title = title;
 
 var logLevel = function (previous, options) {
   return previous || options.loglevel || 'info';
@@ -75,12 +74,6 @@ var previewMainTemplate = function () {
 
 exports.previewMainTemplate = previewMainTemplate;
 
-var managerMainTemplate = function () {
-  return (0, _coreCommon.getManagerMainTemplate)();
-};
-
-exports.managerMainTemplate = managerMainTemplate;
-
 var previewEntries = function (entries = []) {
   entries.push(require.resolve('@storybook/core-client/dist/esm/globals/globals'));
   return entries;
@@ -155,7 +148,6 @@ var features = async function (existing) {
     warnOnLegacyHierarchySeparator: true,
     buildStoriesJson: false,
     storyStoreV7: true,
-    modernInlineRender: true,
     breakingChangesV7: true,
     interactionsDebugger: false,
     babelModeV7: true,