Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions code/core/src/core-server/load.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import type { BuilderOptions, CLIOptions, LoadOptions, Options } from 'storybook

import { global } from '@storybook/global';

import { dirname, join, relative, resolve } from 'pathe';
import { dirname, isAbsolute, join, relative, resolve } from 'pathe';

import { resolvePackageDir } from '../shared/utils/module';

Expand Down Expand Up @@ -68,7 +68,13 @@ export async function loadStorybook(
const builderName = typeof builder === 'string' ? builder : builder?.name;

if (builderName) {
corePresets.push(join(dirname(builderName), 'preset.js'));
/* builderName can be a bare package name (e.g. '@storybook/builder-vite') or an already-resolved
file URL / absolute path (e.g. 'file:///.../.../dist/index.js'). For bare package names, we
need to resolve the package directory first; for already-resolved paths, dirname works directly.
*/
const isResolved = builderName.startsWith('file:') || isAbsolute(builderName);
const builderPresetDir = isResolved ? dirname(builderName) : resolvePackageDir(builderName);
corePresets.push(join(builderPresetDir, 'preset.js'));
}

// Load second pass: all presets are applied in order
Expand Down
10 changes: 8 additions & 2 deletions code/core/src/shared/utils/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,14 @@ export const resolvePackageDir = (
try {
return dirname(fileURLToPath(importMetaResolve(join(pkg, 'package.json'), parent)));
} catch {
// Necessary fallback for Bun runtime
return dirname(fileURLToPath(importMetaResolve(join(pkg, 'package.json'))));
try {
// Necessary fallback for Bun runtime
return dirname(fileURLToPath(importMetaResolve(join(pkg, 'package.json'))));
} catch {
// Fallback using require.resolve for strict pnpm environments where import.meta.resolve may fail
const req = createRequire(parent ?? import.meta.url);
return dirname(req.resolve(join(pkg, 'package.json')));
}
}
};

Expand Down
Loading