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

Merge pull request #20253 from storybookjs/20252-fix-ssv6

Browse Source 
Fix issues with running SSv6
This commit is contained in:
Tom Coleman 2022-12-14 19:36:15 +11:00 committed by GitHub
commit 00da7f9d5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts
View File

@ -147,8 +147,6 @@ export default async (
previewAnnotations.forEach((previewAnnotationFilename: string | undefined) => {
if (!previewAnnotationFilename) return;
const previewApi = storybookPaths['@storybook/preview-api'];
const clientLogger = storybookPaths['@storybook/client-logger'];
// Ensure that relative paths end up mapped to a filename in the cwd, so a later import
// of the `previewAnnotationFilename` in the template works.
@ -159,8 +157,6 @@ export default async (
// file, see https://github.com/storybookjs/storybook/pull/16727#issuecomment-986485173
virtualModuleMapping[entryFilename] = interpolate(entryTemplate, {
previewAnnotationFilename,
previewApi,
clientLogger,
});
entries.push(entryFilename);
});

2
code/lib/builder-webpack5/templates/virtualModuleEntry.template.js
View File

@ -9,7 +9,7 @@ import {
addArgsEnhancer,
addArgTypesEnhancer,
setGlobalRender,
} from '{{previewApi}}';
} from '@storybook/preview-api';
import * as previewAnnotations from '{{previewAnnotationFilename}}';
Object.keys(previewAnnotations).forEach((key) => {

12
code/ui/manager/src/components/preview/preview.tsx
View File

@ -71,11 +71,15 @@ const createCanvas = (id: string, baseUrl = 'iframe.html', withLoader = true): A
useEffect(() => {
if (global.CONFIG_TYPE === 'DEVELOPMENT') {
const channel = addons.getServerChannel();
try {
const channel = addons.getServerChannel();
channel.on(PREVIEW_BUILDER_PROGRESS, (options) => {
setProgress(options);
});
channel.on(PREVIEW_BUILDER_PROGRESS, (options) => {
setProgress(options);
});
} catch {
//
}
}
}, []);