@nx/storybook 16.8.0-beta.4 → 16.8.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/storybook",
-  "version": "16.8.0-beta.4",
+  "version": "16.8.0-beta.5",
   "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,12 +30,12 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/storybook": "16.8.0-beta.4",
-    "@nx/cypress": "16.8.0-beta.4",
-    "@nx/devkit": "16.8.0-beta.4",
-    "@nx/js": "16.8.0-beta.4",
-    "@nx/linter": "16.8.0-beta.4",
-    "@nx/workspace": "16.8.0-beta.4",
+    "@nrwl/storybook": "16.8.0-beta.5",
+    "@nx/cypress": "16.8.0-beta.5",
+    "@nx/devkit": "16.8.0-beta.5",
+    "@nx/js": "16.8.0-beta.5",
+    "@nx/linter": "16.8.0-beta.5",
+    "@nx/workspace": "16.8.0-beta.5",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "semver": "7.5.3",
     "tslib": "^2.3.0"
@@ -44,5 +44,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "c9aad2dc8c2b34531cf61549bff872e68c481e4e"
+  "gitHead": "ad2d1e8a55b2d1b358bb5e7483343d9757ff2c53"
 }

package/presets/cypress.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxE2EStorybookPreset = void 0;
 const cypress_preset_1 = require("@nx/cypress/plugins/cypress-preset");
 function nxE2EStorybookPreset(filePath) {
-    return Object.assign(Object.assign({}, (0, cypress_preset_1.nxE2EPreset)(filePath)), { baseUrl: 'http://localhost:4400' });
+    return {
+        ...(0, cypress_preset_1.nxE2EPreset)(filePath),
+        baseUrl: 'http://localhost:4400',
+    };
 }
 exports.nxE2EStorybookPreset = nxE2EStorybookPreset;

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

@@ -1,45 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const build = require("@storybook/core-server");
 const utilities_1 = require("../../utils/utilities");
 const utils_1 = require("../utils");
