@storybook/core-common 6.5.0-alpha.50 → 6.5.0-alpha.53

package/dist/cjs/presets.js

@@ -17,12 +17,12 @@ 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"];
@@ -71,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 }
@@ -85,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
   };
 };
 
@@ -131,31 +157,16 @@ var map = function ({
   configDir: configDir
 }) {
   return function (item) {
-    try {
-      if (isObject(item)) {
-        var _resolveAddonName = resolveAddonName(configDir, item.name),
-            _name = _resolveAddonName.name;
+    var options = isObject(item) ? item.options || undefined : undefined;
+    var name = isObject(item) ? item.name : item;
 
-        return _objectSpread(_objectSpread({}, item), {}, {
-          name: _name
-        });
-      }
-
-      var _resolveAddonName2 = resolveAddonName(configDir, item),
-          name = _resolveAddonName2.name,
-          type = _resolveAddonName2.type;
-
-      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;
@@ -171,9 +182,9 @@ function interopRequireDefault(filePath) {
 }
 
 function getContent(input) {
-  if (input.type === 'managerEntries') {
+  if (input.type === 'virtual') {
     var type = input.type,
-        _name2 = input.name,
+        _name = input.name,
         rest = _objectWithoutProperties(input, _excluded);
 
     return rest;

package/dist/cjs/utils/safeResolve.js

@@ -0,0 +1,30 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.safeResolveFrom = exports.safeResolve = void 0;
+
+var _resolveFrom = _interopRequireDefault(require("resolve-from"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var safeResolveFrom = function (path, file) {
+  try {
+    return (0, _resolveFrom.default)(path, file);
+  } catch (e) {
+    return undefined;
+  }
+};
+
+exports.safeResolveFrom = safeResolveFrom;
+
+var safeResolve = function (file) {
+  try {
+    return require.resolve(file);
+  } catch (e) {
+    return undefined;
+  }
+};
+
+exports.safeResolve = safeResolve;

package/dist/esm/presets.js

@@ -16,9 +16,9 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import dedent from 'ts-dedent';
 import { resolve } from 'path';
 import { logger } from '@storybook/node-logger';
-import resolveFrom from 'resolve-from';
 import { loadCustomPresets } from './utils/load-custom-presets';
 import { serverRequire } from './utils/interpret-require';
+import { safeResolve, safeResolveFrom } from './utils/safeResolve';
 
 var isObject = function (val) {
   return val != null && typeof val === 'object' && Array.isArray(val) === false;
@@ -52,8 +52,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 }
@@ -66,43 +66,69 @@ function resolvePresetFunction(input, presetOptions, framework, storybookOptions
  */
 
 
-export var resolveAddonName = function (configDir, name) {
-  var path;
+export var resolveAddonName = function (configDir, name, options) {
+  var r = name.startsWith('/') ? safeResolve : safeResolveFrom.bind(null, configDir);
+  var resolved = r(name);
 
-  if (name.startsWith('.')) {
-    path = resolveFrom(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
-
-
-  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: resolveFrom(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 = safeResolve(`${path}/manager`);
+  var registerFile = safeResolve(`${path}/register`) || safeResolve(`${path}/register-panel`);
+  var previewFile = safeResolve(`${path}/preview`);
+  var presetFile = safeResolve(`${path}/preset`);
+
+  if (!(managerFile || previewFile) && presetFile) {
     return {
-      name: resolveFrom(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: resolveFrom(configDir, name),
-    type: 'presets'
+    type: 'presets',
+    name: resolved
   };
 };
 
@@ -110,31 +136,16 @@ var map = function ({
   configDir: configDir
 }) {
   return function (item) {
-    try {
-      if (isObject(item)) {
-        var _resolveAddonName = resolveAddonName(configDir, item.name),
-            _name = _resolveAddonName.name;
+    var options = isObject(item) ? item.options || undefined : undefined;
+    var name = isObject(item) ? item.name : item;
 
-        return _objectSpread(_objectSpread({}, item), {}, {
-          name: _name
-        });
-      }
-
-      var _resolveAddonName2 = resolveAddonName(configDir, item),
-          name = _resolveAddonName2.name,
-          type = _resolveAddonName2.type;
-
-      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) {
-      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}`);
+      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;
@@ -150,9 +161,9 @@ function interopRequireDefault(filePath) {
 }
 
 function getContent(input) {
-  if (input.type === 'managerEntries') {
+  if (input.type === 'virtual') {
     var type = input.type,
-        _name2 = input.name,
+        _name = input.name,
         rest = _objectWithoutProperties(input, _excluded);
 
     return rest;

package/dist/esm/utils/safeResolve.js

@@ -0,0 +1,15 @@
+import resolveFrom from 'resolve-from';
+export var safeResolveFrom = function (path, file) {
+  try {
+    return resolveFrom(path, file);
+  } catch (e) {
+    return undefined;
+  }
+};
+export var safeResolve = function (file) {
+  try {
+    return require.resolve(file);
+  } catch (e) {
+    return undefined;
+  }
+};

package/dist/modern/presets.js

@@ -16,9 +16,9 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import dedent from 'ts-dedent';
 import { resolve } from 'path';
 import { logger } from '@storybook/node-logger';
-import resolveFrom from 'resolve-from';
 import { loadCustomPresets } from './utils/load-custom-presets';
 import { serverRequire } from './utils/interpret-require';
+import { safeResolve, safeResolveFrom } from './utils/safeResolve';
 
 var isObject = function (val) {
   return val != null && typeof val === 'object' && Array.isArray(val) === false;
@@ -52,8 +52,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 }
@@ -66,43 +66,69 @@ function resolvePresetFunction(input, presetOptions, framework, storybookOptions
  */
 
 
-export var resolveAddonName = function (configDir, name) {
-  var path;
+export var resolveAddonName = function (configDir, name, options) {
+  var r = name.startsWith('/') ? safeResolve : safeResolveFrom.bind(null, configDir);
+  var resolved = r(name);
 
-  if (name.startsWith('.')) {
-    path = resolveFrom(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
-
-
-  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: resolveFrom(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 = safeResolve(`${path}/manager`);
+  var registerFile = safeResolve(`${path}/register`) || safeResolve(`${path}/register-panel`);
+  var previewFile = safeResolve(`${path}/preview`);
+  var presetFile = safeResolve(`${path}/preset`);
+
+  if (!(managerFile || previewFile) && presetFile) {
     return {
-      name: resolveFrom(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: resolveFrom(configDir, name),
-    type: 'presets'
+    type: 'presets',
+    name: resolved
   };
 };
 
@@ -110,31 +136,16 @@ var map = function ({
   configDir: configDir
 }) {
   return function (item) {
-    try {
-      if (isObject(item)) {
-        var _resolveAddonName = resolveAddonName(configDir, item.name),
-            _name = _resolveAddonName.name;
+    var options = isObject(item) ? item.options || undefined : undefined;
+    var name = isObject(item) ? item.name : item;
 
-        return _objectSpread(_objectSpread({}, item), {}, {
-          name: _name
-        });
-      }
-
-      var _resolveAddonName2 = resolveAddonName(configDir, item),
-          name = _resolveAddonName2.name,
-          type = _resolveAddonName2.type;
-
-      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) {
-      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}`);
+      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;
@@ -150,9 +161,9 @@ function interopRequireDefault(filePath) {
 }
 
 function getContent(input) {
-  if (input.type === 'managerEntries') {
+  if (input.type === 'virtual') {
     var type = input.type,
-        _name2 = input.name,
+        _name = input.name,
         rest = _objectWithoutProperties(input, _excluded);
 
     return rest;

package/dist/modern/utils/safeResolve.js

@@ -0,0 +1,15 @@
+import resolveFrom from 'resolve-from';
+export var safeResolveFrom = function (path, file) {
+  try {
+    return resolveFrom(path, file);
+  } catch (e) {
+    return undefined;
+  }
+};
+export var safeResolve = function (file) {
+  try {
+    return require.resolve(file);
+  } catch (e) {
+    return undefined;
+  }
+};

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

@@ -4,8 +4,8 @@ export declare function filterPresetsConfig(presetsConfig: PresetConfig[]): Pres
  * 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 }
@@ -16,10 +16,21 @@ export declare function filterPresetsConfig(presetsConfig: PresetConfig[]): Pres
  * - { name: '@storybook/addon-docs(/preset)?', options: { ... } }
  *   =>  { type: 'presets', item: { name: '@storybook/addon-docs/preset', options } }
  */
-export declare const resolveAddonName: (configDir: string, name: string) => {
+interface ResolvedAddonPreset {
+    type: 'presets';
     name: string;
-    type: string;
-};
+}
+interface ResolvedAddonVirtual {
+    type: 'virtual';
+    name: string;
+    managerEntries?: string[];
+    previewAnnotations?: string[];
+    presets?: (string | {
+        name: string;
+        options?: any;
+    })[];
+}
+export declare const resolveAddonName: (configDir: string, name: string, options: any) => ResolvedAddonPreset | ResolvedAddonVirtual;
 export declare function loadPreset(input: PresetConfig, level: number, storybookOptions: InterPresetOptions): LoadedPreset[];
 declare type InterPresetOptions = Pick<CLIOptions & LoadOptions & BuilderOptions, Exclude<keyof (CLIOptions & LoadOptions & BuilderOptions), 'frameworkPresets'>>;
 export declare function getPresets(presets: PresetConfig[], storybookOptions: InterPresetOptions): Presets;

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

@@ -39,6 +39,14 @@ export interface CoreConfig {
     builder: BuilderConfig;
     disableWebpackDefaults?: boolean;
     channelOptions?: Partial<TelejsonOptions>;
+    /**
+     * enable CORS headings to run document in a "secure context"
+     * see: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer#security_requirements
+     * This enables these headers in development-mode:
+     *   Cross-Origin-Opener-Policy: same-origin
+     *   Cross-Origin-Embedder-Policy: require-corp
+     */
+    crossOriginIsolated?: boolean;
 }
 interface DirectoryMapping {
     from: string;
@@ -346,7 +354,13 @@ export interface StorybookConfig {
     webpackFinal?: (config: Configuration, options: Options) => Configuration | Promise<Configuration>;
     /**
      * Add additional scripts to run in the preview a la `.storybook/preview.js`
+     *
+     * @deprecated use `previewAnnotations` or `/preview.js` file instead
      */
     config?: (entries: Entry[], options: Options) => Entry[];
+    /**
+     * Add additional scripts to run in the preview a la `.storybook/preview.js`
+     */
+    previewAnnotations?: (entries: Entry[], options: Options) => Entry[];
 }
 export {};

package/dist/ts3.4/utils/safeResolve.d.ts

@@ -0,0 +1,2 @@
+export declare const safeResolveFrom: (path: string, file: string) => string;
+export declare const safeResolve: (file: string) => string;

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

@@ -4,8 +4,8 @@ export declare function filterPresetsConfig(presetsConfig: PresetConfig[]): Pres
  * 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 }
@@ -16,10 +16,21 @@ export declare function filterPresetsConfig(presetsConfig: PresetConfig[]): Pres
  * - { name: '@storybook/addon-docs(/preset)?', options: { ... } }
  *   =>  { type: 'presets', item: { name: '@storybook/addon-docs/preset', options } }
  */
-export declare const resolveAddonName: (configDir: string, name: string) => {
+interface ResolvedAddonPreset {
+    type: 'presets';
     name: string;
-    type: string;
-};
+}
+interface ResolvedAddonVirtual {
+    type: 'virtual';
+    name: string;
+    managerEntries?: string[];
+    previewAnnotations?: string[];
+    presets?: (string | {
+        name: string;
+        options?: any;
+    })[];
+}
+export declare const resolveAddonName: (configDir: string, name: string, options: any) => ResolvedAddonPreset | ResolvedAddonVirtual;
 export declare function loadPreset(input: PresetConfig, level: number, storybookOptions: InterPresetOptions): LoadedPreset[];
 declare type InterPresetOptions = Omit<CLIOptions & LoadOptions & BuilderOptions, 'frameworkPresets'>;
 export declare function getPresets(presets: PresetConfig[], storybookOptions: InterPresetOptions): Presets;

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

@@ -39,6 +39,14 @@ export interface CoreConfig {
     builder: BuilderConfig;
     disableWebpackDefaults?: boolean;
     channelOptions?: Partial<TelejsonOptions>;
+    /**
+     * enable CORS headings to run document in a "secure context"
+     * see: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer#security_requirements
+     * This enables these headers in development-mode:
+     *   Cross-Origin-Opener-Policy: same-origin
+     *   Cross-Origin-Embedder-Policy: require-corp
+     */
+    crossOriginIsolated?: boolean;
 }
 interface DirectoryMapping {
     from: string;
@@ -342,7 +350,13 @@ export interface StorybookConfig {
     webpackFinal?: (config: Configuration, options: Options) => Configuration | Promise<Configuration>;
     /**
      * Add additional scripts to run in the preview a la `.storybook/preview.js`
+     *
+     * @deprecated use `previewAnnotations` or `/preview.js` file instead
      */
     config?: (entries: Entry[], options: Options) => Entry[];
+    /**
+     * Add additional scripts to run in the preview a la `.storybook/preview.js`
+     */
+    previewAnnotations?: (entries: Entry[], options: Options) => Entry[];
 }
 export {};

package/dist/ts3.9/utils/safeResolve.d.ts

@@ -0,0 +1,2 @@
+export declare const safeResolveFrom: (path: string, file: string) => string;
+export declare const safeResolve: (file: string) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-common",
-  "version": "6.5.0-alpha.50",
+  "version": "6.5.0-alpha.53",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -62,7 +62,7 @@
     "@babel/preset-react": "^7.12.10",
     "@babel/preset-typescript": "^7.12.7",
     "@babel/register": "^7.12.1",
-    "@storybook/node-logger": "6.5.0-alpha.50",
+    "@storybook/node-logger": "6.5.0-alpha.53",
     "@storybook/semver": "^7.3.2",
     "@types/node": "^14.0.10 || ^16.0.0",
     "@types/pretty-hrtime": "^1.0.0",
@@ -111,6 +111,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6cf4571e5a1200613de94aa066fe93f75aec6ad1",
+  "gitHead": "652768b3ff83a355651d5636ccc4d78bee2cdbf9",
   "sbmodern": "dist/modern/index.js"
 }

package/templates/base-preview-head.html

@@ -1,6 +1,17 @@
 <base target="_parent" />
 
 <style>
+  /* While we aren't showing the main block yet, but still preparing, we want everything the user
+     has rendered, which may or may not be in #root, to be display none */
+  .sb-show-preparing-story:not(.sb-show-main) > :not(.sb-preparing-story) {
+    display: none;
+  }
+
+  .sb-show-preparing-docs:not(.sb-show-main) > :not(.sb-preparing-docs) {
+    display: none;
+  }
+
+  /* Hide our own blocks when we aren't supposed to be showing them */
   :not(.sb-show-preparing-story) > .sb-preparing-story,
   :not(.sb-show-preparing-docs) > .sb-preparing-docs,
   :not(.sb-show-nopreview) > .sb-nopreview,
@@ -140,6 +151,9 @@
   .sb-preparing-story,
   .sb-preparing-docs {
     background-color: white;
+    /* Maximum possible z-index. It would be better to use stacking contexts to ensure it's always
+    on top, but this isn't possible as it would require making CSS changes that could affect user code */
+    z-index: 2147483647;
   }
 
   .sb-loader {