@nx/react 16.8.0-beta.3 → 16.8.0-beta.5

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSsrSchematic = exports.setupSsrGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const init_1 = require("../init/init");
 const versions_1 = require("../../utils/versions");
@@ -19,144 +18,147 @@ function readEntryFile(host, path) {
         source: tsModule.createSourceFile(path, content, tsModule.ScriptTarget.Latest, true),
     };
 }
-function setupSsrGenerator(tree, options) {
-    var _a, _b, _c, _d, _e;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, init_1.default)(tree, { skipFormat: true });
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-        const projectRoot = projectConfig.root;
-        const appImportCandidates = [
-            (_a = options.appComponentImportPath) !== null && _a !== void 0 ? _a : 'app/app',
-            'app',
-            'App',
-            'app/App',
-            'App/App',
-        ].map((importPath) => {
-            return {
-                importPath,
-                filePath: (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot || projectConfig.root, `${importPath}.tsx`),
-            };
-        });
-        const appComponentInfo = appImportCandidates.find((candidate) => tree.exists(candidate.filePath));
-        if (!appComponentInfo) {
-            throw new Error(`Cannot find an import path for <App/> component. Try passing setting --appComponentImportPath option.`);
-        }
-        if (!projectConfig.targets.build || !projectConfig.targets.serve) {
-            throw new Error(`Project ${options.project} does not have build and serve targets`);
-        }
-        if (projectConfig.targets.server) {
-            throw new Error(`Project ${options.project} already has a server target.`);
-        }
-        const originalOutputPath = (_c = (_b = projectConfig.targets.build) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.outputPath;
-        if (!originalOutputPath) {
-            throw new Error(`Project ${options.project} does not contain a outputPath for the build target.`);
-        }
-        projectConfig.targets.build.options.outputPath = (0, devkit_1.joinPathFragments)(originalOutputPath, 'browser');
-        projectConfig.targets = Object.assign(Object.assign({}, projectConfig.targets), { server: {
-                dependsOn: ['build'],
-                executor: '@nx/webpack:webpack',
-                outputs: ['{options.outputPath}'],
-                defaultConfiguration: 'production',
-                options: {
-                    target: 'node',
-                    main: `${projectRoot}/server.ts`,
-                    outputPath: (0, devkit_1.joinPathFragments)(originalOutputPath, 'server'),
-                    outputFileName: 'server.js',
-                    tsConfig: `${projectRoot}/tsconfig.server.json`,
-                    compiler: 'babel',
-                    externalDependencies: 'all',
-                    outputHashing: 'none',
-                    isolatedConfig: true,
-                    webpackConfig: (0, devkit_1.joinPathFragments)(projectRoot, 'webpack.config.js'),
+async function setupSsrGenerator(tree, options) {
+    await (0, init_1.default)(tree, { skipFormat: true });
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const projectRoot = projectConfig.root;
+    const appImportCandidates = [
+        options.appComponentImportPath ?? 'app/app',
+        'app',
+        'App',
+        'app/App',
+        'App/App',
+    ].map((importPath) => {
+        return {
+            importPath,
+            filePath: (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot || projectConfig.root, `${importPath}.tsx`),
+        };
+    });
+    const appComponentInfo = appImportCandidates.find((candidate) => tree.exists(candidate.filePath));
+    if (!appComponentInfo) {
+        throw new Error(`Cannot find an import path for <App/> component. Try passing setting --appComponentImportPath option.`);
+    }
+    if (!projectConfig.targets.build || !projectConfig.targets.serve) {
+        throw new Error(`Project ${options.project} does not have build and serve targets`);
+    }
+    if (projectConfig.targets.server) {
+        throw new Error(`Project ${options.project} already has a server target.`);
+    }
+    const originalOutputPath = projectConfig.targets.build?.options?.outputPath;
+    if (!originalOutputPath) {
+        throw new Error(`Project ${options.project} does not contain a outputPath for the build target.`);
+    }
+    projectConfig.targets.build.options.outputPath = (0, devkit_1.joinPathFragments)(originalOutputPath, 'browser');
+    projectConfig.targets = {
+        ...projectConfig.targets,
+        server: {
+            dependsOn: ['build'],
+            executor: '@nx/webpack:webpack',
+            outputs: ['{options.outputPath}'],
+            defaultConfiguration: 'production',
+            options: {
+                target: 'node',
+                main: `${projectRoot}/server.ts`,
+                outputPath: (0, devkit_1.joinPathFragments)(originalOutputPath, 'server'),
+                outputFileName: 'server.js',
+                tsConfig: `${projectRoot}/tsconfig.server.json`,
+                compiler: 'babel',
+                externalDependencies: 'all',
+                outputHashing: 'none',
+                isolatedConfig: true,
+                webpackConfig: (0, devkit_1.joinPathFragments)(projectRoot, 'webpack.config.js'),
+            },
+            configurations: {
+                development: {
+                    optimization: false,
+                    sourceMap: true,
                 },
-                configurations: {
-                    development: {
-                        optimization: false,
-                        sourceMap: true,
-                    },
-                    production: {
-                        fileReplacements: [
-                            {
-                                replace: `${projectRoot}/src/environments/environment.ts`,
-                                with: `${projectRoot}/src/environments/environment.prod.ts`,
-                            },
-                        ],
-                        sourceMap: false,
-                    },
+                production: {
+                    fileReplacements: [
+                        {
+                            replace: `${projectRoot}/src/environments/environment.ts`,
+                            with: `${projectRoot}/src/environments/environment.prod.ts`,
+                        },
+                    ],
+                    sourceMap: false,
                 },
-            }, 'serve-browser': projectConfig.targets.serve, 'serve-server': {
-                executor: '@nx/js:node',
-                defaultConfiguration: 'development',
-                options: {
-                    buildTarget: `${options.project}:server:development`,
-                    buildTargetOptions: {
-                        watch: true,
-                    },
+            },
+        },
+        'serve-browser': projectConfig.targets.serve,
+        'serve-server': {
+            executor: '@nx/js:node',
+            defaultConfiguration: 'development',
+            options: {
+                buildTarget: `${options.project}:server:development`,
+                buildTargetOptions: {
+                    watch: true,
                 },
-                configurations: {
-                    development: {},
-                    production: {
-                        buildTarget: `${options.project}:server:production`,
-                    },
+            },
+            configurations: {
+                development: {},
+                production: {
+                    buildTarget: `${options.project}:server:production`,
                 },
-            }, serve: {
-                executor: '@nx/webpack:ssr-dev-server',
-                defaultConfiguration: 'development',
-                options: {
-                    browserTarget: `${options.project}:build:development`,
-                    serverTarget: `${options.project}:serve-server:development`,
-                    port: options.serverPort,
-                    browserTargetOptions: {
-                        watch: true,
-                    },
+            },
+        },
+        serve: {
+            executor: '@nx/webpack:ssr-dev-server',
+            defaultConfiguration: 'development',
+            options: {
+                browserTarget: `${options.project}:build:development`,
+                serverTarget: `${options.project}:serve-server:development`,
+                port: options.serverPort,
+                browserTargetOptions: {
+                    watch: true,
                 },
-                configurations: {
-                    development: {},
-                    production: {
-                        browserTarget: `${options.project}:build:production`,
-                        serverTarget: `${options.project}:serve-server:production`,
-                    },
+            },
+            configurations: {
+                development: {},
+                production: {
+                    browserTarget: `${options.project}:build:production`,
+                    serverTarget: `${options.project}:serve-server:production`,
                 },
-            } });
-        (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
-        const nxJson = (0, devkit_1.readNxJson)(tree);
-        if (((_d = nxJson.tasksRunnerOptions) === null || _d === void 0 ? void 0 : _d.default) &&
-            !nxJson.tasksRunnerOptions.default.options.cacheableOperations.includes('server')) {
-            nxJson.tasksRunnerOptions.default.options.cacheableOperations = [
-                ...nxJson.tasksRunnerOptions.default.options.cacheableOperations,
-                'server',
-            ];
-        }
-        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), projectRoot, {
-            tmpl: '',
-            extraInclude: ((_e = options.extraInclude) === null || _e === void 0 ? void 0 : _e.length) > 0
-                ? `"${options.extraInclude.join('", "')}",`
-                : '',
-            appComponentImport: appComponentInfo.importPath,
-            browserBuildOutputPath: projectConfig.targets.build.options.outputPath,
-        });
-        // Add <StaticRouter> to server main if needed.
-        // TODO: need to read main.server.tsx not main.tsx.
-        const appContent = tree.read(appComponentInfo.filePath, 'utf-8');
-        const isRouterPresent = appContent.match(/react-router-dom/);
-        if (isRouterPresent) {
-            const serverEntry = (0, devkit_1.joinPathFragments)(projectRoot, 'src/main.server.tsx');
-            const { content, source } = readEntryFile(tree, serverEntry);
-            const changes = (0, devkit_1.applyChangesToString)(content, (0, ast_utils_1.addStaticRouter)(serverEntry, source));
-            tree.write(serverEntry, changes);
-        }
-        (0, devkit_1.updateNxJson)(tree, nxJson);
-        const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
-            express: versions_1.expressVersion,
-            isbot: versions_1.isbotVersion,
-            cors: versions_1.corsVersion,
-        }, {
-            '@types/express': versions_1.typesExpressVersion,
-            '@types/cors': versions_1.typesCorsVersion,
-        });
-        yield (0, devkit_1.formatFiles)(tree);
-        return installTask;
+            },
+        },
+    };
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (nxJson.tasksRunnerOptions?.default &&
+        !nxJson.tasksRunnerOptions.default.options.cacheableOperations.includes('server')) {
+        nxJson.tasksRunnerOptions.default.options.cacheableOperations = [
+            ...nxJson.tasksRunnerOptions.default.options.cacheableOperations,
+            'server',
+        ];
+    }
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), projectRoot, {
+        tmpl: '',
+        extraInclude: options.extraInclude?.length > 0
+            ? `"${options.extraInclude.join('", "')}",`
+            : '',
+        appComponentImport: appComponentInfo.importPath,
+        browserBuildOutputPath: projectConfig.targets.build.options.outputPath,
+    });
+    // Add <StaticRouter> to server main if needed.
+    // TODO: need to read main.server.tsx not main.tsx.
+    const appContent = tree.read(appComponentInfo.filePath, 'utf-8');
+    const isRouterPresent = appContent.match(/react-router-dom/);
+    if (isRouterPresent) {
+        const serverEntry = (0, devkit_1.joinPathFragments)(projectRoot, 'src/main.server.tsx');
+        const { content, source } = readEntryFile(tree, serverEntry);
+        const changes = (0, devkit_1.applyChangesToString)(content, (0, ast_utils_1.addStaticRouter)(serverEntry, source));
+        tree.write(serverEntry, changes);
+    }
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+    const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
+        express: versions_1.expressVersion,
+        isbot: versions_1.isbotVersion,
+        cors: versions_1.corsVersion,
+    }, {
+        '@types/express': versions_1.typesExpressVersion,
+        '@types/cors': versions_1.typesCorsVersion,
     });
+    await (0, devkit_1.formatFiles)(tree);
+    return installTask;
 }
 exports.setupSsrGenerator = setupSsrGenerator;
 exports.default = setupSsrGenerator;

