@nx/storybook 19.0.0-beta.7 → 19.0.0-beta.9

package/migrations.json

@@ -1,29 +1,5 @@
 {
   "generators": {
-    "update-15.0.8-add-storybook-inputs": {
-      "cli": "nx",
-      "version": "15.0.0-beta.0",
-      "description": "Stop hashing storybook config files and story files for build targets and dependent tasks",
-      "factory": "./src/migrations/update-15-0-0/add-storybook-inputs"
-    },
-    "update-15.4.6": {
-      "cli": "nx",
-      "version": "15.4.6-beta.0",
-      "description": "Refactor the Storybook target options",
-      "factory": "./src/migrations/update-15-4-6/refactor-executor-options"
-    },
-    "update-15-5-3": {
-      "cli": "nx",
-      "version": "15.5.3-beta.0",
-      "description": "Add @nrwl/webpack if it is missing and is used.",
-      "factory": "./src/migrations/update-15-5-3/ensure-webpack-package"
-    },
-    "update-15-7-0": {
-      "cli": "nx",
-      "version": "15.7.0-beta.0",
-      "description": "Add @storybook/addon-essentials to all project-level configs and attempt to remove root config.",
-      "factory": "./src/migrations/update-15-7-0/add-addon-essentials-to-all"
-    },
     "update-16-0-0-add-nx-packages": {
       "cli": "nx",
       "version": "16.0.0-beta.1",
@@ -877,93 +853,6 @@
         }
       }
     },
