@nx/storybook 23.0.0-beta.20 → 23.0.0-beta.21

package/migrations.json

@@ -3,12 +3,18 @@
     "update-21-2-0-migrate-storybook-v9": {
       "cli": "nx",
       "version": "21.2.0-beta.3",
+      "requires": {
+        "storybook": ">=9.0.0 <10.0.0"
+      },
       "description": "Update workspace to use Storybook v9",
       "implementation": "./src/migrations/update-21-1-0/update-sb-9"
     },
     "update-21-2-0-remove-addon-dependencies": {
       "cli": "nx",
       "version": "21.2.0-beta.3",
+      "requires": {
+        "storybook": ">=9.0.0 <10.0.0"
+      },
       "description": "Remove deprecated Storybook addon dependencies",
       "implementation": "./src/migrations/update-21-2-0/remove-addon-dependencies"
     },
@@ -26,6 +32,9 @@
   "packageJsonUpdates": {
     "20.2.0": {
       "version": "20.2.0-beta.5",
+      "requires": {
+        "storybook": ">=8.0.0 <9.0.0"
+      },
       "packages": {
         "@storybook/test-runner": {
           "version": "^0.19.0",
@@ -283,6 +292,9 @@
     },
     "20.8.0": {
       "version": "20.8.0-beta.0",
+      "requires": {
+        "storybook": ">=8.0.0 <9.0.0"
+      },
       "packages": {
         "@storybook/test-runner": {
           "version": "^0.22.0",
@@ -540,6 +552,9 @@
     },
     "21.1.0": {
       "version": "22.1.0-beta.3",
+      "requires": {
+        "storybook": ">=8.0.0 <9.0.0"
+      },
       "packages": {
         "@storybook/angular": {
           "version": "^9.0.5",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/storybook",
-  "version": "23.0.0-beta.20",
+  "version": "23.0.0-beta.21",
   "private": false,
   "description": "The Nx Plugin for Storybook contains executors and generators for allowing your workspace to use the powerful Storybook integration testing & documenting capabilities.",
   "repository": {
@@ -34,21 +34,21 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.20",
+    "@nx/devkit": "23.0.0-beta.21",
     "@phenomnomnominal/tsquery": "~6.2.0",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
-    "@nx/cypress": "23.0.0-beta.20",
-    "@nx/js": "23.0.0-beta.20",
-    "@nx/eslint": "23.0.0-beta.20"
+    "@nx/cypress": "23.0.0-beta.21",
+    "@nx/js": "23.0.0-beta.21",
+    "@nx/eslint": "23.0.0-beta.21"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.20",
+    "nx": "23.0.0-beta.21",
     "storybook": "9.0.6"
   },
   "peerDependencies": {
-    "@nx/web": "23.0.0-beta.20",
-    "storybook": ">=7.0.0 <11.0.0"
+    "@nx/web": "23.0.0-beta.21",
+    "storybook": ">=8.0.0 <11.0.0"
   },
   "peerDependenciesMeta": {
     "@nx/web": {

package/src/executors/build-storybook/build-storybook.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-storybook.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/storybook/src/executors/build-storybook/build-storybook.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAU,MAAM,YAAY,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAU3D,wBAA8B,sBAAsB,CAClD,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,eAAe;;GAgBzB"}
+{"version":3,"file":"build-storybook.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/storybook/src/executors/build-storybook/build-storybook.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAU,MAAM,YAAY,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAQ3D,wBAA8B,sBAAsB,CAClD,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,eAAe;;GAYzB"}

package/src/executors/build-storybook/build-storybook.impl.js

@@ -41,10 +41,6 @@ const deprecation_1 = require("../../utils/deprecation");
 async function buildStorybookExecutor(options, context) {
     (0, deprecation_1.warnStorybookBuildExecutorDeprecation)();
     (0, utilities_1.storybookConfigExistsCheck)(options.configDir, context.projectName);
-    const storybookMajor = (0, utilities_1.storybookMajorVersion)();
-    if (storybookMajor > 0 && storybookMajor <= 7) {
-        throw (0, utilities_1.pleaseUpgrade)();
-    }
     const buildOptions = options;
     devkit_1.logger.info(`NX Storybook builder starting ...`);
     await runInstance(buildOptions);

package/src/executors/storybook/storybook.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storybook.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/storybook/src/executors/storybook/storybook.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAU,MAAM,YAAY,CAAC;AAOrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAI3D,wBAA+B,iBAAiB,CAC9C,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,eAAe,GACvB,cAAc,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3C,CAAC,CAqBD"}
+{"version":3,"file":"storybook.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/storybook/src/executors/storybook/storybook.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAU,MAAM,YAAY,CAAC;AAKrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAI3D,wBAA+B,iBAAiB,CAC9C,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,eAAe,GACvB,cAAc,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3C,CAAC,CAgBD"}

package/src/executors/storybook/storybook.impl.js

@@ -39,10 +39,6 @@ const semver_1 = require("semver");
 const deprecation_1 = require("../../utils/deprecation");
 async function* storybookExecutor(options, context) {
     (0, deprecation_1.warnStorybookExecutorDeprecation)();
-    const storybookMajor = (0, utilities_1.storybookMajorVersion)();
-    if (storybookMajor > 0 && storybookMajor <= 7) {
-        throw (0, utilities_1.pleaseUpgrade)();
-    }
     (0, utilities_1.storybookConfigExistsCheck)(options.configDir, context.projectName);
     const buildOptions = options;
     const result = await runInstance(buildOptions);

package/src/generators/configuration/configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/storybook/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAKjB,IAAI,EACL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAwCpD,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,wBAAwB,8BAGjC;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,wBAAwB,8BA6KpC;AAwBD,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/storybook/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAKjB,IAAI,EACL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAuCpD,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,wBAAwB,8BAGjC;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,wBAAwB,8BA6KpC;AAwBD,eAAe,sBAAsB,CAAC"}

package/src/generators/configuration/configuration.js

@@ -6,6 +6,7 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const init_1 = require("../init/init");
 const deprecation_1 = require("../../utils/deprecation");
+const assert_supported_storybook_version_1 = require("../../utils/assert-supported-storybook-version");
 const util_functions_1 = require("./lib/util-functions");
 const utilities_1 = require("../../utils/utilities");
 const versions_1 = require("../../utils/versions");
@@ -16,11 +17,9 @@ function configurationGenerator(tree, schema) {
     return configurationGeneratorInternal(tree, { addPlugin: false, ...schema });
 }
 async function configurationGeneratorInternal(tree, rawSchema) {
+    (0, assert_supported_storybook_version_1.assertSupportedStorybookVersion)(tree);
     const storybookMajor = (0, utilities_1.storybookMajorVersion)(tree);
-    if (storybookMajor > 0 && storybookMajor === 7) {
-        throw new Error((0, utilities_1.pleaseUpgrade)());
-    }
-    else if (storybookMajor === 8) {
+    if (storybookMajor === 8) {
         devkit_1.logger.warn(`Support for Storybook 8 is deprecated. Please upgrade to Storybook 9. See https://nx.dev/nx-api/storybook/generators/migrate-9 for more details.`);
     }
     const schema = normalizeSchema(tree, rawSchema);
@@ -117,7 +116,7 @@ async function configurationGeneratorInternal(tree, rawSchema) {
         // the nxViteTsPaths plugin to register the tsconfig paths in Vite.
         devDeps['@nx/vite'] = versions_1.nxVersion;
     }
-    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDeps));
+    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDeps, undefined, true));
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/configuration/lib/ensure-dependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensure-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/storybook/src/generators/configuration/lib/ensure-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAYpB,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE1D,MAAM,MAAM,yBAAyB,GAAG;IACtC,WAAW,CAAC,EAAE,wBAAwB,CAAC,aAAa,CAAC,CAAC;CACvD,CAAC;AAEF,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,yBAAyB,0CAuFnC"}
+{"version":3,"file":"ensure-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/storybook/src/generators/configuration/lib/ensure-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAMpB,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE1D,MAAM,MAAM,yBAAyB,GAAG;IACtC,WAAW,CAAC,EAAE,wBAAwB,CAAC,aAAa,CAAC,CAAC;CACvD,CAAC;AAEF,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,yBAAyB,0CA8EnC"}

package/src/generators/configuration/lib/ensure-dependencies.js

@@ -2,14 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureDependencies = ensureDependencies;
 const devkit_1 = require("@nx/devkit");
-const semver_1 = require("semver");
 const utilities_1 = require("../../../utils/utilities");
 const versions_1 = require("../../../utils/versions");
 function ensureDependencies(tree, options) {
     const storybookVersionToInstall = (0, utilities_1.getInstalledStorybookVersion)(tree);
     const installedStorybookMajorVersion = (0, utilities_1.storybookMajorVersion)(tree);
     const dependencies = {};
-    const devDependencies = installedStorybookMajorVersion < 9
+    // Storybook v8 ships `@storybook/core-server` and `@storybook/addon-essentials`
+    // as separate packages; v9 folds them into `storybook`.
+    const devDependencies = installedStorybookMajorVersion === 8
         ? {
             '@storybook/core-server': storybookVersionToInstall,
             '@storybook/addon-essentials': storybookVersionToInstall,
@@ -18,18 +19,6 @@ function ensureDependencies(tree, options) {
     const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
     packageJson.dependencies ??= {};
     packageJson.devDependencies ??= {};
-    if (!(0, semver_1.gte)((0, semver_1.coerce)(storybookVersionToInstall), '8.0.0')) {
-        // Needed for Storybook 7
-        // https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#react-peer-dependencies-required
-        if (!packageJson.dependencies['react'] &&
-            !packageJson.devDependencies['react']) {
-            dependencies['react'] = versions_1.reactVersion;
-        }
-        if (!packageJson.dependencies['react-dom'] &&
-            !packageJson.devDependencies['react-dom']) {
-            dependencies['react-dom'] = versions_1.reactVersion;
-        }
-    }
     if (options.uiFramework) {
         devDependencies[options.uiFramework] = storybookVersionToInstall;
         const isPnpm = (0, devkit_1.detectPackageManager)(tree.root) === 'pnpm';
@@ -67,5 +56,5 @@ function ensureDependencies(tree, options) {
             }
         }
     }
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies);
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies, undefined, true);
 }

package/src/generators/convert-to-inferred/convert-to-inferred.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-to-inferred.d.ts","sourceRoot":"","sources":["../../../../../../packages/storybook/src/generators/convert-to-inferred/convert-to-inferred.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAMpB,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,mDAkDlE;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"convert-to-inferred.d.ts","sourceRoot":"","sources":["../../../../../../packages/storybook/src/generators/convert-to-inferred/convert-to-inferred.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAOpB,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,mDAsDlE;AAED,eAAe,iBAAiB,CAAC"}

package/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -7,7 +7,9 @@ const build_post_target_transformer_1 = require("./lib/build-post-target-transfo
 const serve_post_target_transformer_1 = require("./lib/serve-post-target-transformer");
 const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
+const assert_supported_storybook_version_1 = require("../../utils/assert-supported-storybook-version");
 async function convertToInferred(tree, options) {
+    (0, assert_supported_storybook_version_1.assertSupportedStorybookVersion)(tree);
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
     const migrationLogs = new internal_1.AggregatedLog();
     const migratedProjects = await (0, internal_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/storybook/plugin', plugin_1.createNodesV2, {
@@ -37,7 +39,7 @@ async function convertToInferred(tree, options) {
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { storybook: versions_1.storybookVersion });
+    const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { storybook: versions_1.storybookVersion }, undefined, true);
     return (0, devkit_1.runTasksInSerial)(installTask, () => {
         migrationLogs.flushLogs();
     });

package/src/generators/convert-to-inferred/lib/build-post-target-transformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-post-target-transformer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/storybook/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,mBAAmB,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,EAGL,aAAa,EACd,MAAM,qBAAqB,CAAC;AAY7B,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,IAEnE,QAAQ,mBAAmB,EAC3B,MAAM,IAAI,EACV,gBAAgB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,6BAA6B,mBAAmB,8BAgHnD"}
+{"version":3,"file":"build-post-target-transformer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/storybook/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,mBAAmB,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,EAGL,aAAa,EACd,MAAM,qBAAqB,CAAC;AAW7B,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,IAEnE,QAAQ,mBAAmB,EAC3B,MAAM,IAAI,EACV,gBAAgB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,6BAA6B,mBAAmB,8BAgHnD"}

package/src/generators/convert-to-inferred/lib/build-post-target-transformer.js

@@ -5,7 +5,6 @@ const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const utils_1 = require("./utils");
-const utils_2 = require("./utils");
 function buildPostTargetTransformer(migrationLogs) {
     return (target, tree, projectDetails, inferredTargetConfiguration) => {
         let defaultConfigDir = (0, devkit_1.joinPathFragments)(projectDetails.root, '.storybook');
@@ -87,9 +86,7 @@ function handlePropertiesFromTargetOptions(tree, options, defaultConfigDir, proj
         moveStaticDirToConfigFile(tree, configDir, projectName, migrationLogs, configDir === defaultConfigDir);
         delete options.staticDir;
     }
-    const storybookPropMappings = (0, utils_2.getInstalledPackageVersionInfo)(tree, 'storybook')?.major === 8
-        ? utils_1.STORYBOOK_PROP_MAPPINGS.v8
-        : utils_1.STORYBOOK_PROP_MAPPINGS.v7;
+    const storybookPropMappings = (0, utils_1.getStorybookPropMappings)(tree);
     for (const [prevKey, newKey] of Object.entries(storybookPropMappings)) {
         if (prevKey in options) {
             let prevValue = options[prevKey];

package/src/generators/convert-to-inferred/lib/serve-post-target-transformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serve-post-target-transformer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/storybook/src/generators/convert-to-inferred/lib/serve-post-target-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,mBAAmB,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAyB,MAAM,qBAAqB,CAAC;AAO3E,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,IAEnE,QAAQ,mBAAmB,EAC3B,MAAM,IAAI,EACV,gBAAgB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,6BAA6B,mBAAmB,8BAyEnD"}
+{"version":3,"file":"serve-post-target-transformer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/storybook/src/generators/convert-to-inferred/lib/serve-post-target-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,mBAAmB,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAyB,MAAM,qBAAqB,CAAC;AAM3E,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,IAEnE,QAAQ,mBAAmB,EAC3B,MAAM,IAAI,EACV,gBAAgB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,6BAA6B,mBAAmB,8BAyEnD"}

package/src/generators/convert-to-inferred/lib/serve-post-target-transformer.js

@@ -80,9 +80,7 @@ function handlePropertiesFromTargetOptions(tree, options, projectName, projectRo
         options.docs = options.docsMode;
         delete options.docsMode;
     }
-    const storybookPropMappings = (0, utils_1.getInstalledPackageVersionInfo)(tree, 'storybook')?.major === 8
-        ? utils_1.STORYBOOK_PROP_MAPPINGS.v8
-        : utils_1.STORYBOOK_PROP_MAPPINGS.v7;
+    const storybookPropMappings = (0, utils_1.getStorybookPropMappings)(tree);
     for (const [prevKey, newKey] of Object.entries(storybookPropMappings)) {
         if (prevKey in options) {
             let prevValue = options[prevKey];

package/src/generators/convert-to-inferred/lib/utils.d.ts

@@ -2,50 +2,90 @@ import { type Tree } from '@nx/devkit';
 import { AggregatedLog } from '@nx/devkit/internal';
 export declare function getConfigFilePath(tree: Tree, configDir: string): string;
 export declare function addConfigValuesToConfigFile(tree: Tree, configFile: string, configValues: Record<string, Record<string, unknown>>): void;
+declare const MODERN_STORYBOOK_PROP_MAPPING: {
+    readonly port: "port";
+    readonly previewUrl: "preview-url";
+    readonly host: "host";
+    readonly docs: "docs";
+    readonly configDir: "config-dir";
+    readonly logLevel: "loglevel";
+    readonly quiet: "quiet";
+    readonly webpackStatsJson: "stats-json";
+    readonly debugWebpack: "debug-webpack";
+    readonly disableTelemetry: "disable-telemetry";
+    readonly https: "https";
+    readonly sslCa: "ssl-ca";
+    readonly sslCert: "ssl-cert";
+    readonly sslKey: "ssl-key";
+    readonly smokeTest: "smoke-test";
+    readonly noOpen: "no-open";
+    readonly outputDir: "output-dir";
+};
 export declare const STORYBOOK_PROP_MAPPINGS: {
-    v7: {
-        port: string;
-        previewUrl: string;
-        host: string;
-        docs: string;
-        configDir: string;
-        logLevel: string;
-        quiet: string;
-        webpackStatsJson: string;
-        debugWebpack: string;
-        disableTelemetry: string;
-        https: string;
-        sslCa: string;
-        sslCert: string;
-        sslKey: string;
-        smokeTest: string;
-        noOpen: string;
-        outputDir: string;
+    readonly v8: {
+        readonly port: "port";
+        readonly previewUrl: "preview-url";
+        readonly host: "host";
+        readonly docs: "docs";
+        readonly configDir: "config-dir";
+        readonly logLevel: "loglevel";
+        readonly quiet: "quiet";
+        readonly webpackStatsJson: "stats-json";
+        readonly debugWebpack: "debug-webpack";
+        readonly disableTelemetry: "disable-telemetry";
+        readonly https: "https";
+        readonly sslCa: "ssl-ca";
+        readonly sslCert: "ssl-cert";
+        readonly sslKey: "ssl-key";
+        readonly smokeTest: "smoke-test";
+        readonly noOpen: "no-open";
+        readonly outputDir: "output-dir";
+    };
+    readonly v9: {
+        readonly port: "port";
+        readonly previewUrl: "preview-url";
+        readonly host: "host";
+        readonly docs: "docs";
+        readonly configDir: "config-dir";
+        readonly logLevel: "loglevel";
+        readonly quiet: "quiet";
+        readonly webpackStatsJson: "stats-json";
+        readonly debugWebpack: "debug-webpack";
+        readonly disableTelemetry: "disable-telemetry";
+        readonly https: "https";
+        readonly sslCa: "ssl-ca";
+        readonly sslCert: "ssl-cert";
+        readonly sslKey: "ssl-key";
+        readonly smokeTest: "smoke-test";
+        readonly noOpen: "no-open";
+        readonly outputDir: "output-dir";
     };
-    v8: {
-        port: string;
-        previewUrl: string;
-        host: string;
-        docs: string;
-        configDir: string;
-        logLevel: string;
-        quiet: string;
-        webpackStatsJson: string;
-        debugWebpack: string;
-        disableTelemetry: string;
-        https: string;
-        sslCa: string;
-        sslCert: string;
-        sslKey: string;
-        smokeTest: string;
-        noOpen: string;
-        outputDir: string;
+    readonly v10: {
+        readonly port: "port";
+        readonly previewUrl: "preview-url";
+        readonly host: "host";
+        readonly docs: "docs";
+        readonly configDir: "config-dir";
+        readonly logLevel: "loglevel";
+        readonly quiet: "quiet";
+        readonly webpackStatsJson: "stats-json";
+        readonly debugWebpack: "debug-webpack";
+        readonly disableTelemetry: "disable-telemetry";
+        readonly https: "https";
+        readonly sslCa: "ssl-ca";
+        readonly sslCert: "ssl-cert";
+        readonly sslKey: "ssl-key";
+        readonly smokeTest: "smoke-test";
+        readonly noOpen: "no-open";
+        readonly outputDir: "output-dir";
     };
 };
+export declare function getStorybookPropMappings(tree: Tree): typeof MODERN_STORYBOOK_PROP_MAPPING;
 export declare function ensureViteConfigPathIsRelative(tree: Tree, configPath: string, projectName: string, projectRoot: string, executorName: string, migrationLogs: AggregatedLog): void;
 export declare function getInstalledPackageVersion(tree: Tree, pkgName: string): string | null;
 export declare function getInstalledPackageVersionInfo(tree: Tree, pkgName: string): {
     major: number;
     version: string;
 };
+export {};
 //# sourceMappingURL=utils.d.ts.map

package/src/generators/convert-to-inferred/lib/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/storybook/src/generators/convert-to-inferred/lib/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,aAAa,EAAyB,MAAM,qBAAqB,CAAC;AAI3E,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,UAS9D;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAgCtD;AAED,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuCnC,CAAC;AAEF,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,aAAa,QAmE7B;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAGf;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM;;;EAKzE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/storybook/src/generators/convert-to-inferred/lib/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,aAAa,EAAyB,MAAM,qBAAqB,CAAC;AAI3E,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,UAS9D;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAgCtD;AAKD,QAAA,MAAM,6BAA6B;;;;;;;;;;;;;;;;;;CAkBzB,CAAC;AAEX,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAI1B,CAAC;AAEX,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,GACT,OAAO,6BAA6B,CAMtC;AAED,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,aAAa,QAmE7B;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAGf;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM;;;EAKzE"}

package/src/generators/convert-to-inferred/lib/utils.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.STORYBOOK_PROP_MAPPINGS = void 0;
 exports.getConfigFilePath = getConfigFilePath;
 exports.addConfigValuesToConfigFile = addConfigValuesToConfigFile;
+exports.getStorybookPropMappings = getStorybookPropMappings;
 exports.ensureViteConfigPathIsRelative = ensureViteConfigPathIsRelative;
 exports.getInstalledPackageVersion = getInstalledPackageVersion;
 exports.getInstalledPackageVersionInfo = getInstalledPackageVersionInfo;
@@ -46,46 +47,40 @@ function addConfigValuesToConfigFile(tree, configFile, configValues) {
   ${configValuesString}
   ${configFileContents.slice(startPosition)}`);
 }
+// CLI flag names across Storybook v8 / v9 / v10 are identical (verified against
+// storybook v9 and v10 bundled CLI sources); kept as separate entries so a
+// future divergence per major can be expressed in place.
+const MODERN_STORYBOOK_PROP_MAPPING = {
+    port: 'port',
+    previewUrl: 'preview-url',
+    host: 'host',
+    docs: 'docs',
+    configDir: 'config-dir',
+    logLevel: 'loglevel',
+    quiet: 'quiet',
+    webpackStatsJson: 'stats-json',
+    debugWebpack: 'debug-webpack',
+    disableTelemetry: 'disable-telemetry',
+    https: 'https',
+    sslCa: 'ssl-ca',
+    sslCert: 'ssl-cert',
+    sslKey: 'ssl-key',
+    smokeTest: 'smoke-test',
+    noOpen: 'no-open',
+    outputDir: 'output-dir',
+};
 exports.STORYBOOK_PROP_MAPPINGS = {
-    v7: {
-        port: 'port',
-        previewUrl: 'preview-url',
-        host: 'host',
-        docs: 'docs',
-        configDir: 'config-dir',
-        logLevel: 'loglevel',
-        quiet: 'quiet',
-        webpackStatsJson: 'webpack-stats-json',
-        debugWebpack: 'debug-webpack',
-        disableTelemetry: 'disable-telemetry',
-        https: 'https',
-        sslCa: 'ssl-ca',
-        sslCert: 'ssl-cert',
-        sslKey: 'ssl-key',
-        smokeTest: 'smoke-test',
-        noOpen: 'no-open',
-        outputDir: 'output-dir',
-    },
-    v8: {
-        port: 'port',
-        previewUrl: 'preview-url',
-        host: 'host',
-        docs: 'docs',
-        configDir: 'config-dir',
-        logLevel: 'loglevel',
-        quiet: 'quiet',
-        webpackStatsJson: 'stats-json',
-        debugWebpack: 'debug-webpack',
-        disableTelemetry: 'disable-telemetry',
-        https: 'https',
-        sslCa: 'ssl-ca',
-        sslCert: 'ssl-cert',
-        sslKey: 'ssl-key',
-        smokeTest: 'smoke-test',
-        noOpen: 'no-open',
-        outputDir: 'output-dir',
-    },
+    v8: MODERN_STORYBOOK_PROP_MAPPING,
+    v9: MODERN_STORYBOOK_PROP_MAPPING,
+    v10: MODERN_STORYBOOK_PROP_MAPPING,
 };
+function getStorybookPropMappings(tree) {
+    const major = getInstalledPackageVersionInfo(tree, 'storybook')?.major;
+    const key = `v${major}`;
+    // Above-ceiling falls through to the latest known mapping. Below-floor is
+    // unreachable: the generator-level floor assert blocks it before this runs.
+    return exports.STORYBOOK_PROP_MAPPINGS[key] ?? exports.STORYBOOK_PROP_MAPPINGS.v10;
+}
 function ensureViteConfigPathIsRelative(tree, configPath, projectName, projectRoot, executorName, migrationLogs) {
     const configFileContents = tree.read(configPath, 'utf-8');
     if (configFileContents.includes('viteFinal:')) {

package/src/generators/init/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/storybook/src/generators/init/init.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,iBAAiB,EAIjB,IAAI,EAGL,MAAM,YAAY,CAAC;AASpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA2DlC,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAEvD;AAED,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAiErE;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/storybook/src/generators/init/init.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,iBAAiB,EAIjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAMpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA2DlC,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAEvD;AAED,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAmErE;AAED,eAAe,aAAa,CAAC"}

package/src/generators/init/init.js

@@ -7,6 +7,7 @@ const devkit_1 = require("@nx/devkit");
 const plugin_1 = require("../../plugins/plugin");
 const utilities_1 = require("../../utils/utilities");
 const versions_1 = require("../../utils/versions");
+const assert_supported_storybook_version_1 = require("../../utils/assert-supported-storybook-version");
 const update_gitignore_1 = require("./lib/update-gitignore");
 function checkDependenciesInstalled(host, schema) {
     const devDependencies = {
@@ -15,7 +16,7 @@ function checkDependenciesInstalled(host, schema) {
     };
     const storybookVersionToInstall = (0, utilities_1.getStorybookVersionToInstall)(host);
     devDependencies['storybook'] = storybookVersionToInstall;
-    return (0, devkit_1.addDependenciesToPackageJson)(host, {}, devDependencies, undefined, schema.keepExistingVersions);
+    return (0, devkit_1.addDependenciesToPackageJson)(host, {}, devDependencies, undefined, schema.keepExistingVersions ?? true);
 }
 function addCacheableOperation(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
@@ -45,6 +46,7 @@ function initGenerator(tree, schema) {
     return initGeneratorInternal(tree, { addPlugin: false, ...schema });
 }
 async function initGeneratorInternal(tree, schema) {
+    (0, assert_supported_storybook_version_1.assertSupportedStorybookVersion)(tree);
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;

package/src/generators/init/schema.json

@@ -19,7 +19,7 @@
       "type": "boolean",
       "x-priority": "internal",
       "description": "Keep existing dependencies versions",
-      "default": false
+      "default": true
     },
     "updatePackageScripts": {
       "type": "boolean",

package/src/generators/migrate-10/migrate-10.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrate-10.d.ts","sourceRoot":"","sources":["../../../../../../packages/storybook/src/generators/migrate-10/migrate-10.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,IAAI,EAAE,MAAM,YAAY,CAAC;AAIjE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAmClE;AAED,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"migrate-10.d.ts","sourceRoot":"","sources":["../../../../../../packages/storybook/src/generators/migrate-10/migrate-10.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,IAAI,EAAE,MAAM,YAAY,CAAC;AAIjE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAKlC,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAqClE;AAED,eAAe,kBAAkB,CAAC"}

package/src/generators/migrate-10/migrate-10.js

@@ -6,7 +6,9 @@ const output_1 = require("nx/src/utils/output");
 const calling_storybook_cli_1 = require("./calling-storybook-cli");
 const path_1 = require("path");
 const fs_1 = require("fs");
+const assert_supported_storybook_version_1 = require("../../utils/assert-supported-storybook-version");
 async function migrate10Generator(tree, schema) {
+    (0, assert_supported_storybook_version_1.assertSupportedStorybookVersion)(tree);
     const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
     if (!(0, calling_storybook_cli_1.checkStorybookInstalled)(packageJson)) {
         output_1.output.error({

package/src/generators/migrate-9/migrate-9.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrate-9.d.ts","sourceRoot":"","sources":["../../../../../../packages/storybook/src/generators/migrate-9/migrate-9.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,IAAI,EAAE,MAAM,YAAY,CAAC;AAWzD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAwCjE;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"migrate-9.d.ts","sourceRoot":"","sources":["../../../../../../packages/storybook/src/generators/migrate-9/migrate-9.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,IAAI,EAAE,MAAM,YAAY,CAAC;AAWzD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBA0CjE;AAED,eAAe,iBAAiB,CAAC"}

package/src/generators/migrate-9/migrate-9.js

@@ -5,7 +5,9 @@ const devkit_1 = require("@nx/devkit");
 const output_1 = require("nx/src/utils/output");
 const calling_storybook_cli_1 = require("./calling-storybook-cli");
 const helper_functions_1 = require("./helper-functions");
+const assert_supported_storybook_version_1 = require("../../utils/assert-supported-storybook-version");
 async function migrate9Generator(tree, schema) {
+    (0, assert_supported_storybook_version_1.assertSupportedStorybookVersion)(tree);
     schema.versionTag = schema.versionTag ?? 'latest';
     const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
     if (!(0, helper_functions_1.checkStorybookInstalled)(packageJson)) {

package/src/utils/assert-supported-storybook-version.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export declare function assertSupportedStorybookVersion(tree: Tree): void;
+//# sourceMappingURL=assert-supported-storybook-version.d.ts.map

package/src/utils/assert-supported-storybook-version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"assert-supported-storybook-version.d.ts","sourceRoot":"","sources":["../../../../../packages/storybook/src/utils/assert-supported-storybook-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAIvC,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAMhE"}

package/src/utils/assert-supported-storybook-version.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertSupportedStorybookVersion = assertSupportedStorybookVersion;
+const internal_1 = require("@nx/devkit/internal");
+const versions_1 = require("./versions");
+function assertSupportedStorybookVersion(tree) {
+    (0, internal_1.assertSupportedPackageVersion)(tree, 'storybook', versions_1.minSupportedStorybookVersion);
+}

package/src/utils/utilities.d.ts

@@ -1,6 +1,7 @@
 import { TargetConfiguration, Tree } from '@nx/devkit';
 import { CompilerOptions } from 'typescript';
 import ts = require('typescript');
+export { storybookMajorVersion, getInstalledStorybookVersion, } from './versions';
 export declare const Constants: {
     addonDependencies: string[];
     tsConfigExclusions: string[];
@@ -9,11 +10,8 @@ export declare const Constants: {
     };
     jsonIndentLevel: number;
     coreAddonPrefix: string;
-    uiFrameworks7: string[];
 };
 export declare function getStorybookVersionToInstall(tree: Tree): string;
-export declare function storybookMajorVersion(tree?: Tree): number | undefined;
-export declare function getInstalledStorybookVersion(tree?: Tree): string | undefined;
 export declare function safeFileDelete(tree: Tree, path: string): boolean;
 export type TsConfig = {
     extends: string;
@@ -40,5 +38,4 @@ export declare function findStorybookAndBuildTargetsAndCompiler(targets: {
 };
 export declare function isTheFileAStory(tree: Tree, path: string): boolean;
 export declare function getTsSourceFile(host: Tree, path: string): ts.SourceFile;
-export declare function pleaseUpgrade(): string;
 //# sourceMappingURL=utilities.d.ts.map

package/src/utils/utilities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utilities.d.ts","sourceRoot":"","sources":["../../../../../packages/storybook/src/utils/utilities.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,mBAAmB,EACnB,IAAI,EACL,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAG7C,OAAO,EAAE,GAAG,QAAQ,YAAY,CAAC,CAAC;AAKlC,eAAO,MAAM,SAAS;;;;;;;;;CA0BrB,CAAC;AAGF,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,IAAI,UAatD;AAED,wBAAgB,qBAAqB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAuBrE;AAED,wBAAgB,4BAA4B,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAqB5E;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAOhE;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,eAAe,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACtC,CAAC;AAEF,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GAClB,IAAI,CAYN;AAED,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,YAEnC;AAED,wBAAgB,uCAAuC,CAAC,OAAO,EAAE;IAC/D,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,CAAC;CAC3C,GAAG;IACF,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CA2EA;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CA4CjE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,EAAE,CAAC,UAAU,CAcvE;AAED,wBAAgB,aAAa,IAAI,MAAM,CAQtC"}
+{"version":3,"file":"utilities.d.ts","sourceRoot":"","sources":["../../../../../packages/storybook/src/utils/utilities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAG7C,OAAO,EAAE,GAAG,QAAQ,YAAY,CAAC,CAAC;AAGlC,OAAO,EACL,qBAAqB,EACrB,4BAA4B,GAC7B,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,SAAS;;;;;;;;CAQrB,CAAC;AAGF,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAE/D;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAOhE;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,eAAe,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACtC,CAAC;AAEF,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GAClB,IAAI,CAYN;AAED,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,YAEnC;AAED,wBAAgB,uCAAuC,CAAC,OAAO,EAAE;IAC/D,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,CAAC;CAC3C,GAAG;IACF,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CA2EA;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CA4CjE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,EAAE,CAAC,UAAU,CAcvE"}

package/src/utils/utilities.js

@@ -1,23 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Constants = void 0;
+exports.Constants = exports.getInstalledStorybookVersion = exports.storybookMajorVersion = void 0;
 exports.getStorybookVersionToInstall = getStorybookVersionToInstall;
-exports.storybookMajorVersion = storybookMajorVersion;
-exports.getInstalledStorybookVersion = getInstalledStorybookVersion;
 exports.safeFileDelete = safeFileDelete;
 exports.storybookConfigExistsCheck = storybookConfigExistsCheck;
 exports.dedupe = dedupe;
 exports.findStorybookAndBuildTargetsAndCompiler = findStorybookAndBuildTargetsAndCompiler;
 exports.isTheFileAStory = isTheFileAStory;
 exports.getTsSourceFile = getTsSourceFile;
-exports.pleaseUpgrade = pleaseUpgrade;
-const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 const js_1 = require("@nx/js");
 const ts = require("typescript");
-const semver_1 = require("semver");
-const path_1 = require("path");
 const versions_1 = require("./versions");
+var versions_2 = require("./versions");
+Object.defineProperty(exports, "storybookMajorVersion", { enumerable: true, get: function () { return versions_2.storybookMajorVersion; } });
+Object.defineProperty(exports, "getInstalledStorybookVersion", { enumerable: true, get: function () { return versions_2.getInstalledStorybookVersion; } });
 exports.Constants = {
     addonDependencies: ['@storybook/addons'],
     tsConfigExclusions: ['stories', '**/*.stories.ts'],
@@ -26,76 +23,9 @@ exports.Constants = {
     },
     jsonIndentLevel: 2,
     coreAddonPrefix: '@storybook/addon-',
-    uiFrameworks7: [
-        '@storybook/angular',
-        '@storybook/html-webpack5',
-        '@storybook/nextjs',
-        '@storybook/preact-webpack5',
-        '@storybook/react-webpack5',
-        '@storybook/react-vite',
-        '@storybook/server-webpack5',
-        '@storybook/svelte-webpack5',
-        '@storybook/svelte-vite',
-        '@storybook/sveltekit',
-        '@storybook/vue-webpack5',
-        '@storybook/vue-vite',
-        '@storybook/vue3-webpack5',
-        '@storybook/vue3-vite',
-        '@storybook/web-components-webpack5',
-        '@storybook/web-components-vite',
-    ],
 };
 function getStorybookVersionToInstall(tree) {
-    let storybookVersionToInstall = versions_1.storybookVersion;
-    const installedStorybookMajorVersion = storybookMajorVersion(tree);
-    const installedStorybookVersion = getInstalledStorybookVersion(tree);
-    if (installedStorybookMajorVersion >= 7 && installedStorybookVersion) {
-        // Normalize the version by removing range operators (^, ~, etc.)
-        // coerce handles ranges like ^10.0.0 and returns a valid SemVer object
-        const coercedVersion = (0, semver_1.coerce)(installedStorybookVersion);
-        if (coercedVersion && (0, semver_1.gte)(coercedVersion.version, '7.0.0')) {
-            storybookVersionToInstall = installedStorybookVersion;
-        }
-    }
-    return storybookVersionToInstall;
-}
-function storybookMajorVersion(tree) {
-    let foundStorybookPackageVersion = null;
-    if (tree) {
-        foundStorybookPackageVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'storybook');
-    }
-    if (foundStorybookPackageVersion) {
-        try {
-            return (0, semver_1.major)(foundStorybookPackageVersion);
-        }
-        catch {
-            // unable to parse, fallback to requiring version from disk
-        }
-    }
-    try {
-        const storybookPackageVersion = require((0, path_1.join)('storybook', 'package.json')).version;
-        return (0, semver_1.major)(storybookPackageVersion);
-    }
-    catch {
-        return undefined;
-    }
-}
-function getInstalledStorybookVersion(tree) {
-    let foundStorybookPackageVersion = null;
-    if (tree) {
-        foundStorybookPackageVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'storybook');
-    }
-    if (foundStorybookPackageVersion) {
-        return foundStorybookPackageVersion;
-    }
-    // unable to find in root packageJson, fallback to requiring version from disk
-    try {
-        const storybookPackageVersion = require((0, path_1.join)('storybook', 'package.json')).version;
-        return storybookPackageVersion;
-    }
-    catch {
-        return undefined;
-    }
+    return (0, versions_1.versions)(tree).storybookVersion;
 }
 function safeFileDelete(tree, path) {
     if (tree.exists(path)) {
@@ -235,12 +165,3 @@ function getTsSourceFile(host, path) {
     const source = ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);
     return source;
 }
-function pleaseUpgrade() {
-    return `
-    Storybook 7 and lower are no longer maintained, and not supported in Nx. 
-    Please upgrade to Storybook 8.
-
-    Here is a guide on how to upgrade:
-    https://nx.dev/nx-api/storybook/generators/migrate-8
-    `;
-}

package/src/utils/versions.d.ts

@@ -1,9 +1,18 @@
+import { type Tree } from '@nx/devkit';
 export declare const nxVersion: any;
 export declare const litVersion = "^2.6.1";
 export declare const tsNodeVersion = "10.9.1";
 export declare const tsLibVersion = "^2.3.0";
+export declare const minSupportedStorybookVersion = "8.0.0";
 export declare const storybookVersion = "^10.1.0";
 export declare const reactVersion = "^18.2.0";
 export declare const viteVersion = "^6.0.0";
 export declare const coreJsVersion = "^3.36.1";
+type StorybookVersions = {
+    storybookVersion: string;
+};
+export declare function versions(tree: Tree): StorybookVersions;
+export declare function storybookMajorVersion(tree?: Tree): number | undefined;
+export declare function getInstalledStorybookVersion(tree?: Tree): string | undefined;
+export {};
 //# sourceMappingURL=versions.d.ts.map

package/src/utils/versions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/storybook/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAC/D,eAAO,MAAM,UAAU,WAAW,CAAC;AACnC,eAAO,MAAM,aAAa,WAAW,CAAC;AACtC,eAAO,MAAM,YAAY,WAAW,CAAC;AAErC,eAAO,MAAM,gBAAgB,YAAY,CAAC;AAC1C,eAAO,MAAM,YAAY,YAAY,CAAC;AACtC,eAAO,MAAM,WAAW,WAAW,CAAC;AAEpC,eAAO,MAAM,aAAa,YAAY,CAAC"}
+{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/storybook/src/utils/versions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAI5E,eAAO,MAAM,SAAS,KAAwC,CAAC;AAC/D,eAAO,MAAM,UAAU,WAAW,CAAC;AACnC,eAAO,MAAM,aAAa,WAAW,CAAC;AACtC,eAAO,MAAM,YAAY,WAAW,CAAC;AAErC,eAAO,MAAM,4BAA4B,UAAU,CAAC;AAGpD,eAAO,MAAM,gBAAgB,YAAY,CAAC;AAC1C,eAAO,MAAM,YAAY,YAAY,CAAC;AACtC,eAAO,MAAM,WAAW,WAAW,CAAC;AAEpC,eAAO,MAAM,aAAa,YAAY,CAAC;AAEvC,KAAK,iBAAiB,GAAG;IACvB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAaF,wBAAgB,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,iBAAiB,CAQtD;AAED,wBAAgB,qBAAqB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAOrE;AAED,wBAAgB,4BAA4B,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAc5E"}

package/src/utils/versions.js

@@ -1,11 +1,57 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.coreJsVersion = exports.viteVersion = exports.reactVersion = exports.storybookVersion = exports.tsLibVersion = exports.tsNodeVersion = exports.litVersion = exports.nxVersion = void 0;
+exports.coreJsVersion = exports.viteVersion = exports.reactVersion = exports.storybookVersion = exports.minSupportedStorybookVersion = exports.tsLibVersion = exports.tsNodeVersion = exports.litVersion = exports.nxVersion = void 0;
+exports.versions = versions;
+exports.storybookMajorVersion = storybookMajorVersion;
+exports.getInstalledStorybookVersion = getInstalledStorybookVersion;
+const devkit_1 = require("@nx/devkit");
+const semver_1 = require("semver");
+const path_1 = require("path");
 exports.nxVersion = require('../../package.json').version;
 exports.litVersion = '^2.6.1';
 exports.tsNodeVersion = '10.9.1';
 exports.tsLibVersion = '^2.3.0';
+exports.minSupportedStorybookVersion = '8.0.0';
+// Fresh-install default. Latest supported major.
 exports.storybookVersion = '^10.1.0';
 exports.reactVersion = '^18.2.0';
 exports.viteVersion = '^6.0.0';
 exports.coreJsVersion = '^3.36.1';
+const latestVersions = {
+    storybookVersion: exports.storybookVersion,
+};
+const versionMap = {
+    8: { storybookVersion: '^8.6.11' },
+    9: { storybookVersion: '^9.0.5' },
+    10: { storybookVersion: '^10.1.0' },
+};
+function versions(tree) {
+    const installedStorybookMajor = storybookMajorVersion(tree);
+    if (installedStorybookMajor === undefined) {
+        return latestVersions;
+    }
+    return (versionMap[installedStorybookMajor] ?? latestVersions);
+}
+function storybookMajorVersion(tree) {
+    const installedVersion = getInstalledStorybookVersion(tree);
+    if (!installedVersion) {
+        return undefined;
+    }
+    const coerced = (0, semver_1.coerce)(installedVersion);
+    return coerced ? (0, semver_1.major)(coerced) : undefined;
+}
+function getInstalledStorybookVersion(tree) {
+    if (tree) {
+        const declared = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'storybook');
+        if (declared) {
+            return declared;
+        }
+    }
+    // Fall back to resolving from disk when no tree declaration is available.
+    try {
+        return require((0, path_1.join)('storybook', 'package.json')).version;
+    }
+    catch {
+        return undefined;
+    }
+}