@nrwl/react 14.8.7 → 14.9.0-beta.1

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

@@ -0,0 +1,162 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupSsrSchematic = exports.setupSsrGenerator = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const init_1 = require("../init/init");
+const versions_1 = require("../../utils/versions");
+const ast_utils_1 = require("../../utils/ast-utils");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
+let tsModule;
+function readEntryFile(host, path) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    const content = host.read(path, 'utf-8');
+    return {
+        content,
+        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, {});
+        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: '@nrwl/webpack:webpack',
+                outputs: ['{options.outputPath}'],
+                defaultConfiguration: 'production',
+                options: {
+                    target: 'node',
+                    main: `${projectRoot}/server.ts`,
+                    outputPath: (0, devkit_1.joinPathFragments)(originalOutputPath, 'server'),
+                    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,
+                    },
+                    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: '@nrwl/js:node',
+                defaultConfiguration: 'development',
+                options: {
+                    buildTarget: `${options.project}:server:development`,
+                    buildTargetOptions: {
+                        watch: true,
+                    },
+                },
+                configurations: {
+                    development: {},
+                    production: {
+                        buildTarget: `${options.project}:server:production`,
+                    },
+                },
+            }, serve: {
+                executor: '@nrwl/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`,
+                    },
+                },
+            } });
+        (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, devkit_1.joinPathFragments)(__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;
+    });
+}
+exports.setupSsrGenerator = setupSsrGenerator;
+exports.default = setupSsrGenerator;
+exports.setupSsrSchematic = (0, devkit_1.convertNxGenerator)(setupSsrGenerator);
+//# sourceMappingURL=setup-ssr.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":"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"}

package/src/generators/setup-tailwind/lib/add-tailwind-style-imports.js

@@ -19,14 +19,14 @@ function addTailwindStyleImports(tree, project, _options) {
     const stylesPath = candidates.find((x) => tree.exists(x));
     if (stylesPath) {
         const content = tree.read(stylesPath).toString();
-        tree.write(stylesPath, `@tailwind components;\n@tailwind base;\n@tailwind utilities;\n${content}`);
+        tree.write(stylesPath, `@tailwind base;\n@tailwind components;\n@tailwind utilities;\n${content}`);
     }
     else {
         devkit_1.logger.warn((0, devkit_1.stripIndents) `
         Could not find stylesheet to update. Add the following imports to your stylesheet (e.g. styles.css):
         
-          @tailwind components;
           @tailwind base;
+          @tailwind components;
           @tailwind utilities;
           
         See our guide for more details: https://nx.dev/guides/using-tailwind-css-in-react`);

package/src/generators/setup-tailwind/schema.json

@@ -21,21 +21,25 @@
         "index": 0
       },
       "x-dropdown": "projects",
-      "x-prompt": "What project would you like to add the Tailwind CSS setup?"
+      "x-prompt": "What project would you like to add the Tailwind CSS setup?",
+      "x-priority": "important"
     },
     "buildTarget": {
       "type": "string",
       "description": "The name of the target used to build the project. This option is not needed in most cases.",
-      "default": "build"
+      "default": "build",
+      "x-priority": "important"
     },
     "skipFormat": {
       "type": "boolean",
-      "description": "Skips formatting the workspace after the generator completes."
+      "description": "Skips formatting the workspace after the generator completes.",
+      "x-priority": "internal"
     },
     "skipPackageJson": {
       "type": "boolean",
       "default": false,
-      "description": "Do not add dependencies to `package.json`."
+      "description": "Do not add dependencies to `package.json`.",
+      "x-priority": "internal"
     }
   },
   "additionalProperties": false,

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupTailwindSchematic = exports.setupTailwindGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
 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");
@@ -31,7 +30,7 @@ function setupTailwindGenerator(tree, options) {
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }
-        return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
+        return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
 exports.setupTailwindGenerator = setupTailwindGenerator;

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

