@storybook/telemetry 7.0.0-alpha.3 → 7.0.0-alpha.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -25,7 +25,8 @@ exports.monorepoConfigs = monorepoConfigs;
25
25
  const getMonorepoType = () => {
26
26
  const projectRootPath = (0, _coreCommon.getProjectRoot)();
27
27
  if (!projectRootPath) return undefined;
28
- const monorepoType = Object.keys(monorepoConfigs).find(monorepo => {
28
+ const keys = Object.keys(monorepoConfigs);
29
+ const monorepoType = keys.find(monorepo => {
29
30
  const configFile = _path.default.join(projectRootPath, monorepoConfigs[monorepo]);
30
31
 
31
32
  return _fsExtra.default.existsSync(configFile);
@@ -35,7 +36,9 @@ const getMonorepoType = () => {
35
36
  return monorepoType;
36
37
  }
37
38
 
38
- if (!_fsExtra.default.existsSync(_path.default.join(projectRootPath, 'package.json'))) return undefined;
39
+ if (!_fsExtra.default.existsSync(_path.default.join(projectRootPath, 'package.json'))) {
40
+ return undefined;
41
+ }
39
42
 
40
43
  const packageJson = _fsExtra.default.readJsonSync(_path.default.join(projectRootPath, 'package.json'));
41
44
 
package/dist/cjs/index.js CHANGED
@@ -30,7 +30,7 @@ var _notify = require("./notify");
30
30
 
31
31
  var _sanitize = require("./sanitize");
32
32
 
33
- const telemetry = async (eventType, payload = {}, options) => {
33
+ const telemetry = async (eventType, payload = {}, options = {}) => {
34
34
  await (0, _notify.notify)();
35
35
  const telemetryData = {
36
36
  eventType,
@@ -38,7 +38,7 @@ const telemetry = async (eventType, payload = {}, options) => {
38
38
  };
39
39
 
40
40
  try {
41
- telemetryData.metadata = await (0, _storybookMetadata.getStorybookMetadata)(options.configDir);
41
+ telemetryData.metadata = await (0, _storybookMetadata.getStorybookMetadata)(options === null || options === void 0 ? void 0 : options.configDir);
42
42
  } catch (error) {
43
43
  if (!telemetryData.payload.error) telemetryData.payload.error = error;
44
44
  } finally {
@@ -184,15 +184,18 @@ exports.computeStorybookMetadata = computeStorybookMetadata;
184
184
  let cachedMetadata;
185
185
 
186
186
  const getStorybookMetadata = async _configDir => {
187
+ var _packageJson$scripts;
188
+
187
189
  if (cachedMetadata) {
188
190
  return cachedMetadata;
189
191
  }
190
192
 
191
- const packageJson = _readPkgUp.default.sync({
193
+ const {
194
+ packageJson = {}
195
+ } = _readPkgUp.default.sync({
192
196
  cwd: process.cwd()
193
- }).packageJson;
194
-
195
- const configDir = (_configDir || (0, _coreCommon.getStorybookConfiguration)(packageJson.scripts.storybook, '-c', '--config-dir')) ?? '.storybook';
197
+ }) || {};
198
+ const configDir = (_configDir || (0, _coreCommon.getStorybookConfiguration)((packageJson === null || packageJson === void 0 ? void 0 : (_packageJson$scripts = packageJson.scripts) === null || _packageJson$scripts === void 0 ? void 0 : _packageJson$scripts.storybook) || '', '-c', '--config-dir')) ?? '.storybook';
196
199
  const mainConfig = (0, _coreCommon.loadMainConfig)({
197
200
  configDir
198
201
  });
@@ -64,7 +64,7 @@ async function sendTelemetry(data, options = {
64
64
  },
65
65
  retries: 3,
66
66
  retryOn: [503, 504],
67
- retryDelay: attempt => 2 ** attempt * options.retryDelay
67
+ retryDelay: attempt => 2 ** attempt * (typeof (options === null || options === void 0 ? void 0 : options.retryDelay) === 'number' && !Number.isNaN(options === null || options === void 0 ? void 0 : options.retryDelay) ? options.retryDelay : 1000)
68
68
  });
69
69
  tasks.push(request);
70
70
 
@@ -11,7 +11,8 @@ export const monorepoConfigs = {
11
11
  export const getMonorepoType = () => {
12
12
  const projectRootPath = getProjectRoot();
13
13
  if (!projectRootPath) return undefined;
14
- const monorepoType = Object.keys(monorepoConfigs).find(monorepo => {
14
+ const keys = Object.keys(monorepoConfigs);
15
+ const monorepoType = keys.find(monorepo => {
15
16
  const configFile = path.join(projectRootPath, monorepoConfigs[monorepo]);
16
17
  return fs.existsSync(configFile);
17
18
  });
@@ -20,7 +21,10 @@ export const getMonorepoType = () => {
20
21
  return monorepoType;
21
22
  }
22
23
 
23
- if (!fs.existsSync(path.join(projectRootPath, 'package.json'))) return undefined;
24
+ if (!fs.existsSync(path.join(projectRootPath, 'package.json'))) {
25
+ return undefined;
26
+ }
27
+
24
28
  const packageJson = fs.readJsonSync(path.join(projectRootPath, 'package.json'));
25
29
 
26
30
  if (packageJson?.workspaces) {
package/dist/esm/index.js CHANGED
@@ -4,7 +4,7 @@ import { sendTelemetry } from './telemetry';
4
4
  import { notify } from './notify';
5
5
  import { sanitizeError } from './sanitize';
6
6
  export * from './storybook-metadata';
7
- export const telemetry = async (eventType, payload = {}, options) => {
7
+ export const telemetry = async (eventType, payload = {}, options = {}) => {
8
8
  await notify();
9
9
  const telemetryData = {
10
10
  eventType,
@@ -12,7 +12,7 @@ export const telemetry = async (eventType, payload = {}, options) => {
12
12
  };
13
13
 
14
14
  try {
15
- telemetryData.metadata = await getStorybookMetadata(options.configDir);
15
+ telemetryData.metadata = await getStorybookMetadata(options?.configDir);
16
16
  } catch (error) {
17
17
  if (!telemetryData.payload.error) telemetryData.payload.error = error;
18
18
  } finally {
@@ -167,10 +167,12 @@ export const getStorybookMetadata = async _configDir => {
167
167
  return cachedMetadata;
168
168
  }
169
169
 
170
- const packageJson = readPkgUp.sync({
170
+ const {
171
+ packageJson = {}
172
+ } = readPkgUp.sync({
171
173
  cwd: process.cwd()
172
- }).packageJson;
173
- const configDir = (_configDir || getStorybookConfiguration(packageJson.scripts.storybook, '-c', '--config-dir')) ?? '.storybook';
174
+ }) || {};
175
+ const configDir = (_configDir || getStorybookConfiguration(packageJson?.scripts?.storybook || '', '-c', '--config-dir')) ?? '.storybook';
174
176
  const mainConfig = loadMainConfig({
175
177
  configDir
176
178
  });
@@ -50,7 +50,7 @@ export async function sendTelemetry(data, options = {
50
50
  },
51
51
  retries: 3,
52
52
  retryOn: [503, 504],
53
- retryDelay: attempt => 2 ** attempt * options.retryDelay
53
+ retryDelay: attempt => 2 ** attempt * (typeof options?.retryDelay === 'number' && !Number.isNaN(options?.retryDelay) ? options.retryDelay : 1000)
54
54
  });
55
55
  tasks.push(request);
56
56
 
@@ -5,4 +5,4 @@ export declare const computeStorybookMetadata: ({ packageJson, mainConfig, }: {
5
5
  packageJson: PackageJson;
6
6
  mainConfig: StorybookConfig & Record<string, any>;
7
7
  }) => Promise<StorybookMetadata>;
8
- export declare const getStorybookMetadata: (_configDir: string) => Promise<StorybookMetadata>;
8
+ export declare const getStorybookMetadata: (_configDir?: string | undefined) => Promise<StorybookMetadata>;
@@ -3,7 +3,7 @@ import type { PM } from 'detect-package-manager';
3
3
  import type { MonorepoType } from './get-monorepo-type';
4
4
  export declare type EventType = 'start' | 'build' | 'upgrade' | 'init' | 'error-build' | 'error-dev' | 'error-metadata';
5
5
  export interface Dependency {
6
- version: string;
6
+ version: string | undefined;
7
7
  }
8
8
  export interface StorybookAddon extends Dependency {
9
9
  options: any;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@storybook/telemetry",
3
- "version": "7.0.0-alpha.3",
3
+ "version": "7.0.0-alpha.4",
4
4
  "description": "Telemetry logging for crash reports and usage statistics",
5
5
  "keywords": [
6
6
  "storybook"
@@ -33,8 +33,8 @@
33
33
  "prepare": "node ../../scripts/prepare.js"
34
34
  },
35
35
  "dependencies": {
36
- "@storybook/client-logger": "7.0.0-alpha.3",
37
- "@storybook/core-common": "7.0.0-alpha.3",
36
+ "@storybook/client-logger": "7.0.0-alpha.4",
37
+ "@storybook/core-common": "7.0.0-alpha.4",
38
38
  "chalk": "^4.1.0",
39
39
  "core-js": "^3.8.2",
40
40
  "detect-package-manager": "^2.0.1",
@@ -43,11 +43,10 @@
43
43
  "global": "^4.4.0",
44
44
  "isomorphic-unfetch": "^3.1.0",
45
45
  "nanoid": "^3.3.1",
46
- "read-pkg-up": "^7.0.1",
47
- "regenerator-runtime": "^0.13.7"
46
+ "read-pkg-up": "^7.0.1"
48
47
  },
49
48
  "publishConfig": {
50
49
  "access": "public"
51
50
  },
52
- "gitHead": "629b056190993bcee6445471b8cb27208eb401a9"
51
+ "gitHead": "006ed54452dd7c37a8cbe91a84f5312182f7ca00"
53
52
  }