@storybook/core-common 6.5.0-alpha.9 → 6.5.0-beta.2

package/dist/cjs/index.js

@@ -3,11 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  createFileSystemCache: true
+};
+Object.defineProperty(exports, "createFileSystemCache", {
+  enumerable: true,
+  get: function () {
+    return _fileCache.createFileSystemCache;
+  }
+});
 
 var _presets = require("./presets");
 
 Object.keys(_presets).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _presets[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -21,6 +31,7 @@ var _babel = require("./utils/babel");
 
 Object.keys(_babel).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _babel[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -34,6 +45,7 @@ var _checkWebpackVersion = require("./utils/check-webpack-version");
 
 Object.keys(_checkWebpackVersion).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _checkWebpackVersion[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -47,6 +59,7 @@ var _checkAddonOrder = require("./utils/check-addon-order");
 
 Object.keys(_checkAddonOrder).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _checkAddonOrder[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -60,6 +73,7 @@ var _envs = require("./utils/envs");
 
 Object.keys(_envs).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _envs[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -73,6 +87,7 @@ var _es6Transpiler = require("./utils/es6Transpiler");
 
 Object.keys(_es6Transpiler).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _es6Transpiler[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -86,6 +101,7 @@ var _handlebars = require("./utils/handlebars");
 
 Object.keys(_handlebars).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _handlebars[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -99,6 +115,7 @@ var _interpretFiles = require("./utils/interpret-files");
 
 Object.keys(_interpretFiles).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _interpretFiles[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -112,6 +129,7 @@ var _interpretRequire = require("./utils/interpret-require");
 
 Object.keys(_interpretRequire).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _interpretRequire[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -125,6 +143,7 @@ var _loadCustomBabelConfig = require("./utils/load-custom-babel-config");
 
 Object.keys(_loadCustomBabelConfig).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _loadCustomBabelConfig[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -138,6 +157,7 @@ var _loadCustomPresets = require("./utils/load-custom-presets");
 
 Object.keys(_loadCustomPresets).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _loadCustomPresets[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -151,6 +171,7 @@ var _loadCustomWebpackConfig = require("./utils/load-custom-webpack-config");
 
 Object.keys(_loadCustomWebpackConfig).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _loadCustomWebpackConfig[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -160,10 +181,53 @@ Object.keys(_loadCustomWebpackConfig).forEach(function (key) {
   });
 });
 
+var _loadMainConfig = require("./utils/load-main-config");
+
+Object.keys(_loadMainConfig).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _loadMainConfig[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _loadMainConfig[key];
+    }
+  });
+});
+
+var _getStorybookConfiguration = require("./utils/get-storybook-configuration");
+
+Object.keys(_getStorybookConfiguration).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _getStorybookConfiguration[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _getStorybookConfiguration[key];
+    }
+  });
+});
+
+var _getStorybookInfo = require("./utils/get-storybook-info");
+
+Object.keys(_getStorybookInfo).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _getStorybookInfo[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _getStorybookInfo[key];
+    }
+  });
+});
+
 var _loadManagerOrAddonsFile = require("./utils/load-manager-or-addons-file");
 
 Object.keys(_loadManagerOrAddonsFile).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _loadManagerOrAddonsFile[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -177,6 +241,7 @@ var _loadPreviewOrConfigFile = require("./utils/load-preview-or-config-file");
 
 Object.keys(_loadPreviewOrConfigFile).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _loadPreviewOrConfigFile[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -190,6 +255,7 @@ var _logConfig = require("./utils/log-config");
 
 Object.keys(_logConfig).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _logConfig[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -203,6 +269,7 @@ var _mergeWebpackConfig = require("./utils/merge-webpack-config");
 
 Object.keys(_mergeWebpackConfig).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _mergeWebpackConfig[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -216,6 +283,7 @@ var _paths = require("./utils/paths");
 
 Object.keys(_paths).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _paths[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -229,6 +297,7 @@ var _progressReporting = require("./utils/progress-reporting");
 
 Object.keys(_progressReporting).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _progressReporting[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -242,6 +311,7 @@ var _resolvePathInSbCache = require("./utils/resolve-path-in-sb-cache");
 
 Object.keys(_resolvePathInSbCache).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _resolvePathInSbCache[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -255,6 +325,7 @@ var _cache = require("./utils/cache");
 
 Object.keys(_cache).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _cache[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -268,6 +339,7 @@ var _template = require("./utils/template");
 
 Object.keys(_template).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _template[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -281,6 +353,7 @@ var _interpolate = require("./utils/interpolate");
 
 Object.keys(_interpolate).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _interpolate[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -294,6 +367,7 @@ var _validateConfigurationFiles = require("./utils/validate-configuration-files"
 
 Object.keys(_validateConfigurationFiles).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _validateConfigurationFiles[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -307,6 +381,7 @@ var _toRequireContext = require("./utils/to-require-context");
 
 Object.keys(_toRequireContext).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _toRequireContext[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -320,6 +395,7 @@ var _normalizeStories = require("./utils/normalize-stories");
 
 Object.keys(_normalizeStories).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _normalizeStories[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -333,6 +409,7 @@ var _toImportFn = require("./utils/to-importFn");
 
 Object.keys(_toImportFn).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _toImportFn[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -346,6 +423,7 @@ var _readTemplate = require("./utils/readTemplate");
 
 Object.keys(_readTemplate).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _readTemplate[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -359,6 +437,7 @@ var _findDistEsm = require("./utils/findDistEsm");
 
 Object.keys(_findDistEsm).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _findDistEsm[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -372,6 +451,7 @@ var _types = require("./types");
 
 Object.keys(_types).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _types[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -379,4 +459,6 @@ Object.keys(_types).forEach(function (key) {
       return _types[key];
     }
   });
-});
+});
+
+var _fileCache = require("./utils/file-cache");

package/dist/cjs/presets.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.filterPresetsConfig = filterPresetsConfig;
-exports.loadPreset = loadPreset;
 exports.getPresets = getPresets;
 exports.loadAllPresets = loadAllPresets;
+exports.loadPreset = loadPreset;
 exports.resolveAddonName = void 0;
 
 require("core-js/modules/es.promise.js");
@@ -17,21 +17,25 @@ var _path = require("path");
 
 var _nodeLogger = require("@storybook/node-logger");
 
-var _resolveFrom = _interopRequireDefault(require("resolve-from"));
-
 var _loadCustomPresets = require("./utils/load-custom-presets");
 
 var _interpretRequire = require("./utils/interpret-require");
 
+var _safeResolve = require("./utils/safeResolve");
+
+var _excluded = ["type", "name"],
+    _excluded2 = ["addons", "presets", "framework"],
+    _excluded3 = ["corePresets", "frameworkPresets", "overridePresets"];
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-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; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 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; }
 
@@ -67,8 +71,8 @@ function resolvePresetFunction(input, presetOptions, framework, storybookOptions
  * Parse an addon into either a managerEntries or a preset. Throw on invalid input.
  *
  * Valid inputs:
- * - '@storybook/addon-actions/register'
- *   =>  { type: 'managerEntries', item }
+ * - '@storybook/addon-actions/manager'
+ *   =>  { type: 'virtual', item }
  *
  * - '@storybook/addon-docs/preset'
  *   =>  { type: 'presets', item }
@@ -81,43 +85,69 @@ function resolvePresetFunction(input, presetOptions, framework, storybookOptions
  */
 
 
-var resolveAddonName = function (configDir, name) {
-  var path;
-
-  if (name.startsWith('.')) {
-    path = (0, _resolveFrom.default)(configDir, name);
-  } else if (name.startsWith('/')) {
-    path = name;
-  } else if (name.match(/\/(preset|register(-panel)?)(\.(js|ts|tsx|jsx))?$/)) {
-    path = name;
-  } // when user provides full path, we don't need to do anything
+var resolveAddonName = function (configDir, name, options) {
+  var r = name.startsWith('/') ? _safeResolve.safeResolve : _safeResolve.safeResolveFrom.bind(null, configDir);
+  var resolved = r(name);
 
-
-  if (path) {
+  if (name.match(/\/(manager|register(-panel)?)(\.(js|ts|tsx|jsx))?$/)) {
     return {
-      name: path,
-      // Accept `register`, `register.js`, `require.resolve('foo/register'), `register-panel`
-      type: path.match(/register(-panel)?(\.(js|ts|tsx|jsx))?$/) ? 'managerEntries' : 'presets'
+      type: 'virtual',
+      name: name,
+      managerEntries: [resolved]
     };
   }
 
-  try {
+  if (name.match(/\/(preset)(\.(js|ts|tsx|jsx))?$/)) {
     return {
-      name: (0, _resolveFrom.default)(configDir, `${name}/preset`),
-      type: 'presets'
-    }; // eslint-disable-next-line no-empty
-  } catch (err) {}
+      type: 'presets',
+      name: resolved
+    };
+  }
 
-  try {
+  var path = name; // when user provides full path, we don't need to do anything!
+
+  var managerFile = (0, _safeResolve.safeResolve)(`${path}/manager`);
+  var registerFile = (0, _safeResolve.safeResolve)(`${path}/register`) || (0, _safeResolve.safeResolve)(`${path}/register-panel`);
+  var previewFile = (0, _safeResolve.safeResolve)(`${path}/preview`);
+  var presetFile = (0, _safeResolve.safeResolve)(`${path}/preset`);
+
+  if (!(managerFile || previewFile) && presetFile) {
     return {
-      name: (0, _resolveFrom.default)(configDir, `${name}/register`),
-      type: 'managerEntries'
-    }; // eslint-disable-next-line no-empty
-  } catch (err) {}
+      type: 'presets',
+      name: presetFile
+    };
+  }
+
+  if (managerFile || registerFile || previewFile || presetFile) {
+    var managerEntries = [];
+
+    if (managerFile) {
+      managerEntries.push(managerFile);
+    } // register file is the old way of registering addons
+
+
+    if (!managerFile && registerFile && !presetFile) {
+      managerEntries.push(registerFile);
+    }
+
+    return _objectSpread(_objectSpread(_objectSpread({
+      type: 'virtual',
+      name: path
+    }, managerEntries.length ? {
+      managerEntries: managerEntries
+    } : {}), previewFile ? {
+      previewAnnotations: [previewFile]
+    } : {}), presetFile ? {
+      presets: [{
+        name: presetFile,
+        options: options
+      }]
+    } : {});
+  }
 
   return {
-    name: (0, _resolveFrom.default)(configDir, name),
-    type: 'presets'
+    type: 'presets',
+    name: resolved
   };
 };
 
@@ -127,31 +157,16 @@ var map = function ({
   configDir: configDir
 }) {
   return function (item) {
-    try {
-      if (isObject(item)) {
-        var _resolveAddonName = resolveAddonName(configDir, item.name),
-            _name = _resolveAddonName.name;
-
-        return _objectSpread(_objectSpread({}, item), {}, {
-          name: _name
-        });
-      }
-
-      var _resolveAddonName2 = resolveAddonName(configDir, item),
-          name = _resolveAddonName2.name,
-          type = _resolveAddonName2.type;
+    var options = isObject(item) ? item.options || undefined : undefined;
+    var name = isObject(item) ? item.name : item;
 
-      if (type === 'managerEntries') {
-        return {
-          name: `${name}_additionalManagerEntries`,
-          type: type,
-          managerEntries: [name]
-        };
-      }
-
-      return resolveAddonName(configDir, name);
+    try {
+      var resolved = resolveAddonName(configDir, name, options);
+      return _objectSpread(_objectSpread({}, options ? {
+        options: options
+      } : {}), resolved);
     } catch (err) {
-      _nodeLogger.logger.error(`Addon value should end in /register OR it should be a valid preset https://storybook.js.org/docs/react/addons/writing-presets/\n${item}`);
+      _nodeLogger.logger.error(`Addon value should end in /manager or /preview or /register OR it should be a valid preset https://storybook.js.org/docs/react/addons/writing-presets/\n${item}`);
     }
 
     return undefined;
@@ -167,10 +182,10 @@ function interopRequireDefault(filePath) {
 }
 
 function getContent(input) {
-  if (input.type === 'managerEntries') {
+  if (input.type === 'virtual') {
     var type = input.type,
-        _name2 = input.name,
-        rest = _objectWithoutProperties(input, ["type", "name"]);
+        _name = input.name,
+        rest = _objectWithoutProperties(input, _excluded);
 
     return rest;
   }
@@ -202,7 +217,7 @@ function loadPreset(input, level, storybookOptions) {
           addonsInput = _contents.addons,
           presetsInput = _contents.presets,
           framework = _contents.framework,
-          rest = _objectWithoutProperties(_contents, ["addons", "presets", "framework"]);
+          rest = _objectWithoutProperties(_contents, _excluded2);
 
       var _subPresets = resolvePresetFunction(presetsInput, presetOptions, framework, storybookOptions);
 
@@ -336,7 +351,7 @@ function loadAllPresets(options) {
       frameworkPresets = _options$frameworkPre === void 0 ? [] : _options$frameworkPre,
       _options$overridePres = options.overridePresets,
       overridePresets = _options$overridePres === void 0 ? [] : _options$overridePres,
-      restOptions = _objectWithoutProperties(options, ["corePresets", "frameworkPresets", "overridePresets"]);
+      restOptions = _objectWithoutProperties(options, _excluded3);
 
   var frameworkPackage = getFrameworkPackage(options.configDir);
   var presetsConfig = [...corePresets, ...(frameworkPackage ? [] : frameworkPresets), ...(0, _loadCustomPresets.loadCustomPresets)(options), ...overridePresets]; // Remove `@storybook/preset-typescript` and add a warning if in use.

package/dist/cjs/types.js

@@ -1 +1,5 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/utils/babel.js

@@ -27,6 +27,8 @@ var getStorybookBabelConfig = function ({
       legacy: true
     }], [r('@babel/plugin-proposal-class-properties', local), {
       loose: true
+    }], [r('@babel/plugin-proposal-private-property-in-object', local), {
+      loose: true
     }], [r('@babel/plugin-proposal-private-methods', local), {
       loose: true
     }], r('@babel/plugin-proposal-export-default-from', local), r('@babel/plugin-syntax-dynamic-import', local), [r('@babel/plugin-proposal-object-rest-spread', local), {
@@ -51,7 +53,7 @@ var getStorybookBabelConfig = function ({
 exports.getStorybookBabelConfig = getStorybookBabelConfig;
 
 var getStorybookBabelDependencies = function () {
-  return ['@babel/preset-env', '@babel/preset-typescript', '@babel/plugin-transform-shorthand-properties', '@babel/plugin-transform-block-scoping', '@babel/plugin-proposal-decorators', '@babel/plugin-proposal-class-properties', '@babel/plugin-proposal-private-methods', '@babel/plugin-proposal-export-default-from', '@babel/plugin-syntax-dynamic-import', '@babel/plugin-proposal-object-rest-spread', '@babel/plugin-transform-classes', '@babel/plugin-transform-arrow-functions', '@babel/plugin-transform-parameters', '@babel/plugin-transform-destructuring', '@babel/plugin-transform-spread', '@babel/plugin-transform-for-of', 'babel-plugin-macros', '@babel/plugin-proposal-optional-chaining', '@babel/plugin-proposal-nullish-coalescing-operator', 'babel-plugin-polyfill-corejs3', 'babel-loader', 'core-js'];
+  return ['@babel/preset-env', '@babel/preset-typescript', '@babel/plugin-transform-shorthand-properties', '@babel/plugin-proposal-private-property-in-object', '@babel/plugin-transform-block-scoping', '@babel/plugin-proposal-decorators', '@babel/plugin-proposal-class-properties', '@babel/plugin-proposal-private-methods', '@babel/plugin-proposal-export-default-from', '@babel/plugin-syntax-dynamic-import', '@babel/plugin-proposal-object-rest-spread', '@babel/plugin-transform-classes', '@babel/plugin-transform-arrow-functions', '@babel/plugin-transform-parameters', '@babel/plugin-transform-destructuring', '@babel/plugin-transform-spread', '@babel/plugin-transform-for-of', 'babel-plugin-macros', '@babel/plugin-proposal-optional-chaining', '@babel/plugin-proposal-nullish-coalescing-operator', 'babel-plugin-polyfill-corejs3', 'babel-loader', 'core-js'];
 };
 
 exports.getStorybookBabelDependencies = getStorybookBabelDependencies;

package/dist/cjs/utils/cache.js

@@ -5,13 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.cache = void 0;
 
-var _fileSystemCache = _interopRequireDefault(require("file-system-cache"));
+var _fileCache = require("./file-cache");
 
 var _resolvePathInSbCache = require("./resolve-path-in-sb-cache");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var cache = (0, _fileSystemCache.default)({
+var cache = (0, _fileCache.createFileSystemCache)({
   basePath: (0, _resolvePathInSbCache.resolvePathInStorybookCache)('dev-server'),
   ns: 'storybook' // Optional. A grouping namespace for items.
 

package/dist/cjs/utils/envs.js

@@ -10,9 +10,9 @@ var _lazyUniversalDotenv = require("lazy-universal-dotenv");
 
 var _paths = require("./paths");
 
-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; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 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; }
 
@@ -71,10 +71,14 @@ var stringifyProcessEnvs = function (raw) {
   }, {
     // Default fallback
     'process.env.XSTORYBOOK_EXAMPLE_APP': '""'
-  }); // support destructuring like
+  }); // FIXME: something like this is necessary to support destructuring like:
+  //
   // const { foo } = process.env;
+  //
+  // However, it also means that process.env.foo = 'bar' will fail, so removing this:
+  //
+  // envs['process.env'] = JSON.stringify(raw);
 
-  envs['process.env'] = JSON.stringify(raw);
   return envs;
 };
 

package/dist/cjs/utils/es6Transpiler.js

@@ -10,7 +10,7 @@ var _babel = require("./babel");
 var _getStorybookBabelCon = (0, _babel.getStorybookBabelConfig)(),
     plugins = _getStorybookBabelCon.plugins;
 
-var nodeModulesThatNeedToBeParsedBecauseTheyExposeES6 = ['@storybook[\\\\/]node_logger', '@testing-library[\\\\/]dom', '@testing-library[\\\\/]user-event', 'acorn-jsx', 'ansi-align', 'ansi-colors', 'ansi-escapes', 'ansi-regex', 'ansi-styles', 'better-opn', 'boxen', 'chalk', 'color-convert', 'commander', 'find-cache-dir', 'find-up', 'fs-extra', 'highlight.js', 'json5', 'node-fetch', 'pkg-dir', 'prettier', 'pretty-format', 'resolve-from', 'semver', 'slash'].map(function (n) {
+var nodeModulesThatNeedToBeParsedBecauseTheyExposeES6 = ['@storybook[\\\\/]expect', '@storybook[\\\\/]node_logger', '@testing-library[\\\\/]dom', '@testing-library[\\\\/]user-event', 'acorn-jsx', 'ansi-align', 'ansi-colors', 'ansi-escapes', 'ansi-regex', 'ansi-styles', 'better-opn', 'boxen', 'chalk', 'color-convert', 'commander', 'find-cache-dir', 'find-up', 'fs-extra', 'highlight.js', 'jest-mock', 'json5', 'node-fetch', 'pkg-dir', 'prettier', 'pretty-format', 'react-router', 'react-router-dom', 'resolve-from', 'semver', 'slash', 'strip-ansi'].map(function (n) {
   return new RegExp(`[\\\\/]node_modules[\\\\/]${n}`);
 });
 

package/dist/cjs/utils/file-cache.js

@@ -0,0 +1,71 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FileSystemCache = void 0;
+exports.createFileSystemCache = createFileSystemCache;
+
+var _fileSystemCache = _interopRequireDefault(require("file-system-cache"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// @ts-ignore - this package has no typings, so we wrap it and add typings that way, because we expose it
+class FileSystemCache {
+  constructor(options) {
+    this.internal = void 0;
+    this.internal = (0, _fileSystemCache.default)(options);
+  }
+
+  path(key) {
+    return this.internal.path(key);
+  }
+
+  fileExists(key) {
+    return this.internal.fileExists(key);
+  }
+
+  ensureBasePath() {
+    return this.internal.ensureBasePath();
+  }
+
+  get(key, defaultValue) {
+    return this.internal.get(key, defaultValue);
+  }
+
+  getSync(key, defaultValue) {
+    return this.internal.getSync(key, defaultValue);
+  }
+
+  set(key, value) {
+    return this.internal.set(key, value);
+  }
+
+  setSync(key, value) {
+    this.internal.setSync(key, value);
+    return this;
+  }
+
+  remove(key) {
+    return this.internal.remove(key);
+  }
+
+  clear() {
+    return this.internal.clear();
+  }
+
+  save() {
+    return this.internal.save();
+  }
+
+  load() {
+    return this.internal.load();
+  }
+
+}
+
+exports.FileSystemCache = FileSystemCache;
+
+function createFileSystemCache(options) {
+  return new FileSystemCache(options);
+}