Revert "feat(repo): update storybook to v7 (nrwl#16174)"

This reverts commit c4d9a5b.
FrozenPandaz · Apr 12, 2023 · 9f57ec3 · 9f57ec3
1 parent e5b48ac
commit 9f57ec3
Show file tree

Hide file tree

Showing 22 changed files with 4,935 additions and 1,927 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -6,7 +6,7 @@
   },
   "ignorePatterns": ["**/*.ts"],
   "plugins": ["@typescript-eslint", "@nrwl/nx"],
-  "extends": ["plugin:storybook/recommended"],
+  "extends": [],
   "rules": {
     "@typescript-eslint/explicit-module-boundary-types": "off",
     "no-restricted-imports": ["error", "create-nx-workspace"]

diff --git a/e2e/storybook-angular/src/storybook-angular.test.ts b/e2e/storybook-angular/src/storybook-angular.test.ts
@@ -15,7 +15,7 @@ describe('Storybook executors for Angular', () => {
   const angularStorybookLib = uniq('test-ui-ng-lib');
   beforeAll(() => {
     newProject();
-    runCLI(`g @nrwl/angular:library ${angularStorybookLib} --no-interactive`);
+    createTestUILib(angularStorybookLib);
     runCLI(
       `generate @nrwl/angular:storybook-configuration ${angularStorybookLib} --configureCypress --generateStories --generateCypressSpecs --no-interactive`
     );
@@ -25,7 +25,8 @@ describe('Storybook executors for Angular', () => {
     cleanupProject();
   });
 
-  describe('serve and build storybook', () => {
+  // TODO: Enable on SB7
+  xdescribe('serve and build storybook', () => {
     afterAll(() => killPorts());
 
     it('should serve an Angular based Storybook setup', async () => {
@@ -48,7 +49,6 @@ describe('Storybook executors for Angular', () => {
   xdescribe('run cypress tests using storybook', () => {
     it('should execute e2e tests using Cypress running against Storybook', async () => {
       if (runCypressTests()) {
-        addTestButtonToUILib(angularStorybookLib);
         writeFileSync(
           tmpProjPath(
             `apps/${angularStorybookLib}-e2e/src/e2e/test-button/test-button.component.cy.ts`
@@ -82,7 +82,8 @@ describe('Storybook executors for Angular', () => {
   });
 });
 
-function addTestButtonToUILib(libName: string): void {
+export function createTestUILib(libName: string): void {
+  runCLI(`g @nrwl/angular:library ${libName} --no-interactive`);
   runCLI(
     `g @nrwl/angular:component test-button --project=${libName} --no-interactive`
   );

diff --git a/e2e/storybook/src/storybook-nested.test.ts b/e2e/storybook/src/storybook-nested.test.ts
@@ -1,7 +1,6 @@
 import {
   checkFilesExist,
   cleanupProject,
-  getSelectedPackageManager,
   killPorts,
   readJson,
   runCLI,
@@ -11,7 +10,6 @@ import {
   uniq,
 } from '@nrwl/e2e/utils';
 import { writeFileSync } from 'fs';
-import { createFileSync } from 'fs-extra';
 
 describe('Storybook generators and executors for standalone workspaces - using React + Vite', () => {
   const wsName = uniq('react');
@@ -24,7 +22,6 @@ describe('Storybook generators and executors for standalone workspaces - using R
       appName,
       style: 'css',
       bundler: 'vite',
-      packageManager: getSelectedPackageManager(),
     });
 
     runCLI(
@@ -53,94 +50,82 @@ describe('Storybook generators and executors for standalone workspaces - using R
     });
   });
 
-  describe('serve storybook', () => {
+  // TODO: Use --storybook7Configuration and re-enable this test - or else it NEEDS NODE 16
+  xdescribe('serve storybook', () => {
     afterEach(() => killPorts());
 
     it('should serve a React based Storybook setup that uses Vite', async () => {
       const p = await runCommandUntil(`run ${appName}:storybook`, (output) => {
         return /Storybook.*started/gi.test(output);
       });
       p.kill();
-    }, 60000);
+    }, 40000);
   });
 
-  describe('build storybook', () => {
+  // TODO: Use --storybook7Configuration and re-enable this test - or else it NEEDS NODE 16
+  xdescribe('build storybook', () => {
     it('should build a React based storybook that uses Vite', () => {
       runCLI(`run ${appName}:build-storybook --verbose`);
       checkFilesExist(`dist/storybook/${appName}/index.html`);
-    }, 60000);
+    }, 40000);
 
-    // This needs fixing on the Storybook side
-    // vite paths resolution is not working on standalone
+    // This test makes sure path resolution works
     xit('should build a React based storybook that references another lib and uses Vite', () => {
-      const anotherReactLib = uniq('test-another-lib-react');
-      runCLI(`generate @nrwl/react:lib ${anotherReactLib} --no-interactive`);
+      const reactLib = uniq('test-lib-react');
+      runCLI(`generate @nrwl/react:lib ${reactLib} --no-interactive`);
       // create a React component we can reference
-      createFileSync(tmpProjPath(`${anotherReactLib}/src/lib/mytestcmp.tsx`));
       writeFileSync(
-        tmpProjPath(`${anotherReactLib}/src/lib/mytestcmp.tsx`),
+        tmpProjPath(`${reactLib}/src/lib/mytestcmp.tsx`),
         `
-        export function MyTestCmp() {
-          return (
-            <div>
-              <h1>Welcome to OtherLib!</h1>
-            </div>
-          );
-        }
-        
-        export default MyTestCmp;
+            import React from 'react';
+
+            /* eslint-disable-next-line */
+            export interface MyTestCmpProps {}
+
+            export const MyTestCmp = (props: MyTestCmpProps) => {
+              return (
+                <div>
+                  <h1>Welcome to test cmp!</h1>
+                </div>
+              );
+            };
+
+            export default MyTestCmp;
         `
       );
       // update index.ts and export it
       writeFileSync(
-        tmpProjPath(`${anotherReactLib}/src/index.ts`),
+        tmpProjPath(`${reactLib}/src/index.ts`),
         `
             export * from './lib/mytestcmp';
         `
       );
 
-      // create a component and a story in the first lib to reference the cmp from the 2nd lib
-      createFileSync(tmpProjPath(`src/app/test-button.tsx`));
+      // create a story in the first lib to reference the cmp from the 2nd lib
       writeFileSync(
-        tmpProjPath(`src/app/test-button.tsx`),
+        tmpProjPath(`${reactLib}/src/lib/myteststory.stories.tsx`),
         `
-          import { MyTestCmp } from '@${wsName}/${anotherReactLib}';
+            import React from 'react';
 
-          export function TestButton() {
-            return (
-              <div>
-                <MyTestCmp />
-              </div>
-            );
-          }
+            import { MyTestCmp, MyTestCmpProps } from '@${wsName}/${reactLib}';
 
-          export default TestButton;
-        `
-      );
+            export default {
+              component: MyTestCmp,
+              title: 'MyTestCmp',
+            };
 
-      // create a story in the first lib to reference the cmp from the 2nd lib
-      createFileSync(tmpProjPath(`src/app/test-button.stories.tsx`));
-      writeFileSync(
-        tmpProjPath(`src/app/test-button.stories.tsx`),
+            export const primary = () => {
+              /* eslint-disable-next-line */
+              const props: MyTestCmpProps = {};
+
+              return <MyTestCmp />;
+            };
         `
-        import type { Meta } from '@storybook/react';
-        import { TestButton } from './test-button';
-        
-        const Story: Meta<typeof TestButton> = {
-          component: TestButton,
-          title: 'TestButton',
-        };
-        export default Story;
-        
-        export const Primary = {
-          args: {},
-        };
-              `
       );
 
       // build React lib
-      runCLI(`run ${appName}:build-storybook --verbose`);
-      checkFilesExist(`dist/storybook/${appName}/index.html`);
-    }, 60000);
+      runCLI(`run ${reactLib}:build-storybook --verbose`);
+      checkFilesExist(`dist/storybook/${reactLib}/index.html`);
+    }, 40000);
   });
 });
diff --git a/e2e/storybook/src/storybook.test.ts b/e2e/storybook/src/storybook.test.ts
@@ -2,28 +2,47 @@ import {
   checkFilesExist,
   cleanupProject,
   killPorts,
-  newProject,
   runCLI,
   runCommandUntil,
   tmpProjPath,
   uniq,
+  getPackageManagerCommand,
+  runCommand,
+  newProject,
+  updateJson,
 } from '@nrwl/e2e/utils';
 import { writeFileSync } from 'fs';
 
-// TODO: re-enable once the issue is fixed with long build times
-describe.skip('Storybook generators and executors for monorepos', () => {
+describe('Storybook generators and executors for monorepos', () => {
+  const previousPM = process.env.SELECTED_PM;
   const reactStorybookLib = uniq('test-ui-lib-react');
   let proj;
   beforeAll(() => {
-    proj = newProject();
+    process.env.SELECTED_PM = 'yarn';
+    proj = newProject({
+      packageManager: 'yarn',
+    });
     runCLI(`generate @nrwl/react:lib ${reactStorybookLib} --no-interactive`);
     runCLI(
       `generate @nrwl/react:storybook-configuration ${reactStorybookLib} --generateStories --no-interactive --bundler=webpack`
     );
+
+    // TODO(jack): Overriding enhanced-resolve to 5.10.0 now until the package is fixed.
+    // TODO: Use --storybook7Configuration and remove this
+    // See: https://github.com/webpack/enhanced-resolve/issues/362
+    updateJson('package.json', (json) => {
+      json['overrides'] = {
+        'enhanced-resolve': '5.10.0',
+      };
+
+      return json;
+    });
+    runCommand(getPackageManagerCommand().install);
   });
 
   afterAll(() => {
     cleanupProject();
+    process.env.SELECTED_PM = previousPM;
   });
 
   describe('serve and build storybook', () => {
@@ -38,13 +57,13 @@ describe.skip('Storybook generators and executors for monorepos', () => {
         }
       );
       p.kill();
-    }, 60000);
+    }, 50000);
 
     it('should build a React based storybook setup that uses webpack', () => {
       // build
       runCLI(`run ${reactStorybookLib}:build-storybook --verbose`);
       checkFilesExist(`dist/storybook/${reactStorybookLib}/index.html`);
-    }, 60000);
+    }, 50000);
 
     // This test makes sure path resolution works
     it('should build a React based storybook that references another lib and uses webpack', () => {
@@ -98,6 +117,6 @@ describe.skip('Storybook generators and executors for monorepos', () => {
       // build React lib
       runCLI(`run ${reactStorybookLib}:build-storybook --verbose`);
       checkFilesExist(`dist/storybook/${reactStorybookLib}/index.html`);
-    }, 60000);
+    }, 50000);
   });
 });
diff --git a/graph/client/.storybook/main.js b/graph/client/.storybook/main.js
@@ -1,16 +1,12 @@
-/* eslint-disable storybook/no-uninstalled-addons */
 module.exports = {
-  stories: ['../src/app/**/*.stories.@(mdx|js|jsx|ts|tsx)'],
+  core: { builder: 'webpack5' },
+  stories: [
+    '../src/app/**/*.stories.mdx',
+    '../src/app/**/*.stories.@(js|jsx|ts|tsx)',
+  ],
   addons: [
     '@storybook/addon-essentials',
     '@nrwl/react/plugins/storybook',
     'storybook-dark-mode',
   ],
-  framework: {
-    name: '@storybook/react-webpack5',
-    options: {},
-  },
-  docs: {
-    autodocs: true,
-  },
 };
diff --git a/graph/client/project.json b/graph/client/project.json
@@ -245,6 +245,7 @@
     "storybook": {
       "executor": "@nrwl/storybook:storybook",
       "options": {
+        "uiFramework": "@storybook/react",
         "port": 4400,
         "configDir": "graph/client/.storybook"
       },
@@ -258,6 +259,7 @@
       "executor": "@nrwl/storybook:build",
       "outputs": ["{options.outputDir}"],
       "options": {
+        "uiFramework": "@storybook/react",
         "configDir": "graph/client/.storybook",
         "outputDir": "dist/storybook/graph-client"
       },

diff --git a/graph/ui-components/.storybook/main.js b/graph/ui-components/.storybook/main.js
@@ -1,12 +1,8 @@
-/* eslint-disable storybook/no-uninstalled-addons */
 module.exports = {
-  stories: ['../src/lib/**/*.stories.@(mdx|js|jsx|ts|tsx)'],
+  core: { builder: 'webpack5' },
+  stories: [
+    '../src/lib/**/*.stories.mdx',
+    '../src/lib/**/*.stories.@(js|jsx|ts|tsx)',
+  ],
   addons: ['@storybook/addon-essentials', '@nrwl/react/plugins/storybook'],
-  framework: {
-    name: '@storybook/react-webpack5',
-    options: {},
-  },
-  docs: {
-    autodocs: true,
-  },
 };
diff --git a/graph/ui-components/project.json b/graph/ui-components/project.json
@@ -10,6 +10,7 @@
     "storybook": {
       "executor": "@nrwl/storybook:storybook",
       "options": {
+        "uiFramework": "@storybook/react",
         "port": 4400,
         "configDir": "graph/ui-components/.storybook"
       },
@@ -23,6 +24,7 @@
       "executor": "@nrwl/storybook:build",
       "outputs": ["{options.outputDir}"],
       "options": {
+        "uiFramework": "@storybook/react",
         "configDir": "graph/ui-components/.storybook",
         "outputDir": "dist/storybook/graph-ui-components"
       },

diff --git a/graph/ui-graph/.storybook/main.js b/graph/ui-graph/.storybook/main.js
@@ -1,12 +1,8 @@
-/* eslint-disable storybook/no-uninstalled-addons */
 module.exports = {
-  stories: ['../src/lib/**/*.stories.@(mdx|js|jsx|ts|tsx)'],
+  core: { builder: 'webpack5' },
+  stories: [
+    '../src/lib/**/*.stories.mdx',
+    '../src/lib/**/*.stories.@(js|jsx|ts|tsx)',
+  ],
   addons: ['@storybook/addon-essentials', '@nrwl/react/plugins/storybook'],
-  framework: {
-    name: '@storybook/react-webpack5',
-    options: {},
-  },
-  docs: {
-    autodocs: true,
-  },
 };
diff --git a/graph/ui-graph/project.json b/graph/ui-graph/project.json
@@ -10,6 +10,7 @@
     "storybook": {
       "executor": "@nrwl/storybook:storybook",
       "options": {
+        "uiFramework": "@storybook/react",
         "port": 4400,
         "configDir": "graph/ui-graph/.storybook"
       },
@@ -23,6 +24,7 @@
       "executor": "@nrwl/storybook:build",
       "outputs": ["{options.outputDir}"],
       "options": {
+        "uiFramework": "@storybook/react",
         "configDir": "graph/ui-graph/.storybook",
         "outputDir": "dist/storybook/graph-ui-graph"
       },