-function buildStorybookExecutor(options, context) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, utilities_1.storybookConfigExistsCheck)(options.configDir, context.projectName);
-        const storybook7 = (0, utilities_1.storybookMajorVersion)() === 7;
-        if (storybook7) {
-            const buildOptions = options;
-            devkit_1.logger.info(`NX Storybook builder starting ...`);
-            yield runInstance(buildOptions, storybook7);
-            devkit_1.logger.info(`NX Storybook builder finished ...`);
-            devkit_1.logger.info(`NX Storybook files available in ${buildOptions.outputDir}`);
-            return { success: true };
-        }
-        else {
-            // TODO(katerina): Remove Nx17
-            // print warnings
-            (0, utils_1.runStorybookSetupCheck)(options);
-            devkit_1.logger.error((0, utilities_1.pleaseUpgrade)());
-            const frameworkPath = (0, utils_1.getStorybookFrameworkPath)(options.uiFramework);
-            const { default: frameworkOptions } = yield Promise.resolve(`${frameworkPath}`).then(s => require(s));
-            const buildOptions = Object.assign(Object.assign(Object.assign({}, options), frameworkOptions), { frameworkPresets: [...(frameworkOptions.frameworkPresets || [])] });
-            devkit_1.logger.info(`NX Storybook builder starting ...`);
-            yield runInstance(buildOptions, storybook7);
-            devkit_1.logger.info(`NX Storybook builder finished ...`);
-            devkit_1.logger.info(`NX Storybook files available in ${buildOptions.outputDir}`);
-            return { success: true };
-        }
-    });
+async function buildStorybookExecutor(options, context) {
+    (0, utilities_1.storybookConfigExistsCheck)(options.configDir, context.projectName);
+    const storybook7 = (0, utilities_1.storybookMajorVersion)() === 7;
+    if (storybook7) {
+        const buildOptions = options;
+        devkit_1.logger.info(`NX Storybook builder starting ...`);
+        await runInstance(buildOptions, storybook7);
+        devkit_1.logger.info(`NX Storybook builder finished ...`);
+        devkit_1.logger.info(`NX Storybook files available in ${buildOptions.outputDir}`);
+        return { success: true };
+    }
+    else {
+        // TODO(katerina): Remove Nx17
+        // print warnings
+        (0, utils_1.runStorybookSetupCheck)(options);
+        devkit_1.logger.error((0, utilities_1.pleaseUpgrade)());
+        const frameworkPath = (0, utils_1.getStorybookFrameworkPath)(options.uiFramework);
+        const { default: frameworkOptions } = await Promise.resolve(`${frameworkPath}`).then(s => require(s));
+        const buildOptions = {
+            ...options,
+            ...frameworkOptions,
+            frameworkPresets: [...(frameworkOptions.frameworkPresets || [])],
+        };
+        devkit_1.logger.info(`NX Storybook builder starting ...`);
+        await runInstance(buildOptions, storybook7);
+        devkit_1.logger.info(`NX Storybook builder finished ...`);
+        devkit_1.logger.info(`NX Storybook files available in ${buildOptions.outputDir}`);
+        return { success: true };
+    }
 }
 exports.default = buildStorybookExecutor;
 function runInstance(options, storybook7) {
-    var _a;
-    const env = (_a = process.env.NODE_ENV) !== null && _a !== void 0 ? _a : 'production';
+    const env = process.env.NODE_ENV ?? 'production';
     process.env.NODE_ENV = env;
     if (storybook7) {
-        return build.build(Object.assign(Object.assign({}, options), { mode: 'static' }));
+        return build.build({
+            ...options,
+            mode: 'static',
+        });
     }
     else {
         // TODO(katerina): Remove Nx17
@@ -50,6 +53,9 @@ function runInstance(options, storybook7) {
         Please use Node 16 if you are using @storybook/builder-vite. 
       `);
         }
-        return build.buildStaticStandalone(Object.assign(Object.assign({}, options), { ci: true }));
+        return build.buildStaticStandalone({
+            ...options,
+            ci: true,
+        });
     }
 }

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

@@ -1,51 +1,57 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const build = require("@storybook/core-server");
 const utilities_1 = require("../../utils/utilities");
 const utils_1 = require("../utils");
-function storybookExecutor(options, context) {
-    var _a;
-    return tslib_1.__asyncGenerator(this, arguments, function* storybookExecutor_1() {
-        const storybook7 = (0, utilities_1.storybookMajorVersion)() === 7;
-        (0, utilities_1.storybookConfigExistsCheck)(options.configDir, context.projectName);
-        if (storybook7) {
-            const buildOptions = options;
-            const result = yield tslib_1.__await(runInstance(buildOptions, storybook7));
-            yield yield tslib_1.__await({
-                success: true,
-                info: {
-                    port: result === null || result === void 0 ? void 0 : result['port'],
-                    baseUrl: `${options.https ? 'https' : 'http'}://${(_a = options.host) !== null && _a !== void 0 ? _a : 'localhost'}:${result === null || result === void 0 ? void 0 : result['port']}`,
-                },
-            });
-            yield tslib_1.__await(new Promise(() => { }));
-        }
-        else {
-            // TODO(katerina): Remove Nx17
-            // print warnings
-            (0, utils_1.runStorybookSetupCheck)(options);
-            devkit_1.logger.error((0, utilities_1.pleaseUpgrade)());
-            let frameworkPath = (0, utils_1.getStorybookFrameworkPath)(options.uiFramework);
-            const frameworkOptions = (yield tslib_1.__await(Promise.resolve(`${frameworkPath}`).then(s => require(s)))).default;
-            const buildOptions = Object.assign(Object.assign(Object.assign({}, options), frameworkOptions), { frameworkPresets: [...(frameworkOptions.frameworkPresets || [])] });
-            yield tslib_1.__await(runInstance(buildOptions, storybook7));
-            yield yield tslib_1.__await({ success: true });
-            yield tslib_1.__await(new Promise(() => { }));
-        }
-    });
+async function* storybookExecutor(options, context) {
+    const storybook7 = (0, utilities_1.storybookMajorVersion)() === 7;
+    (0, utilities_1.storybookConfigExistsCheck)(options.configDir, context.projectName);
+    if (storybook7) {
+        const buildOptions = options;
+        const result = await runInstance(buildOptions, storybook7);
+        yield {
+            success: true,
+            info: {
+                port: result?.['port'],
+                baseUrl: `${options.https ? 'https' : 'http'}://${options.host ?? 'localhost'}:${result?.['port']}`,
+            },
+        };
+        await new Promise(() => { });
+    }
+    else {
+        // TODO(katerina): Remove Nx17
+        // print warnings
+        (0, utils_1.runStorybookSetupCheck)(options);
+        devkit_1.logger.error((0, utilities_1.pleaseUpgrade)());
+        let frameworkPath = (0, utils_1.getStorybookFrameworkPath)(options.uiFramework);
+        const frameworkOptions = (await Promise.resolve(`${frameworkPath}`).then(s => require(s))).default;
+        const buildOptions = {
+            ...options,
+            ...frameworkOptions,
+            frameworkPresets: [...(frameworkOptions.frameworkPresets || [])],
+        };
+        await runInstance(buildOptions, storybook7);
+        yield { success: true };
+        await new Promise(() => { });
+    }
 }
 exports.default = storybookExecutor;
 function runInstance(options, storybook7) {
-    var _a;
-    const env = (_a = process.env.NODE_ENV) !== null && _a !== void 0 ? _a : 'development';
+    const env = process.env.NODE_ENV ?? 'development';
     process.env.NODE_ENV = env;
     if (storybook7) {
-        return build.build(Object.assign(Object.assign({}, options), { mode: 'dev' }));
+        return build.build({
+            ...options,
+            mode: 'dev',
+        });
     }
     else {
         // TODO(katerina): Remove Nx17
-        return build['buildDev'](Object.assign(Object.assign({}, options), { configType: env.toUpperCase(), mode: 'dev' }));
+        return build['buildDev']({
+            ...options,
+            configType: env.toUpperCase(),
+            mode: 'dev',
+        });
     }
 }