@@ -1 +1 @@
-{"version":3,"file":"setup-tailwind.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/setup-tailwind/setup-tailwind.ts"],"names":[],"mappings":";;;;AACA,yCASsB;AACtB,2FAAqF;AAErF,mDAI8B;AAE9B,iFAA2E;AAC3E,yDAAqD;AAErD,SAAsB,sBAAsB,CAC1C,IAAU,EACV,OAA6B;;QAE7B,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEhE,IACE,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;YACjE,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC,EAClE;YACA,eAAM,CAAC,IAAI,CACT,wKAAwK,CACzK,CAAC;YACF,OAAO;SACR;QAED,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE;YACzE,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QAEH,IAAA,oDAAuB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEhD,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEtC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,KAAK,CAAC,IAAI,CACR,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,YAAY,EAAE,8BAAmB;gBACjC,OAAO,EAAE,yBAAc;gBACvB,WAAW,EAAE,6BAAkB;aAChC,CACF,CACF,CAAC;SACH;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AA5CD,wDA4CC;AAED,kBAAe,sBAAsB,CAAC;AAEzB,QAAA,sBAAsB,GAAG,IAAA,2BAAkB,EACtD,sBAAsB,CACvB,CAAC"}
+{"version":3,"file":"setup-tailwind.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/setup-tailwind/setup-tailwind.ts"],"names":[],"mappings":";;;;AACA,yCASsB;AAEtB,mDAI8B;AAE9B,iFAA2E;AAC3E,yDAAqD;AAErD,SAAsB,sBAAsB,CAC1C,IAAU,EACV,OAA6B;;QAE7B,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEhE,IACE,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;YACjE,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC,EAClE;YACA,eAAM,CAAC,IAAI,CACT,wKAAwK,CACzK,CAAC;YACF,OAAO;SACR;QAED,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE;YACzE,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QAEH,IAAA,oDAAuB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEhD,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEtC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,KAAK,CAAC,IAAI,CACR,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,YAAY,EAAE,8BAAmB;gBACjC,OAAO,EAAE,yBAAc;gBACvB,WAAW,EAAE,6BAAkB;aAChC,CACF,CACF,CAAC;SACH;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AA5CD,wDA4CC;AAED,kBAAe,sBAAsB,CAAC;AAEzB,QAAA,sBAAsB,GAAG,IAAA,2BAAkB,EACtD,sBAAsB,CACvB,CAAC"}

package/src/generators/stories/schema.json

@@ -14,12 +14,14 @@
         "$source": "projectName",
         "index": 0
       },
-      "x-prompt": "For which project do you want to generate stories?"
+      "x-prompt": "For which project do you want to generate stories?",
+      "x-priority": "important"
     },
     "generateCypressSpecs": {
       "type": "boolean",
       "description": "Automatically generate `*.spec.ts` files in the cypress e2e app generated by the cypress-configure generator.",
-      "x-prompt": "Do you want to generate Cypress specs as well?"
+      "x-prompt": "Do you want to generate Cypress specs as well?",
+      "x-priority": "important"
     },
     "cypressProject": {
       "type": "string",

package/src/generators/stories/stories.d.ts

@@ -6,7 +6,7 @@ export interface StorybookStoriesSchema {
     cypressProject?: string;
     ignorePaths?: string[];
 }
-export declare function projectRootPath(config: ProjectConfiguration): string;
+export declare function projectRootPath(tree: Tree, config: ProjectConfiguration): Promise<string>;
 export declare function containsComponentDeclaration(tree: Tree, componentPath: string): boolean;
 export declare function createAllStories(tree: Tree, projectName: string, generateCypressSpecs: boolean, js: boolean, cypressProject?: string, ignorePaths?: string[]): Promise<void>;
 export declare function storiesGenerator(host: Tree, schema: StorybookStoriesSchema): Promise<void>;

package/src/generators/stories/stories.js

@@ -5,49 +5,57 @@ 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");
-const ts = require("typescript");
 const devkit_1 = require("@nrwl/devkit");
 const path_1 = require("path");
-const utilities_1 = require("@nrwl/storybook/src/utils/utilities");
 const minimatch = require("minimatch");
-function projectRootPath(config) {
-    let projectDir;
-    if (config.projectType === 'application') {
-        const { nextBuildTarget } = (0, utilities_1.findStorybookAndBuildTargetsAndCompiler)(config.targets);
-        if (!!nextBuildTarget) {
-            // Next.js apps
-            projectDir = 'components';
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
+let tsModule;
+function projectRootPath(tree, config) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { findStorybookAndBuildTargetsAndCompiler } = yield Promise.resolve().then(() => require('@nrwl/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';
+            }
         }
-        else {
-            // apps/test-app/src/app
-            projectDir = 'app';
+        else if (config.projectType == 'library') {
+            // libs/test-lib/src/lib
+            projectDir = 'lib';
         }
-    }
-    else if (config.projectType == 'library') {
-        // libs/test-lib/src/lib
-        projectDir = 'lib';
-    }
-    return (0, devkit_1.joinPathFragments)(config.sourceRoot, projectDir);
+        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)();
+    }
     const contents = tree.read(componentPath, 'utf-8');
     if (contents === null) {
         throw new Error(`Failed to read ${componentPath}`);
     }
-    const sourceFile = ts.createSourceFile(componentPath, contents, ts.ScriptTarget.Latest, true);
+    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));
 }
 exports.containsComponentDeclaration = containsComponentDeclaration;
 function createAllStories(tree, projectName, generateCypressSpecs, js, cypressProject, ignorePaths) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { isTheFileAStory } = yield Promise.resolve().then(() => require('@nrwl/storybook/src/utils/utilities'));
         const projects = (0, devkit_1.getProjects)(tree);
         const projectConfiguration = projects.get(projectName);
         const { sourceRoot, root } = projectConfiguration;
         let componentPaths = [];
