@nx/storybook 23.0.0-beta.1 → 23.0.0-beta.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/storybook",
-  "version": "23.0.0-beta.1",
+  "version": "23.0.0-beta.11",
   "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,20 +34,20 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.1",
-    "@phenomnomnominal/tsquery": "~6.1.4",
+    "@nx/devkit": "23.0.0-beta.11",
+    "@phenomnomnominal/tsquery": "~6.2.0",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
-    "@nx/cypress": "23.0.0-beta.1",
-    "@nx/js": "23.0.0-beta.1",
-    "@nx/eslint": "23.0.0-beta.1"
+    "@nx/cypress": "23.0.0-beta.11",
+    "@nx/js": "23.0.0-beta.11",
+    "@nx/eslint": "23.0.0-beta.11"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.1",
+    "nx": "23.0.0-beta.11",
     "storybook": "9.0.6"
   },
   "peerDependencies": {
-    "@nx/web": "23.0.0-beta.1",
+    "@nx/web": "23.0.0-beta.11",
     "storybook": ">=7.0.0 <11.0.0"
   },
   "peerDependenciesMeta": {

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;AAU3D,wBAA8B,sBAAsB,CAClD,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,eAAe;;GAgBzB"}

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

@@ -37,7 +37,9 @@ 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) {

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;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"}

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

@@ -36,7 +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) {
+    (0, deprecation_1.warnStorybookExecutorDeprecation)();
     const storybookMajor = (0, utilities_1.storybookMajorVersion)();
     if (storybookMajor > 0 && storybookMajor <= 7) {
         throw (0, utilities_1.pleaseUpgrade)();

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;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"}

package/src/generators/configuration/configuration.js

@@ -5,6 +5,7 @@ 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 util_functions_1 = require("./lib/util-functions");
 const utilities_1 = require("../../utils/utilities");
 const versions_1 = require("../../utils/versions");
@@ -82,6 +83,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);
         }

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;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"}

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

@@ -1,17 +1,16 @@
 "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");
 async function convertToInferred(tree, options) {
     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,7 +32,7 @@ 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);

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;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"}

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

@@ -2,7 +2,7 @@
 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");
@@ -28,7 +28,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 +50,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 +66,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;

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;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"}

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;

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