-    "15.5.2": {
-      "version": "15.5.2-beta.0",
-      "packages": {
-        "@storybook/react-native": {
-          "version": "^6.0.1-beta.11",
-          "alwaysAddToPackageJson": false
-        },
-        "@storybook/addon-ondevice-actions": {
-          "version": "^6.0.1-beta.11",
-          "alwaysAddToPackageJson": false
-        },
-        "@storybook/addon-ondevice-backgrounds": {
-          "version": "^6.0.1-beta.11",
-          "alwaysAddToPackageJson": false
-        },
-        "@storybook/addon-ondevice-controls": {
-          "version": "^6.0.1-beta.11",
-          "alwaysAddToPackageJson": false
-        },
-        "@storybook/addon-ondevice-notes": {
-          "version": "^6.0.1-beta.11",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "15.4.3": {
-      "version": "15.4.3-beta.1",
-      "packages": {
-        "@storybook/core-server": {
-          "version": "^6.5.15",
-          "alwaysAddToPackageJson": false
-        },
-        "@storybook/angular": {
-          "version": "^6.5.15",
-          "alwaysAddToPackageJson": false
-        },
-        "@storybook/react": {
-          "version": "^6.5.15",
-          "alwaysAddToPackageJson": false
-        },
-        "@storybook/web": {
-          "version": "^6.5.15",
-          "alwaysAddToPackageJson": false
-        },
-        "@storybook/addon-essentials": {
-          "version": "^6.5.15",
-          "alwaysAddToPackageJson": false
-        },
-        "@storybook/builder-webpack5": {
-          "version": "^6.5.15",
-          "alwaysAddToPackageJson": false
-        },
-        "@storybook/manager-webpack5": {
-          "version": "^6.5.15",
-          "alwaysAddToPackageJson": false
-        },
-        "@storybook/builder-vite": {
-          "version": "^0.2.6",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "15.1.1": {
-      "version": "15.1.1-beta.0",
-      "packages": {
-        "@storybook/react-native": {
-          "version": "^6.0.1-beta.9",
-          "alwaysAddToPackageJson": false
-        },
-        "@storybook/addon-ondevice-actions": {
-          "version": "^6.0.1-beta.9",
-          "alwaysAddToPackageJson": false
-        },
-        "@storybook/addon-ondevice-backgrounds": {
-          "version": "^6.0.1-beta.9",
-          "alwaysAddToPackageJson": false
-        },
-        "@storybook/addon-ondevice-controls": {
-          "version": "^6.0.1-beta.9",
-          "alwaysAddToPackageJson": false
-        },
-        "@storybook/addon-ondevice-notes": {
-          "version": "^6.0.1-beta.9",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
     "18.2.0": {
       "version": "18.2.0-beta.1",
       "packages": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/storybook",
-  "version": "19.0.0-beta.7",
+  "version": "19.0.0-beta.9",
   "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": {
@@ -30,14 +30,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "19.0.0-beta.7",
+    "@nx/devkit": "19.0.0-beta.9",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
-    "@nx/cypress": "19.0.0-beta.7",
-    "@nx/js": "19.0.0-beta.7",
-    "@nx/eslint": "19.0.0-beta.7",
-    "@nrwl/storybook": "19.0.0-beta.7"
+    "@nx/cypress": "19.0.0-beta.9",
+    "@nx/js": "19.0.0-beta.9",
+    "@nx/eslint": "19.0.0-beta.9",
+    "@nrwl/storybook": "19.0.0-beta.9"
   },
   "publishConfig": {
     "access": "public"

package/src/migrations/update-15-0-0/add-storybook-inputs.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function (tree: Tree): Promise<void>;

package/src/migrations/update-15-0-0/add-storybook-inputs.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-async function default_1(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    const storybookTargets = getStorybookBuildTargets(tree);
-    const hasProductionFileset = !!nxJson.namedInputs?.production;
-    if (storybookTargets.size > 0 && hasProductionFileset) {
-        const productionFileset = new Set(nxJson.namedInputs.production);
-        for (const exclusion of [
-            '!{projectRoot}/.storybook/**/*',
-            '!{projectRoot}/**/*.stories.@(js|jsx|ts|tsx|mdx)',
-        ]) {
-            productionFileset.add(exclusion);
-        }
-        nxJson.namedInputs.production = Array.from(productionFileset);
-    }
-    for (const targetName of storybookTargets) {
-        nxJson.targetDefaults ??= {};
-        const storybookTargetDefaults = (nxJson.targetDefaults[targetName] ??= {});
-        storybookTargetDefaults.inputs ??= [
-            'default',
-            hasProductionFileset ? '^production' : '^default',
-            ...(tree.exists('.storybook') ? ['{workspaceRoot}/.storybook/**/*'] : []),
-        ];
-    }
-    (0, devkit_1.updateNxJson)(tree, nxJson);
-    await (0, devkit_1.formatFiles)(tree);
-}
-exports.default = default_1;
-function getStorybookBuildTargets(tree) {
-    const storybookBuildTargets = new Set();
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/storybook:build', (_, __, target) => {
-        storybookBuildTargets.add(target);
-    });
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@storybook/angular:build-storybook', (_, __, target) => {
-        storybookBuildTargets.add(target);
-    });
-    return storybookBuildTargets;
-}

package/src/migrations/update-15-4-6/refactor-executor-options.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function (tree: Tree): Promise<void>;

package/src/migrations/update-15-4-6/refactor-executor-options.js

@@ -1,65 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-async function default_1(tree) {
-    updateNonAngularStorybookBuildTargets(tree);
-    updateNonAngularStorybookServeTargets(tree);
-    await (0, devkit_1.formatFiles)(tree);
-}
-exports.default = default_1;
-function updateNonAngularStorybookBuildTargets(tree) {
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/storybook:build', (_options, projectName, targetName, configuration) => {
-        if (!configuration) {
-            return;
-        }
-        const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-        if (!projectConfiguration.targets[targetName].options) {
-            projectConfiguration.targets[targetName].options = {};
-        }
-        if (!projectConfiguration.targets[targetName].options.configDir) {
-            projectConfiguration.targets[targetName].options.configDir =
-                projectConfiguration.targets[targetName].options.config?.configFolder;
-        }
-        if (!projectConfiguration.targets[targetName].options.outputDir) {
-            projectConfiguration.targets[targetName].options.outputDir =
-                projectConfiguration.targets[targetName].options.outputPath;
-        }
-        if (!projectConfiguration.targets[targetName].options.docs) {
-            projectConfiguration.targets[targetName].options.docs =
-                projectConfiguration.targets[targetName].options.docsMode;
-        }
-        projectConfiguration.targets[targetName].outputs =
-            projectConfiguration.targets[targetName].outputs?.map((output) => output.replace('{options.outputPath}', '{options.outputDir}'));
-        delete projectConfiguration.targets[targetName].options.config;
-        delete projectConfiguration.targets[targetName].options.outputPath;
-        delete projectConfiguration.targets[targetName].options.docsMode;
-        (0, devkit_1.updateProjectConfiguration)(tree, projectName, {
-            ...projectConfiguration,
-        });
-    });
-}
-function updateNonAngularStorybookServeTargets(tree) {
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/storybook:storybook', (_options, projectName, targetName, configuration) => {
-        if (!configuration) {
-            return;
-        }
-        const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-        if (!projectConfiguration.targets[targetName].options) {
-            projectConfiguration.targets[targetName].options = {};
-        }
-        if (!projectConfiguration.targets[targetName].options.configDir) {
-            projectConfiguration.targets[targetName].options.configDir =
-                projectConfiguration.targets[targetName].options.config?.configFolder;
-        }
-        if (!projectConfiguration.targets[targetName].options.docs) {
-            projectConfiguration.targets[targetName].options.docs =
-                projectConfiguration.targets[targetName].options.docsMode;
-        }
-        delete projectConfiguration.targets[targetName].options.config;
-        delete projectConfiguration.targets[targetName].options.docsMode;
-        (0, devkit_1.updateProjectConfiguration)(tree, projectName, {
-            ...projectConfiguration,
-        });
-    });
-}

package/src/migrations/update-15-5-3/ensure-webpack-package.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function update(tree: Tree): Promise<import("@nx/devkit").GeneratorCallback>;

package/src/migrations/update-15-5-3/ensure-webpack-package.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const versions_1 = require("../../utils/versions");
-// Add @nx/webpack as needed.
-// See: https://github.com/nrwl/nx/issues/14455
-async function update(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    const reactPlugin = '@nrwl/react/plugins/storybook';
-    let shouldInstall = false;
-    for (const [, config] of projects) {
-        let sbConfigPath = (0, devkit_1.joinPathFragments)(config.root, '.storybook/main.ts');
-        if (!tree.exists(sbConfigPath)) {
-            sbConfigPath = (0, devkit_1.joinPathFragments)(config.root, '.storybook/main.js');
-        }
-        if (!tree.exists(sbConfigPath)) {
-            continue;
-        }
-        const sbConfig = tree.read(sbConfigPath, 'utf-8');
-        if (sbConfig.includes(reactPlugin)) {
-            shouldInstall = true;
-            break;
-        }
-    }
-    if (shouldInstall) {
-        return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nrwl/webpack': versions_1.nxVersion });
-    }
-}
-exports.default = update;

package/src/migrations/update-15-7-0/add-addon-essentials-to-all.d.ts

@@ -1,24 +0,0 @@
-import { Tree } from '@nx/devkit';
-import ts = require('typescript');
-/**
- * The purpose of this migrator is to help users move away
- * from the root .storybook/ configuration folder and files.
- *
- * Since we cannot be sure of how users make use of the root Storybook
- * directory, what we are going to do is the following:
- *
- * 1. Make sure that all project-level .storybook/main.js files contain
- * the @storybook/addon-essentials addon.
- * 2. If the root .storybook/main.js file contains the @storybook/addon-essentials remove it
- * from the root
- * 3. If there are things beyond the addons array in the root .storybook/main.js file,
- * then keep it as it is - inform user that they need to manually need to copy over any extra stuff
- * 4. If the root .storybook/main.js file is now empty, inform user that they can delete it safely
- *
- * Point the user to a guide that explains how to all these things.
- */
-export default function (tree: Tree): Promise<void>;
-export declare function getRootMainVariableName(mainJsTs: string): {
-    rootMainVariableName: string;
-    importExpression: ts.Node;
-};

package/src/migrations/update-15-7-0/add-addon-essentials-to-all.js

@@ -1,271 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRootMainVariableName = void 0;
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-const tsquery_1 = require("@phenomnomnominal/tsquery");
-const remove_root_config_1 = require("./remove-root-config");
-/**
- * The purpose of this migrator is to help users move away
- * from the root .storybook/ configuration folder and files.
- *
- * Since we cannot be sure of how users make use of the root Storybook
- * directory, what we are going to do is the following:
- *
- * 1. Make sure that all project-level .storybook/main.js files contain
- * the @storybook/addon-essentials addon.
- * 2. If the root .storybook/main.js file contains the @storybook/addon-essentials remove it
- * from the root
- * 3. If there are things beyond the addons array in the root .storybook/main.js file,
- * then keep it as it is - inform user that they need to manually need to copy over any extra stuff
- * 4. If the root .storybook/main.js file is now empty, inform user that they can delete it safely
- *
- * Point the user to a guide that explains how to all these things.
- */
-async function default_1(tree) {
-    const projectsThatFailedTOAddAddonEssentials = addAddonEssentialsToAllStorybooks(tree);
-    if (projectsThatFailedTOAddAddonEssentials.length) {
-        devkit_1.logger.info(`
-          We could not add the @storybook/addon-essentials addon
-          to the following projects' Storybook configurations:
-    
-          ${projectsThatFailedTOAddAddonEssentials.join(', ')}
-    
-          Please add it manually in the addons array of your project's
-          .storybook/main.js|ts file.
-          `);
-    }
-    const rootMainJsTsPath = tree.exists('.storybook/main.js')
-        ? '.storybook/main.js'
-        : tree.exists('.storybook/main.ts')
-            ? '.storybook/main.ts'
-            : undefined;
-    if (rootMainJsTsPath) {
-        const addonArrayOrEssentialsRemoved = removeAddonEssentialsFromRootStorybook(tree, rootMainJsTsPath);
-        const storiesArrayRemoved = removeStoriesArrayFromRootIfEmpty(tree, rootMainJsTsPath);
-        const removedRoot = (0, remove_root_config_1.removeRootConfig)(tree, rootMainJsTsPath);
-        if (removedRoot) {
-            // Logs are already printed in the removeRootConfig function
-        }
-        else {
-            devkit_1.logger.info(`
-      We removed the ${addonArrayOrEssentialsRemoved === 'addons'
-                ? 'addons array '
-                : '@storybook/addon-essentials addon '} 
-      ${storiesArrayRemoved ? 'and the stories array ' : ''}
-      from the root .storybook/main.js|ts file.
-      `);
-        }
-    }
-    devkit_1.logger.info(`
-    Read more about our effort to deprecate the root .storybook folder here:
-    https://nx.dev/packages/storybook/documents/configuring-storybook
-    `);
-    await (0, devkit_1.formatFiles)(tree);
-}
-exports.default = default_1;
-function removeAddonEssentialsFromRootStorybook(tree, rootMainJsTsPath) {
-    let rootMainJsTs = tree.read(rootMainJsTsPath, 'utf-8');
-    const addonEssentials = tsquery_1.tsquery.query(rootMainJsTs, 'StringLiteral:has([text="@storybook/addon-essentials"])')?.[0];
-    if (addonEssentials?.getText()?.length) {
-        const fullAddonsNode = tsquery_1.tsquery.query(rootMainJsTs, 'PropertyAssignment:has([name="addons"])')?.[0];
-        const stringLiterals = tsquery_1.tsquery.query(fullAddonsNode, 'StringLiteral');
-        if (stringLiterals?.length === 1 &&
-            stringLiterals?.[0]?.getText() === `'@storybook/addon-essentials'`) {
-            rootMainJsTs = (0, devkit_1.applyChangesToString)(rootMainJsTs, [
-                {
-                    type: devkit_1.ChangeType.Delete,
-                    start: fullAddonsNode.getStart(),
-                    length: rootMainJsTs[fullAddonsNode.getEnd()] === ','
-                        ? fullAddonsNode.getText().length + 1
-                        : fullAddonsNode.getText().length,
-                },
-            ]);
-            tree.write(rootMainJsTsPath, rootMainJsTs);
-            return 'addons';
-        }
-        else {
-            rootMainJsTs = (0, devkit_1.applyChangesToString)(rootMainJsTs, [
-                {
-                    type: devkit_1.ChangeType.Delete,
-                    start: addonEssentials.getStart(),
-                    length: rootMainJsTs[addonEssentials.getEnd()] === ','
-                        ? addonEssentials.getText().length + 1
-                        : addonEssentials.getText().length,
-                },
-            ]);
-            tree.write(rootMainJsTsPath, rootMainJsTs);
-            return 'esssentials';
-        }
-    }
-}
-function addAddonEssentialsToAllStorybooks(tree) {
-    const projectsThatFailedTOAddAddonEssentials = [];
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/storybook:build', (options, projectName) => {
-        const failedToAddAddon = addAddon(tree, options, projectName);
-        if (failedToAddAddon) {
-            projectsThatFailedTOAddAddonEssentials.push(failedToAddAddon);
-        }
-    });
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@storybook/angular:build-storybook', (options, projectName) => {
-        const failedToAddAddon = addAddon(tree, options, projectName);
-        if (failedToAddAddon) {
-            projectsThatFailedTOAddAddonEssentials.push(failedToAddAddon);
-        }
-    });
-    return Array.from(new Set(projectsThatFailedTOAddAddonEssentials));
-}
-function addAddon(tree, options, projectName) {
-    const storybookDir = options?.['configDir'];
-    if (storybookDir) {
-        const mainJsTsPath = tree.exists(`${storybookDir}/main.js`)
-            ? `${storybookDir}/main.js`
-            : tree.exists(`${storybookDir}/main.ts`)
-                ? `${storybookDir}/main.ts`
-                : undefined;
-        let addedAddons = mainJsTsPath
-            ? transformMainJsTs(tree, mainJsTsPath)
-            : false;
-        if ((storybookDir && !mainJsTsPath) || !addedAddons) {
-            return projectName;
-        }
-    }
-}
-function transformMainJsTs(tree, mainJsTsPath) {
-    let mainJsTs = tree.read(mainJsTsPath, 'utf-8');
-    const addonsArray = tsquery_1.tsquery.query(mainJsTs, 'ArrayLiteralExpression:has(Identifier[name="addons"])')?.[0];
-    if (addonsArray?.getText()?.length) {
-        // If addons array does not contain @storybook/addon-essentials, add it
-        if (!addonsArray.getText().includes('@storybook/addon-essentials')) {
-            mainJsTs = (0, devkit_1.applyChangesToString)(mainJsTs, [
-                {
-                    type: devkit_1.ChangeType.Insert,
-                    index: addonsArray.getStart() + 1,
-                    text: `'@storybook/addon-essentials', `,
-                },
-            ]);
-            tree.write(mainJsTsPath, mainJsTs);
-            return true;
-        }
-        return false;
-    }
-    else {
-        // We will add the addons array after the stories array
-        // If I have a stories array, that's where my addons need to go
-        // And there's no config without stories
-        const storiesArray = tsquery_1.tsquery.query(mainJsTs, 'ArrayLiteralExpression:has(Identifier[name="stories"])')?.[0];
-        if (storiesArray?.getText()?.length) {
-            mainJsTs = (0, devkit_1.applyChangesToString)(mainJsTs, [
-                {
-                    type: devkit_1.ChangeType.Insert,
-                    index: storiesArray.getEnd(),
-                    text: `, addons: ['@storybook/addon-essentials']`,
-                },
-            ]);
-            tree.write(mainJsTsPath, mainJsTs);
-            return true;
-        }
-        else {
-            /**
-             * main.js has potentially a different structure
-             * sort of like this:
-             * rootMain.addons.push(' ...)
-             * rootMain.stories.push(' ...)
-             * Like in older versions of Nx
-             */
-            const { rootMainVariableName, importExpression } = getRootMainVariableName(mainJsTs);
-            // If there is a PropertyAccessExpression with the text rootMain.addons
-            // then check if it has addon-essentials, if not add it
-            const addonsPropertyAccessExpression = tsquery_1.tsquery.query(mainJsTs, `PropertyAccessExpression:has([expression.name="${rootMainVariableName}"]):has([name="addons"])`)?.[0];
-            if (rootMainVariableName && importExpression) {
-                if (addonsPropertyAccessExpression?.getText() ===
-                    `${rootMainVariableName}.addons.push`) {
-                    const parentCallExpression = addonsPropertyAccessExpression.parent;
-                    // see if parentCallExpression contains a StringLiteral with the text '@storybook/addon-essentials'
-                    const hasAddonEssentials = !!tsquery_1.tsquery
-                        .query(parentCallExpression, `StringLiteral:has([text="@storybook/addon-essentials"])`)?.[0]
-                        ?.getText();
-                    if (!hasAddonEssentials) {
-                        mainJsTs = (0, devkit_1.applyChangesToString)(mainJsTs, [
-                            {
-                                type: devkit_1.ChangeType.Insert,
-                                index: addonsPropertyAccessExpression.getEnd() + 1,
-                                text: `'@storybook/addon-essentials', `,
-                            },
-                        ]);
-                        tree.write(mainJsTsPath, mainJsTs);
-                        return true;
-                    }
-                }
-                else {
-                    mainJsTs = (0, devkit_1.applyChangesToString)(mainJsTs, [
-                        {
-                            type: devkit_1.ChangeType.Insert,
-                            index: importExpression.getEnd() + 1,
-                            text: `${rootMainVariableName}.addons.push('@storybook/addon-essentials');`,
-                        },
-                    ]);
-                    tree.write(mainJsTsPath, mainJsTs);
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-}
-function removeStoriesArrayFromRootIfEmpty(tree, rootMainJsTsPath) {
-    if (rootMainJsTsPath) {
-        let rootMainJsTs = tree.read(rootMainJsTsPath, 'utf-8');
-        const fullStoriesNode = tsquery_1.tsquery.query(rootMainJsTs, 'PropertyAssignment:has([name="stories"])')?.[0];
-        if (!fullStoriesNode) {
-            return false;
-        }
-        const stringLiterals = tsquery_1.tsquery.query(fullStoriesNode, 'StringLiteral');
-        if (stringLiterals?.length === 0) {
-            rootMainJsTs = (0, devkit_1.applyChangesToString)(rootMainJsTs, [
-                {
-                    type: devkit_1.ChangeType.Delete,
-                    start: fullStoriesNode.getStart(),
-                    length: rootMainJsTs[fullStoriesNode.getEnd()] === ','
-                        ? fullStoriesNode.getText().length + 1
-                        : fullStoriesNode.getText().length,
-                },
-            ]);
-            tree.write(rootMainJsTsPath, rootMainJsTs);
-            return true;
-        }
-    }
-}
-function getRootMainVariableName(mainJsTs) {
-    const requireVariableStatement = tsquery_1.tsquery.query(mainJsTs, `VariableStatement:has(CallExpression:has(Identifier[name="require"]))`);
-    let rootMainVariableName;
-    let importExpression;
-    if (requireVariableStatement.length) {
-        importExpression = requireVariableStatement.find((statement) => {
-            const requireCallExpression = tsquery_1.tsquery.query(statement, 'CallExpression:has(Identifier[name="require"])');
-            return requireCallExpression?.[0]?.getText()?.includes('.storybook/main');
-        });
-        if (importExpression) {
-            rootMainVariableName = tsquery_1.tsquery
-                .query(importExpression, 'Identifier')?.[0]
-                ?.getText();
-        }
-    }
-    else {
-        const importDeclarations = tsquery_1.tsquery.query(mainJsTs, 'ImportDeclaration');
-        importExpression = importDeclarations.find((statement) => {
-            const stringLiteral = tsquery_1.tsquery.query(statement, 'StringLiteral');
-            return stringLiteral?.[0]?.getText()?.includes('.storybook/main');
-        });
-        if (importExpression) {
-            rootMainVariableName = tsquery_1.tsquery
-                .query(importExpression, 'ImportSpecifier')?.[0]
-                ?.getText();
-        }
-    }
-    return {
-        rootMainVariableName,
-        importExpression,
-    };
-}
-exports.getRootMainVariableName = getRootMainVariableName;

package/src/migrations/update-15-7-0/remove-root-config.d.ts

@@ -1,14 +0,0 @@
-import { Tree } from '@nx/devkit';
-/**
- * The purpose of this migrator is to help users move away
- * from the root .storybook/ configuration folder and files.
- *
- * This is the second part of the migrator.
- *
- * If the root main.js file is empty, then we can safely delete it
- * and also remove all the references to it from the project-level
- * Storybook configuration files.
- *
- * Point the user to a guide that explains how to all these things.
- */
-export declare function removeRootConfig(tree: Tree, rootMainJsTsPath: string): boolean;

package/src/migrations/update-15-7-0/remove-root-config.js

@@ -1,205 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeRootConfig = void 0;
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-const tsquery_1 = require("@phenomnomnominal/tsquery");
-const add_addon_essentials_to_all_1 = require("./add-addon-essentials-to-all");
-const ts = require("typescript");
-/**
- * The purpose of this migrator is to help users move away
- * from the root .storybook/ configuration folder and files.
- *
- * This is the second part of the migrator.
- *
- * If the root main.js file is empty, then we can safely delete it
- * and also remove all the references to it from the project-level
- * Storybook configuration files.
- *
- * Point the user to a guide that explains how to all these things.
- */
-function removeRootConfig(tree, rootMainJsTsPath) {
-    if (checkIfRootMainJsTsIsEmpty(tree, rootMainJsTsPath)) {
-        const hasRemainingRootMainJsReferences = removeImportFromAllFiles(tree);
-        tree.delete(rootMainJsTsPath);
-        devkit_1.logger.warn(`
-      We removed the root ${rootMainJsTsPath} file and we also
-      removed all it's imports from all project-level Storybook configuration files.
-      `);
-        if (hasRemainingRootMainJsReferences.length) {
-            devkit_1.logger.warn(`
-        However, there are still other references to the root .storybook/main.js|ts file 
-        in the following files: 
-
-        ${hasRemainingRootMainJsReferences.join('\n')}
-
-        Please remove them manually.
-      `);
-        }
-        return true;
-    }
-}
-exports.removeRootConfig = removeRootConfig;
-function removeImportFromAllFiles(tree) {
-    const hasRemainingRootMainJsReferences = [];
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/storybook:build', (options) => {
-        const hasRemainingReference = makeTheChanges(tree, options);
-        if (hasRemainingReference) {
-            hasRemainingRootMainJsReferences.push(hasRemainingReference);
-        }
-    });
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@storybook/angular:build-storybook', (options) => {
-        const hasRemainingReference = makeTheChanges(tree, options);
-        if (hasRemainingReference) {
-            hasRemainingRootMainJsReferences.push(hasRemainingReference);
-        }
-    });
-    return hasRemainingRootMainJsReferences;
-}
-function makeTheChanges(tree, options) {
-    const storybookDir = options?.['configDir'];
-    if (storybookDir) {
-        const mainJsTsPath = tree.exists(`${storybookDir}/main.js`)
-            ? `${storybookDir}/main.js`
-            : tree.exists(`${storybookDir}/main.ts`)
-                ? `${storybookDir}/main.ts`
-                : undefined;
-        if (mainJsTsPath) {
-            let mainJsTs = tree.read(mainJsTsPath, 'utf-8');
-            const { rootMainVariableName, importExpression } = (0, add_addon_essentials_to_all_1.getRootMainVariableName)(mainJsTs);
-            if (importExpression && rootMainVariableName) {
-                const changesToBeMade = [
-                    {
-                        type: devkit_1.ChangeType.Delete,
-                        start: importExpression.getStart(),
-                        length: importExpression.getText().length,
-                    },
-                ];
-                const spreadElements = tsquery_1.tsquery.query(mainJsTs, `SpreadElement:has(Identifier[name="${rootMainVariableName}"])`);
-                spreadElements.forEach((spreadElement) => {
-                    changesToBeMade.push({
-                        type: devkit_1.ChangeType.Delete,
-                        start: spreadElement.getStart(),
-                        length: mainJsTs[spreadElement.getEnd()] === ','
-                            ? spreadElement.getText().length + 1
-                            : spreadElement.getText().length,
-                    });
-                });
-                const spreadAssignments = tsquery_1.tsquery.query(mainJsTs, `SpreadAssignment:has(Identifier[name="${rootMainVariableName}"])`);
-                spreadAssignments.forEach((spreadAssignment) => {
-                    changesToBeMade.push({
-                        type: devkit_1.ChangeType.Delete,
-                        start: spreadAssignment.getStart(),
-                        length: mainJsTs[spreadAssignment.getEnd()] === ','
-                            ? spreadAssignment.getText().length + 1
-                            : spreadAssignment.getText().length,
-                    });
-                });
-                const findOtherRootMainUses = tsquery_1.tsquery.query(mainJsTs, `Identifier[name="${rootMainVariableName}"]`);
-                findOtherRootMainUses.forEach((otherRootMainUse) => {
-                    /**
-                     * This would be mainly to remove the legacy
-                     *
-                     * if (rootMain.webpackFinal) {
-                     *    config = await rootMain.webpackFinal(config, { configType });
-                     * }
-                     */
-                    if (otherRootMainUse.parent.kind ===
-                        ts.SyntaxKind.PropertyAccessExpression &&
-                        otherRootMainUse.parent.parent?.kind === ts.SyntaxKind.IfStatement) {
-                        changesToBeMade.push({
-                            type: devkit_1.ChangeType.Delete,
-                            start: otherRootMainUse.parent.parent.getStart(),
-                            length: otherRootMainUse.parent.parent.getText().length + 1,
-                        });
-                    }
-                });
-                mainJsTs = (0, devkit_1.applyChangesToString)(mainJsTs, [...changesToBeMade]);
-                tree.write(mainJsTsPath, mainJsTs);
-                if (hasMoreRootMainUses(tree, mainJsTsPath, rootMainVariableName)) {
-                    if (checkIfUsesOldSyntaxAndUpdate(tree, mainJsTsPath, rootMainVariableName)) {
-                        return undefined;
-                    }
-                    return mainJsTsPath;
-                }
-            }
-        }
-    }
-}
-function checkIfUsesOldSyntaxAndUpdate(tree, filePath, rootMainVariableName) {
-    const mainJsTs = tree.read(filePath, 'utf-8');
-    const changesToBeMade = [];
-    const { stringArray: addonsArrayString, expressionToDelete: addonsToDelete } = getPropertyArray('addons', mainJsTs, rootMainVariableName);
-    const { stringArray: storiesArrayString, expressionToDelete: storiesToDelete, } = getPropertyArray('stories', mainJsTs, rootMainVariableName);
-    if (storiesToDelete) {
-        changesToBeMade.push(storiesToDelete);
-    }
-    if (addonsToDelete) {
-        changesToBeMade.push(addonsToDelete);
-    }
-    if (addArrayToModuleExports('addons', mainJsTs, addonsArrayString)) {
-        changesToBeMade.push(addArrayToModuleExports('addons', mainJsTs, addonsArrayString));
-    }
-    if (addArrayToModuleExports('stories', mainJsTs, storiesArrayString)) {
-        changesToBeMade.push(addArrayToModuleExports('stories', mainJsTs, storiesArrayString));
-    }
-    if (changesToBeMade.length) {
-        tree.write(filePath, (0, devkit_1.applyChangesToString)(mainJsTs, changesToBeMade));
-        return true;
-    }
-}
-function addArrayToModuleExports(propertyName, mainJsTs, arrayString) {
-    if (!arrayString) {
-        return;
-    }
-    const moduleExports = tsquery_1.tsquery.query(mainJsTs, `PropertyAccessExpression:has([expression.name="module"]):has([name="exports"]):has([name="${propertyName}"])`)?.[0];
-    if (moduleExports) {
-        const parentBinaryExpression = moduleExports.parent;
-        const arrayExpression = tsquery_1.tsquery.query(parentBinaryExpression, `ArrayLiteralExpression`)?.[0];
-        return {
-            type: devkit_1.ChangeType.Insert,
-            index: arrayExpression.getStart() + 1,
-            text: arrayString,
-        };
-    }
-    else {
-        return {
-            type: devkit_1.ChangeType.Insert,
-            index: mainJsTs.length,
-            text: `module.exports.${propertyName} = [${arrayString}];\n`,
-        };
-    }
-}
-function getPropertyArray(propertyName, mainJsTs, rootMainVariableName) {
-    const propertyAccessExpression = tsquery_1.tsquery.query(mainJsTs, `PropertyAccessExpression:has([expression.name="${rootMainVariableName}"]):has([name="${propertyName}"])`)?.[0];
-    if (propertyAccessExpression) {
-        if (propertyAccessExpression?.getText() ===
-            `${rootMainVariableName}.${propertyName}.push`) {
-            const parentCallExpression = propertyAccessExpression.parent;
-            const stringPropertyArray = tsquery_1.tsquery
-                .query(parentCallExpression, `StringLiteral`)
-                .map((stringLiteral) => stringLiteral?.getText());
-            return {
-                stringArray: `${stringPropertyArray.join(', ')}`,
-                expressionToDelete: {
-                    type: devkit_1.ChangeType.Delete,
-                    start: parentCallExpression.getStart(),
-                    length: parentCallExpression.getText().length + 1,
-                },
-            };
-        }
-    }
-}
-function hasMoreRootMainUses(tree, filePath, rootMainVariableName) {
-    const mainJsTs = tree.read(filePath, 'utf-8');
-    const findRemainingRootMainUses = tsquery_1.tsquery.query(mainJsTs, `Identifier[name="${rootMainVariableName}"]`);
-    return findRemainingRootMainUses?.length > 0;
-}
-function checkIfRootMainJsTsIsEmpty(tree, rootMainJsTsPath) {
-    const rootMainJsTs = tree.read(rootMainJsTsPath, 'utf-8');
-    const mainConfigObject = tsquery_1.tsquery.query(rootMainJsTs, 'ObjectLiteralExpression');
-    if (mainConfigObject?.length === 1 &&
-        mainConfigObject[0]?.getText()?.replace(/\s/g, '') === '{}') {
-        return true;
-    }
-}