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

FIX alias pathing

Browse Source
This commit is contained in:
Norbert de Langen 2020-06-09 11:04:19 +02:00
parent 541ce5ce78
commit f48edc7d17
No known key found for this signature in database
GPG Key ID: 976651DA156C2825
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/core/src/server/preview/iframe-webpack.config.js
View File

@ -24,20 +24,27 @@ import { useBaseTsSupport } from '../config/useBaseTsSupport';
const reactPaths = {};
const storybookPaths = {
'@storybook/addons': path.dirname(resolveFrom('@storybook/addons/package.json')),
'@storybook/api': path.dirname(resolveFrom('@storybook/api/package.json')),
'@storybook/channels': path.dirname(resolveFrom('@storybook/channels/package.json')),
'@storybook/addons': path.dirname(resolveFrom(__dirname, '@storybook/addons/package.json')),
'@storybook/api': path.dirname(resolveFrom(__dirname, '@storybook/api/package.json')),
'@storybook/channels': path.dirname(resolveFrom(__dirname, '@storybook/channels/package.json')),
'@storybook/channel-postmessage': path.dirname(
resolveFrom('@storybook/channel-postmessage/package.json')
resolveFrom(__dirname, '@storybook/channel-postmessage/package.json')
),
'@storybook/components': path.dirname(resolveFrom('@storybook/components/package.json')),
'@storybook/core-events': path.dirname(resolveFrom('@storybook/core-events/package.json')),
'@storybook/router': path.dirname(resolveFrom('@storybook/router/package.json')),
'@storybook/theming': path.dirname(resolveFrom('@storybook/theming/package.json')),
'@storybook/semver': path.dirname(resolveFrom('@storybook/semver/package.json')),
'@storybook/components': path.dirname(
resolveFrom(__dirname, '@storybook/components/package.json')
),
'@storybook/core-events': path.dirname(
resolveFrom(__dirname, '@storybook/core-events/package.json')
),
'@storybook/router': path.dirname(resolveFrom(__dirname, '@storybook/router/package.json')),
'@storybook/theming': path.dirname(resolveFrom(__dirname, '@storybook/theming/package.json')),
'@storybook/semver': path.dirname(resolveFrom(__dirname, '@storybook/semver/package.json')),
'@storybook/client-api': path.dirname(
resolveFrom(__dirname, '@storybook/client-api/package.json')
),
'@storybook/client-logger': path.dirname(
resolveFrom(__dirname, '@storybook/client-logger/package.json')
),
};
try {
reactPaths.react = path.dirname(resolveFrom(process.cwd(), 'react/package.json'));
@ -82,13 +89,8 @@ export default async ({
const match = entryFilename.match(/(.*)-generated-(config|other)-entry.js$/);
if (match) {
const configFilename = match[1];
const isUsingYarnPnp = typeof process.versions.pnp !== 'undefined';
const clientApi = isUsingYarnPnp
? `${require.resolve('@storybook/client-api')}`
: '@storybook/client-api';
const clientLogger = isUsingYarnPnp
? `${require.resolve('@storybook/client-logger')}`
: '@storybook/client-logger';
const clientApi = storybookPaths['@storybook/client-api'];
const clientLogger = storybookPaths['@storybook/client-logger'];
virtualModuleMapping[entryFilename] = interpolate(entryTemplate, {
configFilename,
@ -179,7 +181,7 @@ export default async ({
alias: {
...themingPaths,
...storybookPaths,
semver: path.dirname(resolveFrom('@storybook/semver/package.json')),
semver: path.dirname(resolveFrom(__dirname, '@storybook/semver/package.json')),
...reactPaths,
},