Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow passing both buildScriptName and storybookBuildDir #934

Merged
merged 9 commits into from
Mar 20, 2024
Merged

Allow passing both buildScriptName and storybookBuildDir #934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
783381d
Allow passing both build script and directory
Mar 1, 2024
4537958
Merge branch 'main' into feature/allow-build-dir-and-build-script-name
woutervanvliet Mar 6, 2024
af279c8
Merge branch 'main' into feature/allow-build-dir-and-build-script-name
woutervanvliet Mar 7, 2024
d41ae50
Merge branch 'main' into feature/allow-build-dir-and-build-script-name
woutervanvliet Mar 19, 2024
9f4313a
Inform the user about potentially unintentional use of buildScriptName
Mar 19, 2024
a8841b3
Fix test
Mar 19, 2024
96607af
Merge branch 'main' into feature/allow-build-dir-and-build-script-name
woutervanvliet Mar 19, 2024
5f5ef47
Merge branch 'main' into feature/allow-build-dir-and-build-script-name
ghengeveld Mar 20, 2024
366f809
Revert "Inform the user about potentially unintentional use of buildS…
ghengeveld Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions node-src/lib/getOptions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,10 @@ describe('getOptions', () => {
});
});

it('throws if you try to pass a build script and a directory', async () => {
await expect(() =>
getOptions(getContext(['-b', '/tmp/dir', '--storybook-build-dir', '/tmp/dir']))
).toThrow(/You can only use one of --build-script-name, --storybook-build-dir/);
it('allows you to pass both a build script and a directory', async () => {
expect(() =>
getOptions(getContext(['-b', 'build:storybook', '--storybook-build-dir', '/tmp/dir']))
).not.toThrow();
});

it('allows you to specify the branch name', async () => {
Expand Down
1 change: 0 additions & 1 deletion node-src/lib/getOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ export default function getOptions({

// We can only have one of these arguments
const singularOpts = {
buildScriptName: '--build-script-name',
storybookBuildDir: '--storybook-build-dir',
playwright: '--playwright',
cypress: '--cypress',
Expand Down