@nx/storybook 23.0.0-beta.15 → 23.0.0-beta.17

package/migrations.json

@@ -19,7 +19,8 @@
         "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": {

package/package.json

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

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,10 +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 internal_1 = require("@nx/devkit/internal");
-const internal_2 = require("@nx/js/internal");
+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);
@@ -127,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, internal_2.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');
@@ -176,7 +175,7 @@ function createStorybookTsconfigFile(tree, projectRoot, uiFramework, isRootProje
         ],
     };
     if (useTsSolution) {
-        const runtimeConfig = (0, internal_2.findRuntimeTsConfigName)(projectRoot, tree);
+        const runtimeConfig = (0, internal_3.findRuntimeTsConfigName)(projectRoot, tree);
         if (runtimeConfig) {
             storybookTsConfig.references ??= [];
             storybookTsConfig.references.push({
@@ -288,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;
@@ -374,7 +373,7 @@ function addStorybookToNamedInputs(tree) {
 }
 function addStorybookToTargetDefaults(tree, setCache = true) {
     const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
-    const existing = (0, internal_1.normalizeTargetDefaults)(nxJson.targetDefaults).find((e) => e.target === 'build-storybook' &&
+    const existing = (0, internal_2.normalizeTargetDefaults)(nxJson.targetDefaults).find((e) => e.target === 'build-storybook' &&
         e.executor === undefined &&
         e.projects === undefined &&
         e.plugin === undefined);
@@ -396,7 +395,7 @@ function addStorybookToTargetDefaults(tree, setCache = true) {
     if (!inputs.includes('{projectRoot}/tsconfig.storybook.json')) {
         inputs.push('{projectRoot}/tsconfig.storybook.json');
     }
-    (0, internal_1.upsertTargetDefault)(tree, nxJson, {
+    (0, internal_2.upsertTargetDefault)(tree, nxJson, {
         target: 'build-storybook',
         ...(setCache && existing?.cache === undefined ? { cache: true } : {}),
         inputs,
@@ -404,7 +403,7 @@ function addStorybookToTargetDefaults(tree, setCache = true) {
     (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, internal_2.getProjectType)(tree, root, projectType) ===
+    let projectDirectory = (0, internal_3.getProjectType)(tree, root, projectType) ===
         'application'
         ? isNextJs
             ? 'components'
@@ -432,7 +431,7 @@ function createProjectStorybookDir(tree, projectName, uiFramework, js, tsConfigu
         interactionTests,
         mainDir,
         isNextJs: isNextJs &&
-            (0, internal_2.getProjectType)(tree, root, projectType) ===
+            (0, internal_3.getProjectType)(tree, root, projectType) ===
                 'application',
         usesSwc,
         usesVite,
@@ -459,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, internal_2.getProjectType)(tree, root, projectType) === 'application'
+        : (0, internal_3.getProjectType)(tree, root, projectType) === 'application'
             ? 'tsconfig.app.json'
             : 'tsconfig.lib.json');
 }
@@ -569,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/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;AAIlC,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAmClE;AAED,eAAe,kBAAkB,CAAC"}

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

@@ -19,6 +19,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/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.`,
-    ];
 }