GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-04 13:11:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix #18791 and take PackageJson type from an upstream package

Browse Source
This commit is contained in:
Norbert de Langen 2022-07-28 15:02:46 +02:00
parent 82cf379dd4
commit 76292e7192
No known key found for this signature in database
GPG Key ID: FD0E78AF9A837762
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/lib/core-common/src/types.ts
View File

@ -3,6 +3,7 @@ import type { TransformOptions } from '@babel/core';
import { Router } from 'express';
import { Server } from 'http';
import type { Parameters } from '@storybook/csf';
import type { PackageJson } from 'read-pkg-up';
import type { FileSystemCache } from './utils/file-cache';
/**
@ -109,18 +110,7 @@ export interface BuilderResult {
stats?: Stats;
}
// TODO: this is a generic interface that we can share across multiple SB packages (like @storybook/cli)
export interface PackageJson {
name: string;
version: string;
dependencies?: Record<string, string>;
devDependencies?: Record<string, string>;
peerDependencies?: Record<string, string>;
scripts?: Record<string, string>;
eslintConfig?: Record<string, any>;
type?: 'module';
[key: string]: any;
}
export { PackageJson };
// TODO: This could be exported to the outside world and used in `options.ts` file of each `@storybook/APP`
// like it's described in docs/api/new-frameworks.md

2
code/lib/telemetry/src/storybook-metadata.ts
View File

@ -195,7 +195,7 @@ export const getStorybookMetadata = async (_configDir?: string) => {
return cachedMetadata;
}
const { packageJson = {} as PackageJson } = readPkgUp.sync({ cwd: process.cwd() }) || {};
const { packageJson = {} } = readPkgUp.sync({ cwd: process.cwd(), normalize: false }) || {};
const configDir =
(_configDir ||
(getStorybookConfiguration(