Merge pull request storybookjs#31510 from storybookjs/norbert/fix-telemetry-projectjson-generation

Telemetry: Fix `project.json` for getAbsolutePath

Author: ndelangen

code/core/src/telemetry/package-json.ts

@@ -1,6 +1,9 @@
 import { readFile } from 'node:fs/promises';
 import { join } from 'node:path';
 
+import { findUp } from 'find-up';
+import type { PackageJson } from 'type-fest';
+
 import type { Dependency } from './types';
 
 export const getActualPackageVersions = async (packages: Record<string, Partial<Dependency>>) => {
@@ -12,22 +15,33 @@ export const getActualPackageVersion = async (packageName: string) => {
   try {
     const packageJson = await getActualPackageJson(packageName);
     return {
-      name: packageName,
-      version: packageJson.version,
+      name: packageJson?.name || packageName,
+      version: packageJson?.version || null,
     };
   } catch (err) {
-    return { name: packageName, version: null };
+    return {
+      name: packageName,
+      version: null,
+    };
   }
 };
 
-export const getActualPackageJson = async (packageName: string) => {
+export const getActualPackageJson = async (
+  packageName: string
+): Promise<PackageJson | undefined> => {
   try {
-    const resolvedPackageJson = require.resolve(join(packageName, 'package.json'), {
-      paths: [process.cwd()],
-    });
+    let resolvedPackageJson = await findUp('package.json', { cwd: require.resolve(packageName) });
+
+    if (!resolvedPackageJson) {
+      // fallback to require.resolve
+      resolvedPackageJson = require.resolve(join(packageName, 'package.json'), {
+        paths: [process.cwd()],
+      });
+    }
+
     const packageJson = JSON.parse(await readFile(resolvedPackageJson, { encoding: 'utf8' }));
     return packageJson;
   } catch (err) {
-    return null;
+    return undefined;
   }
 };

code/core/src/telemetry/storybook-metadata.ts

@@ -78,7 +78,7 @@ export const computeStorybookMetadata = async ({
     metadata.metaFramework = {
       name: metaFrameworks[metaFramework],
       packageName: metaFramework,
-      version,
+      version: version || 'unknown',
     };
   }
 
@@ -192,7 +192,11 @@ export const computeStorybookMetadata = async ({
 
   const addonVersions = await getActualPackageVersions(addons);
   addonVersions.forEach(({ name, version }) => {
-    addons[name].version = version;
+    addons[name] = addons[name] || {
+      name,
+      version,
+    };
+    addons[name].version = version || undefined;
   });
 
   const addonNames = Object.keys(addons);
@@ -209,7 +213,12 @@ export const computeStorybookMetadata = async ({
 
   const storybookPackageVersions = await getActualPackageVersions(storybookPackages);
   storybookPackageVersions.forEach(({ name, version }) => {
-    storybookPackages[name].version = version;
+    storybookPackages[name] = storybookPackages[name] || {
+      name,
+      version,
+    };
+
+    storybookPackages[name].version = version || undefined;
   });
 
   const hasStorybookEslint = !!allDependencies['eslint-plugin-storybook'];