package/src/generators/setup-tailwind/lib/update-project.js

@@ -3,11 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProject = void 0;
 const devkit_1 = require("@nx/devkit");
 function updateProject(tree, config, options) {
-    var _a, _b, _c, _d, _e;
-    var _f;
-    if (((_b = (_a = config === null || config === void 0 ? void 0 : config.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) === '@nx/webpack:webpack' ||
-        ((_d = (_c = config === null || config === void 0 ? void 0 : config.targets) === null || _c === void 0 ? void 0 : _c.build) === null || _d === void 0 ? void 0 : _d.executor) === '@nrwl/webpack:webpack') {
-        (_e = (_f = config.targets.build).options) !== null && _e !== void 0 ? _e : (_f.options = {});
+    if (config?.targets?.build?.executor === '@nx/webpack:webpack' ||
+        config?.targets?.build?.executor === '@nrwl/webpack:webpack') {
+        config.targets.build.options ??= {};
         config.targets.build.options.postcssConfig = (0, devkit_1.joinPathFragments)(config.root, 'postcss.config.js');
         (0, devkit_1.updateProjectConfiguration)(tree, options.project, config);
     }

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

@@ -1,38 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupTailwindSchematic = exports.setupTailwindGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 const add_tailwind_style_imports_1 = require("./lib/add-tailwind-style-imports");
 const update_project_1 = require("./lib/update-project");
 const path_1 = require("path");
-function setupTailwindGenerator(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-        if (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'postcss.config.js')) ||
-            tree.exists((0, devkit_1.joinPathFragments)(project.root, 'tailwind.config.js'))) {
-            devkit_1.logger.info(`Skipping setup since there are existing PostCSS or Tailwind configuration files. For manual setup instructions, see https://nx.dev/guides/using-tailwind-css-in-react.`);
-            return;
-        }
-        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files'), project.root, {
-            tmpl: '',
-        });
-        (0, add_tailwind_style_imports_1.addTailwindStyleImports)(tree, project, options);
-        (0, update_project_1.updateProject)(tree, project, options);
-        if (!options.skipPackageJson) {
-            tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-                autoprefixer: versions_1.autoprefixerVersion,
-                postcss: versions_1.postcssVersion,
-                tailwindcss: versions_1.tailwindcssVersion,
-            }));
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
+async function setupTailwindGenerator(tree, options) {
+    const tasks = [];
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    if (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'postcss.config.js')) ||
+        tree.exists((0, devkit_1.joinPathFragments)(project.root, 'tailwind.config.js'))) {
+        devkit_1.logger.info(`Skipping setup since there are existing PostCSS or Tailwind configuration files. For manual setup instructions, see https://nx.dev/guides/using-tailwind-css-in-react.`);
+        return;
+    }
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files'), project.root, {
+        tmpl: '',
     });
