refactor(builders): require react in the SB app context as it is prov…

…iding it
storybookjs · Apr 22, 2021 · 833b7f0 · 833b7f0
1 parent 16a5deb
commit 833b7f0
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 42 deletions.
diff --git a/lib/builder-webpack4/package.json b/lib/builder-webpack4/package.json
@@ -120,15 +120,6 @@
     "@types/webpack-hot-middleware": "^2.25.3",
     "@types/webpack-virtual-modules": "^0.1.0"
   },
-  "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0",
-    "react-dom": "^16.8.0 || ^17.0.0"
-  },
-  "peerDependenciesMeta": {
-    "typescript": {
-      "optional": true
-    }
-  },
   "publishConfig": {
     "access": "public"
   },

diff --git a/lib/builder-webpack4/src/preview/iframe-webpack.config.ts b/lib/builder-webpack4/src/preview/iframe-webpack.config.ts
@@ -198,8 +198,16 @@ export default async ({
       alias: {
         ...themingPaths,
         ...storybookPaths,
-        react: path.dirname(require.resolve('react/package.json')),
-        'react-dom': path.dirname(require.resolve('react-dom/package.json')),
+        react: path.dirname(
+          require.resolve('react/package.json', {
+            paths: [require.resolve(`@storybook/${framework}`)],
+          })
+        ),
+        'react-dom': path.dirname(
+          require.resolve('react-dom/package.json', {
+            paths: [require.resolve(`@storybook/${framework}`)],
+          })
+        ),
       },
 
       plugins: [

diff --git a/lib/builder-webpack5/package.json b/lib/builder-webpack5/package.json
@@ -110,15 +110,6 @@
     "@types/webpack-hot-middleware": "^2.25.3",
     "@types/webpack-virtual-modules": "^0.1.0"
   },
-  "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0",
-    "react-dom": "^16.8.0 || ^17.0.0"
-  },
-  "peerDependenciesMeta": {
-    "typescript": {
-      "optional": true
-    }
-  },
   "publishConfig": {
     "access": "public"
   },

diff --git a/lib/builder-webpack5/src/preview/iframe-webpack.config.ts b/lib/builder-webpack5/src/preview/iframe-webpack.config.ts
@@ -199,8 +199,16 @@ export default async ({
       alias: {
         ...themingPaths,
         ...storybookPaths,
-        react: path.dirname(require.resolve('react/package.json')),
-        'react-dom': path.dirname(require.resolve('react-dom/package.json')),
+        react: path.dirname(
+          require.resolve('react/package.json', {
+            paths: [require.resolve(`@storybook/${framework}`)],
+          })
+        ),
+        'react-dom': path.dirname(
+          require.resolve('react-dom/package.json', {
+            paths: [require.resolve(`@storybook/${framework}`)],
+          })
+        ),
       },
 
       plugins: [

diff --git a/lib/core-client/package.json b/lib/core-client/package.json
@@ -62,11 +62,6 @@
     "react-dom": "^16.8.0 || ^17.0.0",
     "webpack": "*"
   },
-  "peerDependenciesMeta": {
-    "typescript": {
-      "optional": true
-    }
-  },
   "publishConfig": {
     "access": "public"
   },

diff --git a/yarn.lock b/yarn.lock
@@ -6783,12 +6783,6 @@ __metadata:
     webpack-filter-warnings-plugin: ^1.2.1
     webpack-hot-middleware: ^2.25.0
     webpack-virtual-modules: ^0.2.2
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0
-    react-dom: ^16.8.0 || ^17.0.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
   languageName: unknown
   linkType: soft
 
@@ -6863,12 +6857,6 @@ __metadata:
     webpack-dev-middleware: ^4.1.0
     webpack-hot-middleware: ^2.25.0
     webpack-virtual-modules: ^0.4.1
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0
-    react-dom: ^16.8.0 || ^17.0.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
   languageName: unknown
   linkType: soft
 
@@ -7067,9 +7055,6 @@ __metadata:
     react: ^16.8.0 || ^17.0.0
     react-dom: ^16.8.0 || ^17.0.0
     webpack: "*"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
   languageName: unknown
   linkType: soft