@@ -1,5 +1,5 @@
 import { type 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 getConfigFilePath(tree: Tree, configDir: string): string;
 export declare function addConfigValuesToConfigFile(tree: Tree, configFile: string, configValues: Record<string, Record<string, unknown>>): void;
 export declare const STORYBOOK_PROP_MAPPINGS: {

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,EAA+B,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,gEAAgE,CAAC;AAK/F,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,CAKf;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM;;;EAIzE"}
+{"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"}

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

@@ -8,7 +8,7 @@ exports.getInstalledPackageVersion = getInstalledPackageVersion;
 exports.getInstalledPackageVersionInfo = getInstalledPackageVersionInfo;
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 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 semver_1 = require("semver");
 function getConfigFilePath(tree, configDir) {
     return [
@@ -122,15 +122,15 @@ function ensureViteConfigPathIsRelative(tree, configPath, projectName, projectRo
     if (pathToViteConfig.match(/^(\.\.\/|\.\/)/)) {
         return;
     }
-    const relativePathToViteConfig = (0, plugin_migration_utils_1.toProjectRelativePath)(pathToViteConfig, projectRoot);
+    const relativePathToViteConfig = (0, internal_1.toProjectRelativePath)(pathToViteConfig, projectRoot);
     tree.write(configPath, `${configFileContents.slice(0, viteConfigPathNode.getStart() + 1)}${relativePathToViteConfig}${configFileContents.slice(viteConfigPathNode.getEnd() - 1)}`);
 }
 function getInstalledPackageVersion(tree, pkgName) {
-    const { dependencies, devDependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const version = dependencies?.[pkgName] ?? devDependencies?.[pkgName];
-    return version;
+    // resolves pnpm catalog: refs (and yarn catalog refs)
+    return (0, devkit_1.getDependencyVersionFromPackageJson)(tree, pkgName);
 }
 function getInstalledPackageVersionInfo(tree, pkgName) {
     const version = getInstalledPackageVersion(tree, pkgName);
-    return version ? { major: (0, semver_1.major)((0, semver_1.coerce)(version)), version } : null;
+    const coerced = version ? (0, semver_1.coerce)(version) : null;
+    return coerced ? { major: (0, semver_1.major)(coerced), version } : null;
 }

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":"AAAA,OAAO,EAIL,iBAAiB,EAIjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAUpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA8DlC,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;AASpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA8DlC,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"}

package/src/generators/init/init.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initGenerator = initGenerator;
 exports.initGeneratorInternal = initGeneratorInternal;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const plugin_1 = require("../../plugins/plugin");
 const utilities_1 = require("../../utils/utilities");
 const versions_1 = require("../../utils/versions");
@@ -52,7 +52,7 @@ async function initGeneratorInternal(tree, schema) {
         nxJson.useInferencePlugins !== false;
     schema.addPlugin ??= addPluginDefault;
     if (schema.addPlugin) {
-        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/storybook/plugin', plugin_1.createNodesV2, {
+        await (0, internal_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/storybook/plugin', plugin_1.createNodesV2, {
             serveStorybookTargetName: [
                 'storybook',
                 'serve:storybook',

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/storybook/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAQd,MAAM,YAAY,CAAC;AAapB,MAAM,WAAW,sBAAsB;IACrC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAeD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,sBAAsB,CAgC7D,CAAC;AAEF,eAAO,MAAM,aAAa,uCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/storybook/src/plugins/plugin.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAMd,MAAM,YAAY,CAAC;AAUpB,MAAM,WAAW,sBAAsB;IACrC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAID;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,sBAAsB,CAiC7D,CAAC;AAEF,eAAO,MAAM,aAAa,uCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -1,23 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = exports.createNodes = exports.createDependencies = void 0;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const fs_1 = require("fs");
-const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const js_1 = require("@nx/js");
-const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
 const file_hasher_1 = require("nx/src/hasher/file-hasher");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const util_1 = require("@nx/js/src/plugins/typescript/util");
-function readTargetsCache(cachePath) {
-    return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
-}
-function writeTargetsToCache(cachePath, results) {
-    (0, devkit_1.writeJsonFile)(cachePath, results);
-}
 /**
  * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
  */
@@ -32,18 +24,20 @@ exports.createNodes = [
         const normalizedOptions = normalizeOptions(options);
         const optionsHash = (0, file_hasher_1.hashObject)(normalizedOptions);
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `storybook-${optionsHash}.hash`);
-        const targetsCache = readTargetsCache(cachePath);
-        const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
+        const targetsCache = new internal_1.PluginCache(cachePath);
+        const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
+        const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
+        const lockFileName = (0, js_1.getLockFileName)(packageManager);
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, _, context) => createNodesInternal(configFile, normalizedOptions, context, targetsCache, pmc), configFilePaths, normalizedOptions, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, _, context) => createNodesInternal(configFile, normalizedOptions, context, targetsCache, pmc, lockFileName), configFilePaths, normalizedOptions, context);
         }
         finally {
-            writeTargetsToCache(cachePath, targetsCache);
+            targetsCache.writeToDisk();
         }
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context, targetsCache, pmc) {
+async function createNodesInternal(configFilePath, options, context, targetsCache, pmc, lockFileName) {
     let projectRoot = '';
     if (configFilePath.includes('/.storybook')) {
         projectRoot = (0, path_1.dirname)(configFilePath).replace('/.storybook', '');
@@ -60,14 +54,16 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         !siblingFiles.includes('project.json')) {
         return {};
     }
-    const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
+    const hash = await (0, internal_1.calculateHashForCreateNodes)(projectRoot, options, context, [lockFileName]);
     const projectName = buildProjectName(projectRoot, context.workspaceRoot);
-    targetsCache[hash] ??= await buildStorybookTargets(configFilePath, projectRoot, options, context, projectName, pmc);
+    if (!targetsCache.has(hash)) {
+        targetsCache.set(hash, await buildStorybookTargets(configFilePath, projectRoot, options, context, projectName, pmc));
+    }
     const result = {
         projects: {
             [projectRoot]: {
                 root: projectRoot,
-                targets: targetsCache[hash],
+                targets: targetsCache.get(hash),
             },
         },
     };
@@ -75,7 +71,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
 }
 async function buildStorybookTargets(configFilePath, projectRoot, options, context, projectName, pmc) {
     const buildOutputs = getOutputs();
-    const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
+    const namedInputs = (0, internal_1.getNamedInputs)(projectRoot, context);
     // First attempt to do a very fast lookup for the framework
     // If that fails, the framework might be inherited, so do a very heavyweight lookup
     const storybookFramework = (await getStorybookFramework(configFilePath, context)) ||
@@ -220,7 +216,7 @@ function parseFrameworkName(mainTsJs) {
 }
 async function getStorybookFullyResolvedFramework(configFilePath, context) {
     const resolvedPath = (0, path_1.join)(context.workspaceRoot, configFilePath);
-    const { framework } = await (0, config_utils_1.loadConfigFile)(resolvedPath);
+    const { framework } = await (0, internal_1.loadConfigFile)(resolvedPath);
     return typeof framework === 'string' ? framework : framework.name;
 }
 function getOutputs() {

package/src/utils/deprecation.d.ts

@@ -0,0 +1,6 @@
+export declare const STORYBOOK_EXECUTOR_DEPRECATION_MESSAGE = "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 targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.";
+export declare const STORYBOOK_BUILD_EXECUTOR_DEPRECATION_MESSAGE = "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 targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.";
+export declare function warnStorybookExecutorDeprecation(): void;
+export declare function warnStorybookBuildExecutorDeprecation(): void;
+export declare function warnStorybookExecutorGenerating(): void;
+//# sourceMappingURL=deprecation.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"deprecation.d.ts","sourceRoot":"","sources":["../../../../../packages/storybook/src/utils/deprecation.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,sCAAsC,+QAC2N,CAAC;AAE/Q,eAAO,MAAM,4CAA4C,2QACiN,CAAC;AAE3Q,wBAAgB,gCAAgC,IAAI,IAAI,CAEvD;AAED,wBAAgB,qCAAqC,IAAI,IAAI,CAE5D;AAED,wBAAgB,+BAA+B,IAAI,IAAI,CAItD"}

package/src/utils/deprecation.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.STORYBOOK_BUILD_EXECUTOR_DEPRECATION_MESSAGE = exports.STORYBOOK_EXECUTOR_DEPRECATION_MESSAGE = void 0;
+exports.warnStorybookExecutorDeprecation = warnStorybookExecutorDeprecation;
+exports.warnStorybookBuildExecutorDeprecation = warnStorybookBuildExecutorDeprecation;
+exports.warnStorybookExecutorGenerating = warnStorybookExecutorGenerating;
+const devkit_1 = require("@nx/devkit");
+// TODO(v24): Remove the @nx/storybook:storybook and @nx/storybook:build
+// executors. The inferred plugin (@nx/storybook/plugin) and the
+// convert-to-inferred generator stay supported.
+exports.STORYBOOK_EXECUTOR_DEPRECATION_MESSAGE = '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 targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.';
+exports.STORYBOOK_BUILD_EXECUTOR_DEPRECATION_MESSAGE = '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 targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.';
+function warnStorybookExecutorDeprecation() {
+    devkit_1.logger.warn(exports.STORYBOOK_EXECUTOR_DEPRECATION_MESSAGE);
+}
+function warnStorybookBuildExecutorDeprecation() {
+    devkit_1.logger.warn(exports.STORYBOOK_BUILD_EXECUTOR_DEPRECATION_MESSAGE);
+}
+function warnStorybookExecutorGenerating() {
+    devkit_1.logger.warn('Generating targets that use the deprecated `@nx/storybook:storybook` and `@nx/storybook:build` executors. These executors will be removed in Nx v24. Run `nx g @nx/storybook:convert-to-inferred` next to migrate these targets to the `@nx/storybook/plugin` inferred plugin and prevent future generators from emitting executor targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.');
+}