fix(storybook): re-enable x-prompt and remove custom handling (#17360)

nrwl · Jun 2, 2023 · 6d147b6 · 6d147b6 · vercel · Jun 2, 2023
1 parent 8a7f79f
commit 6d147b6
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 49 deletions.
diff --git a/docs/generated/packages/storybook/generators/configuration.json b/docs/generated/packages/storybook/generators/configuration.json
@@ -89,6 +89,7 @@
           "@storybook/web-components-vite"
         ],
         "aliases": ["storybook7UiFramework"],
+        "x-prompt": "Choose the Storybook framework that you need to use.",
         "x-priority": "important",
         "hidden": false
       },

diff --git a/packages/storybook/package.json b/packages/storybook/package.json
@@ -31,7 +31,6 @@
   },
   "dependencies": {
     "dotenv": "~10.0.0",
-    "enquirer": "~2.3.6",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "semver": "7.3.4",
     "@nx/cypress": "file:../cypress",

diff --git a/packages/storybook/src/generators/configuration/configuration-nested.spec.ts b/packages/storybook/src/generators/configuration/configuration-nested.spec.ts
@@ -6,7 +6,6 @@ import {
   writeJson,
 } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import * as enquirer from 'enquirer';
 
 import configurationGenerator from './configuration';
 import * as workspaceConfiguration from './test-configs/root-workspace-configuration.json';
@@ -19,9 +18,6 @@ jest.mock('nx/src/project-graph/project-graph', () => ({
     .mockImplementation(async () => ({ nodes: {}, dependencies: {} })),
 }));
 
-jest.mock('enquirer');
-// @ts-ignore
-enquirer.prompt = jest.fn();
 describe('@nx/storybook:configuration for workspaces with Root project', () => {
   beforeAll(() => {
     process.env.NX_INTERACTIVE = 'true';
@@ -32,10 +28,6 @@ describe('@nx/storybook:configuration for workspaces with Root project', () => {
   });
   describe('basic functionalities', () => {
     let tree: Tree;
-    // @ts-ignore
-    enquirer.prompt = jest
-      .fn()
-      .mockReturnValue(Promise.resolve({ bundler: 'webpack' }));
     beforeEach(async () => {
       tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
       updateJson<NxJsonConfiguration>(tree, 'nx.json', (json) => {

diff --git a/packages/storybook/src/generators/configuration/configuration.spec.ts b/packages/storybook/src/generators/configuration/configuration.spec.ts
@@ -10,7 +10,6 @@ import {
   writeJson,
 } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import * as enquirer from 'enquirer';
 
 import { Linter } from '@nx/linter';
 import { libraryGenerator } from '@nx/js';
@@ -26,9 +25,6 @@ jest.mock('nx/src/project-graph/project-graph', () => ({
     .fn()
     .mockImplementation(async () => ({ nodes: {}, dependencies: {} })),
 }));
-jest.mock('enquirer');
-// @ts-ignore
-enquirer.prompt = jest.fn();
 
 describe('@nx/storybook:configuration for Storybook v7', () => {
   describe('basic functionalities', () => {

diff --git a/packages/storybook/src/generators/configuration/configuration.ts b/packages/storybook/src/generators/configuration/configuration.ts
@@ -39,7 +39,6 @@ import {
   storybookVersion,
   tsNodeVersion,
 } from '../../utils/versions';
-import { getGeneratorConfigurationOptions } from './lib/user-prompts';
 
 export async function configurationGenerator(
   tree: Tree,
@@ -49,10 +48,6 @@ export async function configurationGenerator(
     throw new Error(pleaseUpgrade());
   }
 
-  if (process.env.NX_INTERACTIVE === 'true') {
-    rawSchema = await getGeneratorConfigurationOptions(rawSchema);
-  }
-
   const schema = normalizeSchema(rawSchema);
 
   const tasks: GeneratorCallback[] = [];

diff --git a/packages/storybook/src/generators/configuration/lib/user-prompts.ts b/packages/storybook/src/generators/configuration/lib/user-prompts.ts
diff --git a/packages/storybook/src/generators/configuration/schema.json b/packages/storybook/src/generators/configuration/schema.json
@@ -89,6 +89,7 @@
         "@storybook/web-components-vite"
       ],
       "aliases": ["storybook7UiFramework"],
+      "x-prompt": "Choose the Storybook framework that you need to use.",
       "x-priority": "important",
       "hidden": false
     },