+    (0, add_tailwind_style_imports_1.addTailwindStyleImports)(tree, project, options);
+    (0, update_project_1.updateProject)(tree, project, options);
+    if (!options.skipPackageJson) {
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            autoprefixer: versions_1.autoprefixerVersion,
+            postcss: versions_1.postcssVersion,
+            tailwindcss: versions_1.tailwindcssVersion,
+        }));
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.setupTailwindGenerator = setupTailwindGenerator;
 exports.default = setupTailwindGenerator;

package/src/generators/stories/stories.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.storiesSchematic = exports.storiesGenerator = exports.createAllStories = exports.containsComponentDeclaration = exports.projectRootPath = void 0;
-const tslib_1 = require("tslib");
 const component_story_1 = require("../component-story/component-story");
 const component_cypress_spec_1 = require("../component-cypress-spec/component-cypress-spec");
 const ast_utils_1 = require("../../utils/ast-utils");
@@ -11,31 +10,28 @@ const minimatch = require("minimatch");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const versions_1 = require("../../utils/versions");
 let tsModule;
-function projectRootPath(tree, config) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { findStorybookAndBuildTargetsAndCompiler } = yield Promise.resolve().then(() => require('@nx/storybook/src/utils/utilities'));
-        let projectDir;
-        if (config.projectType === 'application') {
-            const { nextBuildTarget } = findStorybookAndBuildTargetsAndCompiler(config.targets);
-            if (!!nextBuildTarget) {
-                // Next.js apps
-                projectDir = 'components';
-            }
-            else {
-                // apps/test-app/src/app
-                projectDir = 'app';
-            }
+async function projectRootPath(tree, config) {
+    const { findStorybookAndBuildTargetsAndCompiler } = await Promise.resolve().then(() => require('@nx/storybook/src/utils/utilities'));
+    let projectDir;
+    if (config.projectType === 'application') {
+        const { nextBuildTarget } = findStorybookAndBuildTargetsAndCompiler(config.targets);
+        if (!!nextBuildTarget) {
+            // Next.js apps
+            projectDir = 'components';
         }
-        else if (config.projectType == 'library') {
-            // libs/test-lib/src/lib
-            projectDir = 'lib';
+        else {
+            // apps/test-app/src/app
+            projectDir = 'app';
         }
-        return (0, devkit_1.joinPathFragments)(config.sourceRoot, projectDir);
-    });
+    }
+    else if (config.projectType == 'library') {
+        // libs/test-lib/src/lib
+        projectDir = 'lib';
+    }
+    return (0, devkit_1.joinPathFragments)(config.sourceRoot, projectDir);
 }
 exports.projectRootPath = projectRootPath;
 function containsComponentDeclaration(tree, componentPath) {
-    var _a;
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
@@ -45,83 +41,78 @@ function containsComponentDeclaration(tree, componentPath) {
     }
     const sourceFile = tsModule.createSourceFile(componentPath, contents, tsModule.ScriptTarget.Latest, true);
     return !!((0, ast_utils_1.getComponentNode)(sourceFile) ||
-        ((_a = (0, ast_utils_1.findExportDeclarationsForJsx)(sourceFile)) === null || _a === void 0 ? void 0 : _a.length));
+        (0, ast_utils_1.findExportDeclarationsForJsx)(sourceFile)?.length);
 }
 exports.containsComponentDeclaration = containsComponentDeclaration;
