@nx/storybook 23.0.0-beta.2 → 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"
     },
@@ -19,12 +25,16 @@
         "storybook": ">=10.0.0"
       },
       "description": "Update workspace to use Storybook v10",
-      "implementation": "./src/migrations/update-22-1-0/migrate-to-storybook-10"
+      "implementation": "./src/migrations/update-22-1-0/migrate-to-storybook-10",
+      "prompt": "./src/generators/migrate-10/files/ai-instructions-for-cjs-esm.md"
     }
   },
   "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",
@@ -282,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",
@@ -539,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.2",
+  "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.2",
-    "@phenomnomnominal/tsquery": "~6.1.4",
+    "@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.2",
-    "@nx/js": "23.0.0-beta.2",
-    "@nx/eslint": "23.0.0-beta.2"
+    "@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.2",
+    "nx": "23.0.0-beta.21",
     "storybook": "9.0.6"
   },
   "peerDependencies": {
-    "@nx/web": "23.0.0-beta.2",
-    "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;AAS3D,wBAA8B,sBAAsB,CAClD,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,eAAe;;GAczB"}
+{"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

@@ -37,12 +37,10 @@ exports.default = buildStorybookExecutor;
 const devkit_1 = require("@nx/devkit");
 const utilities_1 = require("../../utils/utilities");
 const semver_1 = require("semver");
+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/build-storybook/schema.json

@@ -5,6 +5,7 @@
   "cli": "nx",
   "description": "Build storybook in production mode.",
   "type": "object",
+  "x-deprecated": "The `@nx/storybook:build` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/storybook:convert-to-inferred` to migrate to the `@nx/storybook/plugin` inferred plugin. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.",
   "presets": [
     {
       "name": "Default minimum setup",

package/src/executors/storybook/schema.json

@@ -6,6 +6,7 @@
   "cli": "nx",
   "description": "Serve up Storybook in development mode.",
   "type": "object",
+  "x-deprecated": "The `@nx/storybook:storybook` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/storybook:convert-to-inferred` to migrate to the `@nx/storybook/plugin` inferred plugin. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.",
   "presets": [
     {
       "name": "Default minimum setup",

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;AAG3D,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,CAmBD"}
+{"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

@@ -36,11 +36,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = storybookExecutor;
 const utilities_1 = require("../../utils/utilities");
 const semver_1 = require("semver");
+const deprecation_1 = require("../../utils/deprecation");
 async function* storybookExecutor(options, context) {
-    const storybookMajor = (0, utilities_1.storybookMajorVersion)();
-    if (storybookMajor > 0 && storybookMajor <= 7) {
-        throw (0, utilities_1.pleaseUpgrade)();
-    }
+    (0, deprecation_1.warnStorybookExecutorDeprecation)();
     (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;AAuCpD,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,wBAAwB,8BAGjC;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,wBAAwB,8BA4KpC;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

@@ -5,21 +5,21 @@ exports.configurationGeneratorInternal = configurationGeneratorInternal;
 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");
 const ensure_dependencies_1 = require("./lib/ensure-dependencies");
 const edit_root_tsconfig_1 = require("./lib/edit-root-tsconfig");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 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);
@@ -62,7 +62,7 @@ async function configurationGeneratorInternal(tree, rawSchema) {
         ? p === '@nx/storybook/plugin'
         : p.plugin === '@nx/storybook/plugin');
     const mainDir = !!nextConfigFilePath &&
-        (0, ts_solution_setup_1.getProjectType)(tree, root, projectType) === 'application'
+        (0, internal_1.getProjectType)(tree, root, projectType) === 'application'
         ? 'components'
         : 'src';
     const usesVite = !!viteConfigFilePath || schema.uiFramework?.endsWith('-vite');
@@ -82,6 +82,7 @@ async function configurationGeneratorInternal(tree, rawSchema) {
     }
     let devDeps = {};
     if (!hasPlugin || schema.addExplicitTargets) {
+        (0, deprecation_1.warnStorybookExecutorGenerating)();
         if (schema.uiFramework === '@storybook/angular') {
             (0, util_functions_1.addAngularStorybookTarget)(tree, schema.project, schema.interactionTests);
         }
@@ -115,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/configuration/lib/util-functions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util-functions.d.ts","sourceRoot":"","sources":["../../../../../../../packages/storybook/src/generators/configuration/lib/util-functions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util-functions.d.ts","sourceRoot":"","sources":["../../../../../../../packages/storybook/src/generators/configuration/lib/util-functions.ts"],"names":[],"mappings":"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"}

package/src/generators/configuration/lib/util-functions.js

@@ -25,9 +25,9 @@ const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const utilities_1 = require("../../../utils/utilities");
 const versions_1 = require("../../../utils/versions");
-const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
-const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/eslint/internal");
+const internal_2 = require("@nx/devkit/internal");
+const internal_3 = require("@nx/js/internal");
 const DEFAULT_PORT = 4400;
 function addStorybookTarget(tree, projectName, uiFramework, interactionTests) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
@@ -126,7 +126,7 @@ async function addStaticTarget(tree, opts) {
 function createStorybookTsconfigFile(tree, projectRoot, uiFramework, isRootProject, mainDir) {
     const storybookMajorVersion = (0, utilities_1.storybookMajorVersion)(tree);
     const offset = (0, devkit_1.offsetFromRoot)(projectRoot);
-    const useTsSolution = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const useTsSolution = (0, internal_3.isUsingTsSolutionSetup)(tree);
     // First let's check if old configuration file exists
     // If it exists, let's rename it and move it to the new location
     const oldStorybookTsConfigPath = (0, devkit_1.joinPathFragments)(projectRoot, '.storybook/tsconfig.json');
@@ -175,7 +175,7 @@ function createStorybookTsconfigFile(tree, projectRoot, uiFramework, isRootProje
         ],
     };
     if (useTsSolution) {
-        const runtimeConfig = (0, ts_solution_setup_1.findRuntimeTsConfigName)(projectRoot, tree);
+        const runtimeConfig = (0, internal_3.findRuntimeTsConfigName)(projectRoot, tree);
         if (runtimeConfig) {
             storybookTsConfig.references ??= [];
             storybookTsConfig.references.push({
@@ -287,14 +287,14 @@ function configureTsSolutionConfig(tree, schema) {
 function updateLintConfig(tree, schema) {
     const { project: projectName } = schema;
     const { root } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-    const eslintFile = (0, eslint_file_1.findEslintFile)(tree, root);
+    const eslintFile = (0, internal_1.findEslintFile)(tree, root);
     if (!eslintFile) {
         return;
     }
     const parserConfigPath = (0, path_1.join)(root, schema.uiFramework === '@storybook/angular'
         ? '.storybook/tsconfig.json'
         : 'tsconfig.storybook.json');
-    if ((0, flat_config_1.useFlatConfig)(tree)) {
+    if ((0, internal_1.useFlatConfig)(tree)) {
         let config = tree.read(eslintFile, 'utf-8');
         const projectRegex = RegExp(/project:\s?\[?['"](.*)['"]\]?/g);
         let match;
@@ -372,34 +372,38 @@ function addStorybookToNamedInputs(tree) {
     }
 }
 function addStorybookToTargetDefaults(tree, setCache = true) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    nxJson.targetDefaults ??= {};
-    nxJson.targetDefaults['build-storybook'] ??= {};
-    if (setCache) {
-        nxJson.targetDefaults['build-storybook'].cache ??= true;
-    }
-    nxJson.targetDefaults['build-storybook'].inputs ??= [
-        'default',
-        nxJson.namedInputs && 'production' in nxJson.namedInputs
-            ? '^production'
-            : '^default',
-    ];
-    if (!nxJson.targetDefaults['build-storybook'].inputs.includes('{projectRoot}/.storybook/**/*')) {
-        nxJson.targetDefaults['build-storybook'].inputs.push('{projectRoot}/.storybook/**/*');
-    }
-    // Delete the !{projectRoot}/.storybook/**/* glob from build-storybook
-    // because we want to rebuild Storybook if the .storybook folder changes
-    const index = nxJson.targetDefaults['build-storybook'].inputs.indexOf('!{projectRoot}/.storybook/**/*');
-    if (index !== -1) {
-        nxJson.targetDefaults['build-storybook'].inputs.splice(index, 1);
-    }
-    if (!nxJson.targetDefaults['build-storybook'].inputs.includes('{projectRoot}/tsconfig.storybook.json')) {
-        nxJson.targetDefaults['build-storybook'].inputs.push('{projectRoot}/tsconfig.storybook.json');
-    }
+    const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
+    const existing = (0, internal_2.normalizeTargetDefaults)(nxJson.targetDefaults).find((e) => e.target === 'build-storybook' &&
+        e.executor === undefined &&
+        e.projects === undefined &&
+        e.plugin === undefined);
+    const inputs = existing?.inputs
+        ? [...existing.inputs]
+        : [
+            'default',
+            nxJson.namedInputs && 'production' in nxJson.namedInputs
+                ? '^production'
+                : '^default',
+        ];
+    if (!inputs.includes('{projectRoot}/.storybook/**/*')) {
+        inputs.push('{projectRoot}/.storybook/**/*');
+    }
+    // Drop the negation glob so Storybook rebuilds when .storybook changes.
+    const negatedIndex = inputs.indexOf('!{projectRoot}/.storybook/**/*');
+    if (negatedIndex !== -1)
+        inputs.splice(negatedIndex, 1);
+    if (!inputs.includes('{projectRoot}/tsconfig.storybook.json')) {
+        inputs.push('{projectRoot}/tsconfig.storybook.json');
+    }
+    (0, internal_2.upsertTargetDefault)(tree, nxJson, {
+        target: 'build-storybook',
+        ...(setCache && existing?.cache === undefined ? { cache: true } : {}),
+        inputs,
+    });
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 function createProjectStorybookDir(tree, projectName, uiFramework, js, tsConfiguration, root, projectType, projectIsRootProjectInStandaloneWorkspace, interactionTests, mainDir, isNextJs, usesSwc, usesVite, viteConfigFilePath, hasPlugin, viteConfigFileName, usesReactNative) {
-    let projectDirectory = (0, ts_solution_setup_1.getProjectType)(tree, root, projectType) ===
+    let projectDirectory = (0, internal_3.getProjectType)(tree, root, projectType) ===
         'application'
         ? isNextJs
             ? 'components'
@@ -427,7 +431,7 @@ function createProjectStorybookDir(tree, projectName, uiFramework, js, tsConfigu
         interactionTests,
         mainDir,
         isNextJs: isNextJs &&
-            (0, ts_solution_setup_1.getProjectType)(tree, root, projectType) ===
+            (0, internal_3.getProjectType)(tree, root, projectType) ===
                 'application',
         usesSwc,
         usesVite,
@@ -454,7 +458,7 @@ function getTsConfigPath(tree, projectName, path) {
     const { root, projectType } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     return (0, path_1.join)(root, path?.length > 0
         ? path
-        : (0, ts_solution_setup_1.getProjectType)(tree, root, projectType) === 'application'
+        : (0, internal_3.getProjectType)(tree, root, projectType) === 'application'
             ? 'tsconfig.app.json'
             : 'tsconfig.lib.json');
 }
@@ -564,7 +568,7 @@ function renameAndMoveOldTsConfig(projectRoot, pathToStorybookConfigFile, tree)
             return json;
         });
     }
-    const eslintFile = (0, eslint_file_1.findEslintFile)(tree, projectRoot);
+    const eslintFile = (0, internal_1.findEslintFile)(tree, projectRoot);
     if (eslintFile) {
         const fileName = (0, devkit_1.joinPathFragments)(projectRoot, eslintFile);
         const config = tree.read(fileName, 'utf-8');

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":"AAAA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAWpB,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

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToInferred = convertToInferred;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const aggregate_log_util_1 = require("@nx/devkit/src/generators/plugin-migrations/aggregate-log-util");
-const executor_to_plugin_migrator_1 = require("@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator");
 const build_post_target_transformer_1 = require("./lib/build-post-target-transformer");
 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 aggregate_log_util_1.AggregatedLog();
-    const migratedProjects = await (0, executor_to_plugin_migrator_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/storybook/plugin', plugin_1.createNodesV2, {
+    const migrationLogs = new internal_1.AggregatedLog();
+    const migratedProjects = await (0, internal_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/storybook/plugin', plugin_1.createNodesV2, {
         buildStorybookTargetName: 'build-storybook',
         serveStorybookTargetName: 'storybook',
         staticStorybookTargetName: 'static-storybook',
@@ -33,12 +34,12 @@ async function convertToInferred(tree, options) {
         },
     ], options.project);
     if (migratedProjects.size === 0) {
-        throw new executor_to_plugin_migrator_1.NoTargetsToMigrateError();
+        throw new internal_1.NoTargetsToMigrateError();
     }
     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

@@ -1,5 +1,5 @@
 import { TargetConfiguration, Tree } from '@nx/devkit';
-import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util';
+import { AggregatedLog } from '@nx/devkit/internal';
 export declare function buildPostTargetTransformer(migrationLogs: AggregatedLog): (target: TargetConfiguration, tree: Tree, projectDetails: {
     projectName: string;
     root: string;

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;AAM1E,OAAO,EAAE,aAAa,EAAE,MAAM,gEAAgE,CAAC;AAW/F,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

@@ -2,10 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildPostTargetTransformer = buildPostTargetTransformer;
 const devkit_1 = require("@nx/devkit");
-const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
+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');
@@ -28,7 +27,7 @@ function buildPostTargetTransformer(migrationLogs) {
                 const configuration = target.configurations[configurationName];
                 if (configuration.configDir &&
                     configuration.configDir !==
-                        (0, plugin_migration_utils_1.toProjectRelativePath)(defaultConfigDir, projectDetails.root)) {
+                        (0, internal_1.toProjectRelativePath)(defaultConfigDir, projectDetails.root)) {
                     const configFilePath = (0, utils_1.getConfigFilePath)(tree, (0, devkit_1.joinPathFragments)(projectDetails.root, configuration.configDir));
                     (0, utils_1.addConfigValuesToConfigFile)(tree, configFilePath, configValues);
                     (0, utils_1.ensureViteConfigPathIsRelative)(tree, configFilePath, projectDetails.projectName, projectDetails.root, '@nx/storybook:build', migrationLogs);
@@ -50,7 +49,7 @@ function buildPostTargetTransformer(migrationLogs) {
             }
         }
         if (target.outputs) {
-            (0, plugin_migration_utils_1.processTargetOutputs)(target, [{ newName: 'output-dir', oldName: 'outputDir' }], inferredTargetConfiguration, {
+            (0, internal_1.processTargetOutputs)(target, [{ newName: 'output-dir', oldName: 'outputDir' }], inferredTargetConfiguration, {
                 projectName: projectDetails.projectName,
                 projectRoot: projectDetails.root,
             });
@@ -66,10 +65,10 @@ function handlePropertiesFromTargetOptions(tree, options, defaultConfigDir, proj
         if (options.configDir !== defaultConfigDir) {
             configDir = options.configDir;
         }
-        options.configDir = (0, plugin_migration_utils_1.toProjectRelativePath)(options.configDir, projectRoot);
+        options.configDir = (0, internal_1.toProjectRelativePath)(options.configDir, projectRoot);
     }
     if (options.outputDir) {
-        options.outputDir = (0, plugin_migration_utils_1.toProjectRelativePath)(options.outputDir, projectRoot);
+        options.outputDir = (0, internal_1.toProjectRelativePath)(options.outputDir, projectRoot);
     }
     if ('styles' in options) {
         delete options.styles;
@@ -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

@@ -1,5 +1,5 @@
 import { TargetConfiguration, Tree } from '@nx/devkit';
-import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util';
+import { AggregatedLog } from '@nx/devkit/internal';
 export declare function servePostTargetTransformer(migrationLogs: AggregatedLog): (target: TargetConfiguration, tree: Tree, projectDetails: {
     projectName: string;
     root: string;

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,EAAE,MAAM,gEAAgE,CAAC;AAQ/F,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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.servePostTargetTransformer = servePostTargetTransformer;
 const devkit_1 = require("@nx/devkit");
-const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
+const internal_1 = require("@nx/devkit/internal");
 const utils_1 = require("./utils");
 function servePostTargetTransformer(migrationLogs) {
     return (target, tree, projectDetails, inferredTargetConfiguration) => {
@@ -39,10 +39,10 @@ function servePostTargetTransformer(migrationLogs) {
 }
 function handlePropertiesFromTargetOptions(tree, options, projectName, projectRoot, migrationLogs) {
     if ('configDir' in options) {
-        options.configDir = (0, plugin_migration_utils_1.toProjectRelativePath)(options.configDir, projectRoot);
+        options.configDir = (0, internal_1.toProjectRelativePath)(options.configDir, projectRoot);
     }
     if (options.outputDir) {
-        options.outputDir = (0, plugin_migration_utils_1.toProjectRelativePath)(options.outputDir, projectRoot);
+        options.outputDir = (0, internal_1.toProjectRelativePath)(options.outputDir, projectRoot);
     }
     if ('uiFramework' in options) {
         delete options.uiFramework;
@@ -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];