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

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

@@ -1,51 +1,91 @@
 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;
+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,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,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,12 +3,13 @@ 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;
 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 [
@@ -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:')) {
@@ -122,7 +117,7 @@ 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) {

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

@@ -2,11 +2,12 @@
 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");
+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,17 +16,15 @@ 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);
+    const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
     const cacheableOperations = nxJson.tasksRunnerOptions?.default?.options?.cacheableOperations;
     if (cacheableOperations && !cacheableOperations.includes('build-storybook')) {
         nxJson.tasksRunnerOptions.default.options.cacheableOperations.push('build-storybook');
     }
-    nxJson.targetDefaults ??= {};
-    nxJson.targetDefaults['build-storybook'] ??= {};
-    nxJson.targetDefaults['build-storybook'].cache = true;
+    (0, internal_1.upsertTargetDefault)(tree, nxJson, { target: 'build-storybook', cache: true });
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 function moveToDevDependencies(tree) {
@@ -47,12 +46,13 @@ 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;
     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/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,iBA+BlE;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({
@@ -19,6 +21,9 @@ async function migrate10Generator(tree, schema) {
         return;
     }
     (0, calling_storybook_cli_1.callUpgrade)(schema);
+    if (schema.skipAiInstructions) {
+        return;
+    }
     const pathToAiInstructions = (0, path_1.join)(__dirname, 'files', 'ai-instructions-for-cjs-esm.md');
     if (!(0, fs_1.existsSync)(pathToAiInstructions)) {
         return;

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

@@ -1,4 +1,5 @@
 export interface Schema {
   autoAcceptAllPrompts?: boolean;
   configDirs?: string[];
+  skipAiInstructions?: boolean;
 }

package/src/generators/migrate-10/schema.json

@@ -14,6 +14,11 @@
       "type": "array",
       "description": "Directory(ies) where to load Storybook configurations from. Use this if you want to customize the Storybook projects you'd like to migrate.",
       "default": []
+    },
+    "skipAiInstructions": {
+      "type": "boolean",
+      "description": "Skip writing the AI migration instructions file to `tools/ai-migrations/`.",
+      "default": false
     }
   },
   "examplesFile": "../../../docs/migrate-10-generator-examples.md"

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/migrations/update-22-1-0/migrate-to-storybook-10.d.ts

@@ -1,3 +1,3 @@
 import { Tree } from '@nx/devkit';
-export default function migrateToStorybook10(tree: Tree): Promise<string[]>;
+export default function migrateToStorybook10(tree: Tree): Promise<void>;
 //# sourceMappingURL=migrate-to-storybook-10.d.ts.map

package/src/migrations/update-22-1-0/migrate-to-storybook-10.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrate-to-storybook-10.d.ts","sourceRoot":"","sources":["../../../../../../packages/storybook/src/migrations/update-22-1-0/migrate-to-storybook-10.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAOlC,wBAA8B,oBAAoB,CAAC,IAAI,EAAE,IAAI,qBAkB5D"}
+{"version":3,"file":"migrate-to-storybook-10.d.ts","sourceRoot":"","sources":["../../../../../../packages/storybook/src/migrations/update-22-1-0/migrate-to-storybook-10.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAIlC,wBAA8B,oBAAoB,CAAC,IAAI,EAAE,IAAI,iBAc5D"}

package/src/migrations/update-22-1-0/migrate-to-storybook-10.js

@@ -16,9 +16,6 @@ async function migrateToStorybook10(tree) {
     });
     await (0, migrate_10_1.default)(tree, {
         autoAcceptAllPrompts: true,
+        skipAiInstructions: true,
     });
-    return [
-        `Storybook 10 requires Storybook Configs to use ESM.`,
-        `We created 'tools/ai-migrations/MIGRATE_STORYBOOK_10.md' with instructions for an AI Agent to convert CJS Storybook Configs to ESM in your workspace.`,
-    ];
 }

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,EAEL,kBAAkB,EAIlB,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,CA+D7D,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);
-}
+const internal_2 = require("@nx/js/internal");
 /**
  * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
  */
@@ -32,18 +24,40 @@ 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);
+            const { entries, preErrors } = await filterStorybookConfigs(configFilePaths, context);
+            const projectHashes = await (0, internal_1.calculateHashesForCreateNodes)(entries.map((e) => e.projectRoot), normalizedOptions, context, entries.map(() => [lockFileName]));
+            let results = [];
+            let nodeErrors = [];
+            try {
+                results = await (0, devkit_1.createNodesFromFiles)((configFile, _, ctx, idx) => createNodesInternal(configFile, normalizedOptions, ctx, targetsCache, pmc, entries[idx].projectRoot, projectHashes[idx]), entries.map((e) => e.configFile), normalizedOptions, context);
+            }
+            catch (e) {
+                if (e instanceof devkit_1.AggregateCreateNodesError) {
+                    results = e.partialResults ?? [];
+                    nodeErrors = e.errors;
+                }
+                else {
+                    throw e;
+                }
+            }
+            const allErrors = [...preErrors, ...nodeErrors];
+            if (allErrors.length > 0) {
+                throw new devkit_1.AggregateCreateNodesError(allErrors, results);
+            }
+            return results;
         }
         finally {
-            writeTargetsToCache(cachePath, targetsCache);
+            targetsCache.writeToDisk();
         }
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context, targetsCache, pmc) {
+function getProjectRootFromConfigPath(configFilePath) {
     let projectRoot = '';
     if (configFilePath.includes('/.storybook')) {
         projectRoot = (0, path_1.dirname)(configFilePath).replace('/.storybook', '');
@@ -54,20 +68,18 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
     if (projectRoot === '') {
         projectRoot = '.';
     }
-    // Do not create a project if package.json and project.json isn't there.
-    const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
-    if (!siblingFiles.includes('package.json') &&
-        !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))]);
+    return projectRoot;
+}
+async function createNodesInternal(configFilePath, options, context, targetsCache, pmc, projectRoot, hash) {
     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 +87,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)) ||
@@ -91,7 +103,7 @@ async function buildStorybookTargets(configFilePath, projectRoot, options, conte
         targets[options.testStorybookTargetName] = testTarget(projectRoot);
     }
     targets[options.staticStorybookTargetName] = serveStaticTarget(options, projectRoot);
-    (0, util_1.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
+    (0, internal_2.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
     return targets;
 }
 function buildTarget(namedInputs, outputs, projectRoot, frameworkIsAngular, projectName, configFilePath) {
@@ -220,7 +232,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() {
@@ -232,6 +244,28 @@ function getOutputs() {
     ];
     return outputs;
 }
+async function filterStorybookConfigs(configFiles, context) {
+    const preErrors = [];
+    const candidates = await Promise.all(configFiles.map(async (configFile) => {
+        try {
+            const projectRoot = getProjectRootFromConfigPath(configFile);
+            const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
+            if (!siblingFiles.includes('package.json') &&
+                !siblingFiles.includes('project.json')) {
+                return null;
+            }
+            return { configFile, projectRoot };
+        }
+        catch (e) {
+            preErrors.push([configFile, e]);
+            return null;
+        }
+    }));
+    return {
+        entries: candidates.filter((c) => c !== null),
+        preErrors,
+    };
+}
 function normalizeOptions(options) {
     return {
         buildStorybookTargetName: options.buildStorybookTargetName ?? 'build-storybook',

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/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.');
+}

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