@@ -82,9 +82,13 @@ export async function storybookConfigurationGenerator(
82
82
ensurePackage ( '@nx/storybook' , nxVersion ) ;
83
83
const { configurationGenerator } = await import ( '@nx/storybook' ) ;
84
84
85
+ const { oldFormat } = await getStorybookVersion ( ) ;
86
+
85
87
await configurationGenerator ( tree , {
86
88
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' ,
88
92
bundler : 'vite' ,
89
93
name : normalizedOptions . name ,
90
94
js : normalizedOptions . js ,
@@ -103,22 +107,33 @@ export async function storybookConfigurationGenerator(
103
107
async function addStorybookDependencies (
104
108
tree : Tree
105
109
) : Promise < GeneratorCallback > {
106
- const { storybook7Version } = await import (
107
- '@nx/storybook/src/utils/versions'
108
- ) ;
110
+ const { storybookVersion } = await getStorybookVersion ( ) ;
109
111
110
112
return addDependenciesToPackageJson (
111
113
tree ,
112
114
{ } ,
113
115
{
114
116
'storybook-framework-qwik' : storybookFrameworkQwikVersion ,
115
- '@storybook/builder-vite' : storybook7Version ,
116
- '@storybook/addon-docs' : storybook7Version ,
117
+ '@storybook/builder-vite' : storybookVersion ,
118
+ '@storybook/addon-docs' : storybookVersion ,
117
119
react : reactVersion ,
118
120
'react-dom' : reactDOMVersion ,
119
121
'@types/mdx' : typesMdx ,
120
122
}
121
123
) ;
122
124
}
123
125
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
+
124
139
export default storybookConfigurationGenerator ;
0 commit comments