@storybook/core-server 6.4.0-beta.23 → 6.4.0-beta.27

package/dist/cjs/build-dev.js

@@ -96,6 +96,7 @@ async function buildDevStandalone(options) {
   options.configType = 'DEVELOPMENT';
   options.configDir = _path.default.resolve(options.configDir);
   options.outputDir = options.smokeTest ? (0, _coreCommon.resolvePathInStorybookCache)('public') : _path.default.resolve(options.outputDir || (0, _coreCommon.resolvePathInStorybookCache)('public'));
+  options.serverChannelUrl = (0, _serverAddress.getServerChannelUrl)(port, options);
   /* eslint-enable no-param-reassign */
 
   var previewBuilder = await (0, _getPreviewBuilder.getPreviewBuilder)(options.configDir);

package/dist/cjs/build-static.js

@@ -18,6 +18,8 @@ var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
 var _path = _interopRequireDefault(require("path"));
 
+var _tsDedent = _interopRequireDefault(require("ts-dedent"));
+
 var _nodeLogger = require("@storybook/node-logger");
 
 var _coreCommon = require("@storybook/core-common");
@@ -90,13 +92,32 @@ async function buildStaticStandalone(options) {
 
   await _fsExtra.default.emptyDir(options.outputDir);
   await (0, _cpy.default)(defaultFavIcon, options.outputDir);
-  await (0, _copyAllStaticFiles.copyAllStaticFiles)(options.staticDir, options.outputDir);
   var previewBuilder = await (0, _getPreviewBuilder.getPreviewBuilder)(options.configDir);
   var managerBuilder = await (0, _getManagerBuilder.getManagerBuilder)(options.configDir);
   var presets = (0, _coreCommon.loadAllPresets)(_objectSpread({
     corePresets: [require.resolve('./presets/common-preset'), ...managerBuilder.corePresets, ...previewBuilder.corePresets, require.resolve('./presets/babel-cache-preset')],
     overridePresets: previewBuilder.overridePresets
   }, options));
+  var staticDirs = await presets.apply('staticDirs');
+
+  if (staticDirs && options.staticDir) {
+    throw new Error((0, _tsDedent.default)`
+      Conflict when trying to read staticDirs:
+      * Storybook's configuration option: 'staticDirs'
+      * Storybook's CLI flag: '--staticDir' or '-s'
+      
+      Choose one of them, but not both.
+    `);
+  }
+
+  if (staticDirs) {
+    await (0, _copyAllStaticFiles.copyAllStaticFilesRelativeToMain)(staticDirs, options.outputDir, options.configDir);
+  }
+
+  if (options.staticDir) {
+    await (0, _copyAllStaticFiles.copyAllStaticFiles)(options.staticDir, options.outputDir);
+  }
+
   var features = await presets.apply('features');
 
   if (features !== null && features !== void 0 && features.buildStoriesJson || features !== null && features !== void 0 && features.storyStoreV7) {

package/dist/cjs/cli/utils.js

@@ -32,14 +32,32 @@ function getEnvConfig(program, configEnv) {
   });
 }
 
-var warnDLLsDeprecated = (0, _utilDeprecate.default)(function () {}, (0, _tsDedent.default)`
+var warnDeprecatedFlag = function (message) {
+  return (0, _utilDeprecate.default)(function () {}, (0, _tsDedent.default)(message));
+};
+
+var warnDLLsDeprecated = warnDeprecatedFlag(`
     DLL-related CLI flags are deprecated, see:
     
     https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-dll-flags
   `);
+var warnStaticDirDeprecated = warnDeprecatedFlag(`
+    --static-dir CLI flag is deprecated, see:
+
+    https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-static-dir-flag
+  `);
 
-function checkDeprecatedFlags(options) {
-  if (!options.dll || options.uiDll || options.docsDll) {
+function checkDeprecatedFlags({
+  dll: dll,
+  uiDll: uiDll,
+  docsDll: docsDll,
+  staticDir: staticDir
+}) {
+  if (!dll || uiDll || docsDll) {
     warnDLLsDeprecated();
   }
+
+  if (staticDir) {
+    warnStaticDirDeprecated();
+  }
 }

package/dist/cjs/dev-server.js

@@ -26,6 +26,8 @@ var _serverStatics = require("./utils/server-statics");
 
 var _storiesJson = require("./utils/stories-json");
 
+var _getServerChannel = require("./utils/get-server-channel");
+
 var _openInBrowser = require("./utils/open-in-browser");
 
 var _getPreviewBuilder = require("./utils/get-preview-builder");
@@ -58,6 +60,7 @@ async function storybookDevServer(options) {
   var startTime = process.hrtime();
   var app = (0, _express.default)();
   var server = await (0, _serverInit.getServer)(app, options);
+  var serverChannel = (0, _getServerChannel.getServerChannel)(server);
   app.use((0, _compression.default)({
     level: 1
   }));
@@ -76,7 +79,7 @@ async function storybookDevServer(options) {
   var features = await options.presets.apply('features');
 
   if (features !== null && features !== void 0 && features.buildStoriesJson || features !== null && features !== void 0 && features.storyStoreV7) {
-    await (0, _storiesJson.useStoriesJson)(router, options);
+    await (0, _storiesJson.useStoriesJson)(router, serverChannel, options);
   }
 
   (0, _middleware.getMiddleware)(options.configDir)(router);

package/dist/cjs/utils/copy-all-static-files.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.copyAllStaticFiles = copyAllStaticFiles;
+exports.copyAllStaticFilesRelativeToMain = copyAllStaticFilesRelativeToMain;
 
 require("core-js/modules/es.promise.js");
 
@@ -15,6 +16,8 @@ var _path = _interopRequireDefault(require("path"));
 
 var _nodeLogger = require("@storybook/node-logger");
 
+var _coreCommon = require("@storybook/core-common");
+
 var _serverStatics = require("./server-statics");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -50,4 +53,34 @@ async function copyAllStaticFiles(staticDirs, outputDir) {
       }
     }));
   }
+}
+
+async function copyAllStaticFilesRelativeToMain(staticDirs, outputDir, configDir) {
+  staticDirs.forEach(async function (dir) {
+    var staticDirAndTarget = typeof dir === 'string' ? dir : `${dir.from}:${dir.to}`;
+
+    var _await$parseStaticDir2 = await (0, _serverStatics.parseStaticDir)((0, _coreCommon.getDirectoryFromWorkingDir)({
+      configDir: configDir,
+      workingDir: process.cwd(),
+      directory: staticDirAndTarget
+    })),
+        from = _await$parseStaticDir2.staticPath,
+        to = _await$parseStaticDir2.targetEndpoint;
+
+    var targetPath = _path.default.join(outputDir, to);
+
+    var skipPaths = ['index.html', 'iframe.html'].map(function (f) {
+      return _path.default.join(targetPath, f);
+    });
+
+    _nodeLogger.logger.info((0, _chalk.default)`=> Copying static files: {cyan ${from}} at {cyan ${targetPath}}`);
+
+    await _fsExtra.default.copy(from, targetPath, {
+      dereference: true,
+      preserveTimestamps: true,
+      filter: function (_, dest) {
+        return !skipPaths.includes(dest);
+      }
+    });
+  });
 }

package/dist/cjs/utils/get-server-channel.js

@@ -0,0 +1,47 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getServerChannel = getServerChannel;
+exports.ServerChannel = void 0;
+
+var _ws = _interopRequireWildcard(require("ws"));
+
+var _telejson = require("telejson");
+
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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; }
+
+class ServerChannel {
+  constructor(server) {
+    this.webSocketServer = void 0;
+    this.webSocketServer = new _ws.WebSocketServer({
+      server: server
+    });
+  }
+
+  emit(type, args = []) {
+    var event = {
+      type: type,
+      args: args
+    };
+    var data = (0, _telejson.stringify)(event, {
+      maxDepth: 15,
+      allowFunction: true
+    });
+    Array.from(this.webSocketServer.clients).filter(function (c) {
+      return c.readyState === _ws.default.OPEN;
+    }).forEach(function (client) {
+      return client.send(data);
+    });
+  }
+
+}
+
+exports.ServerChannel = ServerChannel;
+
+function getServerChannel(server) {
+  return new ServerChannel(server);
+}

package/dist/cjs/utils/server-address.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getServerAddresses = getServerAddresses;
-exports.getServerPort = void 0;
+exports.getServerChannelUrl = exports.getServerPort = void 0;
 
 var _ip = _interopRequireDefault(require("ip"));
 
@@ -29,4 +29,12 @@ var getServerPort = function (port) {
   });
 };
 
-exports.getServerPort = getServerPort;
+exports.getServerPort = getServerPort;
+
+var getServerChannelUrl = function (port, {
+  https: https
+}) {
+  return `${https ? 'wss' : 'ws'}://localhost:${port}/`;
+};
+
+exports.getServerChannelUrl = getServerChannelUrl;

package/dist/cjs/utils/server-statics.js

@@ -12,6 +12,8 @@ require("core-js/modules/es.promise.js");
 
 var _nodeLogger = require("@storybook/node-logger");
 
+var _coreCommon = require("@storybook/core-common");
+
 var _chalk = _interopRequireDefault(require("chalk"));
 
 var _express = _interopRequireDefault(require("express"));
@@ -42,14 +44,43 @@ var defaultFavIcon = require.resolve('../public/favicon.ico');
 
 async function useStatics(router, options) {
   var hasCustomFavicon = false;
+  var staticDirs = await options.presets.apply('staticDirs', []);
+
+  if (staticDirs && options.staticDir) {
+    throw new Error((0, _tsDedent.default)`
+      Conflict when trying to read staticDirs:
+      * Storybook's configuration option: 'staticDirs'
+      * Storybook's CLI flag: '--staticDir' or '-s'
+      
+      Choose one of them, but not both.
+    `);
+  }
+
+  staticDirs.forEach(async function (dir) {
+    var staticDirAndTarget = typeof dir === 'string' ? dir : `${dir.from}:${dir.to}`;
+
+    var _await$parseStaticDir = await parseStaticDir((0, _coreCommon.getDirectoryFromWorkingDir)({
+      configDir: options.configDir,
+      workingDir: process.cwd(),
+      directory: staticDirAndTarget
+    })),
+        from = _await$parseStaticDir.staticPath,
+        to = _await$parseStaticDir.targetEndpoint;
+
+    _nodeLogger.logger.info((0, _chalk.default)`=> Serving static files from {cyan ${from}} at {cyan ${to}}`);
+
+    router.use(to, _express.default.static(from, {
+      index: false
+    }));
+  });
 
   if (options.staticDir && options.staticDir.length > 0) {
     await Promise.all(options.staticDir.map(async function (dir) {
       try {
-        var _await$parseStaticDir = await parseStaticDir(dir),
-            staticDir = _await$parseStaticDir.staticDir,
-            staticPath = _await$parseStaticDir.staticPath,
-            targetEndpoint = _await$parseStaticDir.targetEndpoint;
+        var _await$parseStaticDir2 = await parseStaticDir(dir),
+            staticDir = _await$parseStaticDir2.staticDir,
+            staticPath = _await$parseStaticDir2.staticPath,
+            targetEndpoint = _await$parseStaticDir2.targetEndpoint;
 
         _nodeLogger.logger.info((0, _chalk.default)`=> Serving static files from {cyan ${staticDir}} at {cyan ${targetEndpoint}}`);
 

package/dist/cjs/utils/stories-json.js

@@ -11,22 +11,19 @@ require("core-js/modules/es.promise.js");
 
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
-var _events = _interopRequireDefault(require("events"));
-
 var _coreCommon = require("@storybook/core-common");
 
+var _coreEvents = _interopRequireDefault(require("@storybook/core-events"));
+
 var _debounce = _interopRequireDefault(require("lodash/debounce"));
 
 var _StoryIndexGenerator = require("./StoryIndexGenerator");
 
 var _watchStorySpecifiers = require("./watch-story-specifiers");
 
-var _useEventsAsSse = require("./use-events-as-sse");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var INVALIDATE = 'INVALIDATE';
-var DEBOUNCE = 50;
+var DEBOUNCE = 100;
 exports.DEBOUNCE = DEBOUNCE;
 
 async function extractStoriesJson(outputFile, normalizedStories, options) {
@@ -36,7 +33,7 @@ async function extractStoriesJson(outputFile, normalizedStories, options) {
   await _fsExtra.default.writeJson(outputFile, index);
 }
 
-async function useStoriesJson(router, options, workingDir = process.cwd()) {
+async function useStoriesJson(router, serverChannel, options, workingDir = process.cwd()) {
   var normalizedStories = (0, _coreCommon.normalizeStories)(await options.presets.apply('stories'), {
     configDir: options.configDir,
     workingDir: workingDir
@@ -50,9 +47,8 @@ async function useStoriesJson(router, options, workingDir = process.cwd()) {
   // This is mainly for testing purposes.
 
   var started = false;
-  var invalidationEmitter = new _events.default();
   var maybeInvalidate = (0, _debounce.default)(function () {
-    return invalidationEmitter.emit(INVALIDATE);
+    return serverChannel.emit(_coreEvents.default.STORY_INDEX_INVALIDATED);
   }, DEBOUNCE, {
     leading: true
   });
@@ -69,10 +65,8 @@ async function useStoriesJson(router, options, workingDir = process.cwd()) {
     await generator.initialize();
   }
 
-  var eventsAsSSE = (0, _useEventsAsSse.useEventsAsSSE)(invalidationEmitter, [INVALIDATE]);
   router.use('/stories.json', async function (req, res) {
     await ensureStarted();
-    if (eventsAsSSE(req, res)) return;
 
     try {
       var index = await generator.getIndex();

package/dist/esm/build-dev.js

@@ -29,7 +29,7 @@ import { getReleaseNotesData, getReleaseNotesFailedState } from './utils/release
 import { outputStats } from './utils/output-stats';
 import { outputStartupInformation } from './utils/output-startup-information';
 import { updateCheck } from './utils/update-check';
-import { getServerPort } from './utils/server-address';
+import { getServerPort, getServerChannelUrl } from './utils/server-address';
 import { getPreviewBuilder } from './utils/get-preview-builder';
 import { getManagerBuilder } from './utils/get-manager-builder';
 export async function buildDevStandalone(options) {
@@ -70,6 +70,7 @@ export async function buildDevStandalone(options) {
   options.configType = 'DEVELOPMENT';
   options.configDir = path.resolve(options.configDir);
   options.outputDir = options.smokeTest ? resolvePathInStorybookCache('public') : path.resolve(options.outputDir || resolvePathInStorybookCache('public'));
+  options.serverChannelUrl = getServerChannelUrl(port, options);
   /* eslint-enable no-param-reassign */
 
   var previewBuilder = await getPreviewBuilder(options.configDir);

package/dist/esm/build-static.js

@@ -26,11 +26,12 @@ import chalk from 'chalk';
 import cpy from 'cpy';
 import fs from 'fs-extra';
 import path from 'path';
+import dedent from 'ts-dedent';
 import { logger } from '@storybook/node-logger';
 import { loadAllPresets, cache, normalizeStories, logConfig } from '@storybook/core-common';
 import { getProdCli } from './cli';
 import { outputStats } from './utils/output-stats';
-import { copyAllStaticFiles } from './utils/copy-all-static-files';
+import { copyAllStaticFiles, copyAllStaticFilesRelativeToMain } from './utils/copy-all-static-files';
 import { getPreviewBuilder } from './utils/get-preview-builder';
 import { getManagerBuilder } from './utils/get-manager-builder';
 import { extractStoriesJson } from './utils/stories-json';
@@ -62,13 +63,32 @@ export async function buildStaticStandalone(options) {
 
   await fs.emptyDir(options.outputDir);
   await cpy(defaultFavIcon, options.outputDir);
-  await copyAllStaticFiles(options.staticDir, options.outputDir);
   var previewBuilder = await getPreviewBuilder(options.configDir);
   var managerBuilder = await getManagerBuilder(options.configDir);
   var presets = loadAllPresets(_objectSpread({
     corePresets: [require.resolve('./presets/common-preset'), ...managerBuilder.corePresets, ...previewBuilder.corePresets, require.resolve('./presets/babel-cache-preset')],
     overridePresets: previewBuilder.overridePresets
   }, options));
+  var staticDirs = await presets.apply('staticDirs');
+
+  if (staticDirs && options.staticDir) {
+    throw new Error(dedent`
+      Conflict when trying to read staticDirs:
+      * Storybook's configuration option: 'staticDirs'
+      * Storybook's CLI flag: '--staticDir' or '-s'
+      
+      Choose one of them, but not both.
+    `);
+  }
+
+  if (staticDirs) {
+    await copyAllStaticFilesRelativeToMain(staticDirs, options.outputDir, options.configDir);
+  }
+
+  if (options.staticDir) {
+    await copyAllStaticFiles(options.staticDir, options.outputDir);
+  }
+
   var features = await presets.apply('features');
 
   if (features !== null && features !== void 0 && features.buildStoriesJson || features !== null && features !== void 0 && features.storyStoreV7) {

package/dist/esm/cli/utils.js

@@ -17,13 +17,32 @@ export function getEnvConfig(program, configEnv) {
     }
   });
 }
-var warnDLLsDeprecated = deprecate(function () {}, dedent`
+
+var warnDeprecatedFlag = function (message) {
+  return deprecate(function () {}, dedent(message));
+};
+
+var warnDLLsDeprecated = warnDeprecatedFlag(`
     DLL-related CLI flags are deprecated, see:
     
     https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-dll-flags
   `);
-export function checkDeprecatedFlags(options) {
-  if (!options.dll || options.uiDll || options.docsDll) {
+var warnStaticDirDeprecated = warnDeprecatedFlag(`
+    --static-dir CLI flag is deprecated, see:
+
+    https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-static-dir-flag
+  `);
+export function checkDeprecatedFlags({
+  dll: dll,
+  uiDll: uiDll,
+  docsDll: docsDll,
+  staticDir: staticDir
+}) {
+  if (!dll || uiDll || docsDll) {
     warnDLLsDeprecated();
   }
+
+  if (staticDir) {
+    warnStaticDirDeprecated();
+  }
 }

package/dist/esm/dev-server.js

@@ -20,6 +20,7 @@ import { getServerAddresses } from './utils/server-address';
 import { getServer } from './utils/server-init';
 import { useStatics } from './utils/server-statics';
 import { useStoriesJson } from './utils/stories-json';
+import { getServerChannel } from './utils/get-server-channel';
 import { openInBrowser } from './utils/open-in-browser';
 import { getPreviewBuilder } from './utils/get-preview-builder';
 import { getManagerBuilder } from './utils/get-manager-builder'; // @ts-ignore
@@ -29,6 +30,7 @@ export async function storybookDevServer(options) {
   var startTime = process.hrtime();
   var app = express();
   var server = await getServer(app, options);
+  var serverChannel = getServerChannel(server);
   app.use(compression({
     level: 1
   }));
@@ -47,7 +49,7 @@ export async function storybookDevServer(options) {
   var features = await options.presets.apply('features');
 
   if (features !== null && features !== void 0 && features.buildStoriesJson || features !== null && features !== void 0 && features.storyStoreV7) {
-    await useStoriesJson(router, options);
+    await useStoriesJson(router, serverChannel, options);
   }
 
   getMiddleware(options.configDir)(router);

package/dist/esm/utils/copy-all-static-files.js

@@ -3,6 +3,7 @@ import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';
 import { logger } from '@storybook/node-logger';
+import { getDirectoryFromWorkingDir } from '@storybook/core-common';
 import { parseStaticDir } from './server-statics';
 export async function copyAllStaticFiles(staticDirs, outputDir) {
   if (staticDirs && staticDirs.length > 0) {
@@ -32,4 +33,30 @@ export async function copyAllStaticFiles(staticDirs, outputDir) {
       }
     }));
   }
+}
+export async function copyAllStaticFilesRelativeToMain(staticDirs, outputDir, configDir) {
+  staticDirs.forEach(async function (dir) {
+    var staticDirAndTarget = typeof dir === 'string' ? dir : `${dir.from}:${dir.to}`;
+
+    var _await$parseStaticDir2 = await parseStaticDir(getDirectoryFromWorkingDir({
+      configDir: configDir,
+      workingDir: process.cwd(),
+      directory: staticDirAndTarget
+    })),
+        from = _await$parseStaticDir2.staticPath,
+        to = _await$parseStaticDir2.targetEndpoint;
+
+    var targetPath = path.join(outputDir, to);
+    var skipPaths = ['index.html', 'iframe.html'].map(function (f) {
+      return path.join(targetPath, f);
+    });
+    logger.info(chalk`=> Copying static files: {cyan ${from}} at {cyan ${targetPath}}`);
+    await fs.copy(from, targetPath, {
+      dereference: true,
+      preserveTimestamps: true,
+      filter: function (_, dest) {
+        return !skipPaths.includes(dest);
+      }
+    });
+  });
 }

package/dist/esm/utils/get-server-channel.js

@@ -0,0 +1,30 @@
+import WebSocket, { WebSocketServer } from 'ws';
+import { stringify } from 'telejson';
+export class ServerChannel {
+  constructor(server) {
+    this.webSocketServer = void 0;
+    this.webSocketServer = new WebSocketServer({
+      server: server
+    });
+  }
+
+  emit(type, args = []) {
+    var event = {
+      type: type,
+      args: args
+    };
+    var data = stringify(event, {
+      maxDepth: 15,
+      allowFunction: true
+    });
+    Array.from(this.webSocketServer.clients).filter(function (c) {
+      return c.readyState === WebSocket.OPEN;
+    }).forEach(function (client) {
+      return client.send(data);
+    });
+  }
+
+}
+export function getServerChannel(server) {
+  return new ServerChannel(server);
+}

package/dist/esm/utils/server-address.js

@@ -12,4 +12,9 @@ export var getServerPort = function (port) {
     logger.error(error);
     process.exit(-1);
   });
+};
+export var getServerChannelUrl = function (port, {
+  https: https
+}) {
+  return `${https ? 'wss' : 'ws'}://localhost:${port}/`;
 };

package/dist/esm/utils/server-statics.js

@@ -13,6 +13,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import "core-js/modules/es.promise.js";
 import "core-js/modules/es.symbol.description.js";
 import { logger } from '@storybook/node-logger';
+import { getDirectoryFromWorkingDir } from '@storybook/core-common';
 import chalk from 'chalk';
 import express from 'express';
 import { pathExists } from 'fs-extra';
@@ -24,14 +25,42 @@ var defaultFavIcon = require.resolve('../public/favicon.ico');
 
 export async function useStatics(router, options) {
   var hasCustomFavicon = false;
+  var staticDirs = await options.presets.apply('staticDirs', []);
+
+  if (staticDirs && options.staticDir) {
+    throw new Error(dedent`
+      Conflict when trying to read staticDirs:
+      * Storybook's configuration option: 'staticDirs'
+      * Storybook's CLI flag: '--staticDir' or '-s'
+      
+      Choose one of them, but not both.
+    `);
+  }
+
+  staticDirs.forEach(async function (dir) {
+    var staticDirAndTarget = typeof dir === 'string' ? dir : `${dir.from}:${dir.to}`;
+
+    var _await$parseStaticDir = await parseStaticDir(getDirectoryFromWorkingDir({
+      configDir: options.configDir,
+      workingDir: process.cwd(),
+      directory: staticDirAndTarget
+    })),
+        from = _await$parseStaticDir.staticPath,
+        to = _await$parseStaticDir.targetEndpoint;
+
+    logger.info(chalk`=> Serving static files from {cyan ${from}} at {cyan ${to}}`);
+    router.use(to, express.static(from, {
+      index: false
+    }));
+  });
 
   if (options.staticDir && options.staticDir.length > 0) {
     await Promise.all(options.staticDir.map(async function (dir) {
       try {
-        var _await$parseStaticDir = await parseStaticDir(dir),
-            staticDir = _await$parseStaticDir.staticDir,
-            staticPath = _await$parseStaticDir.staticPath,
-            targetEndpoint = _await$parseStaticDir.targetEndpoint;
+        var _await$parseStaticDir2 = await parseStaticDir(dir),
+            staticDir = _await$parseStaticDir2.staticDir,
+            staticPath = _await$parseStaticDir2.staticPath,
+            targetEndpoint = _await$parseStaticDir2.targetEndpoint;
 
         logger.info(chalk`=> Serving static files from {cyan ${staticDir}} at {cyan ${targetEndpoint}}`);
         router.use(targetEndpoint, express.static(staticPath, {

package/dist/esm/utils/stories-json.js

@@ -1,20 +1,18 @@
 import "core-js/modules/es.promise.js";
 import fs from 'fs-extra';
-import EventEmitter from 'events';
 import { normalizeStories } from '@storybook/core-common';
+import Events from '@storybook/core-events';
 import debounce from 'lodash/debounce';
 import { StoryIndexGenerator } from './StoryIndexGenerator';
 import { watchStorySpecifiers } from './watch-story-specifiers';
-import { useEventsAsSSE } from './use-events-as-sse';
-var INVALIDATE = 'INVALIDATE';
-export var DEBOUNCE = 50;
+export var DEBOUNCE = 100;
 export async function extractStoriesJson(outputFile, normalizedStories, options) {
   var generator = new StoryIndexGenerator(normalizedStories, options);
   await generator.initialize();
   var index = await generator.getIndex();
   await fs.writeJson(outputFile, index);
 }
-export async function useStoriesJson(router, options, workingDir = process.cwd()) {
+export async function useStoriesJson(router, serverChannel, options, workingDir = process.cwd()) {
   var normalizedStories = normalizeStories(await options.presets.apply('stories'), {
     configDir: options.configDir,
     workingDir: workingDir
@@ -28,9 +26,8 @@ export async function useStoriesJson(router, options, workingDir = process.cwd()
   // This is mainly for testing purposes.
 
   var started = false;
-  var invalidationEmitter = new EventEmitter();
   var maybeInvalidate = debounce(function () {
-    return invalidationEmitter.emit(INVALIDATE);
+    return serverChannel.emit(Events.STORY_INDEX_INVALIDATED);
   }, DEBOUNCE, {
     leading: true
   });
@@ -47,10 +44,8 @@ export async function useStoriesJson(router, options, workingDir = process.cwd()
     await generator.initialize();
   }
 
-  var eventsAsSSE = useEventsAsSSE(invalidationEmitter, [INVALIDATE]);
   router.use('/stories.json', async function (req, res) {
     await ensureStarted();
-    if (eventsAsSSE(req, res)) return;
 
     try {
       var index = await generator.getIndex();