-        (0, devkit_1.visitNotIgnoredFiles)(tree, projectRootPath(projectConfiguration), (path) => {
+        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;
@@ -57,7 +65,7 @@ function createAllStories(tree, projectName, generateCypressSpecs, js, cypressPr
                 (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 (!(0, utilities_1.isTheFileAStory)(tree, path)) {
+                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('.'));

package/src/generators/stories/stories.js.map

@@ -1 +1 @@
-{"version":3,"file":"stories.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/stories/stories.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stories.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/stories/stories.ts"],"names":[],"mappings":"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"}

package/src/generators/storybook-configuration/configuration.d.ts

@@ -1,5 +1,5 @@
 import { StorybookConfigureSchema } from './schema';
 import { Tree } from '@nrwl/devkit';
-export declare function storybookConfigurationGenerator(host: Tree, schema: StorybookConfigureSchema): Promise<import("@nrwl/devkit").GeneratorCallback>;
+export declare function storybookConfigurationGenerator(host: Tree, schema: StorybookConfigureSchema): Promise<any>;
 export default storybookConfigurationGenerator;
 export declare const storybookConfigurationSchematic: (generatorOptions: StorybookConfigureSchema) => (tree: any, context: any) => Promise<any>;

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

@@ -4,13 +4,13 @@ exports.storybookConfigurationSchematic = exports.storybookConfigurationGenerato
 const tslib_1 = require("tslib");
 const stories_1 = require("../stories/stories");
 const devkit_1 = require("@nrwl/devkit");
-const storybook_1 = require("@nrwl/storybook");
-const project_name_1 = require("@nrwl/cypress/src/utils/project-name");
+const versions_1 = require("../../utils/versions");
 function generateStories(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const libConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
-        const libRoot = libConfig.root;
-        const cypressProject = (0, project_name_1.getE2eProjectName)(schema.name, libRoot, schema.cypressDirectory);
+        (0, devkit_1.ensurePackage)('@nrwl/cypress', versions_1.nxVersion);
+        const { getE2eProjectName } = yield Promise.resolve().then(() => require('@nrwl/cypress/src/utils/project-name'));
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
+        const cypressProject = getE2eProjectName(schema.name, projectConfig.root, schema.cypressDirectory);
         yield (0, stories_1.default)(host, {
             project: schema.name,
             generateCypressSpecs: schema.configureCypress && schema.generateCypressSpecs,
@@ -21,8 +21,20 @@ function generateStories(host, schema) {
     });
 }
 function storybookConfigurationGenerator(host, schema) {
+    var _a, _b;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const installTask = yield (0, storybook_1.configurationGenerator)(host, {
+        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nrwl/storybook', versions_1.nxVersion);
+        let bundler = (_a = schema.bundler) !== null && _a !== void 0 ? _a : 'webpack';
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
+        if (projectConfig.projectType === 'application' &&
+            ((_b = projectConfig.targets['build']) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/vite:build') {
+            bundler = 'vite';
+            if (schema.bundler !== 'vite') {
+                devkit_1.logger.info(`The project ${schema.name} is set up to use Vite. So
+      Storybook will be configured to use Vite as well.`);
+            }
+        }
+        const installTask = yield configurationGenerator(host, {
             name: schema.name,
             uiFramework: '@storybook/react',
             configureCypress: schema.configureCypress,
@@ -31,6 +43,12 @@ function storybookConfigurationGenerator(host, schema) {
             cypressDirectory: schema.cypressDirectory,
             standaloneConfig: schema.standaloneConfig,
             tsConfiguration: schema.tsConfiguration,
+            configureTestRunner: schema.configureTestRunner,
+            bundler,
+            storybook7Configuration: schema.storybook7Configuration,
+            storybook7UiFramework: bundler === 'vite'
+                ? '@storybook/react-vite'
+                : '@storybook/react-webpack5',
         });
         if (schema.generateStories) {
             yield generateStories(host, schema);

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

@@ -1 +1 @@
-{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":";;;;AACA,gDAAkD;AAClD,yCAIsB;AACtB,+CAAyD;AACzD,uEAAyE;AAEzE,SAAe,eAAe,CAAC,IAAU,EAAE,MAAgC;;QACzE,MAAM,SAAS,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAC9D,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC;QAC/B,MAAM,cAAc,GAAG,IAAA,gCAAiB,EACtC,MAAM,CAAC,IAAI,EACX,OAAO,EACP,MAAM,CAAC,gBAAgB,CACxB,CAAC;QACF,MAAM,IAAA,iBAAgB,EAAC,IAAI,EAAE;YAC3B,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,oBAAoB,EAClB,MAAM,CAAC,gBAAgB,IAAI,MAAM,CAAC,oBAAoB;YACxD,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,cAAc;YACd,WAAW,EAAE,MAAM,CAAC,WAAW;SAChC,CAAC,CAAC;IACL,CAAC;CAAA;AAED,SAAsB,+BAA+B,CACnD,IAAU,EACV,MAAgC;;QAEhC,MAAM,WAAW,GAAG,MAAM,IAAA,kCAAsB,EAAC,IAAI,EAAE;YACrD,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,WAAW,EAAE,kBAAkB;YAC/B,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,eAAe,EAAE,MAAM,CAAC,eAAe;SACxC,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,eAAe,EAAE;YAC1B,MAAM,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACrC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AApBD,0EAoBC;AAED,kBAAe,+BAA+B,CAAC;AAClC,QAAA,+BAA+B,GAAG,IAAA,2BAAkB,EAC/D,+BAA+B,CAChC,CAAC"}
+{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":";;;;AACA,gDAAkD;AAClD,yCAMsB;AACtB,mDAAiD;AAEjD,SAAe,eAAe,CAAC,IAAU,EAAE,MAAgC;;QACzE,IAAA,sBAAa,EAAC,eAAe,EAAE,oBAAS,CAAC,CAAC;QAC1C,MAAM,EAAE,iBAAiB,EAAE,GAAG,2CAC5B,sCAAsC,EACvC,CAAC;QACF,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAClE,MAAM,cAAc,GAAG,iBAAiB,CACtC,MAAM,CAAC,IAAI,EACX,aAAa,CAAC,IAAI,EAClB,MAAM,CAAC,gBAAgB,CACxB,CAAC;QACF,MAAM,IAAA,iBAAgB,EAAC,IAAI,EAAE;YAC3B,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,oBAAoB,EAClB,MAAM,CAAC,gBAAgB,IAAI,MAAM,CAAC,oBAAoB;YACxD,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,cAAc;YACd,WAAW,EAAE,MAAM,CAAC,WAAW;SAChC,CAAC,CAAC;IACL,CAAC;CAAA;AAED,SAAsB,+BAA+B,CACnD,IAAU,EACV,MAAgC;;;QAEhC,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAA,sBAAa,EAC9C,iBAAiB,EACjB,oBAAS,CACV,CAAC;QAEF,IAAI,OAAO,GAAG,MAAA,MAAM,CAAC,OAAO,mCAAI,SAAS,CAAC;QAC1C,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAElE,IACE,aAAa,CAAC,WAAW,KAAK,aAAa;YAC3C,CAAA,MAAA,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,0CAAE,QAAQ,MAAK,kBAAkB,EAC/D;YACA,OAAO,GAAG,MAAM,CAAC;YACjB,IAAI,MAAM,CAAC,OAAO,KAAK,MAAM,EAAE;gBAC7B,eAAM,CAAC,IAAI,CACT,eAAe,MAAM,CAAC,IAAI;wDACsB,CACjD,CAAC;aACH;SACF;QAED,MAAM,WAAW,GAAG,MAAM,sBAAsB,CAAC,IAAI,EAAE;YACrD,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,WAAW,EAAE,kBAAkB;YAC/B,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;YAC/C,OAAO;YACP,uBAAuB,EAAE,MAAM,CAAC,uBAAuB;YACvD,qBAAqB,EACnB,OAAO,KAAK,MAAM;gBAChB,CAAC,CAAC,uBAAuB;gBACzB,CAAC,CAAC,2BAA2B;SAClC,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,eAAe,EAAE;YAC1B,MAAM,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACrC;QAED,OAAO,WAAW,CAAC;;CACpB;AAhDD,0EAgDC;AAED,kBAAe,+BAA+B,CAAC;AAClC,QAAA,+BAA+B,GAAG,IAAA,2BAAkB,EAC/D,+BAA+B,CAChC,CAAC"}

package/src/generators/storybook-configuration/schema.d.ts

@@ -11,5 +11,7 @@ export interface StorybookConfigureSchema {
   cypressDirectory?: string;
   standaloneConfig?: boolean;
   ignorePaths?: string[];
+  bundler?: 'webpack' | 'vite';
   configureTestRunner?: boolean;
+  storybook7Configuration?: boolean;
 }

package/src/generators/storybook-configuration/schema.json

@@ -15,25 +15,29 @@
         "index": 0
       },
       "x-prompt": "For which project do you want to generate Storybook configuration?",
-      "x-dropdown": "projects"
+      "x-dropdown": "projects",
+      "x-priority": "important"
     },
     "configureCypress": {
       "type": "boolean",
       "description": "Run the cypress-configure generator.",
       "x-prompt": "Configure a cypress e2e app to run against the storybook instance?",
-      "default": true
+      "default": true,
+      "x-priority": "important"
     },
     "generateStories": {
       "type": "boolean",
       "description": "Automatically generate `*.stories.ts` files for components declared in this project?",
       "x-prompt": "Automatically generate *.stories.ts files for components declared in this project?",
-      "default": true
+      "default": true,
+      "x-priority": "important"
     },
     "generateCypressSpecs": {
       "type": "boolean",
       "description": "Automatically generate test files in the Cypress E2E app generated by the `cypress-configure` generator.",
       "x-prompt": "Automatically generate test files in the Cypress E2E app generated by the cypress-configure generator?",
-      "default": true
+      "default": true,
+      "x-priority": "important"
     },
     "cypressDirectory": {
       "type": "string",
@@ -52,12 +56,14 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint", "tslint"],
+      "enum": ["eslint"],
       "default": "eslint"
     },
     "standaloneConfig": {
       "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
-      "type": "boolean"
+      "type": "boolean",
+      "default": true,
+      "x-deprecated": "Nx only supports standaloneConfig"
     },
     "ignorePaths": {
       "type": "array",
@@ -76,8 +82,19 @@
     },
     "configureTestRunner": {
       "type": "boolean",
-      "description": "Add a Storybook Test-Runner target.",
-      "x-prompt": "Add a Storybook Test-Runner target?"
+      "description": "Add a Storybook Test-Runner target."
+    },
+    "bundler": {
+      "description": "The Storybook builder to use.",
+      "enum": ["vite", "webpack"],
+      "x-priority": "important"
+    },
+    "storybook7Configuration": {
+      "description": "Configure your workspace using Storybook version 7.",
+      "type": "boolean",
+      "default": false,
+      "hidden": true,
+      "aliases": ["storybook7betaConfiguration"]
     }
   },
   "required": ["name"],

package/src/migrations/update-13-0-0/webpack5-changes-utils.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const devkit_2 = require("@nrwl/devkit");
 const ts = require("typescript");
-const find_nodes_1 = require("@nrwl/workspace/src/utilities/typescript/find-nodes");
+const typescript_1 = require("nx/src/utils/typescript");
 function migrateToWebPack5(tree) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         allReactProjectsWithStorybookConfiguration(tree).forEach((project) => {
@@ -61,10 +61,10 @@ function editProjectMainJs(tree, projectMainJsFile, projectName) {
         const file = getTsSourceFile(tree, projectMainJsFile);
         const appFileContent = tree.read(projectMainJsFile, 'utf-8');
         newContents = appFileContent;
-        moduleExportsFull = (0, find_nodes_1.findNodes)(file, [ts.SyntaxKind.ExpressionStatement]);
+        moduleExportsFull = (0, typescript_1.findNodes)(file, [ts.SyntaxKind.ExpressionStatement]);
         if (moduleExportsFull && moduleExportsFull[0]) {
             const moduleExports = moduleExportsFull[0];
-            const listOfStatements = (0, find_nodes_1.findNodes)(moduleExports, [
+            const listOfStatements = (0, typescript_1.findNodes)(moduleExports, [
                 ts.SyntaxKind.SyntaxList,
             ]);
             /**

package/src/migrations/update-13-0-0/webpack5-changes-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpack5-changes-utils.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-13-0-0/webpack5-changes-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webpack5-changes-utils.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-13-0-0/webpack5-changes-utils.ts"],"names":[],"mappings":"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"}