-function createAllStories(tree, projectName, interactionTests, js, projects, projectConfiguration, generateCypressSpecs, cypressProject, ignorePaths) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { isTheFileAStory } = yield Promise.resolve().then(() => require('@nx/storybook/src/utils/utilities'));
-        const { sourceRoot, root } = projectConfiguration;
-        let componentPaths = [];
-        const projectPath = yield projectRootPath(tree, projectConfiguration);
-        (0, devkit_1.visitNotIgnoredFiles)(tree, projectPath, (path) => {
-            // Ignore private files starting with "_".
-            if ((0, path_1.basename)(path).startsWith('_'))
-                return;
-            if (ignorePaths === null || ignorePaths === void 0 ? void 0 : ignorePaths.some((pattern) => minimatch(path, pattern)))
-                return;
-            if ((path.endsWith('.tsx') && !path.endsWith('.spec.tsx')) ||
-                (path.endsWith('.js') && !path.endsWith('.spec.js')) ||
-                (path.endsWith('.jsx') && !path.endsWith('.spec.jsx'))) {
-                // Check if file is NOT a story (either ts/tsx or js/jsx)
-                if (!isTheFileAStory(tree, path)) {
-                    // Since the file is not a story
-                    // Let's see if the .stories.* file exists
-                    const ext = path.slice(path.lastIndexOf('.'));
-                    const storyPath = `${path.split(ext)[0]}.stories${ext}`;
-                    if (!tree.exists(storyPath)) {
-                        componentPaths.push(path);
-                    }
+async function createAllStories(tree, projectName, interactionTests, js, projects, projectConfiguration, generateCypressSpecs, cypressProject, ignorePaths) {
+    const { isTheFileAStory } = await Promise.resolve().then(() => require('@nx/storybook/src/utils/utilities'));
+    const { sourceRoot, root } = projectConfiguration;
+    let componentPaths = [];
+    const projectPath = await projectRootPath(tree, projectConfiguration);
+    (0, devkit_1.visitNotIgnoredFiles)(tree, projectPath, (path) => {
+        // Ignore private files starting with "_".
+        if ((0, path_1.basename)(path).startsWith('_'))
+            return;
+        if (ignorePaths?.some((pattern) => minimatch(path, pattern)))
+            return;
+        if ((path.endsWith('.tsx') && !path.endsWith('.spec.tsx')) ||
+            (path.endsWith('.js') && !path.endsWith('.spec.js')) ||
+            (path.endsWith('.jsx') && !path.endsWith('.spec.jsx'))) {
+            // Check if file is NOT a story (either ts/tsx or js/jsx)
+            if (!isTheFileAStory(tree, path)) {
+                // Since the file is not a story
+                // Let's see if the .stories.* file exists
+                const ext = path.slice(path.lastIndexOf('.'));
+                const storyPath = `${path.split(ext)[0]}.stories${ext}`;
+                if (!tree.exists(storyPath)) {
+                    componentPaths.push(path);
                 }
             }
-        });
-        const e2eProjectName = cypressProject || `${projectName}-e2e`;
-        const e2eProject = projects.get(e2eProjectName);
-        if (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`);
         }
-        yield Promise.all(componentPaths.map((componentPath) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const relativeCmpDir = componentPath.replace((0, path_1.join)(sourceRoot, '/'), '');
-            if (!containsComponentDeclaration(tree, componentPath)) {
-                return;
-            }
-            yield (0, component_story_1.default)(tree, {
-                componentPath: relativeCmpDir,
+    });
+    const e2eProjectName = cypressProject || `${projectName}-e2e`;
+    const e2eProject = projects.get(e2eProjectName);
+    if (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`);
+    }
+    await Promise.all(componentPaths.map(async (componentPath) => {
+        const relativeCmpDir = componentPath.replace((0, path_1.join)(sourceRoot, '/'), '');
+        if (!containsComponentDeclaration(tree, componentPath)) {
+            return;
+        }
+        await (0, component_story_1.default)(tree, {
+            componentPath: relativeCmpDir,
+            project: projectName,
+            skipFormat: true,
+            interactionTests,
+        });
+        if (generateCypressSpecs && e2eProject) {
+            await (0, component_cypress_spec_1.default)(tree, {
                 project: projectName,
+                componentPath: relativeCmpDir,
+                js,
+                cypressProject,
                 skipFormat: true,
-                interactionTests,
             });
-            if (generateCypressSpecs && e2eProject) {
-                yield (0, component_cypress_spec_1.default)(tree, {
-                    project: projectName,
-                    componentPath: relativeCmpDir,
-                    js,
-                    cypressProject,
-                    skipFormat: true,
-                });
-            }
-        })));
-    });
+        }
+    }));
 }
 exports.createAllStories = createAllStories;
