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

Merge pull request #21161 from storybookjs/norbert/try-harder-getting-mjs-files

Browse Source 
Fix: try harder to resolve `.mjs` files for the browser entries
This commit is contained in:
Norbert de Langen 2023-02-21 15:57:08 +01:00 committed by GitHub
commit 3a067f7b2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
code/lib/core-common/src/presets.ts
View File

@ -26,6 +26,15 @@ export function filterPresetsConfig(presetsConfig: PresetConfig[]): PresetConfig
});
}
function resolvePathToMjs(filePath: string): string {
const { dir, name } = parse(filePath);
const mjsPath = join(dir, `${name}.mjs`);
if (safeResolve(mjsPath)) {
return mjsPath;
}
return filePath;
}
function resolvePresetFunction<T = any>(
input: T[] | Function,
presetOptions: any,
@ -76,7 +85,7 @@ export const resolveAddonName = (
// we remove the extension
// this is a bit of a hack to try to find .mjs files
// node can only ever resolve .js files; it does not look at the exports field in package.json
managerEntries: [join(fdir, fname)],
managerEntries: [resolvePathToMjs(join(fdir, fname))],
};
}
if (name.match(/\/(preset)(\.(js|mjs|ts|tsx|jsx))?$/)) {
@ -98,15 +107,21 @@ export const resolveAddonName = (
// serve it up correctly when yarn pnp or pnpm is being used.
// Vite will be broken in such cases, because it does not process absolute paths,
// and it will try to import from the bare import, breaking in pnp/pnpm.
const absolutizeExport = (exportName: string) => {
return resolve(`${name}${exportName}`);
const absolutizeExport = (exportName: string, preferMJS: boolean) => {
const found = resolve(`${name}${exportName}`);
if (found) {
return preferMJS ? resolvePathToMjs(found) : found;
}
return undefined;
};
const managerFile = absolutizeExport(`/manager`);
const registerFile = absolutizeExport(`/register`) || absolutizeExport(`/register-panel`);
const managerFile = absolutizeExport(`/manager`, true);
const registerFile =
absolutizeExport(`/register`, true) || absolutizeExport(`/register-panel`, true);
const previewFile = checkExists(`/preview`);
const previewFileAbsolute = absolutizeExport('/preview');
const presetFile = absolutizeExport(`/preset`);
const previewFileAbsolute = absolutizeExport('/preview', true);
const presetFile = absolutizeExport(`/preset`, false);
if (!(managerFile || previewFile) && presetFile) {
return {
@ -119,19 +134,11 @@ export const resolveAddonName = (
const managerEntries = [];
if (managerFile) {
// we remove the extension
// this is a bit of a hack to try to find .mjs files
// node can only ever resolve .js files; it does not look at the exports field in package.json
const { dir: fdir, name: fname } = parse(managerFile);
managerEntries.push(join(fdir, fname));
managerEntries.push(managerFile);
}
// register file is the old way of registering addons
if (!managerFile && registerFile && !presetFile) {
// we remove the extension
// this is a bit of a hack to try to find .mjs files
// node can only ever resolve .js files; it does not look at the exports field in package.json
const { dir: fdir, name: fname } = parse(registerFile);
managerEntries.push(join(fdir, fname));
managerEntries.push(registerFile);
}
return {