@storybook/telemetry 6.5.8-alpha.0 → 6.5.9-alpha.1

package/dist/cjs/storybook-metadata.js

@@ -16,11 +16,15 @@ require("core-js/modules/es.array.iterator.js");
 
 require("core-js/modules/web.dom-collections.iterator.js");
 
+require("core-js/modules/es.promise.js");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.metaFrameworks = exports.getStorybookMetadata = exports.computeStorybookMetadata = void 0;
 
+require("regenerator-runtime/runtime.js");
+
 require("core-js/modules/es.array.map.js");
 
 require("core-js/modules/es.object.assign.js");
@@ -45,10 +49,6 @@ require("core-js/modules/es.array.includes.js");
 
 require("core-js/modules/es.string.includes.js");
 
-require("core-js/modules/es.promise.js");
-
-require("regenerator-runtime/runtime.js");
-
 var _readPkgUp = _interopRequireDefault(require("read-pkg-up"));
 
 var _detectPackageManager = require("detect-package-manager");
@@ -63,66 +63,16 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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; }
 
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-var cachedMetadata;
-
-var getStorybookMetadata = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_configDir) {
-    var _ref2;
-
-    var packageJson, configDir, mainConfig;
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            if (!cachedMetadata) {
-              _context.next = 2;
-              break;
-            }
-
-            return _context.abrupt("return", cachedMetadata);
-
-          case 2:
-            packageJson = _readPkgUp.default.sync({
-              cwd: process.cwd()
-            }).packageJson;
-            configDir = (_ref2 = _configDir || (0, _coreCommon.getStorybookConfiguration)(packageJson.scripts.storybook, '-c', '--config-dir')) !== null && _ref2 !== void 0 ? _ref2 : '.storybook';
-            mainConfig = (0, _coreCommon.loadMainConfig)({
-              configDir: configDir
-            });
-            _context.next = 7;
-            return computeStorybookMetadata({
-              mainConfig: mainConfig,
-              packageJson: packageJson
-            });
-
-          case 7:
-            cachedMetadata = _context.sent;
-            return _context.abrupt("return", cachedMetadata);
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
-          case 9:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
-  return function getStorybookMetadata(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-exports.getStorybookMetadata = getStorybookMetadata;
 var metaFrameworks = {
   next: 'Next',
   'react-scripts': 'CRA',
@@ -163,16 +113,16 @@ var getFrameworkOptions = function getFrameworkOptions(mainConfig) {
 
 
 var computeStorybookMetadata = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(_ref3) {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref) {
     var _mainConfig$core, _storybookPackages$st;
 
     var packageJson, mainConfig, metadata, allDependencies, metaFramework, _yield$getActualPacka, version, monorepoType, packageManagerType, packageManagerVerson, _builder$options, builder, addons, addonVersions, addonNames, storybookPackages, storybookPackageVersions, language, hasStorybookEslint, storybookInfo, storybookVersion;
 
-    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+    return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
-        switch (_context2.prev = _context2.next) {
+        switch (_context.prev = _context.next) {
           case 0:
-            packageJson = _ref3.packageJson, mainConfig = _ref3.mainConfig;
+            packageJson = _ref.packageJson, mainConfig = _ref.mainConfig;
             metadata = {
               generatedAt: new Date().getTime(),
               builder: {
@@ -190,15 +140,15 @@ var computeStorybookMetadata = /*#__PURE__*/function () {
             });
 
             if (!metaFramework) {
-              _context2.next = 10;
+              _context.next = 10;
               break;
             }
 
-            _context2.next = 7;
+            _context.next = 7;
             return (0, _packageVersions.getActualPackageVersion)(metaFramework);
 
           case 7:
-            _yield$getActualPacka = _context2.sent;
+            _yield$getActualPacka = _context.sent;
             version = _yield$getActualPacka.version;
             metadata.metaFramework = {
               name: metaFrameworks[metaFramework],
@@ -213,19 +163,19 @@ var computeStorybookMetadata = /*#__PURE__*/function () {
               metadata.monorepo = monorepoType;
             }
 
-            _context2.prev = 12;
-            _context2.next = 15;
+            _context.prev = 12;
+            _context.next = 15;
             return (0, _detectPackageManager.detect)({
               cwd: (0, _coreCommon.getProjectRoot)()
             });
 
           case 15:
-            packageManagerType = _context2.sent;
-            _context2.next = 18;
+            packageManagerType = _context.sent;
+            _context.next = 18;
             return (0, _detectPackageManager.getNpmVersion)(packageManagerType);
 
           case 18:
-            packageManagerVerson = _context2.sent;
+            packageManagerVerson = _context.sent;
             metadata.packageManager = {
               type: packageManagerType,
               version: packageManagerVerson
@@ -233,12 +183,12 @@ var computeStorybookMetadata = /*#__PURE__*/function () {
             // so we just set the package manager if the detection is successful
             // eslint-disable-next-line no-empty
 
-            _context2.next = 24;
+            _context.next = 24;
             break;
 
           case 22:
-            _context2.prev = 22;
-            _context2.t0 = _context2["catch"](12);
+            _context.prev = 22;
+            _context.t0 = _context["catch"](12);
 
           case 24:
             metadata.hasCustomBabel = !!mainConfig.babel;
@@ -273,7 +223,7 @@ var computeStorybookMetadata = /*#__PURE__*/function () {
                 var options;
 
                 if (typeof addon === 'string') {
-                  result = addon.replace('/register', '');
+                  result = addon.replace('/register', '').replace('/preset', '');
                 } else {
                   options = addon.options;
                   result = addon.name;
@@ -286,14 +236,14 @@ var computeStorybookMetadata = /*#__PURE__*/function () {
               });
             }
 
-            _context2.next = 35;
+            _context.next = 35;
             return (0, _packageVersions.getActualPackageVersions)(addons);
 
           case 35:
-            addonVersions = _context2.sent;
-            addonVersions.forEach(function (_ref5) {
-              var name = _ref5.name,
-                  version = _ref5.version;
+            addonVersions = _context.sent;
+            addonVersions.forEach(function (_ref3) {
+              var name = _ref3.name,
+                  version = _ref3.version;
               addons[name].version = version;
             });
             addonNames = Object.keys(addons); // all Storybook deps minus the addons
@@ -305,21 +255,21 @@ var computeStorybookMetadata = /*#__PURE__*/function () {
                 version: undefined
               }));
             }, {});
-            _context2.next = 41;
+            _context.next = 41;
             return (0, _packageVersions.getActualPackageVersions)(storybookPackages);
 
           case 41:
-            storybookPackageVersions = _context2.sent;
-            storybookPackageVersions.forEach(function (_ref6) {
-              var name = _ref6.name,
-                  version = _ref6.version;
+            storybookPackageVersions = _context.sent;
+            storybookPackageVersions.forEach(function (_ref4) {
+              var name = _ref4.name,
+                  version = _ref4.version;
               storybookPackages[name].version = version;
             });
             language = allDependencies.typescript ? 'typescript' : 'javascript';
             hasStorybookEslint = !!allDependencies['eslint-plugin-storybook'];
             storybookInfo = (0, _coreCommon.getStorybookInfo)(packageJson);
             storybookVersion = ((_storybookPackages$st = storybookPackages[storybookInfo.frameworkPackage]) === null || _storybookPackages$st === void 0 ? void 0 : _storybookPackages$st.version) || storybookInfo.version;
-            return _context2.abrupt("return", Object.assign({}, metadata, {
+            return _context.abrupt("return", Object.assign({}, metadata, {
               storybookVersion: storybookVersion,
               language: language,
               storybookPackages: storybookPackages,
@@ -332,16 +282,66 @@ var computeStorybookMetadata = /*#__PURE__*/function () {
             }));
 
           case 48:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[12, 22]]);
+  }));
+
+  return function computeStorybookMetadata(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+exports.computeStorybookMetadata = computeStorybookMetadata;
+var cachedMetadata;
+
+var getStorybookMetadata = /*#__PURE__*/function () {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(_configDir) {
+    var _ref6;
+
+    var packageJson, configDir, mainConfig;
+    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!cachedMetadata) {
+              _context2.next = 2;
+              break;
+            }
+
+            return _context2.abrupt("return", cachedMetadata);
+
+          case 2:
+            packageJson = _readPkgUp.default.sync({
+              cwd: process.cwd()
+            }).packageJson;
+            configDir = (_ref6 = _configDir || (0, _coreCommon.getStorybookConfiguration)(packageJson.scripts.storybook, '-c', '--config-dir')) !== null && _ref6 !== void 0 ? _ref6 : '.storybook';
+            mainConfig = (0, _coreCommon.loadMainConfig)({
+              configDir: configDir
+            });
+            _context2.next = 7;
+            return computeStorybookMetadata({
+              mainConfig: mainConfig,
+              packageJson: packageJson
+            });
+
+          case 7:
+            cachedMetadata = _context2.sent;
+            return _context2.abrupt("return", cachedMetadata);
+
+          case 9:
           case "end":
             return _context2.stop();
         }
       }
-    }, _callee2, null, [[12, 22]]);
+    }, _callee2);
   }));
 
-  return function computeStorybookMetadata(_x2) {
-    return _ref4.apply(this, arguments);
+  return function getStorybookMetadata(_x2) {
+    return _ref5.apply(this, arguments);
   };
 }();
 
-exports.computeStorybookMetadata = computeStorybookMetadata;
+exports.getStorybookMetadata = getStorybookMetadata;

package/dist/esm/storybook-metadata.js

@@ -1,5 +1,11 @@
+import "regenerator-runtime/runtime.js";
+
 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; }
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -18,7 +24,6 @@ import "core-js/modules/es.string.replace.js";
 import "core-js/modules/es.array.filter.js";
 import "core-js/modules/es.array.includes.js";
 import "core-js/modules/es.string.includes.js";
-import "core-js/modules/es.promise.js";
 import "core-js/modules/es.array.slice.js";
 import "core-js/modules/es.array.from.js";
 import "core-js/modules/es.string.iterator.js";
@@ -27,64 +32,12 @@ import "core-js/modules/es.symbol.description.js";
 import "core-js/modules/es.symbol.iterator.js";
 import "core-js/modules/es.array.iterator.js";
 import "core-js/modules/web.dom-collections.iterator.js";
-import "regenerator-runtime/runtime.js";
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
+import "core-js/modules/es.promise.js";
 import readPkgUp from 'read-pkg-up';
 import { detect, getNpmVersion } from 'detect-package-manager';
 import { loadMainConfig, getStorybookInfo, getStorybookConfiguration, getProjectRoot } from '@storybook/core-common';
 import { getActualPackageVersion, getActualPackageVersions } from './package-versions';
 import { getMonorepoType } from './get-monorepo-type';
-var cachedMetadata;
-export var getStorybookMetadata = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_configDir) {
-    var _ref2;
-
-    var packageJson, configDir, mainConfig;
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            if (!cachedMetadata) {
-              _context.next = 2;
-              break;
-            }
-
-            return _context.abrupt("return", cachedMetadata);
-
-          case 2:
-            packageJson = readPkgUp.sync({
-              cwd: process.cwd()
-            }).packageJson;
-            configDir = (_ref2 = _configDir || getStorybookConfiguration(packageJson.scripts.storybook, '-c', '--config-dir')) !== null && _ref2 !== void 0 ? _ref2 : '.storybook';
-            mainConfig = loadMainConfig({
-              configDir: configDir
-            });
-            _context.next = 7;
-            return computeStorybookMetadata({
-              mainConfig: mainConfig,
-              packageJson: packageJson
-            });
-
-          case 7:
-            cachedMetadata = _context.sent;
-            return _context.abrupt("return", cachedMetadata);
-
-          case 9:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-
-  return function getStorybookMetadata(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
 export var metaFrameworks = {
   next: 'Next',
   'react-scripts': 'CRA',
@@ -123,16 +76,16 @@ var getFrameworkOptions = function getFrameworkOptions(mainConfig) {
 
 
 export var computeStorybookMetadata = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(_ref3) {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref) {
     var _mainConfig$core, _storybookPackages$st;
 
     var packageJson, mainConfig, metadata, allDependencies, metaFramework, _yield$getActualPacka, version, monorepoType, packageManagerType, packageManagerVerson, _builder$options, builder, addons, addonVersions, addonNames, storybookPackages, storybookPackageVersions, language, hasStorybookEslint, storybookInfo, storybookVersion;
 
-    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+    return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
-        switch (_context2.prev = _context2.next) {
+        switch (_context.prev = _context.next) {
           case 0:
-            packageJson = _ref3.packageJson, mainConfig = _ref3.mainConfig;
+            packageJson = _ref.packageJson, mainConfig = _ref.mainConfig;
             metadata = {
               generatedAt: new Date().getTime(),
               builder: {
@@ -150,15 +103,15 @@ export var computeStorybookMetadata = /*#__PURE__*/function () {
             });
 
             if (!metaFramework) {
-              _context2.next = 10;
+              _context.next = 10;
               break;
             }
 
-            _context2.next = 7;
+            _context.next = 7;
             return getActualPackageVersion(metaFramework);
 
           case 7:
-            _yield$getActualPacka = _context2.sent;
+            _yield$getActualPacka = _context.sent;
             version = _yield$getActualPacka.version;
             metadata.metaFramework = {
               name: metaFrameworks[metaFramework],
@@ -173,19 +126,19 @@ export var computeStorybookMetadata = /*#__PURE__*/function () {
               metadata.monorepo = monorepoType;
             }
 
-            _context2.prev = 12;
-            _context2.next = 15;
+            _context.prev = 12;
+            _context.next = 15;
             return detect({
               cwd: getProjectRoot()
             });
 
           case 15:
-            packageManagerType = _context2.sent;
-            _context2.next = 18;
+            packageManagerType = _context.sent;
+            _context.next = 18;
             return getNpmVersion(packageManagerType);
 
           case 18:
-            packageManagerVerson = _context2.sent;
+            packageManagerVerson = _context.sent;
             metadata.packageManager = {
               type: packageManagerType,
               version: packageManagerVerson
@@ -193,12 +146,12 @@ export var computeStorybookMetadata = /*#__PURE__*/function () {
             // so we just set the package manager if the detection is successful
             // eslint-disable-next-line no-empty
 
-            _context2.next = 24;
+            _context.next = 24;
             break;
 
           case 22:
-            _context2.prev = 22;
-            _context2.t0 = _context2["catch"](12);
+            _context.prev = 22;
+            _context.t0 = _context["catch"](12);
 
           case 24:
             metadata.hasCustomBabel = !!mainConfig.babel;
@@ -233,7 +186,7 @@ export var computeStorybookMetadata = /*#__PURE__*/function () {
                 var options;
 
                 if (typeof addon === 'string') {
-                  result = addon.replace('/register', '');
+                  result = addon.replace('/register', '').replace('/preset', '');
                 } else {
                   options = addon.options;
                   result = addon.name;
@@ -246,14 +199,14 @@ export var computeStorybookMetadata = /*#__PURE__*/function () {
               });
             }
 
-            _context2.next = 35;
+            _context.next = 35;
             return getActualPackageVersions(addons);
 
           case 35:
-            addonVersions = _context2.sent;
-            addonVersions.forEach(function (_ref5) {
-              var name = _ref5.name,
-                  version = _ref5.version;
+            addonVersions = _context.sent;
+            addonVersions.forEach(function (_ref3) {
+              var name = _ref3.name,
+                  version = _ref3.version;
               addons[name].version = version;
             });
             addonNames = Object.keys(addons); // all Storybook deps minus the addons
@@ -265,21 +218,21 @@ export var computeStorybookMetadata = /*#__PURE__*/function () {
                 version: undefined
               }));
             }, {});
-            _context2.next = 41;
+            _context.next = 41;
             return getActualPackageVersions(storybookPackages);
 
           case 41:
-            storybookPackageVersions = _context2.sent;
-            storybookPackageVersions.forEach(function (_ref6) {
-              var name = _ref6.name,
-                  version = _ref6.version;
+            storybookPackageVersions = _context.sent;
+            storybookPackageVersions.forEach(function (_ref4) {
+              var name = _ref4.name,
+                  version = _ref4.version;
               storybookPackages[name].version = version;
             });
             language = allDependencies.typescript ? 'typescript' : 'javascript';
             hasStorybookEslint = !!allDependencies['eslint-plugin-storybook'];
             storybookInfo = getStorybookInfo(packageJson);
             storybookVersion = ((_storybookPackages$st = storybookPackages[storybookInfo.frameworkPackage]) === null || _storybookPackages$st === void 0 ? void 0 : _storybookPackages$st.version) || storybookInfo.version;
-            return _context2.abrupt("return", Object.assign({}, metadata, {
+            return _context.abrupt("return", Object.assign({}, metadata, {
               storybookVersion: storybookVersion,
               language: language,
               storybookPackages: storybookPackages,
@@ -292,14 +245,61 @@ export var computeStorybookMetadata = /*#__PURE__*/function () {
             }));
 
           case 48:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[12, 22]]);
+  }));
+
+  return function computeStorybookMetadata(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+var cachedMetadata;
+export var getStorybookMetadata = /*#__PURE__*/function () {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(_configDir) {
+    var _ref6;
+
+    var packageJson, configDir, mainConfig;
+    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!cachedMetadata) {
+              _context2.next = 2;
+              break;
+            }
+
+            return _context2.abrupt("return", cachedMetadata);
+
+          case 2:
+            packageJson = readPkgUp.sync({
+              cwd: process.cwd()
+            }).packageJson;
+            configDir = (_ref6 = _configDir || getStorybookConfiguration(packageJson.scripts.storybook, '-c', '--config-dir')) !== null && _ref6 !== void 0 ? _ref6 : '.storybook';
+            mainConfig = loadMainConfig({
+              configDir: configDir
+            });
+            _context2.next = 7;
+            return computeStorybookMetadata({
+              mainConfig: mainConfig,
+              packageJson: packageJson
+            });
+
+          case 7:
+            cachedMetadata = _context2.sent;
+            return _context2.abrupt("return", cachedMetadata);
+
+          case 9:
           case "end":
             return _context2.stop();
         }
       }
-    }, _callee2, null, [[12, 22]]);
+    }, _callee2);
   }));
 
-  return function computeStorybookMetadata(_x2) {
-    return _ref4.apply(this, arguments);
+  return function getStorybookMetadata(_x2) {
+    return _ref5.apply(this, arguments);
   };
 }();

package/dist/modern/storybook-metadata.js

@@ -4,27 +4,6 @@ import { detect, getNpmVersion } from 'detect-package-manager';
 import { loadMainConfig, getStorybookInfo, getStorybookConfiguration, getProjectRoot } from '@storybook/core-common';
 import { getActualPackageVersion, getActualPackageVersions } from './package-versions';
 import { getMonorepoType } from './get-monorepo-type';
-let cachedMetadata;
-export const getStorybookMetadata = async _configDir => {
-  var _ref;
-
-  if (cachedMetadata) {
-    return cachedMetadata;
-  }
-
-  const packageJson = readPkgUp.sync({
-    cwd: process.cwd()
-  }).packageJson;
-  const configDir = (_ref = _configDir || getStorybookConfiguration(packageJson.scripts.storybook, '-c', '--config-dir')) !== null && _ref !== void 0 ? _ref : '.storybook';
-  const mainConfig = loadMainConfig({
-    configDir
-  });
-  cachedMetadata = await computeStorybookMetadata({
-    mainConfig,
-    packageJson
-  });
-  return cachedMetadata;
-};
 export const metaFrameworks = {
   next: 'Next',
   'react-scripts': 'CRA',
@@ -135,7 +114,7 @@ export const computeStorybookMetadata = async ({
       let options;
 
       if (typeof addon === 'string') {
-        result = addon.replace('/register', '');
+        result = addon.replace('/register', '').replace('/preset', '');
       } else {
         options = addon.options;
         result = addon.name;
@@ -186,4 +165,25 @@ export const computeStorybookMetadata = async ({
     addons,
     hasStorybookEslint
   });
+};
+let cachedMetadata;
+export const getStorybookMetadata = async _configDir => {
+  var _ref;
+
+  if (cachedMetadata) {
+    return cachedMetadata;
+  }
+
+  const packageJson = readPkgUp.sync({
+    cwd: process.cwd()
+  }).packageJson;
+  const configDir = (_ref = _configDir || getStorybookConfiguration(packageJson.scripts.storybook, '-c', '--config-dir')) !== null && _ref !== void 0 ? _ref : '.storybook';
+  const mainConfig = loadMainConfig({
+    configDir
+  });
+  cachedMetadata = await computeStorybookMetadata({
+    mainConfig,
+    packageJson
+  });
+  return cachedMetadata;
 };

package/dist/ts3.4/storybook-metadata.d.ts

@@ -1,8 +1,8 @@
 import { StorybookConfig, PackageJson } from '@storybook/core-common';
 import { StorybookMetadata } from './types';
-export declare const getStorybookMetadata: (_configDir: string) => Promise<StorybookMetadata>;
 export declare const metaFrameworks: Record<string, string>;
 export declare const computeStorybookMetadata: ({ packageJson, mainConfig, }: {
     packageJson: PackageJson;
     mainConfig: StorybookConfig & Record<string, any>;
 }) => Promise<StorybookMetadata>;
+export declare const getStorybookMetadata: (_configDir: string) => Promise<StorybookMetadata>;

package/dist/ts3.9/storybook-metadata.d.ts

@@ -1,8 +1,8 @@
 import type { StorybookConfig, PackageJson } from '@storybook/core-common';
 import type { StorybookMetadata } from './types';
-export declare const getStorybookMetadata: (_configDir: string) => Promise<StorybookMetadata>;
 export declare const metaFrameworks: Record<string, string>;
 export declare const computeStorybookMetadata: ({ packageJson, mainConfig, }: {
     packageJson: PackageJson;
     mainConfig: StorybookConfig & Record<string, any>;
 }) => Promise<StorybookMetadata>;
+export declare const getStorybookMetadata: (_configDir: string) => Promise<StorybookMetadata>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/telemetry",
-  "version": "6.5.8-alpha.0",
+  "version": "6.5.9-alpha.1",
   "description": "Telemetry logging for crash reports and usage statistics",
   "keywords": [
     "storybook"
@@ -40,8 +40,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/client-logger": "6.5.8-alpha.0",
-    "@storybook/core-common": "6.5.8-alpha.0",
+    "@storybook/client-logger": "6.5.9-alpha.1",
+    "@storybook/core-common": "6.5.9-alpha.1",
     "chalk": "^4.1.0",
     "core-js": "^3.8.2",
     "detect-package-manager": "^2.0.1",
@@ -56,6 +56,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "22683e756917d598c87fbcf73de434e1ae608556",
+  "gitHead": "9c2e14f3230290d5ed7f3c60f153cc1a2126f95c",
   "sbmodern": "dist/modern/index.js"
 }