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

Fix bug in ConfigFile for parsing main.js

Browse Source
This commit is contained in:
Michael Shilman 2021-10-20 19:06:05 +08:00
parent b81ffbedd2
commit 22acffec54
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/csf-tools/src/ConfigFile.test.ts
View File

@ -126,6 +126,21 @@ describe('ConfigFile', () => {
)
).toEqual('webpack5');
});
it('variable exports', () => {
expect(
getField(
['stories'],
dedent`
import type { StorybookConfig } from '@storybook/react/types';
const config: StorybookConfig = {
stories: [{ directory: '../src', titlePrefix: 'Demo' }],
}
module.exports = config;
`
)
).toEqual([{ directory: '../src', titlePrefix: 'Demo' }]);
});
});
});

16
lib/csf-tools/src/ConfigFile.ts
View File

@ -111,7 +111,7 @@ export class ConfigFile {
}
});
} else {
logger.warn(`Unexpected ${node}`);
logger.warn(`Unexpected ${JSON.stringify(node)}`);
}
},
},
@ -126,9 +126,13 @@ export class ConfigFile {
t.isIdentifier(left.property) &&
left.property.name === 'exports'
) {
if (t.isObjectExpression(right)) {
self._exportsObject = right;
right.properties.forEach((p: t.ObjectProperty) => {
let exportObject = right;
if (t.isIdentifier(right)) {
exportObject = _findVarInitialization(right.name, parent as t.Program);
}
if (t.isObjectExpression(exportObject)) {
self._exportsObject = exportObject;
exportObject.properties.forEach((p: t.ObjectProperty) => {
const exportName = propKey(p);
if (exportName) {
let exportVal = p.value;
@ -139,7 +143,7 @@ export class ConfigFile {
}
});
} else {
logger.warn(`Unexpected ${node}`);
logger.warn(`Unexpected ${JSON.stringify(node)}`);
}
}
}
@ -205,7 +209,7 @@ export class ConfigFile {
},
});
if (!valueNode) {
throw new Error(`Unexpected value ${value}`);
throw new Error(`Unexpected value ${JSON.stringify(value)}`);
}
this.setFieldNode(path, valueNode);
}