@storybook/core-server 7.0.0-beta.1 → 7.0.0-beta.2

package/dist/cjs/build-static.js

@@ -133,9 +133,14 @@ async function buildStaticStandalone(options) {
   if (!(core !== null && core !== void 0 && core.disableTelemetry)) {
     effects.push(initializedStoryIndexGenerator.then(async function (generator) {
       var storyIndex = await (generator === null || generator === void 0 ? void 0 : generator.getIndex());
-      var payload = storyIndex ? {
-        storyIndex: (0, _summarizeIndex.summarizeIndex)(storyIndex)
-      } : undefined;
+      var payload = {
+        precedingUpgrade: await (0, _telemetry.getPrecedingUpgrade)()
+      };
+      if (storyIndex) {
+        Object.assign(payload, {
+          storyIndex: (0, _summarizeIndex.summarizeIndex)(storyIndex)
+        });
+      }
       await (0, _telemetry.telemetry)('build', payload, {
         configDir: options.configDir
       });

package/dist/cjs/dev-server.js

@@ -104,7 +104,9 @@ async function storybookDevServer(options) {
   // this is a preview route, the builder has to be started before we can serve it
   // this handler keeps request to that route pending until the builder is ready to serve it, preventing a 404
   _router.router.get('/iframe.html', function (req, res, next) {
-    previewStarted.then(function () {
+    // We need to catch here or node will treat any errors thrown by `previewStarted` as
+    // unhandled and exit (even though they are very much handled below)
+    previewStarted.catch(function () {}).then(function () {
       return next();
     });
   });

package/dist/cjs/utils/doTelemetry.js

@@ -15,10 +15,15 @@ async function doTelemetry(core, initializedStoryIndexGenerator, options) {
       var storyIndex = await (generator === null || generator === void 0 ? void 0 : generator.getIndex());
       var versionCheck = options.versionCheck,
         versionUpdates = options.versionUpdates;
-      var payload = storyIndex ? {
-        versionStatus: versionUpdates ? (0, _versionStatus.versionStatus)(versionCheck) : 'disabled',
-        storyIndex: (0, _summarizeIndex.summarizeIndex)(storyIndex)
-      } : undefined;
+      var payload = {
+        precedingUpgrade: await (0, _telemetry.getPrecedingUpgrade)()
+      };
+      if (storyIndex) {
+        Object.assign(payload, {
+          versionStatus: versionUpdates ? (0, _versionStatus.versionStatus)(versionCheck) : 'disabled',
+          storyIndex: (0, _summarizeIndex.summarizeIndex)(storyIndex)
+        });
+      }
       (0, _telemetry.telemetry)('dev', payload, {
         configDir: options.configDir
       });

package/dist/cjs/withTelemetry.js

@@ -25,14 +25,14 @@ var promptCrashReports = async function () {
   await _coreCommon.cache.set('enableCrashReports', enableCrashReports);
   return enableCrashReports;
 };
-async function shouldSendError({
+async function getErrorLevel({
   cliOptions: cliOptions,
   presetOptions: presetOptions
 }) {
-  if (cliOptions !== null && cliOptions !== void 0 && cliOptions.disableTelemetry) return false;
+  if (cliOptions !== null && cliOptions !== void 0 && cliOptions.disableTelemetry) return 'none';
 
   // If we are running init or similar, we just have to go with true here
-  if (!presetOptions) return true;
+  if (!presetOptions) return 'full';
 
   // should we load the preset?
   var presets = await (0, _coreCommon.loadAllPresets)(_objectSpread({
@@ -43,15 +43,15 @@ async function shouldSendError({
   // If the user has chosen to enable/disable crash reports in main.js
   // or disabled telemetry, we can return that
   var core = await presets.apply('core');
-  if ((core === null || core === void 0 ? void 0 : core.enableCrashReports) !== undefined) return core.enableCrashReports;
-  if (core !== null && core !== void 0 && core.disableTelemetry) return false;
+  if ((core === null || core === void 0 ? void 0 : core.enableCrashReports) !== undefined) return core.enableCrashReports ? 'full' : 'error';
+  if (core !== null && core !== void 0 && core.disableTelemetry) return 'none';
 
   // Deal with typo, remove in future version (7.1?)
   var valueFromCache = (await _coreCommon.cache.get('enableCrashReports')) ?? (await _coreCommon.cache.get('enableCrashreports'));
-  if (valueFromCache !== undefined) return valueFromCache;
+  if (valueFromCache !== undefined) return valueFromCache ? 'full' : 'error';
   var valueFromPrompt = await promptCrashReports();
-  if (valueFromPrompt !== undefined) return valueFromPrompt;
-  return true;
+  if (valueFromPrompt !== undefined) return valueFromPrompt ? 'full' : 'error';
+  return 'full';
 }
 async function withTelemetry(eventType, options, run) {
   (0, _telemetry.telemetry)('boot', {
@@ -63,15 +63,18 @@ async function withTelemetry(eventType, options, run) {
     await run();
   } catch (error) {
     try {
-      if (await shouldSendError(options)) {
+      var errorLevel = await getErrorLevel(options);
+      if (errorLevel !== 'none') {
         var _options$cliOptions, _options$presetOption;
+        var precedingUpgrade = await (0, _telemetry.getPrecedingUpgrade)();
         await (0, _telemetry.telemetry)('error', {
           eventType: eventType,
-          error: error
+          precedingUpgrade: precedingUpgrade,
+          error: errorLevel === 'full' ? error : undefined
         }, {
           immediate: true,
           configDir: ((_options$cliOptions = options.cliOptions) === null || _options$cliOptions === void 0 ? void 0 : _options$cliOptions.configDir) || ((_options$presetOption = options.presetOptions) === null || _options$presetOption === void 0 ? void 0 : _options$presetOption.configDir),
-          enableCrashReports: true
+          enableCrashReports: errorLevel === 'full'
         });
       }
     } catch (err) {

package/dist/esm/build-static.js

@@ -13,7 +13,7 @@ import { dirname, isAbsolute, join, resolve } from 'path';
 import { dedent } from 'ts-dedent';
 import global from 'global';
 import { logger } from '@storybook/node-logger';
-import { telemetry } from '@storybook/telemetry';
+import { telemetry, getPrecedingUpgrade } from '@storybook/telemetry';
 import { loadAllPresets, loadMainConfig, logConfig, normalizeStories, resolveAddonName } from '@storybook/core-common';
 import { outputStats } from './utils/output-stats';
 import { copyAllStaticFiles, copyAllStaticFilesRelativeToMain } from './utils/copy-all-static-files';
@@ -126,9 +126,14 @@ export async function buildStaticStandalone(options) {
   if (!(core !== null && core !== void 0 && core.disableTelemetry)) {
     effects.push(initializedStoryIndexGenerator.then(async function (generator) {
       var storyIndex = await (generator === null || generator === void 0 ? void 0 : generator.getIndex());
-      var payload = storyIndex ? {
-        storyIndex: summarizeIndex(storyIndex)
-      } : undefined;
+      var payload = {
+        precedingUpgrade: await getPrecedingUpgrade()
+      };
+      if (storyIndex) {
+        Object.assign(payload, {
+          storyIndex: summarizeIndex(storyIndex)
+        });
+      }
       await telemetry('build', payload, {
         configDir: options.configDir
       });

package/dist/esm/dev-server.js

@@ -97,7 +97,9 @@ export async function storybookDevServer(options) {
   // this is a preview route, the builder has to be started before we can serve it
   // this handler keeps request to that route pending until the builder is ready to serve it, preventing a 404
   router.get('/iframe.html', function (req, res, next) {
-    previewStarted.then(function () {
+    // We need to catch here or node will treat any errors thrown by `previewStarted` as
+    // unhandled and exit (even though they are very much handled below)
+    previewStarted.catch(function () {}).then(function () {
       return next();
     });
   });

package/dist/esm/utils/doTelemetry.js

@@ -1,4 +1,4 @@
-import { telemetry } from '@storybook/telemetry';
+import { telemetry, getPrecedingUpgrade } from '@storybook/telemetry';
 import { useStorybookMetadata } from './metadata';
 import { summarizeIndex } from './summarizeIndex';
 import { router } from './router';
@@ -9,10 +9,15 @@ export async function doTelemetry(core, initializedStoryIndexGenerator, options)
       var storyIndex = await (generator === null || generator === void 0 ? void 0 : generator.getIndex());
       var versionCheck = options.versionCheck,
         versionUpdates = options.versionUpdates;
-      var payload = storyIndex ? {
-        versionStatus: versionUpdates ? versionStatus(versionCheck) : 'disabled',
-        storyIndex: summarizeIndex(storyIndex)
-      } : undefined;
+      var payload = {
+        precedingUpgrade: await getPrecedingUpgrade()
+      };
+      if (storyIndex) {
+        Object.assign(payload, {
+          versionStatus: versionUpdates ? versionStatus(versionCheck) : 'disabled',
+          storyIndex: summarizeIndex(storyIndex)
+        });
+      }
       telemetry('dev', payload, {
         configDir: options.configDir
       });

package/dist/esm/withTelemetry.js

@@ -3,7 +3,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 import prompts from 'prompts';
 import { loadAllPresets, cache } from '@storybook/core-common';
-import { telemetry } from '@storybook/telemetry';
+import { telemetry, getPrecedingUpgrade } from '@storybook/telemetry';
 var promptCrashReports = async function () {
   if (process.env.CI && process.env.NODE_ENV !== 'test') {
     return undefined;
@@ -18,14 +18,14 @@ var promptCrashReports = async function () {
   await cache.set('enableCrashReports', enableCrashReports);
   return enableCrashReports;
 };
-async function shouldSendError({
+async function getErrorLevel({
   cliOptions: cliOptions,
   presetOptions: presetOptions
 }) {
-  if (cliOptions !== null && cliOptions !== void 0 && cliOptions.disableTelemetry) return false;
+  if (cliOptions !== null && cliOptions !== void 0 && cliOptions.disableTelemetry) return 'none';
 
   // If we are running init or similar, we just have to go with true here
-  if (!presetOptions) return true;
+  if (!presetOptions) return 'full';
 
   // should we load the preset?
   var presets = await loadAllPresets(_objectSpread({
@@ -36,15 +36,15 @@ async function shouldSendError({
   // If the user has chosen to enable/disable crash reports in main.js
   // or disabled telemetry, we can return that
   var core = await presets.apply('core');
-  if ((core === null || core === void 0 ? void 0 : core.enableCrashReports) !== undefined) return core.enableCrashReports;
-  if (core !== null && core !== void 0 && core.disableTelemetry) return false;
+  if ((core === null || core === void 0 ? void 0 : core.enableCrashReports) !== undefined) return core.enableCrashReports ? 'full' : 'error';
+  if (core !== null && core !== void 0 && core.disableTelemetry) return 'none';
 
   // Deal with typo, remove in future version (7.1?)
   var valueFromCache = (await cache.get('enableCrashReports')) ?? (await cache.get('enableCrashreports'));
-  if (valueFromCache !== undefined) return valueFromCache;
+  if (valueFromCache !== undefined) return valueFromCache ? 'full' : 'error';
   var valueFromPrompt = await promptCrashReports();
-  if (valueFromPrompt !== undefined) return valueFromPrompt;
-  return true;
+  if (valueFromPrompt !== undefined) return valueFromPrompt ? 'full' : 'error';
+  return 'full';
 }
 export async function withTelemetry(eventType, options, run) {
   telemetry('boot', {
@@ -56,15 +56,18 @@ export async function withTelemetry(eventType, options, run) {
     await run();
   } catch (error) {
     try {
-      if (await shouldSendError(options)) {
+      var errorLevel = await getErrorLevel(options);
+      if (errorLevel !== 'none') {
         var _options$cliOptions, _options$presetOption;
+        var precedingUpgrade = await getPrecedingUpgrade();
         await telemetry('error', {
           eventType: eventType,
-          error: error
+          precedingUpgrade: precedingUpgrade,
+          error: errorLevel === 'full' ? error : undefined
         }, {
           immediate: true,
           configDir: ((_options$cliOptions = options.cliOptions) === null || _options$cliOptions === void 0 ? void 0 : _options$cliOptions.configDir) || ((_options$presetOption = options.presetOptions) === null || _options$presetOption === void 0 ? void 0 : _options$presetOption.configDir),
-          enableCrashReports: true
+          enableCrashReports: errorLevel === 'full'
         });
       }
     } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-server",
-  "version": "7.0.0-beta.1",
+  "version": "7.0.0-beta.2",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -35,16 +35,16 @@
   "dependencies": {
     "@aw-web-design/x-default-browser": "1.4.88",
     "@discoveryjs/json-ext": "^0.5.3",
-    "@storybook/builder-manager": "7.0.0-beta.1",
-    "@storybook/core-common": "7.0.0-beta.1",
-    "@storybook/core-events": "7.0.0-beta.1",
+    "@storybook/builder-manager": "7.0.0-beta.2",
+    "@storybook/core-common": "7.0.0-beta.2",
+    "@storybook/core-events": "7.0.0-beta.2",
     "@storybook/csf": "next",
-    "@storybook/csf-tools": "7.0.0-beta.1",
+    "@storybook/csf-tools": "7.0.0-beta.2",
     "@storybook/docs-mdx": "next",
-    "@storybook/node-logger": "7.0.0-beta.1",
-    "@storybook/preview-api": "7.0.0-beta.1",
-    "@storybook/telemetry": "7.0.0-beta.1",
-    "@storybook/types": "7.0.0-beta.1",
+    "@storybook/node-logger": "7.0.0-beta.2",
+    "@storybook/preview-api": "7.0.0-beta.2",
+    "@storybook/telemetry": "7.0.0-beta.2",
+    "@storybook/types": "7.0.0-beta.2",
     "@types/node": "^16.0.0",
     "@types/node-fetch": "^2.5.7",
     "@types/pretty-hrtime": "^1.0.0",
@@ -76,7 +76,7 @@
     "ws": "^8.2.3"
   },
   "devDependencies": {
-    "@storybook/builder-webpack5": "7.0.0-beta.1",
+    "@storybook/builder-webpack5": "7.0.0-beta.2",
     "@types/compression": "^1.7.0",
     "@types/ip": "^1.1.0",
     "@types/serve-favicon": "^2.5.2",
@@ -101,5 +101,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd"
+  "gitHead": "66a0d588184add900c48d49f3a62743fa9cc5185"
 }