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

fix(essentials): use require.resolve to ensure Yarn PnP compatibility

Browse Source 
Files of various addons should be resolved in the context of `addon-essentials` and not in the one of SB user projects.
File to load can be `preset.js`, `register.js`, or the package entry point, so we need to check all these cases as it's done in `lib/core/src/server/presets.js`.
This commit is contained in:
Gaëtan Maisse 2020-07-07 08:31:29 +02:00
parent 34d8f8ed10
commit fa126f6f1a
No known key found for this signature in database
GPG Key ID: D934C0EF3714A8A8
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
addons/essentials/src/index.ts
View File

@ -1,4 +1,4 @@
import path from 'path'; import path, { join } from 'path';
import { logger } from '@storybook/node-logger'; import { logger } from '@storybook/node-logger';
interface PresetOptions { interface PresetOptions {
@ -33,8 +33,30 @@ export function addons(options: PresetOptions = {}) {
}; };
const main = requireMain(options.configDir); const main = requireMain(options.configDir);
return ['actions', 'docs', 'controls', 'backgrounds', 'viewport'] return (
.filter((key) => (options as any)[key] !== false) ['actions', 'docs', 'controls', 'backgrounds', 'viewport']
.map((key) => `@storybook/addon-${key}`) .filter((key) => (options as any)[key] !== false)
.filter((addon) => !checkInstalled(addon, main)); .map((key) => `@storybook/addon-${key}`)
.filter((addon) => !checkInstalled(addon, main))
// Use `require.resolve` to ensure Yarn PnP compatibility
// Files of various addons should be resolved in the context of `addon-essentials` as they are listed as deps here
// and not in `@storybook/core` nor in SB user projects. If `@storybook/core` make the require itself Yarn 2 will
// throw an error saying that the package to require must be added as a dependency. Doing `require.resolve` will
// allow `@storybook/core` to work with absolute path directly, no more require of dep no more issue.
// File to load can be `preset.js`, `register.js`, or the package entry point, so we need to check all these cases
// as it's done in `lib/core/src/server/presets.js`.
.map((addon) => {
try {
return require.resolve(join(addon, 'preset'));
// eslint-disable-next-line no-empty
} catch (err) {}
try {
return require.resolve(join(addon, 'register'));
// eslint-disable-next-line no-empty
} catch (err) {}
return require.resolve(addon);
})
);
} }