@storybook/core-common 6.4.0-beta.3 → 6.4.0-beta.7

package/dist/cjs/utils/glob-to-regexp.js

@@ -0,0 +1,32 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.globToRegex = globToRegex;
+
+var _micromatch = require("micromatch");
+
+function globToRegex(glob) {
+  var regex = (0, _micromatch.makeRe)(glob, {
+    fastpaths: false,
+    noglobstar: false,
+    bash: false
+  });
+
+  if (!regex.source.startsWith('^')) {
+    throw new Error(`Invalid glob: >> ${glob} >> ${regex}`);
+  }
+
+  if (!glob.startsWith('./')) {
+    return regex;
+  } // makeRe is sort of funny. If you pass it a directory starting with `./` it
+  // creates a matcher that expects files with no prefix (e.g. `src/file.js`)
+  // but if you pass it a directory that starts with `../` it expects files that
+  // start with `../`. Let's make it consistent.
+  // Globs starting `**` require special treatment due to the regex they
+  // produce, specifically a negative look-ahead
+
+
+  return new RegExp(['^\\.', glob.startsWith('./**') ? '' : '\\/', regex.source.substring(1)].join(''));
+}

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

@@ -3,12 +3,22 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.normalizeStories = exports.normalizeDirectory = exports.normalizeStoriesEntry = void 0;
+exports.normalizeStories = exports.normalizeStoriesEntry = void 0;
 
 var _fs = _interopRequireDefault(require("fs"));
 
 var _path = _interopRequireDefault(require("path"));
 
+var _utilDeprecate = _interopRequireDefault(require("util-deprecate"));
+
+var _tsDedent = _interopRequireDefault(require("ts-dedent"));
+
+var _micromatch = require("micromatch");
+
+var _slash = _interopRequireDefault(require("slash"));
+
+var _globToRegexp = require("./glob-to-regexp");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
@@ -17,11 +27,24 @@ 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 DEFAULT_FILES = '*.stories.@(mdx|tsx|ts|jsx|js)';
-var DEFAULT_TITLE_PREFIX = ''; // Escaping regexes for glob regexes is fun
-// Mathing things like '../**/*.stories.mdx'
+var DEFAULT_TITLE_PREFIX = '';
+var DEFAULT_FILES = '**/*.stories.@(mdx|tsx|ts|jsx|js)'; // LEGACY support for bad glob patterns we had in SB 5 - remove in SB7
+
+var fixBadGlob = (0, _utilDeprecate.default)(function (match) {
+  return match.input.replace(match[1], `@${match[1]}`);
+}, (0, _tsDedent.default)`
+    You have specified an invalid glob, we've attempted to fix it, please ensure that the glob you specify is valid. See: https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#correct-globs-in-mainjs
+  `);
 