-function storiesGenerator(host, schema) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(host);
-        const projectConfiguration = projects.get(schema.project);
-        schema.interactionTests = (_a = schema.interactionTests) !== null && _a !== void 0 ? _a : true;
-        yield createAllStories(host, schema.project, schema.interactionTests, schema.js, projects, projectConfiguration, schema.generateCypressSpecs, schema.cypressProject, schema.ignorePaths);
-        const tasks = [];
-        if (schema.interactionTests) {
-            const { interactionTestsDependencies, addInteractionsInAddons } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
-            tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {}, interactionTestsDependencies()));
-            addInteractionsInAddons(host, projectConfiguration);
-        }
-        if (!schema.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+async function storiesGenerator(host, schema) {
+    const projects = (0, devkit_1.getProjects)(host);
+    const projectConfiguration = projects.get(schema.project);
+    schema.interactionTests = schema.interactionTests ?? true;
+    await createAllStories(host, schema.project, schema.interactionTests, schema.js, projects, projectConfiguration, schema.generateCypressSpecs, schema.cypressProject, schema.ignorePaths);
+    const tasks = [];
+    if (schema.interactionTests) {
+        const { interactionTestsDependencies, addInteractionsInAddons } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {}, interactionTestsDependencies()));
+        addInteractionsInAddons(host, projectConfiguration);
+    }
+    if (!schema.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.storiesGenerator = storiesGenerator;
 exports.default = storiesGenerator;