package/src/executors/utils.js

@@ -94,7 +94,10 @@ function webpackFinalPropertyCheck(options) {
     ];
     placesToCheck = placesToCheck
         .map((entry) => {
-        return Object.assign(Object.assign({}, entry), { result: (0, fs_1.existsSync)(entry.path) });
+        return {
+            ...entry,
+            result: (0, fs_1.existsSync)(entry.path),
+        };
     })
         .filter((x) => x.result === true);
     if (placesToCheck.length > 0) {
@@ -115,11 +118,10 @@ function builderIsWebpackButNotWebpack5(storybookConfig) {
     ]);
     let builderIsWebpackNot5 = false;
     importArray.forEach((parent) => {
-        var _a, _b, _c;
         const identifier = (0, js_1.findNodes)(parent, ts.SyntaxKind.Identifier);
         const sbBuilder = (0, js_1.findNodes)(parent, ts.SyntaxKind.StringLiteral);
-        const builderText = (_b = (_a = sbBuilder === null || sbBuilder === void 0 ? void 0 : sbBuilder[0]) === null || _a === void 0 ? void 0 : _a.getText()) !== null && _b !== void 0 ? _b : '';
-        if (((_c = identifier === null || identifier === void 0 ? void 0 : identifier[0]) === null || _c === void 0 ? void 0 : _c.getText()) === 'builder' &&
+        const builderText = sbBuilder?.[0]?.getText() ?? '';
+        if (identifier?.[0]?.getText() === 'builder' &&
             builderText.includes('webpack') &&
             !builderText.includes('webpack5')) {
             builderIsWebpackNot5 = true;

package/src/generators/configuration/configuration.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configurationSchematic = exports.configurationGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const cypress_project_1 = require("../cypress-project/cypress-project");
 const init_1 = require("../init/init");
@@ -10,109 +9,109 @@ const linter_1 = require("@nx/linter");
 const utilities_1 = require("../../utils/utilities");
 const versions_1 = require("../../utils/versions");
 const interaction_testing_utils_1 = require("./lib/interaction-testing.utils");
-function configurationGenerator(tree, rawSchema) {
-    var _a, _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if ((0, utilities_1.storybookMajorVersion)() === 6) {
-            throw new Error((0, utilities_1.pleaseUpgrade)());
-        }
-        const schema = normalizeSchema(rawSchema);
-        const tasks = [];
-        const { projectType, targets, root } = (0, devkit_1.readProjectConfiguration)(tree, schema.name);
-        const { nextBuildTarget, compiler, viteBuildTarget } = (0, utilities_1.findStorybookAndBuildTargetsAndCompiler)(targets);
-        let viteConfigFilePath;
-        if (viteBuildTarget) {
-            viteConfigFilePath = (0, util_functions_1.getViteConfigFilePath)(tree, root, (_b = (_a = targets[viteBuildTarget]) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.configFile);
-        }
-        if (viteBuildTarget) {
-            if (schema.uiFramework === '@storybook/react-webpack5') {
-                devkit_1.logger.info(`Your project ${schema.name} uses Vite as a bundler. 
+async function configurationGenerator(tree, rawSchema) {
+    if ((0, utilities_1.storybookMajorVersion)() === 6) {
+        throw new Error((0, utilities_1.pleaseUpgrade)());
+    }
+    const schema = normalizeSchema(rawSchema);
+    const tasks = [];
+    const { projectType, targets, root } = (0, devkit_1.readProjectConfiguration)(tree, schema.name);
+    const { nextBuildTarget, compiler, viteBuildTarget } = (0, utilities_1.findStorybookAndBuildTargetsAndCompiler)(targets);
+    let viteConfigFilePath;
+    if (viteBuildTarget) {
+        viteConfigFilePath = (0, util_functions_1.getViteConfigFilePath)(tree, root, targets[viteBuildTarget]?.options?.configFile);
+    }
+    if (viteBuildTarget) {
+        if (schema.uiFramework === '@storybook/react-webpack5') {
+            devkit_1.logger.info(`Your project ${schema.name} uses Vite as a bundler. 
         Nx will configure Storybook for this project to use Vite as well.`);
-                schema.uiFramework = '@storybook/react-vite';
-            }
-            if (schema.uiFramework === '@storybook/web-components-webpack5') {
-                devkit_1.logger.info(`Your project ${schema.name} uses Vite as a bundler. 
-        Nx will configure Storybook for this project to use Vite as well.`);
-                schema.uiFramework = '@storybook/web-components-vite';
-            }
-        }
-        if (nextBuildTarget) {
-            schema.uiFramework = '@storybook/nextjs';
+            schema.uiFramework = '@storybook/react-vite';
         }
-        const initTask = yield (0, init_1.initGenerator)(tree, {
-            uiFramework: schema.uiFramework,
-            js: schema.js,
-        });
-        tasks.push(initTask);
-        const mainDir = !!nextBuildTarget && projectType === 'application' ? 'components' : 'src';
-        (0, util_functions_1.createProjectStorybookDir)(tree, schema.name, schema.uiFramework, schema.js, schema.tsConfiguration, root, projectType, (0, util_functions_1.projectIsRootProjectInStandaloneWorkspace)(root), schema.interactionTests, mainDir, !!nextBuildTarget, compiler === 'swc', !!viteBuildTarget || schema.uiFramework.endsWith('-vite'), viteConfigFilePath);
-        if (schema.uiFramework !== '@storybook/angular') {
-            (0, util_functions_1.createStorybookTsconfigFile)(tree, root, schema.uiFramework, (0, util_functions_1.projectIsRootProjectInStandaloneWorkspace)(root), mainDir);
+        if (schema.uiFramework === '@storybook/web-components-webpack5') {
+            devkit_1.logger.info(`Your project ${schema.name} uses Vite as a bundler. 
+        Nx will configure Storybook for this project to use Vite as well.`);
+            schema.uiFramework = '@storybook/web-components-vite';
         }
-        (0, util_functions_1.configureTsProjectConfig)(tree, schema);
-        (0, util_functions_1.editTsconfigBaseJson)(tree);
-        (0, util_functions_1.configureTsSolutionConfig)(tree, schema);
-        (0, util_functions_1.updateLintConfig)(tree, schema);
-        (0, util_functions_1.addBuildStorybookToCacheableOperations)(tree);
-        (0, util_functions_1.addStorybookToNamedInputs)(tree);
-        if (schema.uiFramework === '@storybook/angular') {
-            (0, util_functions_1.addAngularStorybookTask)(tree, schema.name, schema.interactionTests);
+    }
+    if (nextBuildTarget) {
+        schema.uiFramework = '@storybook/nextjs';
+    }
+    const initTask = await (0, init_1.initGenerator)(tree, {
+        uiFramework: schema.uiFramework,
+        js: schema.js,
+    });
+    tasks.push(initTask);
+    const mainDir = !!nextBuildTarget && projectType === 'application' ? 'components' : 'src';
+    (0, util_functions_1.createProjectStorybookDir)(tree, schema.name, schema.uiFramework, schema.js, schema.tsConfiguration, root, projectType, (0, util_functions_1.projectIsRootProjectInStandaloneWorkspace)(root), schema.interactionTests, mainDir, !!nextBuildTarget, compiler === 'swc', !!viteBuildTarget || schema.uiFramework.endsWith('-vite'), viteConfigFilePath);
+    if (schema.uiFramework !== '@storybook/angular') {
+        (0, util_functions_1.createStorybookTsconfigFile)(tree, root, schema.uiFramework, (0, util_functions_1.projectIsRootProjectInStandaloneWorkspace)(root), mainDir);
+    }
+    (0, util_functions_1.configureTsProjectConfig)(tree, schema);
+    (0, util_functions_1.editTsconfigBaseJson)(tree);
+    (0, util_functions_1.configureTsSolutionConfig)(tree, schema);
+    (0, util_functions_1.updateLintConfig)(tree, schema);
+    (0, util_functions_1.addBuildStorybookToCacheableOperations)(tree);
+    (0, util_functions_1.addStorybookToNamedInputs)(tree);
+    if (schema.uiFramework === '@storybook/angular') {
+        (0, util_functions_1.addAngularStorybookTask)(tree, schema.name, schema.interactionTests);
+    }
+    else {
+        (0, util_functions_1.addStorybookTask)(tree, schema.name, schema.uiFramework, schema.interactionTests);
+    }
+    if (schema.configureStaticServe) {
+        (0, util_functions_1.addStaticTarget)(tree, schema);
+    }
+    // TODO(v18): remove Cypress
+    if (schema.configureCypress) {
+        const e2eProject = await (0, util_functions_1.getE2EProjectName)(tree, schema.name);
+        if (!e2eProject) {
+            const cypressTask = await (0, cypress_project_1.cypressProjectGenerator)(tree, {
+                name: schema.name,
+                js: schema.js,
+                linter: schema.linter,
+                directory: schema.cypressDirectory,
+                standaloneConfig: schema.standaloneConfig,
+                ciTargetName: schema.configureStaticServe
+                    ? 'static-storybook'
+                    : undefined,
+                skipFormat: true,
+            });
+            tasks.push(cypressTask);
         }
         else {
-            (0, util_functions_1.addStorybookTask)(tree, schema.name, schema.uiFramework, schema.interactionTests);
-        }
-        if (schema.configureStaticServe) {
-            (0, util_functions_1.addStaticTarget)(tree, schema);
-        }
-        // TODO(v18): remove Cypress
-        if (schema.configureCypress) {
-            const e2eProject = yield (0, util_functions_1.getE2EProjectName)(tree, schema.name);
-            if (!e2eProject) {
-                const cypressTask = yield (0, cypress_project_1.cypressProjectGenerator)(tree, {
-                    name: schema.name,
-                    js: schema.js,
-                    linter: schema.linter,
-                    directory: schema.cypressDirectory,
-                    standaloneConfig: schema.standaloneConfig,
-                    ciTargetName: schema.configureStaticServe
-                        ? 'static-storybook'
-                        : undefined,
-                    skipFormat: true,
-                });
-                tasks.push(cypressTask);
-            }
-            else {
-                devkit_1.logger.warn(`There is already an e2e project setup for ${schema.name}, called ${e2eProject}.`);
-            }
+            devkit_1.logger.warn(`There is already an e2e project setup for ${schema.name}, called ${e2eProject}.`);
         }
-        let devDeps = {};
-        if (schema.tsConfiguration) {
-            devDeps['ts-node'] = versions_1.tsNodeVersion;
-        }
-        if (schema.interactionTests) {
-            devDeps = Object.assign(Object.assign({}, devDeps), (0, interaction_testing_utils_1.interactionTestsDependencies)());
-        }
-        if (schema.configureStaticServe) {
-            devDeps['@nx/web'] = versions_1.nxVersion;
-        }
-        if (projectType !== 'application' &&
-            schema.uiFramework === '@storybook/react-webpack5') {
-            devDeps['core-js'] = versions_1.coreJsVersion;
-        }
-        if (schema.uiFramework.endsWith('-vite') &&
-            (!viteBuildTarget || !viteConfigFilePath)) {
-            // This means that the user has selected a Vite framework
-            // but the project does not have Vite configuration.
-            // We need to install the @nx/vite plugin in order to be able to use
-            // the nxViteTsPaths plugin to register the tsconfig paths in Vite.
-            devDeps['@nx/vite'] = versions_1.nxVersion;
-        }
-        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDeps));
-        if (!schema.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+    }
+    let devDeps = {};
+    if (schema.tsConfiguration) {
+        devDeps['ts-node'] = versions_1.tsNodeVersion;
+    }
+    if (schema.interactionTests) {
+        devDeps = {
+            ...devDeps,
+            ...(0, interaction_testing_utils_1.interactionTestsDependencies)(),
+        };
+    }
+    if (schema.configureStaticServe) {
+        devDeps['@nx/web'] = versions_1.nxVersion;
+    }
+    if (projectType !== 'application' &&
+        schema.uiFramework === '@storybook/react-webpack5') {
+        devDeps['core-js'] = versions_1.coreJsVersion;
+    }
+    if (schema.uiFramework.endsWith('-vite') &&
+        (!viteBuildTarget || !viteConfigFilePath)) {
+        // This means that the user has selected a Vite framework
+        // but the project does not have Vite configuration.
+        // We need to install the @nx/vite plugin in order to be able to use
+        // the nxViteTsPaths plugin to register the tsconfig paths in Vite.
+        devDeps['@nx/vite'] = versions_1.nxVersion;
+    }
+    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDeps));
+    if (!schema.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.configurationGenerator = configurationGenerator;
 function normalizeSchema(schema) {
@@ -122,7 +121,10 @@ function normalizeSchema(schema) {
         js: false,
         tsConfiguration: true,
     };
-    return Object.assign(Object.assign({}, defaults), schema);
+    return {
+        ...defaults,
+        ...schema,
+    };
 }
 exports.default = configurationGenerator;
 exports.configurationSchematic = (0, devkit_1.convertNxGenerator)(configurationGenerator);

package/src/generators/configuration/lib/interaction-testing.utils.js

@@ -14,7 +14,6 @@ function interactionTestsDependencies() {
 }
 exports.interactionTestsDependencies = interactionTestsDependencies;
 function addInteractionsInAddons(tree, projectConfig) {
-    var _a, _b, _c;
     const mainJsTsPath = getMainTsJsPath(tree, projectConfig);
     if (!mainJsTsPath)
         return;
@@ -22,17 +21,17 @@ function addInteractionsInAddons(tree, projectConfig) {
     if (!mainJsTs)
         return;
     // Find addons array
-    const addonsArray = (_a = tsquery_1.tsquery.query(mainJsTs, `PropertyAssignment:has(Identifier:has([name="addons"]))`)) === null || _a === void 0 ? void 0 : _a[0];
+    const addonsArray = tsquery_1.tsquery.query(mainJsTs, `PropertyAssignment:has(Identifier:has([name="addons"]))`)?.[0];
     // if there's no addons array don't do anything
     // they may be setting up storybook in another project
     if (!addonsArray)
         return;
     // Check if addons array already has addon-interactions
-    const addonsArrayHasAddonInteractions = (_b = tsquery_1.tsquery.query(addonsArray, `StringLiteral:has([text="@storybook/addon-interactions"])`)) === null || _b === void 0 ? void 0 : _b[0];
+    const addonsArrayHasAddonInteractions = tsquery_1.tsquery.query(addonsArray, `StringLiteral:has([text="@storybook/addon-interactions"])`)?.[0];
     if (addonsArrayHasAddonInteractions)
         return;
     // get the array of the addons
-    const arrayLiteralExpression = (_c = tsquery_1.tsquery.query(addonsArray, `ArrayLiteralExpression`)) === null || _c === void 0 ? void 0 : _c[0];
+    const arrayLiteralExpression = tsquery_1.tsquery.query(addonsArray, `ArrayLiteralExpression`)?.[0];
     if (!arrayLiteralExpression)
         return;
     mainJsTs = (0, devkit_1.applyChangesToString)(mainJsTs, [
@@ -48,10 +47,9 @@ exports.addInteractionsInAddons = addInteractionsInAddons;
 function getMainTsJsPath(host, projectConfig) {
     let mainJsTsPath = undefined;
     Object.entries(projectConfig.targets).forEach(([_targetName, targetConfig]) => {
-        var _a;
         if (targetConfig.executor === '@nx/storybook:storybook' ||
             targetConfig.executor === '@storybook/angular:start-storybook') {
-            const configDir = (_a = targetConfig.options) === null || _a === void 0 ? void 0 : _a.configDir;
+            const configDir = targetConfig.options?.configDir;
             if (host.exists(`${configDir}/main.js`)) {
                 mainJsTsPath = `${configDir}/main.js`;
             }