@nx/angular 16.8.0-beta.4 → 16.8.0-beta.6

package/src/generators/setup-tailwind/lib/detect-tailwind-installed-version.js

@@ -5,9 +5,8 @@ const devkit_1 = require("@nx/devkit");
 const semver_1 = require("@nx/devkit/src/utils/semver");
 const semver_2 = require("semver");
 function detectTailwindInstalledVersion(tree) {
-    var _a;
     const { dependencies, devDependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const tailwindVersion = (_a = dependencies === null || dependencies === void 0 ? void 0 : dependencies.tailwindcss) !== null && _a !== void 0 ? _a : devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies.tailwindcss;
+    const tailwindVersion = dependencies?.tailwindcss ?? devDependencies?.tailwindcss;
     if (!tailwindVersion) {
         return undefined;
     }

package/src/generators/setup-tailwind/lib/normalize-options.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 function normalizeOptions(options) {
-    return Object.assign(Object.assign({}, options), { buildTarget: options.buildTarget || 'build' });
+    return {
+        ...options,
+        buildTarget: options.buildTarget || 'build',
+    };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/setup-tailwind/lib/update-application-styles.js

@@ -23,20 +23,19 @@ function updateApplicationStyles(tree, options, project) {
 }
 exports.updateApplicationStyles = updateApplicationStyles;
 function findStylesEntryPoint(tree, options, project) {
-    var _a, _b, _c, _d, _e, _f;
     // first check for common names
     const possibleStylesEntryPoints = [
-        (0, devkit_1.joinPathFragments)((_a = project.sourceRoot) !== null && _a !== void 0 ? _a : project.root, 'styles.css'),
-        (0, devkit_1.joinPathFragments)((_b = project.sourceRoot) !== null && _b !== void 0 ? _b : project.root, 'styles.scss'),
-        (0, devkit_1.joinPathFragments)((_c = project.sourceRoot) !== null && _c !== void 0 ? _c : project.root, 'styles.sass'),
-        (0, devkit_1.joinPathFragments)((_d = project.sourceRoot) !== null && _d !== void 0 ? _d : project.root, 'styles.less'),
+        (0, devkit_1.joinPathFragments)(project.sourceRoot ?? project.root, 'styles.css'),
+        (0, devkit_1.joinPathFragments)(project.sourceRoot ?? project.root, 'styles.scss'),
+        (0, devkit_1.joinPathFragments)(project.sourceRoot ?? project.root, 'styles.sass'),
+        (0, devkit_1.joinPathFragments)(project.sourceRoot ?? project.root, 'styles.less'),
     ];
     let stylesEntryPoint = possibleStylesEntryPoints.find((s) => tree.exists(s));
     if (stylesEntryPoint) {
         return stylesEntryPoint;
     }
     // then check for the specified styles in the build configuration if it exists
-    const styles = (_f = (_e = project.targets) === null || _e === void 0 ? void 0 : _e[options.buildTarget].options) === null || _f === void 0 ? void 0 : _f.styles;
+    const styles = project.targets?.[options.buildTarget].options?.styles;
     if (!styles) {
         return undefined;
     }

package/src/generators/setup-tailwind/setup-tailwind.js

@@ -1,32 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupTailwindGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
-function setupTailwindGenerator(tree, rawOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = (0, lib_1.normalizeOptions)(rawOptions);
-        const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-        const tailwindInstalledVersion = (0, lib_1.detectTailwindInstalledVersion)(tree);
-        let installTask = () => { };
-        if (!options.skipPackageJson) {
-            if (tailwindInstalledVersion === undefined) {
-                installTask = (0, lib_1.addTailwindRequiredPackages)(tree);
-            }
+async function setupTailwindGenerator(tree, rawOptions) {
+    const options = (0, lib_1.normalizeOptions)(rawOptions);
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const tailwindInstalledVersion = (0, lib_1.detectTailwindInstalledVersion)(tree);
+    let installTask = () => { };
+    if (!options.skipPackageJson) {
+        if (tailwindInstalledVersion === undefined) {
+            installTask = (0, lib_1.addTailwindRequiredPackages)(tree);
         }
-        (0, lib_1.addTailwindConfig)(tree, options, project, tailwindInstalledVersion !== null && tailwindInstalledVersion !== void 0 ? tailwindInstalledVersion : '3');
-        if (project.projectType === 'application') {
-            (0, lib_1.updateApplicationStyles)(tree, options, project);
-        }
-        else if (project.projectType === 'library') {
-            (0, lib_1.addTailwindConfigPathToProject)(tree, options, project);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return installTask;
-    });
+    }
+    (0, lib_1.addTailwindConfig)(tree, options, project, tailwindInstalledVersion ?? '3');
+    if (project.projectType === 'application') {
+        (0, lib_1.updateApplicationStyles)(tree, options, project);
+    }
+    else if (project.projectType === 'library') {
+        (0, lib_1.addTailwindConfigPathToProject)(tree, options, project);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return installTask;
 }
 exports.setupTailwindGenerator = setupTailwindGenerator;
 exports.default = setupTailwindGenerator;

package/src/generators/stories/lib/get-e2e-project.js

@@ -7,7 +7,7 @@ function getE2EProject(tree, e2eProjectName) {
     try {
         e2eProject = (0, devkit_1.readProjectConfiguration)(tree, e2eProjectName);
     }
-    catch (_a) {
+    catch {
         e2eProject = undefined;
     }
     return e2eProject;

package/src/generators/stories/stories.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularStoriesGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const component_cypress_spec_1 = require("../component-cypress-spec/component-cypress-spec");
 const component_story_1 = require("../component-story/component-story");
@@ -11,64 +10,58 @@ const get_e2e_project_1 = require("./lib/get-e2e-project");
 const module_info_1 = require("../utils/storybook-ast/module-info");
 const minimatch = require("minimatch");
 const versions_1 = require("../../utils/versions");
-function angularStoriesGenerator(tree, options) {
-    var _a, _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const e2eProjectName = (_a = options.cypressProject) !== null && _a !== void 0 ? _a : `${options.name}-e2e`;
-        const e2eProject = (0, get_e2e_project_1.getE2EProject)(tree, e2eProjectName);
-        const entryPoints = (0, entry_point_1.getProjectEntryPoints)(tree, options.name);
-        const componentsInfo = [];
-        for (const entryPoint of entryPoints) {
-            const moduleFilePaths = (0, module_info_1.getModuleFilePaths)(tree, entryPoint);
-            componentsInfo.push(...(0, component_info_1.getComponentsInfo)(tree, entryPoint, moduleFilePaths, options.name), ...(0, component_info_1.getStandaloneComponentsInfo)(tree, entryPoint));
+async function angularStoriesGenerator(tree, options) {
+    const e2eProjectName = options.cypressProject ?? `${options.name}-e2e`;
+    const e2eProject = (0, get_e2e_project_1.getE2EProject)(tree, e2eProjectName);
+    const entryPoints = (0, entry_point_1.getProjectEntryPoints)(tree, options.name);
+    const componentsInfo = [];
+    for (const entryPoint of entryPoints) {
+        const moduleFilePaths = (0, module_info_1.getModuleFilePaths)(tree, entryPoint);
+        componentsInfo.push(...(0, component_info_1.getComponentsInfo)(tree, entryPoint, moduleFilePaths, options.name), ...(0, component_info_1.getStandaloneComponentsInfo)(tree, entryPoint));
+    }
+    if (options.generateCypressSpecs && !e2eProject) {
+        devkit_1.logger.info(`There was no e2e project "${e2eProjectName}" found, so cypress specs will not be generated. Pass "--cypressProject" to specify a different e2e project name.`);
+    }
+    const componentInfos = componentsInfo.filter((f) => !options.ignorePaths?.some((pattern) => {
+        const shouldIgnorePath = minimatch((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`), pattern);
+        return shouldIgnorePath;
+    }));
+    for (const info of componentInfos) {
+        if (info === undefined) {
+            continue;
         }
-        if (options.generateCypressSpecs && !e2eProject) {
-            devkit_1.logger.info(`There was no e2e project "${e2eProjectName}" found, so cypress specs will not be generated. Pass "--cypressProject" to specify a different e2e project name.`);
-        }
-        const componentInfos = componentsInfo.filter((f) => {
-            var _a;
-            return !((_a = options.ignorePaths) === null || _a === void 0 ? void 0 : _a.some((pattern) => {
-                const shouldIgnorePath = minimatch((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`), pattern);
-                return shouldIgnorePath;
-            }));
+        await (0, component_story_1.default)(tree, {
+            projectPath: info.moduleFolderPath,
+            componentName: info.name,
+            componentPath: info.path,
+            componentFileName: info.componentFileName,
+            interactionTests: options.interactionTests ?? true,
+            skipFormat: true,
         });
-        for (const info of componentInfos) {
-            if (info === undefined) {
-                continue;
-            }
-            yield (0, component_story_1.default)(tree, {
+        if (options.generateCypressSpecs && e2eProject) {
+            await (0, component_cypress_spec_1.default)(tree, {
+                projectName: options.name,
                 projectPath: info.moduleFolderPath,
+                cypressProject: options.cypressProject,
                 componentName: info.name,
                 componentPath: info.path,
                 componentFileName: info.componentFileName,
-                interactionTests: (_b = options.interactionTests) !== null && _b !== void 0 ? _b : true,
+                specDirectory: (0, devkit_1.joinPathFragments)(info.entryPointName, info.path),
                 skipFormat: true,
             });
-            if (options.generateCypressSpecs && e2eProject) {
-                yield (0, component_cypress_spec_1.default)(tree, {
-                    projectName: options.name,
-                    projectPath: info.moduleFolderPath,
-                    cypressProject: options.cypressProject,
-                    componentName: info.name,
-                    componentPath: info.path,
-                    componentFileName: info.componentFileName,
-                    specDirectory: (0, devkit_1.joinPathFragments)(info.entryPointName, info.path),
-                    skipFormat: true,
-                });
-            }
-        }
-        const tasks = [];
-        if (options.interactionTests) {
-            const { interactionTestsDependencies, addInteractionsInAddons } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
-            const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, options.name);
-            addInteractionsInAddons(tree, projectConfiguration);
-            tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, interactionTestsDependencies()));
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
         }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+    }
+    const tasks = [];
+    if (options.interactionTests) {
+        const { interactionTestsDependencies, addInteractionsInAddons } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
+        const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, options.name);
+        addInteractionsInAddons(tree, projectConfiguration);
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, interactionTestsDependencies()));
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.angularStoriesGenerator = angularStoriesGenerator;
 exports.default = angularStoriesGenerator;

package/src/generators/storybook-configuration/lib/assert-compatible-storybook-version.js

@@ -7,7 +7,7 @@ function assertCompatibleStorybookVersion() {
     try {
         storybookVersion = require(require.resolve('@storybook/angular/package.json')).version;
     }
-    catch (_a) { }
+    catch { }
     if (storybookVersion && (0, semver_1.lt)(storybookVersion, '6.4.0-rc.1')) {
         throw new Error('Incompatible Storybook Version: Please use a version of @storybook/angular higher than 6.4.0-rc.1');
     }

package/src/generators/storybook-configuration/lib/generate-stories.js

@@ -1,22 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateStories = void 0;
-const tslib_1 = require("tslib");
 const project_name_1 = require("@nx/cypress/src/utils/project-name");
 const devkit_1 = require("@nx/devkit");
 const stories_1 = require("../../stories/stories");
-function generateStories(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const project = (0, devkit_1.readProjectConfiguration)(tree, options.name);
-        const e2eProjectName = (0, project_name_1.getE2eProjectName)(options.name, project.root, options.cypressDirectory);
-        yield (0, stories_1.angularStoriesGenerator)(tree, {
-            name: options.name,
-            generateCypressSpecs: options.configureCypress && options.generateCypressSpecs,
-            cypressProject: e2eProjectName,
-            ignorePaths: options.ignorePaths,
-            interactionTests: options.interactionTests,
-            skipFormat: true,
-        });
+async function generateStories(tree, options) {
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.name);
+    const e2eProjectName = (0, project_name_1.getE2eProjectName)(options.name, project.root, options.cypressDirectory);
+    await (0, stories_1.angularStoriesGenerator)(tree, {
+        name: options.name,
+        generateCypressSpecs: options.configureCypress && options.generateCypressSpecs,
+        cypressProject: e2eProjectName,
+        ignorePaths: options.ignorePaths,
+        interactionTests: options.interactionTests,
+        skipFormat: true,
     });
 }
 exports.generateStories = generateStories;

package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js

@@ -1,23 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateStorybookConfiguration = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
-function generateStorybookConfiguration(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
-        return yield configurationGenerator(tree, {
-            name: options.name,
-            uiFramework: '@storybook/angular',
-            configureCypress: options.configureCypress,
-            linter: options.linter,
-            cypressDirectory: options.cypressDirectory,
-            tsConfiguration: options.tsConfiguration,
-            interactionTests: options.interactionTests,
-            configureStaticServe: options.configureStaticServe,
-            skipFormat: true,
-        });
+async function generateStorybookConfiguration(tree, options) {
+    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
+    return await configurationGenerator(tree, {
+        name: options.name,
+        uiFramework: '@storybook/angular',
+        configureCypress: options.configureCypress,
+        linter: options.linter,
+        cypressDirectory: options.cypressDirectory,
+        tsConfiguration: options.tsConfiguration,
+        interactionTests: options.interactionTests,
+        configureStaticServe: options.configureStaticServe,
+        skipFormat: true,
     });
 }
 exports.generateStorybookConfiguration = generateStorybookConfiguration;

package/src/generators/storybook-configuration/storybook-configuration.js

@@ -1,29 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.storybookConfigurationGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const assert_compatible_storybook_version_1 = require("./lib/assert-compatible-storybook-version");
 const generate_stories_1 = require("./lib/generate-stories");
 const generate_storybook_configuration_1 = require("./lib/generate-storybook-configuration");
 const validate_options_1 = require("./lib/validate-options");
 // TODO(v18): remove Cypress
-function storybookConfigurationGenerator(tree, options) {
-    var _a, _b, _c;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, assert_compatible_storybook_version_1.assertCompatibleStorybookVersion)();
-        (0, validate_options_1.validateOptions)(options);
-        const storybookGeneratorInstallTask = yield (0, generate_storybook_configuration_1.generateStorybookConfiguration)(tree, Object.assign(Object.assign({}, options), { interactionTests: (_a = options.interactionTests) !== null && _a !== void 0 ? _a : true, tsConfiguration: (_b = options.tsConfiguration) !== null && _b !== void 0 ? _b : true }));
-        if (options.generateStories) {
-            yield (0, generate_stories_1.generateStories)(tree, Object.assign(Object.assign({}, options), { interactionTests: (_c = options.interactionTests) !== null && _c !== void 0 ? _c : true, skipFormat: true }));
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return () => {
-            storybookGeneratorInstallTask();
-        };
+async function storybookConfigurationGenerator(tree, options) {
+    (0, assert_compatible_storybook_version_1.assertCompatibleStorybookVersion)();
+    (0, validate_options_1.validateOptions)(options);
+    const storybookGeneratorInstallTask = await (0, generate_storybook_configuration_1.generateStorybookConfiguration)(tree, {
+        ...options,
+        interactionTests: options.interactionTests ?? true,
+        tsConfiguration: options.tsConfiguration ?? true, // default is true
     });
+    if (options.generateStories) {
+        await (0, generate_stories_1.generateStories)(tree, {
+            ...options,
+            interactionTests: options.interactionTests ?? true,
+            skipFormat: true,
+        });
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return () => {
+        storybookGeneratorInstallTask();
+    };
 }
 exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
 exports.default = storybookConfigurationGenerator;

package/src/generators/utils/create-ts-config.js

@@ -24,7 +24,7 @@ function createTsConfig(host, projectRoot, type, options, relativePathToRootTsCo
     // inline tsconfig.base.json into the project
     if (options.rootProject) {
         json.compileOnSave = false;
-        json.compilerOptions = Object.assign(Object.assign({}, js_1.tsConfigBaseOptions), json.compilerOptions);
+        json.compilerOptions = { ...js_1.tsConfigBaseOptions, ...json.compilerOptions };
         json.exclude = ['node_modules', 'tmp'];
     }
     else {

package/src/generators/utils/entry-point.js

@@ -4,10 +4,9 @@ exports.locateLibraryEntryPointFromDirectory = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 function locateLibraryEntryPointFromDirectory(tree, directory, projectRoot, projectSourceRoot) {
-    var _a, _b;
     const ngPackageJsonPath = (0, devkit_1.joinPathFragments)(directory, 'ng-package.json');
     let entryPointFile = tree.exists(ngPackageJsonPath)
-        ? (_b = (_a = (0, devkit_1.readJson)(tree, ngPackageJsonPath).lib) === null || _a === void 0 ? void 0 : _a.entryFile) !== null && _b !== void 0 ? _b : 'src/public_api.ts'
+        ? (0, devkit_1.readJson)(tree, ngPackageJsonPath).lib?.entryFile ?? 'src/public_api.ts'
         : null;
     if (entryPointFile) {
         return (0, devkit_1.joinPathFragments)(directory, entryPointFile);

package/src/generators/utils/export-scam.js

@@ -9,7 +9,7 @@ function exportScam(tree, options) {
         return;
     }
     const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
+    const projectSourceRoot = sourceRoot ?? (0, devkit_1.joinPathFragments)(root, 'src');
     if (projectType === 'application') {
         devkit_1.logger.warn('--export=true was ignored as the project the SCAM is being generated in is not a library.');
         return;

package/src/generators/utils/insert-ngmodule-import.js

@@ -135,5 +135,5 @@ function findPropertyAssignment(ngModuleOptions, propertyName) {
 }
 let tsUtils;
 function getTsEsLintTypeUtils() {
-    return tsUtils !== null && tsUtils !== void 0 ? tsUtils : require('@typescript-eslint/type-utils');
+    return tsUtils ?? require('@typescript-eslint/type-utils');
 }

package/src/generators/utils/path.js

@@ -16,11 +16,11 @@ function getRelativeImportToFile(sourceFilePath, targetFilePath) {
 }
 exports.getRelativeImportToFile = getRelativeImportToFile;
 function normalizeNameAndPaths(tree, options) {
-    var _a;
     const { root, sourceRoot, projectType } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
+    const projectSourceRoot = sourceRoot ?? (0, devkit_1.joinPathFragments)(root, 'src');
     const { name, path: namePath } = (0, names_1.parseNameWithPath)(options.name);
-    const path = (_a = options.path) !== null && _a !== void 0 ? _a : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib', namePath);
+    const path = options.path ??
+        (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib', namePath);
     const directory = options.flat
         ? (0, devkit_1.normalizePath)(path)
         : (0, devkit_1.joinPathFragments)(path, name);

package/src/generators/utils/project.js

@@ -39,8 +39,7 @@ Valid selector prefixes must start with a letter, and must contain only alphanum
 }
 exports.normalizeNewProjectPrefix = normalizeNewProjectPrefix;
 function getProjectPrefix(tree, project) {
-    var _a;
-    return ((_a = (0, devkit_1.readProjectConfiguration)(tree, project)
-        .prefix) !== null && _a !== void 0 ? _a : (0, get_npm_scope_1.getNpmScope)(tree));
+    return ((0, devkit_1.readProjectConfiguration)(tree, project)
+        .prefix ?? (0, get_npm_scope_1.getNpmScope)(tree));
 }
 exports.getProjectPrefix = getProjectPrefix;

package/src/generators/utils/selector.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
 function buildSelector(tree, name, prefix, projectPrefix, casing) {
     let selector = name;
-    prefix !== null && prefix !== void 0 ? prefix : (prefix = projectPrefix !== null && projectPrefix !== void 0 ? projectPrefix : (0, get_npm_scope_1.getNpmScope)(tree));
+    prefix ??= projectPrefix ?? (0, get_npm_scope_1.getNpmScope)(tree);
     if (prefix) {
         selector = `${prefix}-${selector}`;
     }

package/src/generators/utils/storybook-ast/component-info.js

@@ -30,9 +30,8 @@ exports.getComponentsInfo = getComponentsInfo;
 function getStandaloneComponentsInfo(tree, entryPoint) {
     const componentsInfo = [];
     (0, devkit_1.visitNotIgnoredFiles)(tree, entryPoint.path, (filePath) => {
-        var _a;
         const normalizedFilePath = (0, devkit_1.normalizePath)(filePath);
-        if ((_a = entryPoint.excludeDirs) === null || _a === void 0 ? void 0 : _a.some((excludeDir) => normalizedFilePath.startsWith(excludeDir))) {
+        if (entryPoint.excludeDirs?.some((excludeDir) => normalizedFilePath.startsWith(excludeDir))) {
             return;
         }
         if ((0, path_1.extname)(normalizedFilePath) !== '.ts' ||

package/src/generators/utils/storybook-ast/entry-point.js

@@ -46,12 +46,11 @@ function collectLibrarySecondaryEntryPoints(tree, root, entryPointPaths) {
     });
 }
 function normalizeMainEntryPointSourceRoot(tree, root, sourceRoot, projectType) {
-    var _a;
     const projectTypeDir = projectType === 'application' ? 'app' : 'lib';
     if (sourceRoot) {
         return [(0, devkit_1.joinPathFragments)(sourceRoot, projectTypeDir), sourceRoot].find((path) => tree.exists(path));
     }
-    return (_a = getSourcePath(tree, root, projectTypeDir)) !== null && _a !== void 0 ? _a : root;
+    return getSourcePath(tree, root, projectTypeDir) ?? root;
 }
 function getSourcePath(tree, basePath, projectTypeDir) {
     const candidatePaths = [

package/src/generators/utils/storybook-ast/module-info.js

@@ -23,9 +23,8 @@ exports.getModuleDeclaredComponents = getModuleDeclaredComponents;
 function getModuleFilePaths(tree, entryPoint) {
     let moduleFilePaths = [];
     (0, devkit_1.visitNotIgnoredFiles)(tree, entryPoint.path, (filePath) => {
-        var _a;
         const normalizedFilePath = (0, devkit_1.normalizePath)(filePath);
-        if ((_a = entryPoint.excludeDirs) === null || _a === void 0 ? void 0 : _a.some((excludeDir) => normalizedFilePath.startsWith(excludeDir))) {
+        if (entryPoint.excludeDirs?.some((excludeDir) => normalizedFilePath.startsWith(excludeDir))) {
             return;
         }
         if ((0, path_1.extname)(normalizedFilePath) === '.ts' &&

package/src/generators/utils/storybook-ast/tree-utilities.js

@@ -27,5 +27,5 @@ function isPathIgnored(tree, path) {
         ig = (0, ignore_1.default)();
         ig.add(tree.read('.gitignore', 'utf-8'));
     }
-    return path !== '' && (ig === null || ig === void 0 ? void 0 : ig.ignores(path));
+    return path !== '' && ig?.ignores(path);
 }