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

fix merge conflict

Browse Source
This commit is contained in:
Norbert de Langen 2022-06-21 13:27:48 +02:00
parent b0d32a90bb
commit 4dbfd8ed87
No known key found for this signature in database
GPG Key ID: FD0E78AF9A837762
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ import TerserWebpackPlugin from 'terser-webpack-plugin';
import VirtualModulePlugin from 'webpack-virtual-modules'; import VirtualModulePlugin from 'webpack-virtual-modules';
import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin'; import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
import type { Options, CoreConfig, Webpack5BuilderConfig } from '@storybook/core-common'; import type { Options, CoreConfig } from '@storybook/core-common';
import { import {
stringifyProcessEnvs, stringifyProcessEnvs,
handlebars, handlebars,
@ -19,7 +19,7 @@ import {
loadPreviewOrConfigFile, loadPreviewOrConfigFile,
} from '@storybook/core-common'; } from '@storybook/core-common';
import { toRequireContextString, toImportFn } from '@storybook/core-webpack'; import { toRequireContextString, toImportFn } from '@storybook/core-webpack';
import type { TypescriptOptions } from '../types'; import type { BuilderOptions, TypescriptOptions } from '../types';
import { createBabelLoader } from './babel-loader-preview'; import { createBabelLoader } from './babel-loader-preview';
const storybookPaths: Record<string, string> = { const storybookPaths: Record<string, string> = {
@ -85,6 +85,8 @@ export default async (
const bodyHtmlSnippet = await presets.apply('previewBody'); const bodyHtmlSnippet = await presets.apply('previewBody');
const template = await presets.apply<string>('previewMainTemplate'); const template = await presets.apply<string>('previewMainTemplate');
const coreOptions = await presets.apply<CoreConfig>('core'); const coreOptions = await presets.apply<CoreConfig>('core');
const builderOptions: BuilderOptions =
typeof coreOptions.builder === 'string' ? {} : coreOptions.builder?.options || {};
const configs = [ const configs = [
...(await presets.apply('config', [], options)), ...(await presets.apply('config', [], options)),
@ -102,8 +104,7 @@ export default async (
const storiesFilename = 'storybook-stories.js'; const storiesFilename = 'storybook-stories.js';
const storiesPath = path.resolve(path.join(workingDir, storiesFilename)); const storiesPath = path.resolve(path.join(workingDir, storiesFilename));
const needPipelinedImport = const needPipelinedImport = !!builderOptions?.lazyCompilation && !isProd;
!!(coreOptions.builder as Webpack5BuilderConfig).options?.lazyCompilation && !isProd;
virtualModuleMapping[storiesPath] = toImportFn(stories, { needPipelinedImport }); virtualModuleMapping[storiesPath] = toImportFn(stories, { needPipelinedImport });
const configEntryPath = path.resolve(path.join(workingDir, 'storybook-config-entry.js')); const configEntryPath = path.resolve(path.join(workingDir, 'storybook-config-entry.js'));
virtualModuleMapping[configEntryPath] = handlebars( virtualModuleMapping[configEntryPath] = handlebars(
@ -206,7 +207,7 @@ export default async (
CONFIG_TYPE: configType, CONFIG_TYPE: configType,
LOGLEVEL: logLevel, LOGLEVEL: logLevel,
FRAMEWORK_OPTIONS: frameworkOptions, FRAMEWORK_OPTIONS: frameworkOptions,
CHANNEL_OPTIONS: coreOptions?.channelOptions, CHANNEL_OPTIONS: coreOptions.channelOptions,
FEATURES: features, FEATURES: features,
PREVIEW_URL: previewUrl, PREVIEW_URL: previewUrl,
STORIES: stories.map((specifier) => ({ STORIES: stories.map((specifier) => ({