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

fix: server-statics.

Browse Source
This commit is contained in:
Yadong Zhang 2023-02-13 06:07:16 +00:00
parent 3e0b2830c7
commit c2a344c7d7
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/lib/core-server/src/presets/common-preset.ts
View File

@ -22,13 +22,15 @@ import { parseStaticDir } from '../utils/server-statics';
const defaultFavicon = require.resolve('@storybook/core-server/public/favicon.svg');
export const defaultStaticDirs = {
from: join(dirname(require.resolve('@storybook/manager/package.json')), 'static'),
to: '/sb-common-assets',
};
export const defaultStaticDirs = [
{
from: join(dirname(require.resolve('@storybook/manager/package.json')), 'static'),
to: '/sb-common-assets',
},
];
export const staticDirs: PresetPropertyFn<'staticDirs'> = async (values = []) => [
{ ...defaultStaticDirs },
...defaultStaticDirs,
...values,
];

19
code/lib/core-server/src/utils/server-statics.ts
View File

@ -4,16 +4,24 @@ import { getDirectoryFromWorkingDir } from '@storybook/core-common';
import chalk from 'chalk';
import express from 'express';
import { pathExists } from 'fs-extra';
import path from 'path';
import path, { dirname, join } from 'path';
import favicon from 'serve-favicon';
import isEqual from 'lodash/isEqual.js';
import { dedent } from 'ts-dedent';
const defaultStaticDirs = [
{
from: join(dirname(require.resolve('@storybook/manager/package.json')), 'static'),
to: '/sb-common-assets',
},
];
export async function useStatics(router: any, options: Options) {
const staticDirs = await options.presets.apply<StorybookConfig['staticDirs']>('staticDirs');
const faviconPath = await options.presets.apply<string>('favicon');
if (staticDirs && options.staticDir) {
if (staticDirs && options.staticDir && !isEqual(staticDirs, defaultStaticDirs)) {
throw new Error(dedent`
Conflict when trying to read staticDirs:
* Storybook's configuration option: 'staticDirs'
@ -23,9 +31,10 @@ export async function useStatics(router: any, options: Options) {
`);
}
const statics = staticDirs
? staticDirs.map((dir) => (typeof dir === 'string' ? dir : `${dir.from}:${dir.to}`))
: options.staticDir;
const statics =
staticDirs && !isEqual(staticDirs, defaultStaticDirs)
? staticDirs.map((dir) => (typeof dir === 'string' ? dir : `${dir.from}:${dir.to}`))
: options.staticDir;
if (statics && statics.length > 0) {
await Promise.all(