Merge pull request #29558 from storybookjs/yann/fix-typescript-issues

Build: Fix type issues
storybookjs · Nov 7, 2024 · 341695c · 341695c
2 parents 07ef408 + 9ed9d72
commit 341695c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/code/addons/backgrounds/src/components/Tool.tsx b/code/addons/backgrounds/src/components/Tool.tsx
@@ -124,7 +124,7 @@ const Pure = memo(function PureTool(props: PureProps) {
                       onHide();
                     },
                   })),
-                ]}
+                ].flat()}
               />
             );
           }}

diff --git a/code/addons/viewport/src/components/Tool.tsx b/code/addons/viewport/src/components/Tool.tsx
@@ -139,7 +139,7 @@ const Pure = React.memo(function PureTool(props: PureProps) {
                   onHide();
                 },
               })),
-            ]}
+            ].flat()}
           />
         )}
         closeOnOutsideClick

diff --git a/scripts/prepare/tools.ts b/scripts/prepare/tools.ts
@@ -118,7 +118,10 @@ export const nodeInternals = [
   ...require('module').builtinModules.flatMap((m: string) => [m, `node:${m}`]),
 ];
 
-export const getWorkspace = async () => {
+type PackageJson = typefest.PackageJson &
+  Required<Pick<typefest.PackageJson, 'name' | 'version'>> & { path: string };
+
+export const getWorkspace = async (): Promise<PackageJson[]> => {
   const codePackage = await readJson(join(CODE_DIRECTORY, 'package.json'));
   const {
     workspaces: { packages: patterns },
@@ -142,8 +145,7 @@ export const getWorkspace = async () => {
           return null;
         }
         const pkg = await readJson(packageJsonPath);
-        return { ...pkg, path: packagePath } as typefest.PackageJson &
-          Required<Pick<typefest.PackageJson, 'name' | 'version'>> & { path: string };
+        return { ...pkg, path: packagePath } as PackageJson;
       })
   ).then((packages) => packages.filter((p) => p !== null));
 };