Skip to content

Commit

Permalink
fix(storybook): do not add target defaults and named inputs if they a…
Browse files Browse the repository at this point in the history
…re not defined (#11941)
  • Loading branch information
FrozenPandaz committed Sep 8, 2022
1 parent b582964 commit 31b1b00
Showing 1 changed file with 22 additions and 19 deletions.
41 changes: 22 additions & 19 deletions packages/storybook/src/generators/configuration/util-functions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -267,28 +267,31 @@ export function createRootStorybookDir(

const workspaceConfiguration = readWorkspaceConfiguration(tree);

const hasProductionFileset = !!workspaceConfiguration.namedInputs?.production;
if (hasProductionFileset) {
workspaceConfiguration.namedInputs.production.push(
'!{projectRoot}/.storybook/**/*'
);
workspaceConfiguration.namedInputs.production.push(
'!{projectRoot}/**/*.stories.@(js|jsx|ts|tsx|mdx)'
);
}
if (workspaceConfiguration.namedInputs) {
const hasProductionFileset =
!!workspaceConfiguration.namedInputs?.production;
if (hasProductionFileset) {
workspaceConfiguration.namedInputs.production.push(
'!{projectRoot}/.storybook/**/*'
);
workspaceConfiguration.namedInputs.production.push(
'!{projectRoot}/**/*.stories.@(js|jsx|ts|tsx|mdx)'
);
}

workspaceConfiguration.targetDefaults ??= {};
workspaceConfiguration.targetDefaults['build-storybook'] ??= {};
workspaceConfiguration.targetDefaults['build-storybook'].inputs ??= [
'default',
hasProductionFileset ? '^production' : '^default',
];
workspaceConfiguration.targetDefaults ??= {};
workspaceConfiguration.targetDefaults['build-storybook'] ??= {};
workspaceConfiguration.targetDefaults['build-storybook'].inputs ??= [
'default',
hasProductionFileset ? '^production' : '^default',
];

workspaceConfiguration.targetDefaults['build-storybook'].inputs.push(
'{workspaceRoot}/.storybook/**/*'
);
workspaceConfiguration.targetDefaults['build-storybook'].inputs.push(
'{workspaceRoot}/.storybook/**/*'
);

updateWorkspaceConfiguration(tree, workspaceConfiguration);
updateWorkspaceConfiguration(tree, workspaceConfiguration);
}

if (js) {
toJS(tree);
Expand Down

0 comments on commit 31b1b00

Please sign in to comment.