Skip to content

Commit 0f0b3cd

Browse files
fix(qwik-nx): use renamed variable for storybook version in nx 16.1 (#160)
1 parent 022809d commit 0f0b3cd

File tree

1 file changed

+21
-6
lines changed
  • packages/qwik-nx/src/generators/storybook-configuration

1 file changed

+21
-6
lines changed

packages/qwik-nx/src/generators/storybook-configuration/generator.ts

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,13 @@ export async function storybookConfigurationGenerator(
8282
ensurePackage('@nx/storybook', nxVersion);
8383
const { configurationGenerator } = await import('@nx/storybook');
8484

85+
const { oldFormat } = await getStorybookVersion();
86+
8587
await configurationGenerator(tree, {
8688
storybook7UiFramework: '@storybook/html-webpack5',
87-
uiFramework: '@storybook/html',
89+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
90+
// @ts-ignore
91+
uiFramework: oldFormat ? '@storybook/html' : '@storybook/html-webpack5',
8892
bundler: 'vite',
8993
name: normalizedOptions.name,
9094
js: normalizedOptions.js,
@@ -103,22 +107,33 @@ export async function storybookConfigurationGenerator(
103107
async function addStorybookDependencies(
104108
tree: Tree
105109
): Promise<GeneratorCallback> {
106-
const { storybook7Version } = await import(
107-
'@nx/storybook/src/utils/versions'
108-
);
110+
const { storybookVersion } = await getStorybookVersion();
109111

110112
return addDependenciesToPackageJson(
111113
tree,
112114
{},
113115
{
114116
'storybook-framework-qwik': storybookFrameworkQwikVersion,
115-
'@storybook/builder-vite': storybook7Version,
116-
'@storybook/addon-docs': storybook7Version,
117+
'@storybook/builder-vite': storybookVersion,
118+
'@storybook/addon-docs': storybookVersion,
117119
react: reactVersion,
118120
'react-dom': reactDOMVersion,
119121
'@types/mdx': typesMdx,
120122
}
121123
);
122124
}
123125

126+
async function getStorybookVersion() {
127+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
128+
// @ts-ignore "storybook7Version" was renamed to "storybookVersion" in nx16.1. Leaving both for compatibility
129+
const { storybook7Version, storybookVersion } = await import(
130+
'@nx/storybook/src/utils/versions'
131+
);
132+
const oldFormat = !!storybook7Version;
133+
return {
134+
oldFormat,
135+
storybookVersion: oldFormat ? storybook7Version : storybookVersion,
136+
};
137+
}
138+
124139
export default storybookConfigurationGenerator;

0 commit comments

Comments
 (0)