feat(storybook): import builder from core-server, not core (#9562)

nrwl · Mar 29, 2022 · f3dde18 · f3dde18 · vercel · Mar 29, 2022
1 parent 3c6f880
commit f3dde18
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -71,7 +71,6 @@
     "@nrwl/react": "13.10.0-beta.6",
     "@nrwl/web": "13.10.0-beta.6",
     "@nrwl/workspace": "13.10.0-beta.6",
-    "nx": "13.10.0-beta.6",
     "@parcel/watcher": "2.0.4",
     "@phenomnomnominal/tsquery": "4.1.1",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
@@ -87,10 +86,11 @@
     "@storybook/addon-knobs": "~6.3.0",
     "@storybook/angular": "~6.4.12",
     "@storybook/core": "~6.4.12",
+    "@storybook/core-server": "^6.4.19",
     "@storybook/react": "~6.4.12",
     "@svgr/webpack": "^6.1.2",
-    "@swc/core": "^1.2.152",
     "@swc-node/register": "^1.4.2",
+    "@swc/core": "^1.2.152",
     "@testing-library/react": "11.2.6",
     "@testing-library/react-hooks": "7.0.1",
     "@tippyjs/react": "^4.2.6",
@@ -192,6 +192,7 @@
     "ng-packagr": "~13.3.0",
     "ngrx-store-freeze": "0.2.4",
     "node-fetch": "^2.6.7",
+    "nx": "13.10.0-beta.6",
     "open": "^8.4.0",
     "parse-markdown-links": "^1.0.4",
     "parse5": "4.0.0",
@@ -309,4 +310,3 @@
     "immer": "~9.0.6"
   }
 }
-
diff --git a/packages/storybook/migrations.json b/packages/storybook/migrations.json
@@ -81,6 +81,15 @@
     }
   },
   "packageJsonUpdates": {
+    "13.10.0": {
+      "version": "13.10.0-beta.0",
+      "packages": {
+        "@storybook/core-server": {
+          "version": "~6.4.12",
+          "alwaysAddToPackageJson": true
+        }
+      }
+    },
     "13.4.5": {
       "version": "13.4.5-beta.1",
       "packages": {

diff --git a/packages/storybook/src/executors/storybook/storybook.impl.spec.ts b/packages/storybook/src/executors/storybook/storybook.impl.spec.ts
@@ -3,10 +3,10 @@ import * as fs from 'fs';
 
 import { ExecutorContext } from '@nrwl/devkit';
 
-jest.mock('@storybook/core/server', () => ({
+jest.mock('@storybook/core-server', () => ({
   buildDevStandalone: jest.fn().mockImplementation(() => Promise.resolve()),
 }));
-import { buildDevStandalone } from '@storybook/core/server';
+import { buildDevStandalone } from '@storybook/core-server';
 
 import storybookExecutor, { StorybookExecutorOptions } from './storybook.impl';
 import { join } from 'path';

diff --git a/packages/storybook/src/executors/storybook/storybook.impl.ts b/packages/storybook/src/executors/storybook/storybook.impl.ts
@@ -1,5 +1,5 @@
 import { ExecutorContext, logger } from '@nrwl/devkit';
-import { buildDevStandalone } from '@storybook/core/server';
+import { buildDevStandalone } from '@storybook/core-server';
 import 'dotenv/config';
 import { showStorybookV5Warning } from '../../utils/utilities';
 import { CommonNxStorybookConfig } from '../models';

diff --git a/packages/storybook/src/generators/init/__snapshots__/init.spec.ts.snap b/packages/storybook/src/generators/init/__snapshots__/init.spec.ts.snap
@@ -11,6 +11,7 @@ Object {
     "@storybook/addon-essentials": "~6.4.12",
     "@storybook/angular": "~6.4.12",
     "@storybook/builder-webpack5": "~6.4.12",
+    "@storybook/core-server": "~6.4.12",
     "@storybook/manager-webpack5": "~6.4.12",
     "existing": "1.0.0",
     "webpack": "^5.64.0",

diff --git a/packages/storybook/src/generators/init/init.spec.ts b/packages/storybook/src/generators/init/init.spec.ts
@@ -40,6 +40,9 @@ describe('@nrwl/storybook:init', () => {
       expect(
         packageJson.devDependencies['@storybook/addon-essentials']
       ).toBeDefined();
+      expect(
+        packageJson.devDependencies['@storybook/core-server']
+      ).toBeDefined();
 
       // angular specific
       expect(packageJson.devDependencies['@storybook/angular']).toBeDefined();

diff --git a/packages/storybook/src/generators/init/init.ts b/packages/storybook/src/generators/init/init.ts
@@ -37,6 +37,13 @@ function checkDependenciesInstalled(host: Tree, schema: Schema) {
    * Leave it alone.
    */
 
+  if (
+    !packageJson.dependencies['@storybook/core-server'] &&
+    !packageJson.devDependencies['@storybook/core-server']
+  ) {
+    devDependencies['@storybook/core-server'] = storybookVersion;
+  }
+
   if (
     !packageJson.dependencies['@storybook/addon-essentials'] &&
     !packageJson.devDependencies['@storybook/addon-essentials']

diff --git a/scripts/depcheck/missing.ts b/scripts/depcheck/missing.ts
@@ -87,6 +87,7 @@ const IGNORE_MATCHES = {
     '@storybook/addon-knobs',
     '@storybook/addon-essentials',
     '@storybook/core',
+    '@storybook/core-server',
     'rxjs',
   ],
   nx: [

diff --git a/yarn.lock b/yarn.lock
@@ -3803,7 +3803,7 @@
   dependencies:
     core-js "^3.8.2"
 
-"@storybook/core-server@6.4.19":
+"@storybook/core-server@6.4.19", "@storybook/core-server@^6.4.19":
   version "6.4.19"
   resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.4.19.tgz#0d1b4b2094749b8bce03e3d01422e14e5fef8e66"
   integrity sha512-bKsUB9f7hl5ya2JXxpIrErmbDQjoH39FVbzYZWjMo4t/b7+Xyi6vYadwyWcqlpUQmis09ZaSMv8L/Tw0TuwLAA==