@storybook/addon-controls 6.4.0-beta.3 → 6.4.0-beta.33

package/dist/cjs/preset/checkDocsLoaded.js

@@ -0,0 +1,61 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+require("core-js/modules/es.weak-map.js");
+
+require("core-js/modules/es.string.iterator.js");
+
+require("core-js/modules/es.array.iterator.js");
+
+require("core-js/modules/web.dom-collections.iterator.js");
+
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+
+require("core-js/modules/es.symbol.js");
+
+require("core-js/modules/es.symbol.description.js");
+
+require("core-js/modules/es.symbol.iterator.js");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.checkDocsLoaded = void 0;
+
+require("core-js/modules/es.array.join.js");
+
+require("core-js/modules/es.promise.js");
+
+require("core-js/modules/es.object.to-string.js");
+
+var _coreCommon = require("@storybook/core-common");
+
+var _path = _interopRequireDefault(require("path"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var checkDocsLoaded = function checkDocsLoaded(configDir) {
+  (0, _coreCommon.checkAddonOrder)({
+    before: {
+      name: '@storybook/addon-docs',
+      inEssentials: true
+    },
+    after: {
+      name: '@storybook/addon-controls',
+      inEssentials: true
+    },
+    configFile: _path.default.isAbsolute(configDir) ? _path.default.join(configDir, 'main') : _path.default.join(process.cwd(), configDir, 'main'),
+    getConfig: function getConfig(configFile) {
+      return Promise.resolve("".concat(configFile)).then(function (s) {
+        return _interopRequireWildcard(require(s));
+      });
+    }
+  });
+};
+
+exports.checkDocsLoaded = checkDocsLoaded;

package/dist/esm/preset/checkDocsLoaded.js

@@ -0,0 +1,21 @@
+import "core-js/modules/es.array.join.js";
+import "core-js/modules/es.promise.js";
+import "core-js/modules/es.object.to-string.js";
+import { checkAddonOrder } from '@storybook/core-common';
+import path from 'path';
+export var checkDocsLoaded = function checkDocsLoaded(configDir) {
+  checkAddonOrder({
+    before: {
+      name: '@storybook/addon-docs',
+      inEssentials: true
+    },
+    after: {
+      name: '@storybook/addon-controls',
+      inEssentials: true
+    },
+    configFile: path.isAbsolute(configDir) ? path.join(configDir, 'main') : path.join(process.cwd(), configDir, 'main'),
+    getConfig: function getConfig(configFile) {
+      return import(configFile);
+    }
+  });
+};

package/dist/modern/preset/checkDocsLoaded.js

@@ -0,0 +1,16 @@
+import { checkAddonOrder } from '@storybook/core-common';
+import path from 'path';
+export const checkDocsLoaded = configDir => {
+  checkAddonOrder({
+    before: {
+      name: '@storybook/addon-docs',
+      inEssentials: true
+    },
+    after: {
+      name: '@storybook/addon-controls',
+      inEssentials: true
+    },
+    configFile: path.isAbsolute(configDir) ? path.join(configDir, 'main') : path.join(process.cwd(), configDir, 'main'),
+    getConfig: configFile => import(configFile)
+  });
+};

package/dist/ts3.4/preset/checkDocsLoaded.d.ts

@@ -0,0 +1 @@
+export declare const checkDocsLoaded: (configDir: string) => void;

package/dist/ts3.9/preset/checkDocsLoaded.d.ts

@@ -0,0 +1 @@
+export declare const checkDocsLoaded: (configDir: string) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-controls",
-  "version": "6.4.0-beta.3",
+  "version": "6.4.0-beta.33",
   "description": "Interact with component inputs dynamically in the Storybook UI",
   "keywords": [
     "addon",
@@ -45,14 +45,15 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.4.0-beta.3",
-    "@storybook/api": "6.4.0-beta.3",
-    "@storybook/client-logger": "6.4.0-beta.3",
-    "@storybook/components": "6.4.0-beta.3",
-    "@storybook/csf": "0.0.2--canary.6aca495.0",
-    "@storybook/node-logger": "6.4.0-beta.3",
-    "@storybook/store": "6.4.0-beta.3",
-    "@storybook/theming": "6.4.0-beta.3",
+    "@storybook/addons": "6.4.0-beta.33",
+    "@storybook/api": "6.4.0-beta.33",
+    "@storybook/client-logger": "6.4.0-beta.33",
+    "@storybook/components": "6.4.0-beta.33",
+    "@storybook/core-common": "6.4.0-beta.33",
+    "@storybook/csf": "0.0.2--canary.87bc651.0",
+    "@storybook/node-logger": "6.4.0-beta.33",
+    "@storybook/store": "6.4.0-beta.33",
+    "@storybook/theming": "6.4.0-beta.33",
     "core-js": "^3.8.2",
     "lodash": "^4.17.20",
     "ts-dedent": "^2.0.0"
@@ -72,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0fc9200599c97a5797c5af886792200cd29e2046",
+  "gitHead": "c85171dc319d1d3a31eee1b762f01ba84ae45194",
   "sbmodern": "dist/modern/register.js",
   "storybook": {
     "displayName": "Controls",

package/preset.js

@@ -1,7 +1,7 @@
-const { ensureDocsBeforeControls } = require('./dist/cjs/preset/ensureDocsBeforeControls');
-
 function managerEntries(entry = [], options) {
-  ensureDocsBeforeControls(options.configDir);
+  // eslint-disable-next-line global-require
+  const { checkDocsLoaded } = require('./dist/cjs/preset/checkDocsLoaded');
+  checkDocsLoaded(options.configDir);
   return [...entry, require.resolve('./dist/esm/register')];
 }
 

package/dist/cjs/preset/ensureDocsBeforeControls.js

@@ -1,75 +0,0 @@
-"use strict";
-
-require("core-js/modules/es.array.slice.js");
-
-require("core-js/modules/es.object.freeze.js");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ensureDocsBeforeControls = exports.verifyDocsBeforeControls = void 0;
-
-require("core-js/modules/es.array.find-index.js");
-
-require("core-js/modules/es.function.name.js");
-
-require("core-js/modules/es.array.includes.js");
-
-require("core-js/modules/es.string.includes.js");
-
-require("core-js/modules/es.array.join.js");
-
-var _path = _interopRequireDefault(require("path"));
-
-var _nodeLogger = require("@storybook/node-logger");
-
-var _tsDedent = _interopRequireDefault(require("ts-dedent"));
-
-var _templateObject;
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
-var findIndex = function findIndex(addon, addons) {
-  return addons.findIndex(function (entry) {
-    var name = entry.name || entry;
-    return name && name.includes(addon);
-  });
-};
-
-var indexOfAddonOrEssentials = function indexOfAddonOrEssentials(addon, addons) {
-  var index = findIndex(addon, addons);
-  return index >= 0 ? index : findIndex('@storybook/addon-essentials', addons);
-};
-
-var verifyDocsBeforeControls = function verifyDocsBeforeControls(addons) {
-  var docsIndex = indexOfAddonOrEssentials('@storybook/addon-docs', addons);
-  var controlsIndex = indexOfAddonOrEssentials('@storybook/addon-controls', addons);
-  return controlsIndex >= 0 && docsIndex >= 0 && docsIndex <= controlsIndex;
-};
-
-exports.verifyDocsBeforeControls = verifyDocsBeforeControls;
-
-var ensureDocsBeforeControls = function ensureDocsBeforeControls(configDir) {
-  var mainFile = _path.default.isAbsolute(configDir) ? _path.default.join(configDir, 'main') : _path.default.join(process.cwd(), configDir, 'main');
-
-  try {
-    // eslint-disable-next-line global-require,import/no-dynamic-require
-    var main = require(mainFile);
-
-    if (!(main !== null && main !== void 0 && main.addons)) {
-      _nodeLogger.logger.warn("Unable to find main.js addons: ".concat(mainFile));
-
-      return;
-    }
-
-    if (!verifyDocsBeforeControls(main.addons)) {
-      _nodeLogger.logger.warn((0, _tsDedent.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        Expected '@storybook/addon-docs' to be listed before '@storybook/addon-controls' (or '@storybook/addon-essentials'). Check your main.js?\n        If addon-docs or addon-essentials is included by another addon/preset you can safely ignore this warning.\n        \n        https://github.com/storybookjs/storybook/issues/11442\n      "]))));
-    }
-  } catch (err) {
-    _nodeLogger.logger.warn("Unable to find main.js: ".concat(mainFile));
-  }
-};
-
-exports.ensureDocsBeforeControls = ensureDocsBeforeControls;

package/dist/esm/preset/ensureDocsBeforeControls.js

@@ -1,51 +0,0 @@
-var _templateObject;
-
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
-import "core-js/modules/es.array.find-index.js";
-import "core-js/modules/es.function.name.js";
-import "core-js/modules/es.array.includes.js";
-import "core-js/modules/es.string.includes.js";
-import "core-js/modules/es.array.join.js";
-import "core-js/modules/es.array.slice.js";
-import "core-js/modules/es.object.freeze.js";
-import path from 'path';
-import { logger } from '@storybook/node-logger';
-import dedent from 'ts-dedent';
-
-var findIndex = function findIndex(addon, addons) {
-  return addons.findIndex(function (entry) {
-    var name = entry.name || entry;
-    return name && name.includes(addon);
-  });
-};
-
-var indexOfAddonOrEssentials = function indexOfAddonOrEssentials(addon, addons) {
-  var index = findIndex(addon, addons);
-  return index >= 0 ? index : findIndex('@storybook/addon-essentials', addons);
-};
-
-export var verifyDocsBeforeControls = function verifyDocsBeforeControls(addons) {
-  var docsIndex = indexOfAddonOrEssentials('@storybook/addon-docs', addons);
-  var controlsIndex = indexOfAddonOrEssentials('@storybook/addon-controls', addons);
-  return controlsIndex >= 0 && docsIndex >= 0 && docsIndex <= controlsIndex;
-};
-export var ensureDocsBeforeControls = function ensureDocsBeforeControls(configDir) {
-  var mainFile = path.isAbsolute(configDir) ? path.join(configDir, 'main') : path.join(process.cwd(), configDir, 'main');
-
-  try {
-    // eslint-disable-next-line global-require,import/no-dynamic-require
-    var main = require(mainFile);
-
-    if (!(main !== null && main !== void 0 && main.addons)) {
-      logger.warn("Unable to find main.js addons: ".concat(mainFile));
-      return;
-    }
-
-    if (!verifyDocsBeforeControls(main.addons)) {
-      logger.warn(dedent(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        Expected '@storybook/addon-docs' to be listed before '@storybook/addon-controls' (or '@storybook/addon-essentials'). Check your main.js?\n        If addon-docs or addon-essentials is included by another addon/preset you can safely ignore this warning.\n        \n        https://github.com/storybookjs/storybook/issues/11442\n      "]))));
-    }
-  } catch (err) {
-    logger.warn("Unable to find main.js: ".concat(mainFile));
-  }
-};

package/dist/modern/preset/ensureDocsBeforeControls.js

@@ -1,43 +0,0 @@
-import path from 'path';
-import { logger } from '@storybook/node-logger';
-import dedent from 'ts-dedent';
-
-const findIndex = (addon, addons) => addons.findIndex(entry => {
-  const name = entry.name || entry;
-  return name && name.includes(addon);
-});
-
-const indexOfAddonOrEssentials = (addon, addons) => {
-  const index = findIndex(addon, addons);
-  return index >= 0 ? index : findIndex('@storybook/addon-essentials', addons);
-};
-
-export const verifyDocsBeforeControls = addons => {
-  const docsIndex = indexOfAddonOrEssentials('@storybook/addon-docs', addons);
-  const controlsIndex = indexOfAddonOrEssentials('@storybook/addon-controls', addons);
-  return controlsIndex >= 0 && docsIndex >= 0 && docsIndex <= controlsIndex;
-};
-export const ensureDocsBeforeControls = configDir => {
-  const mainFile = path.isAbsolute(configDir) ? path.join(configDir, 'main') : path.join(process.cwd(), configDir, 'main');
-
-  try {
-    // eslint-disable-next-line global-require,import/no-dynamic-require
-    const main = require(mainFile);
-
-    if (!(main !== null && main !== void 0 && main.addons)) {
-      logger.warn(`Unable to find main.js addons: ${mainFile}`);
-      return;
-    }
-
-    if (!verifyDocsBeforeControls(main.addons)) {
-      logger.warn(dedent`
-        Expected '@storybook/addon-docs' to be listed before '@storybook/addon-controls' (or '@storybook/addon-essentials'). Check your main.js?
-        If addon-docs or addon-essentials is included by another addon/preset you can safely ignore this warning.
-        
-        https://github.com/storybookjs/storybook/issues/11442
-      `);
-    }
-  } catch (err) {
-    logger.warn(`Unable to find main.js: ${mainFile}`);
-  }
-};

package/dist/ts3.4/preset/ensureDocsBeforeControls.d.ts

@@ -1,7 +0,0 @@
-declare type OptionsEntry = {
-    name: string;
-};
-declare type Entry = string | OptionsEntry;
-export declare const verifyDocsBeforeControls: (addons: Entry[]) => boolean;
-export declare const ensureDocsBeforeControls: (configDir: string) => void;
-export {};

package/dist/ts3.9/preset/ensureDocsBeforeControls.d.ts

@@ -1,7 +0,0 @@
-declare type OptionsEntry = {
-    name: string;
-};
-declare type Entry = string | OptionsEntry;
-export declare const verifyDocsBeforeControls: (addons: Entry[]) => boolean;
-export declare const ensureDocsBeforeControls: (configDir: string) => void;
-export {};