-var GLOB_REGEX = /^(?<directory>[^*]*)\/\*\*\/(?<files>\*\..*)/;
+var detectBadGlob = function (val) {
+  var match = val.match(/\.(\([^)]+\))/);
+
+  if (match) {
+    return fixBadGlob(match);
+  }
+
+  return val;
+};
 
 var isDirectory = function (configDir, entry) {
   try {
@@ -31,87 +54,81 @@ var isDirectory = function (configDir, entry) {
   }
 };
 
-var normalizeStoriesEntry = function (entry, configDir) {
-  var glob;
-  var directory;
-  var files;
-  var titlePrefix;
+var normalizeStoriesEntry = function (entry, {
+  configDir: configDir,
+  workingDir: workingDir
+}) {
+  var specifierWithoutMatcher;
 
   if (typeof entry === 'string') {
-    if (!entry.includes('**') && isDirectory(configDir, entry)) {
-      directory = entry;
-      files = DEFAULT_FILES;
-      titlePrefix = DEFAULT_TITLE_PREFIX;
-    } else {
-      var match = entry.match(GLOB_REGEX);
-
-      if (match) {
-        directory = match.groups.directory;
-        files = match.groups.files;
-        titlePrefix = DEFAULT_TITLE_PREFIX;
+    if (!entry.includes('*')) {
+      if (isDirectory(configDir, entry)) {
+        specifierWithoutMatcher = {
+          titlePrefix: DEFAULT_TITLE_PREFIX,
+          directory: entry,
+          files: DEFAULT_FILES
+        };
       } else {
-        glob = entry;
+        specifierWithoutMatcher = {
+          titlePrefix: DEFAULT_TITLE_PREFIX,
+          directory: _path.default.dirname(entry),
+          files: _path.default.basename(entry)
+        };
       }
-    }
-  } else {
-    directory = entry.directory;
-    files = entry.files || DEFAULT_FILES;
-    titlePrefix = entry.titlePrefix || DEFAULT_TITLE_PREFIX;
-  }
+    } else {
+      var fixedEntry = detectBadGlob(entry);
+      var globResult = (0, _micromatch.scan)(fixedEntry);
 
-  if (typeof glob !== 'undefined') {
-    return {
-      glob: glob,
-      specifier: undefined
-    };
-  }
+      var _directory = globResult.isGlob ? globResult.prefix + globResult.base : _path.default.dirname(fixedEntry);
+
+      var filesFallback = _directory !== '.' ? fixedEntry.substr(_directory.length + 1) : fixedEntry;
 
-  return {
-    glob: `${directory}/**/${files}`,
-    specifier: {
-      directory: directory,
-      titlePrefix: titlePrefix,
-      files: files
+      var _files = globResult.isGlob ? globResult.glob : filesFallback;
+
+      specifierWithoutMatcher = {
+        titlePrefix: DEFAULT_TITLE_PREFIX,
+        directory: _directory,
+        files: _files
+      };
     }
-  };
-};
+  } else {
+    specifierWithoutMatcher = _objectSpread({
+      titlePrefix: DEFAULT_TITLE_PREFIX,
+      files: DEFAULT_FILES
+    }, entry);
+  } // We are going to be doing everything with node importPaths which use
+  // URL format, i.e. `/` as a separator, so let's make sure we've normalized
 
-exports.normalizeStoriesEntry = normalizeStoriesEntry;
 
-/**
- * Stories entries are specified relative to the configDir. Webpack filenames are produced relative to the
- * current working directory. This function rewrites the specifier.directory relative to the current working
- * directory.
- */
-var normalizeDirectory = function (entry, {
-  configDir: configDir,
-  workingDir: workingDir
-}) {
-  if (!entry.specifier) return entry;
-  var directory = entry.specifier.directory;
+  var files = (0, _slash.default)(specifierWithoutMatcher.files); // At this stage `directory` is relative to `main.js` (the config dir)
+  // We want to work relative to the working dir, so we transform it here.
 
-  var directoryFromConfig = _path.default.resolve(configDir, directory);
+  var _specifierWithoutMatc = specifierWithoutMatcher,
+      directoryRelativeToConfig = _specifierWithoutMatc.directory;
 
-  var directoryFromWorking = _path.default.relative(workingDir, directoryFromConfig); // relative('/foo', '/foo/src') => 'src'
-  // but we want `./src`to match webpack's file names
+  var absoluteDirectory = _path.default.resolve(configDir, directoryRelativeToConfig);
 
+  var directory = (0, _slash.default)(_path.default.relative(workingDir, absoluteDirectory)); // relative('/foo', '/foo/src') => 'src'
+  // but we want `./src` to match importPaths
 
-  if (!directoryFromWorking.startsWith('.')) {
-    directoryFromWorking = `.${_path.default.sep}${directoryFromWorking}`;
+  if (!directory.startsWith('.')) {
+    directory = `./${directory}`;
   }
 
-  return _objectSpread(_objectSpread({}, entry), {}, {
-    specifier: _objectSpread(_objectSpread({}, entry.specifier), {}, {
-      directory: directoryFromWorking
-    })
+  directory = directory.replace(/\/$/, ''); // Now make the importFn matcher.
+
+  var importPathMatcher = (0, _globToRegexp.globToRegex)(`${directory}/${files}`);
+  return _objectSpread(_objectSpread({}, specifierWithoutMatcher), {}, {
+    directory: directory,
+    importPathMatcher: importPathMatcher
   });
 };
 
-exports.normalizeDirectory = normalizeDirectory;
+exports.normalizeStoriesEntry = normalizeStoriesEntry;
 
 var normalizeStories = function (entries, options) {
   return entries.map(function (entry) {
-    return normalizeDirectory(normalizeStoriesEntry(entry, options.configDir), options);
+    return normalizeStoriesEntry(entry, options);
   });
 };
 

package/dist/cjs/utils/progress-reporting.js

@@ -35,6 +35,7 @@ var useProgressReporting = async function (router, startTime, options) {
     reportProgress = function (progress) {
       if (closed || response.writableEnded) return;
       response.write(`data: ${JSON.stringify(progress)}\n\n`);
+      response.flush();
       if (progress.value === 1) close();
     };
   });

package/dist/cjs/utils/to-importFn.js

@@ -8,30 +8,27 @@ exports.toImportFn = toImportFn;
 
 var _tsDedent = _interopRequireDefault(require("ts-dedent"));
 
-var _ = require("..");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function toImportFnPart(entry) {
-  var _toRequireContext = (0, _.toRequireContext)(entry.glob),
-      base = _toRequireContext.path,
-      regex = _toRequireContext.regex;
+function toImportFnPart(specifier) {
+  var directory = specifier.directory,
+      importPathMatcher = specifier.importPathMatcher; // It appears webpack passes *something* similar to the absolute path to the file
+  // on disk (prefixed with something unknown) to the matcher.
+  // We don't want to include the absolute path in our bundle, so we will just pull the
+  // '^' and any leading '.' off the regexp and match on that.
+  // It's imperfect as it could match extra things in extremely unusual cases, but it'll do for now.
 
-  var webpackIncludeRegex = new RegExp(regex.source.substring(1));
+  var webpackIncludeRegex = new RegExp(importPathMatcher.source.replace(/^\^\\\.*/, ''));
   return (0, _tsDedent.default)`
       async (path) => {
-        const pathBase = path.substring(0, ${base.length + 1});
-        if (pathBase !== '${base}/') {
+        if (!${importPathMatcher}.exec(path)) {
           return;
         }
 
-        const pathRemainder = path.substring(${base.length + 1});
-        if (!${regex}.exec(pathRemainder)) {
-          return;
-        }
+        const pathRemainder = path.substring(${directory.length + 1});
         return import(
           /* webpackInclude: ${webpackIncludeRegex} */
-          '${base}/' + pathRemainder
+          '${directory}/' + pathRemainder
         );
       }
 

package/dist/cjs/utils/to-require-context.js

@@ -5,92 +5,30 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.toRequireContextString = exports.toRequireContext = void 0;
 
-var _micromatch = require("micromatch");
-
-var _utilDeprecate = _interopRequireDefault(require("util-deprecate"));
-
-var _tsDedent = _interopRequireDefault(require("ts-dedent"));
-
-var _path = _interopRequireDefault(require("path"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// LEGACY support for bad glob patterns we had in SB 5 - remove in SB7
-var fixBadGlob = (0, _utilDeprecate.default)(function (match) {
-  return match.input.replace(match[1], `@${match[1]}`);
-}, (0, _tsDedent.default)`
-    You have specified an invalid glob, we've attempted to fix it, please ensure that the glob you specify is valid. See: https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#correct-globs-in-mainjs
-  `);
-
-var detectBadGlob = function (val) {
-  var match = val.match(/\.(\([^)]+\))/);
-
-  if (match) {
-    return fixBadGlob(match);
-  }
-
-  return val;
-};
-
-var isObject = function (val) {
-  return val != null && typeof val === 'object' && Array.isArray(val) === false;
-};
-
-var toRequireContext = function (input) {
-  var fixedInput = detectBadGlob(input);
-
-  switch (true) {
-    case typeof input === 'string':
-      {
-        var globResult = (0, _micromatch.scan)(fixedInput);
-        var base = globResult.isGlob ? globResult.prefix + globResult.base : _path.default.dirname(fixedInput);
-        var globFallback = base !== '.' ? fixedInput.substr(base.length + 1) : fixedInput;
-        var glob = globResult.isGlob ? globResult.glob : globFallback;
-        var regex = (0, _micromatch.makeRe)(glob, {
-          fastpaths: false,
-          noglobstar: false,
-          bash: false
-        });
-        var source = regex.source;
-
-        if (source.startsWith('^')) {
-          // webpack's require.context matches against paths starting `./`
-          // Globs starting `**` require special treatment due to the regex they
-          // produce, specifically a negative look-ahead
-          var match = ['^\\.', glob.startsWith('**') ? '' : '\\/', source.substring(1)].join('');
-          var recursive = glob.includes('**') || glob.split('/').length > 1;
-          return {
-            path: base,
-            recursive: recursive,
-            match: match,
-            regex: regex
-          };
-        }
-
-        throw new Error(`Invalid glob: >> ${input} >> ${regex}`);
-      }
-
-    case isObject(input):
-      {
-        return input;
-      }
-
-    default:
-      {
-        throw new Error('the provided input cannot be transformed into a require.context');
-      }
-  }
+var _globToRegexp = require("./glob-to-regexp");
+
+var toRequireContext = function (specifier) {
+  var directory = specifier.directory,
+      files = specifier.files; // The importPathMatcher is a `./`-prefixed matcher that includes the directory
+  // For `require.context()` we want the same thing, relative to directory
+
+  var match = (0, _globToRegexp.globToRegex)(`./${files}`);
+  return {
+    path: directory,
+    recursive: !!files.match(/^\*{1,2}\//),
+    match: match
+  };
 };
 
 exports.toRequireContext = toRequireContext;
 
-var toRequireContextString = function (input) {
-  var _toRequireContext = toRequireContext(input),
+var toRequireContextString = function (specifier) {
+  var _toRequireContext = toRequireContext(specifier),
       p = _toRequireContext.path,
       r = _toRequireContext.recursive,
       m = _toRequireContext.match;
 
-  var result = `require.context('${p}', ${r}, /${m}/)`;
+  var result = `require.context('${p}', ${r}, ${m})`;
   return result;
 };
 

package/dist/esm/utils/glob-to-regexp.js

@@ -0,0 +1,24 @@
+import { makeRe } from 'micromatch';
+export function globToRegex(glob) {
+  var regex = makeRe(glob, {
+    fastpaths: false,
+    noglobstar: false,
+    bash: false
+  });
+
+  if (!regex.source.startsWith('^')) {
+    throw new Error(`Invalid glob: >> ${glob} >> ${regex}`);
+  }
+
+  if (!glob.startsWith('./')) {
+    return regex;
+  } // makeRe is sort of funny. If you pass it a directory starting with `./` it
+  // creates a matcher that expects files with no prefix (e.g. `src/file.js`)
+  // but if you pass it a directory that starts with `../` it expects files that
+  // start with `../`. Let's make it consistent.
+  // Globs starting `**` require special treatment due to the regex they
+  // produce, specifically a negative look-ahead
+
+
+  return new RegExp(['^\\.', glob.startsWith('./**') ? '' : '\\/', regex.source.substring(1)].join(''));
+}

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

@@ -6,11 +6,29 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import fs from 'fs';
 import path from 'path';
-var DEFAULT_FILES = '*.stories.@(mdx|tsx|ts|jsx|js)';
-var DEFAULT_TITLE_PREFIX = ''; // Escaping regexes for glob regexes is fun
-// Mathing things like '../**/*.stories.mdx'
+import deprecate from 'util-deprecate';
+import dedent from 'ts-dedent';
+import { scan } from 'micromatch';
+import slash from 'slash';
+import { globToRegex } from './glob-to-regexp';
+var DEFAULT_TITLE_PREFIX = '';
+var DEFAULT_FILES = '**/*.stories.@(mdx|tsx|ts|jsx|js)'; // LEGACY support for bad glob patterns we had in SB 5 - remove in SB7
 
-var GLOB_REGEX = /^(?<directory>[^*]*)\/\*\*\/(?<files>\*\..*)/;
+var fixBadGlob = deprecate(function (match) {
+  return match.input.replace(match[1], `@${match[1]}`);
+}, dedent`
+    You have specified an invalid glob, we've attempted to fix it, please ensure that the glob you specify is valid. See: https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#correct-globs-in-mainjs
+  `);
+
+var detectBadGlob = function (val) {
+  var match = val.match(/\.(\([^)]+\))/);
+
+  if (match) {
+    return fixBadGlob(match);
+  }
+
+  return val;
+};
 
 var isDirectory = function (configDir, entry) {
   try {
@@ -20,78 +38,75 @@ var isDirectory = function (configDir, entry) {
   }
 };
 
-export var normalizeStoriesEntry = function (entry, configDir) {
-  var glob;
-  var directory;
-  var files;
-  var titlePrefix;
+export var normalizeStoriesEntry = function (entry, {
+  configDir: configDir,
+  workingDir: workingDir
+}) {
+  var specifierWithoutMatcher;
 
   if (typeof entry === 'string') {
-    if (!entry.includes('**') && isDirectory(configDir, entry)) {
-      directory = entry;
-      files = DEFAULT_FILES;
-      titlePrefix = DEFAULT_TITLE_PREFIX;
-    } else {
-      var match = entry.match(GLOB_REGEX);
-
-      if (match) {
-        directory = match.groups.directory;
-        files = match.groups.files;
-        titlePrefix = DEFAULT_TITLE_PREFIX;
+    if (!entry.includes('*')) {
+      if (isDirectory(configDir, entry)) {
+        specifierWithoutMatcher = {
+          titlePrefix: DEFAULT_TITLE_PREFIX,
+          directory: entry,
+          files: DEFAULT_FILES
+        };
       } else {
-        glob = entry;
+        specifierWithoutMatcher = {
+          titlePrefix: DEFAULT_TITLE_PREFIX,
+          directory: path.dirname(entry),
+          files: path.basename(entry)
+        };
       }
+    } else {
+      var fixedEntry = detectBadGlob(entry);
+      var globResult = scan(fixedEntry);
+
+      var _directory = globResult.isGlob ? globResult.prefix + globResult.base : path.dirname(fixedEntry);
+
+      var filesFallback = _directory !== '.' ? fixedEntry.substr(_directory.length + 1) : fixedEntry;
+
+      var _files = globResult.isGlob ? globResult.glob : filesFallback;
+
+      specifierWithoutMatcher = {
+        titlePrefix: DEFAULT_TITLE_PREFIX,
+        directory: _directory,
+        files: _files
+      };
     }
   } else {
-    directory = entry.directory;
-    files = entry.files || DEFAULT_FILES;
-    titlePrefix = entry.titlePrefix || DEFAULT_TITLE_PREFIX;
-  }
+    specifierWithoutMatcher = _objectSpread({
+      titlePrefix: DEFAULT_TITLE_PREFIX,
+      files: DEFAULT_FILES
+    }, entry);
+  } // We are going to be doing everything with node importPaths which use
+  // URL format, i.e. `/` as a separator, so let's make sure we've normalized
 
-  if (typeof glob !== 'undefined') {
-    return {
-      glob: glob,
-      specifier: undefined
-    };
-  }
 
-  return {
-    glob: `${directory}/**/${files}`,
-    specifier: {
-      directory: directory,
-      titlePrefix: titlePrefix,
-      files: files
-    }
-  };
-};
+  var files = slash(specifierWithoutMatcher.files); // At this stage `directory` is relative to `main.js` (the config dir)
+  // We want to work relative to the working dir, so we transform it here.
 
-/**
- * Stories entries are specified relative to the configDir. Webpack filenames are produced relative to the
- * current working directory. This function rewrites the specifier.directory relative to the current working
- * directory.
- */
-export var normalizeDirectory = function (entry, {
-  configDir: configDir,
-  workingDir: workingDir
-}) {
-  if (!entry.specifier) return entry;
-  var directory = entry.specifier.directory;
-  var directoryFromConfig = path.resolve(configDir, directory);
-  var directoryFromWorking = path.relative(workingDir, directoryFromConfig); // relative('/foo', '/foo/src') => 'src'
-  // but we want `./src`to match webpack's file names
-
-  if (!directoryFromWorking.startsWith('.')) {
-    directoryFromWorking = `.${path.sep}${directoryFromWorking}`;
+  var _specifierWithoutMatc = specifierWithoutMatcher,
+      directoryRelativeToConfig = _specifierWithoutMatc.directory;
+  var absoluteDirectory = path.resolve(configDir, directoryRelativeToConfig);
+  var directory = slash(path.relative(workingDir, absoluteDirectory)); // relative('/foo', '/foo/src') => 'src'
+  // but we want `./src` to match importPaths
+
+  if (!directory.startsWith('.')) {
+    directory = `./${directory}`;
   }
 
-  return _objectSpread(_objectSpread({}, entry), {}, {
-    specifier: _objectSpread(_objectSpread({}, entry.specifier), {}, {
-      directory: directoryFromWorking
-    })
+  directory = directory.replace(/\/$/, ''); // Now make the importFn matcher.
+
+  var importPathMatcher = globToRegex(`${directory}/${files}`);
+  return _objectSpread(_objectSpread({}, specifierWithoutMatcher), {}, {
+    directory: directory,
+    importPathMatcher: importPathMatcher
   });
 };
 export var normalizeStories = function (entries, options) {
   return entries.map(function (entry) {
-    return normalizeDirectory(normalizeStoriesEntry(entry, options.configDir), options);
+    return normalizeStoriesEntry(entry, options);
   });
 };

package/dist/esm/utils/progress-reporting.js

@@ -26,6 +26,7 @@ export var useProgressReporting = async function (router, startTime, options) {
     reportProgress = function (progress) {
       if (closed || response.writableEnded) return;
       response.write(`data: ${JSON.stringify(progress)}\n\n`);
+      response.flush();
       if (progress.value === 1) close();
     };
   });

package/dist/esm/utils/to-importFn.js

@@ -1,25 +1,23 @@
 import dedent from 'ts-dedent';
-import { toRequireContext } from '..';
-export function toImportFnPart(entry) {
-  var _toRequireContext = toRequireContext(entry.glob),
-      base = _toRequireContext.path,
-      regex = _toRequireContext.regex;
+export function toImportFnPart(specifier) {
+  var directory = specifier.directory,
+      importPathMatcher = specifier.importPathMatcher; // It appears webpack passes *something* similar to the absolute path to the file
+  // on disk (prefixed with something unknown) to the matcher.
+  // We don't want to include the absolute path in our bundle, so we will just pull the
+  // '^' and any leading '.' off the regexp and match on that.
+  // It's imperfect as it could match extra things in extremely unusual cases, but it'll do for now.
 
-  var webpackIncludeRegex = new RegExp(regex.source.substring(1));
+  var webpackIncludeRegex = new RegExp(importPathMatcher.source.replace(/^\^\\\.*/, ''));
   return dedent`
       async (path) => {
-        const pathBase = path.substring(0, ${base.length + 1});
-        if (pathBase !== '${base}/') {
+        if (!${importPathMatcher}.exec(path)) {
           return;
         }
 
-        const pathRemainder = path.substring(${base.length + 1});
-        if (!${regex}.exec(pathRemainder)) {
-          return;
-        }
+        const pathRemainder = path.substring(${directory.length + 1});
         return import(
           /* webpackInclude: ${webpackIncludeRegex} */
-          '${base}/' + pathRemainder
+          '${directory}/' + pathRemainder
         );
       }
 

package/dist/esm/utils/to-require-context.js

@@ -1,79 +1,22 @@
-import { makeRe, scan } from 'micromatch';
-import deprecate from 'util-deprecate';
-import dedent from 'ts-dedent';
-import path from 'path'; // LEGACY support for bad glob patterns we had in SB 5 - remove in SB7
-
-var fixBadGlob = deprecate(function (match) {
-  return match.input.replace(match[1], `@${match[1]}`);
-}, dedent`
-    You have specified an invalid glob, we've attempted to fix it, please ensure that the glob you specify is valid. See: https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#correct-globs-in-mainjs
-  `);
-
-var detectBadGlob = function (val) {
-  var match = val.match(/\.(\([^)]+\))/);
-
-  if (match) {
-    return fixBadGlob(match);
-  }
-
-  return val;
-};
-
-var isObject = function (val) {
-  return val != null && typeof val === 'object' && Array.isArray(val) === false;
-};
-
-export var toRequireContext = function (input) {
-  var fixedInput = detectBadGlob(input);
-
-  switch (true) {
-    case typeof input === 'string':
-      {
-        var globResult = scan(fixedInput);
-        var base = globResult.isGlob ? globResult.prefix + globResult.base : path.dirname(fixedInput);
-        var globFallback = base !== '.' ? fixedInput.substr(base.length + 1) : fixedInput;
-        var glob = globResult.isGlob ? globResult.glob : globFallback;
-        var regex = makeRe(glob, {
-          fastpaths: false,
-          noglobstar: false,
-          bash: false
-        });
-        var source = regex.source;
-
-        if (source.startsWith('^')) {
-          // webpack's require.context matches against paths starting `./`
-          // Globs starting `**` require special treatment due to the regex they
-          // produce, specifically a negative look-ahead
-          var match = ['^\\.', glob.startsWith('**') ? '' : '\\/', source.substring(1)].join('');
-          var recursive = glob.includes('**') || glob.split('/').length > 1;
-          return {
-            path: base,
-            recursive: recursive,
-            match: match,
-            regex: regex
-          };
-        }
-
-        throw new Error(`Invalid glob: >> ${input} >> ${regex}`);
-      }
-
-    case isObject(input):
-      {
-        return input;
-      }
-
-    default:
-      {
-        throw new Error('the provided input cannot be transformed into a require.context');
-      }
-  }
+import { globToRegex } from './glob-to-regexp';
+export var toRequireContext = function (specifier) {
+  var directory = specifier.directory,
+      files = specifier.files; // The importPathMatcher is a `./`-prefixed matcher that includes the directory
+  // For `require.context()` we want the same thing, relative to directory
+
+  var match = globToRegex(`./${files}`);
+  return {
+    path: directory,
+    recursive: !!files.match(/^\*{1,2}\//),
+    match: match
+  };
 };
-export var toRequireContextString = function (input) {
-  var _toRequireContext = toRequireContext(input),
+export var toRequireContextString = function (specifier) {
+  var _toRequireContext = toRequireContext(specifier),
       p = _toRequireContext.path,
       r = _toRequireContext.recursive,
       m = _toRequireContext.match;
 
-  var result = `require.context('${p}', ${r}, /${m}/)`;
+  var result = `require.context('${p}', ${r}, ${m})`;
   return result;
 };

package/dist/modern/utils/glob-to-regexp.js

@@ -0,0 +1,24 @@
+import { makeRe } from 'micromatch';
+export function globToRegex(glob) {
+  var regex = makeRe(glob, {
+    fastpaths: false,
+    noglobstar: false,
+    bash: false
+  });
+
+  if (!regex.source.startsWith('^')) {
+    throw new Error(`Invalid glob: >> ${glob} >> ${regex}`);
+  }
+
+  if (!glob.startsWith('./')) {
+    return regex;
+  } // makeRe is sort of funny. If you pass it a directory starting with `./` it
+  // creates a matcher that expects files with no prefix (e.g. `src/file.js`)
+  // but if you pass it a directory that starts with `../` it expects files that
+  // start with `../`. Let's make it consistent.
+  // Globs starting `**` require special treatment due to the regex they
+  // produce, specifically a negative look-ahead
+
+
+  return new RegExp(['^\\.', glob.startsWith('./**') ? '' : '\\/', regex.source.substring(1)].join(''));
+}

package/dist/modern/utils/normalize-stories.js

@@ -6,11 +6,29 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import fs from 'fs';
 import path from 'path';
-var DEFAULT_FILES = '*.stories.@(mdx|tsx|ts|jsx|js)';
-var DEFAULT_TITLE_PREFIX = ''; // Escaping regexes for glob regexes is fun
-// Mathing things like '../**/*.stories.mdx'
+import deprecate from 'util-deprecate';
+import dedent from 'ts-dedent';
+import { scan } from 'micromatch';
+import slash from 'slash';
+import { globToRegex } from './glob-to-regexp';
+var DEFAULT_TITLE_PREFIX = '';
+var DEFAULT_FILES = '**/*.stories.@(mdx|tsx|ts|jsx|js)'; // LEGACY support for bad glob patterns we had in SB 5 - remove in SB7
 
-var GLOB_REGEX = /^(?<directory>[^*]*)\/\*\*\/(?<files>\*\..*)/;
+var fixBadGlob = deprecate(function (match) {
+  return match.input.replace(match[1], `@${match[1]}`);
+}, dedent`
+    You have specified an invalid glob, we've attempted to fix it, please ensure that the glob you specify is valid. See: https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#correct-globs-in-mainjs
+  `);
+
+var detectBadGlob = function (val) {
+  var match = val.match(/\.(\([^)]+\))/);
+
+  if (match) {
+    return fixBadGlob(match);
+  }
+
+  return val;
+};
 
 var isDirectory = function (configDir, entry) {
   try {
@@ -20,78 +38,75 @@ var isDirectory = function (configDir, entry) {
   }
 };
 
-export var normalizeStoriesEntry = function (entry, configDir) {
-  var glob;
-  var directory;
-  var files;
-  var titlePrefix;
+export var normalizeStoriesEntry = function (entry, {
+  configDir: configDir,
+  workingDir: workingDir
+}) {
+  var specifierWithoutMatcher;
 
   if (typeof entry === 'string') {
-    if (!entry.includes('**') && isDirectory(configDir, entry)) {
-      directory = entry;
-      files = DEFAULT_FILES;
-      titlePrefix = DEFAULT_TITLE_PREFIX;
-    } else {
-      var match = entry.match(GLOB_REGEX);
-
-      if (match) {
-        directory = match.groups.directory;
-        files = match.groups.files;
-        titlePrefix = DEFAULT_TITLE_PREFIX;
+    if (!entry.includes('*')) {
+      if (isDirectory(configDir, entry)) {
+        specifierWithoutMatcher = {
+          titlePrefix: DEFAULT_TITLE_PREFIX,
+          directory: entry,
+          files: DEFAULT_FILES
+        };
       } else {
-        glob = entry;
+        specifierWithoutMatcher = {
+          titlePrefix: DEFAULT_TITLE_PREFIX,
+          directory: path.dirname(entry),
+          files: path.basename(entry)
+        };
       }
+    } else {
+      var fixedEntry = detectBadGlob(entry);
+      var globResult = scan(fixedEntry);
+
+      var _directory = globResult.isGlob ? globResult.prefix + globResult.base : path.dirname(fixedEntry);
+
+      var filesFallback = _directory !== '.' ? fixedEntry.substr(_directory.length + 1) : fixedEntry;
+
+      var _files = globResult.isGlob ? globResult.glob : filesFallback;
+
+      specifierWithoutMatcher = {
+        titlePrefix: DEFAULT_TITLE_PREFIX,
+        directory: _directory,
+        files: _files
+      };
     }
   } else {
-    directory = entry.directory;
-    files = entry.files || DEFAULT_FILES;
-    titlePrefix = entry.titlePrefix || DEFAULT_TITLE_PREFIX;
-  }
+    specifierWithoutMatcher = _objectSpread({
+      titlePrefix: DEFAULT_TITLE_PREFIX,
+      files: DEFAULT_FILES
+    }, entry);
+  } // We are going to be doing everything with node importPaths which use
+  // URL format, i.e. `/` as a separator, so let's make sure we've normalized
 
-  if (typeof glob !== 'undefined') {
-    return {
-      glob: glob,
-      specifier: undefined
-    };
-  }
 
-  return {
-    glob: `${directory}/**/${files}`,
-    specifier: {
-      directory: directory,
-      titlePrefix: titlePrefix,
-      files: files
-    }
-  };
-};
+  var files = slash(specifierWithoutMatcher.files); // At this stage `directory` is relative to `main.js` (the config dir)
+  // We want to work relative to the working dir, so we transform it here.
 
-/**
- * Stories entries are specified relative to the configDir. Webpack filenames are produced relative to the
- * current working directory. This function rewrites the specifier.directory relative to the current working
- * directory.
- */
-export var normalizeDirectory = function (entry, {
-  configDir: configDir,
-  workingDir: workingDir
-}) {
-  if (!entry.specifier) return entry;
-  var directory = entry.specifier.directory;
-  var directoryFromConfig = path.resolve(configDir, directory);
-  var directoryFromWorking = path.relative(workingDir, directoryFromConfig); // relative('/foo', '/foo/src') => 'src'
-  // but we want `./src`to match webpack's file names
-
-  if (!directoryFromWorking.startsWith('.')) {
-    directoryFromWorking = `.${path.sep}${directoryFromWorking}`;
+  var _specifierWithoutMatc = specifierWithoutMatcher,
+      directoryRelativeToConfig = _specifierWithoutMatc.directory;
+  var absoluteDirectory = path.resolve(configDir, directoryRelativeToConfig);
+  var directory = slash(path.relative(workingDir, absoluteDirectory)); // relative('/foo', '/foo/src') => 'src'
+  // but we want `./src` to match importPaths
+
+  if (!directory.startsWith('.')) {
+    directory = `./${directory}`;
   }
 
-  return _objectSpread(_objectSpread({}, entry), {}, {
-    specifier: _objectSpread(_objectSpread({}, entry.specifier), {}, {
-      directory: directoryFromWorking
-    })
+  directory = directory.replace(/\/$/, ''); // Now make the importFn matcher.
+
+  var importPathMatcher = globToRegex(`${directory}/${files}`);
+  return _objectSpread(_objectSpread({}, specifierWithoutMatcher), {}, {
+    directory: directory,
+    importPathMatcher: importPathMatcher
   });
 };
 export var normalizeStories = function (entries, options) {
   return entries.map(function (entry) {
-    return normalizeDirectory(normalizeStoriesEntry(entry, options.configDir), options);
+    return normalizeStoriesEntry(entry, options);
   });
 };

package/dist/modern/utils/progress-reporting.js

@@ -26,6 +26,7 @@ export var useProgressReporting = async function (router, startTime, options) {
     reportProgress = function (progress) {
       if (closed || response.writableEnded) return;
       response.write(`data: ${JSON.stringify(progress)}\n\n`);
+      response.flush();
       if (progress.value === 1) close();
     };
   });

package/dist/modern/utils/to-importFn.js

@@ -1,25 +1,23 @@
 import dedent from 'ts-dedent';
-import { toRequireContext } from '..';
-export function toImportFnPart(entry) {
-  var _toRequireContext = toRequireContext(entry.glob),
-      base = _toRequireContext.path,
-      regex = _toRequireContext.regex;
+export function toImportFnPart(specifier) {
+  var directory = specifier.directory,
+      importPathMatcher = specifier.importPathMatcher; // It appears webpack passes *something* similar to the absolute path to the file
+  // on disk (prefixed with something unknown) to the matcher.
+  // We don't want to include the absolute path in our bundle, so we will just pull the
+  // '^' and any leading '.' off the regexp and match on that.
+  // It's imperfect as it could match extra things in extremely unusual cases, but it'll do for now.
 
-  var webpackIncludeRegex = new RegExp(regex.source.substring(1));
+  var webpackIncludeRegex = new RegExp(importPathMatcher.source.replace(/^\^\\\.*/, ''));
   return dedent`
       async (path) => {
-        const pathBase = path.substring(0, ${base.length + 1});
-        if (pathBase !== '${base}/') {
+        if (!${importPathMatcher}.exec(path)) {
           return;
         }
 
-        const pathRemainder = path.substring(${base.length + 1});
-        if (!${regex}.exec(pathRemainder)) {
-          return;
-        }
+        const pathRemainder = path.substring(${directory.length + 1});
         return import(
           /* webpackInclude: ${webpackIncludeRegex} */
-          '${base}/' + pathRemainder
+          '${directory}/' + pathRemainder
         );
       }
 

package/dist/modern/utils/to-require-context.js

@@ -1,79 +1,22 @@
-import { makeRe, scan } from 'micromatch';
-import deprecate from 'util-deprecate';
-import dedent from 'ts-dedent';
-import path from 'path'; // LEGACY support for bad glob patterns we had in SB 5 - remove in SB7
-
-var fixBadGlob = deprecate(function (match) {
-  return match.input.replace(match[1], `@${match[1]}`);
-}, dedent`
-    You have specified an invalid glob, we've attempted to fix it, please ensure that the glob you specify is valid. See: https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#correct-globs-in-mainjs
-  `);
-
-var detectBadGlob = function (val) {
-  var match = val.match(/\.(\([^)]+\))/);
-
-  if (match) {
-    return fixBadGlob(match);
-  }
-
-  return val;
-};
-
-var isObject = function (val) {
-  return val != null && typeof val === 'object' && Array.isArray(val) === false;
-};
-
-export var toRequireContext = function (input) {
-  var fixedInput = detectBadGlob(input);
-
-  switch (true) {
-    case typeof input === 'string':
-      {
-        var globResult = scan(fixedInput);
-        var base = globResult.isGlob ? globResult.prefix + globResult.base : path.dirname(fixedInput);
-        var globFallback = base !== '.' ? fixedInput.substr(base.length + 1) : fixedInput;
-        var glob = globResult.isGlob ? globResult.glob : globFallback;
-        var regex = makeRe(glob, {
-          fastpaths: false,
-          noglobstar: false,
-          bash: false
-        });
-        var source = regex.source;
-
-        if (source.startsWith('^')) {
-          // webpack's require.context matches against paths starting `./`
-          // Globs starting `**` require special treatment due to the regex they
-          // produce, specifically a negative look-ahead
-          var match = ['^\\.', glob.startsWith('**') ? '' : '\\/', source.substring(1)].join('');
-          var recursive = glob.includes('**') || glob.split('/').length > 1;
-          return {
-            path: base,
-            recursive: recursive,
-            match: match,
-            regex: regex
-          };
-        }
-
-        throw new Error(`Invalid glob: >> ${input} >> ${regex}`);
-      }
-
-    case isObject(input):
-      {
-        return input;
-      }
-
-    default:
-      {
-        throw new Error('the provided input cannot be transformed into a require.context');
-      }
-  }
+import { globToRegex } from './glob-to-regexp';
+export var toRequireContext = function (specifier) {
+  var directory = specifier.directory,
+      files = specifier.files; // The importPathMatcher is a `./`-prefixed matcher that includes the directory
+  // For `require.context()` we want the same thing, relative to directory
+
+  var match = globToRegex(`./${files}`);
+  return {
+    path: directory,
+    recursive: !!files.match(/^\*{1,2}\//),
+    match: match
+  };
 };
-export var toRequireContextString = function (input) {
-  var _toRequireContext = toRequireContext(input),
+export var toRequireContextString = function (specifier) {
+  var _toRequireContext = toRequireContext(specifier),
       p = _toRequireContext.path,
       r = _toRequireContext.recursive,
       m = _toRequireContext.match;
 
-  var result = `require.context('${p}', ${r}, /${m}/)`;
+  var result = `require.context('${p}', ${r}, ${m})`;
   return result;
 };

package/dist/ts3.4/types.d.ts

@@ -191,15 +191,25 @@ export interface TypescriptOptions {
     reactDocgenTypescriptOptions: PluginOptions;
 }
 interface StoriesSpecifier {
+    /**
+     * When auto-titling, what to prefix all generated titles with (default: '')
+     */
+    titlePrefix?: string;
+    /**
+     * Where to start looking for story files
+     */
     directory: string;
+    /**
+     * What does the filename of a story file look like?
+     * (a glob, relative to directory, no leading `./`)
+     * If unset, we use `** / *.stories.@(mdx|tsx|ts|jsx|js)` (no spaces)
+     */
     files?: string;
-    titlePrefix?: string;
 }
 export declare type StoriesEntry = string | StoriesSpecifier;
-export interface NormalizedStoriesSpecifier {
-    glob: string;
-    specifier?: StoriesSpecifier;
-}
+export declare type NormalizedStoriesSpecifier = Required<StoriesSpecifier> & {
+    importPathMatcher: RegExp;
+};
 /**
  * The interface for Storybook configuration in `main.ts` files.
  */

package/dist/ts3.4/utils/glob-to-regexp.d.ts

@@ -0,0 +1 @@
+export declare function globToRegex(glob: string): RegExp;

package/dist/ts3.4/utils/normalize-stories.d.ts

@@ -1,14 +1,8 @@
 import { StoriesEntry, NormalizedStoriesSpecifier } from '../types';
-export declare const normalizeStoriesEntry: (entry: StoriesEntry, configDir: string) => NormalizedStoriesSpecifier;
+export declare const normalizeStoriesEntry: (entry: StoriesEntry, { configDir, workingDir }: NormalizeOptions) => NormalizedStoriesSpecifier;
 interface NormalizeOptions {
     configDir: string;
     workingDir: string;
 }
-/**
- * Stories entries are specified relative to the configDir. Webpack filenames are produced relative to the
- * current working directory. This function rewrites the specifier.directory relative to the current working
- * directory.
- */
-export declare const normalizeDirectory: (entry: NormalizedStoriesSpecifier, { configDir, workingDir }: NormalizeOptions) => NormalizedStoriesSpecifier;
 export declare const normalizeStories: (entries: StoriesEntry[], options: NormalizeOptions) => NormalizedStoriesSpecifier[];
 export {};

package/dist/ts3.4/utils/to-importFn.d.ts

@@ -1,3 +1,3 @@
 import { NormalizedStoriesSpecifier } from '../types';
-export declare function toImportFnPart(entry: NormalizedStoriesSpecifier): string;
+export declare function toImportFnPart(specifier: NormalizedStoriesSpecifier): string;
 export declare function toImportFn(stories: NormalizedStoriesSpecifier[]): string;

package/dist/ts3.4/utils/to-require-context.d.ts

@@ -1,2 +1,7 @@
-export declare const toRequireContext: (input: any) => any;
-export declare const toRequireContextString: (input: any) => string;
+import { NormalizedStoriesSpecifier } from '../types';
+export declare const toRequireContext: (specifier: NormalizedStoriesSpecifier) => {
+    path: string;
+    recursive: boolean;
+    match: RegExp;
+};
+export declare const toRequireContextString: (specifier: NormalizedStoriesSpecifier) => string;

package/dist/ts3.9/types.d.ts

@@ -187,15 +187,25 @@ export interface TypescriptOptions {
     reactDocgenTypescriptOptions: PluginOptions;
 }
 interface StoriesSpecifier {
+    /**
+     * When auto-titling, what to prefix all generated titles with (default: '')
+     */
+    titlePrefix?: string;
+    /**
+     * Where to start looking for story files
+     */
     directory: string;
+    /**
+     * What does the filename of a story file look like?
+     * (a glob, relative to directory, no leading `./`)
+     * If unset, we use `** / *.stories.@(mdx|tsx|ts|jsx|js)` (no spaces)
+     */
     files?: string;
-    titlePrefix?: string;
 }
 export declare type StoriesEntry = string | StoriesSpecifier;
-export interface NormalizedStoriesSpecifier {
-    glob: string;
-    specifier?: StoriesSpecifier;
-}
+export declare type NormalizedStoriesSpecifier = Required<StoriesSpecifier> & {
+    importPathMatcher: RegExp;
+};
 /**
  * The interface for Storybook configuration in `main.ts` files.
  */

package/dist/ts3.9/utils/glob-to-regexp.d.ts

@@ -0,0 +1 @@
+export declare function globToRegex(glob: string): RegExp;

package/dist/ts3.9/utils/normalize-stories.d.ts

@@ -1,14 +1,8 @@
 import type { StoriesEntry, NormalizedStoriesSpecifier } from '../types';
-export declare const normalizeStoriesEntry: (entry: StoriesEntry, configDir: string) => NormalizedStoriesSpecifier;
+export declare const normalizeStoriesEntry: (entry: StoriesEntry, { configDir, workingDir }: NormalizeOptions) => NormalizedStoriesSpecifier;
 interface NormalizeOptions {
     configDir: string;
     workingDir: string;
 }
-/**
- * Stories entries are specified relative to the configDir. Webpack filenames are produced relative to the
- * current working directory. This function rewrites the specifier.directory relative to the current working
- * directory.
- */
-export declare const normalizeDirectory: (entry: NormalizedStoriesSpecifier, { configDir, workingDir }: NormalizeOptions) => NormalizedStoriesSpecifier;
 export declare const normalizeStories: (entries: StoriesEntry[], options: NormalizeOptions) => NormalizedStoriesSpecifier[];
 export {};

package/dist/ts3.9/utils/to-importFn.d.ts

@@ -1,3 +1,3 @@
 import type { NormalizedStoriesSpecifier } from '../types';
-export declare function toImportFnPart(entry: NormalizedStoriesSpecifier): string;
+export declare function toImportFnPart(specifier: NormalizedStoriesSpecifier): string;
 export declare function toImportFn(stories: NormalizedStoriesSpecifier[]): string;

package/dist/ts3.9/utils/to-require-context.d.ts

@@ -1,2 +1,7 @@
-export declare const toRequireContext: (input: any) => any;
-export declare const toRequireContextString: (input: any) => string;
+import { NormalizedStoriesSpecifier } from '../types';
+export declare const toRequireContext: (specifier: NormalizedStoriesSpecifier) => {
+    path: string;
+    recursive: boolean;
+    match: RegExp;
+};
+export declare const toRequireContextString: (specifier: NormalizedStoriesSpecifier) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-common",
-  "version": "6.4.0-beta.3",
+  "version": "6.4.0-beta.7",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -61,7 +61,7 @@
     "@babel/preset-react": "^7.12.10",
     "@babel/preset-typescript": "^7.12.7",
     "@babel/register": "^7.12.1",
-    "@storybook/node-logger": "6.4.0-beta.3",
+    "@storybook/node-logger": "6.4.0-beta.7",
     "@storybook/semver": "^7.3.2",
     "@types/micromatch": "^4.0.1",
     "@types/node": "^14.0.10",
@@ -85,12 +85,14 @@
     "pkg-dir": "^5.0.0",
     "pretty-hrtime": "^1.0.3",
     "resolve-from": "^5.0.0",
+    "slash": "^3.0.0",
     "ts-dedent": "^2.0.0",
     "util-deprecate": "^1.0.2",
     "webpack": "4"
   },
   "devDependencies": {
     "@storybook/react-docgen-typescript-plugin": "1.0.2-canary.253f8c1.0",
+    "@types/compression": "^1.7.0",
     "@types/interpret": "^1.1.1",
     "@types/mock-fs": "^4.13.0",
     "mock-fs": "^4.13.0"
@@ -107,6 +109,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0fc9200599c97a5797c5af886792200cd29e2046",
+  "gitHead": "5c16acd21a956f16a7b24900a9bf38b674646217",
   "sbmodern": "dist/modern/index.js"
 }

package/typings.d.ts

@@ -1,6 +1,15 @@
+import('@types/compression');
+
 declare module 'lazy-universal-dotenv';
 declare module 'pnp-webpack-plugin';
 declare module '@storybook/semver';
+
+declare namespace jest {
+  interface Matchers<R> {
+    toMatchPaths(paths: string[]): R;
+  }
+}
+
 declare module 'file-system-cache' {
   export interface Options {
     basePath?: string;