Merge pull request #17705 from storybookjs/fix-pnp-tests

Addon-docs: Fix dependencies for yarn pnp
storybookjs · Apr 1, 2022 · ab1edc8 · ab1edc8
2 parents d3b4566 + bfbb086
commit ab1edc8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 33 deletions.
diff --git a/addons/docs/package.json b/addons/docs/package.json
@@ -73,6 +73,7 @@
     "@storybook/source-loader": "6.5.0-alpha.52",
     "@storybook/store": "6.5.0-alpha.52",
     "@storybook/theming": "6.5.0-alpha.52",
+    "babel-loader": "^8.0.0",
     "core-js": "^3.8.2",
     "fast-deep-equal": "^3.1.3",
     "global": "^4.4.0",
@@ -86,23 +87,14 @@
   "devDependencies": {
     "@babel/core": "^7.12.10",
     "@storybook/mdx2-csf": "canary",
-    "@types/util-deprecate": "^1.0.0",
-    "babel-loader": "^8.0.0",
-    "webpack": "4"
+    "@types/util-deprecate": "^1.0.0"
   },
   "peerDependencies": {
     "@storybook/mdx2-csf": "*",
     "react": "^16.8.0 || ^17.0.0",
-    "react-dom": "^16.8.0 || ^17.0.0",
-    "webpack": "*"
+    "react-dom": "^16.8.0 || ^17.0.0"
   },
   "peerDependenciesMeta": {
-    "@storybook/builder-webpack4": {
-      "optional": true
-    },
-    "@storybook/builder-webpack5": {
-      "optional": true
-    },
     "@storybook/mdx2-csf": {
       "optional": true
     },
@@ -111,9 +103,6 @@
     },
     "react-dom": {
       "optional": true
-    },
-    "webpack": {
-      "optional": true
     }
   },
   "publishConfig": {

diff --git a/addons/docs/src/frameworks/common/preset.ts b/addons/docs/src/frameworks/common/preset.ts
@@ -3,7 +3,7 @@ import remarkSlug from 'remark-slug';
 import remarkExternalLinks from 'remark-external-links';
 import global from 'global';
 
-import type { BuilderConfig, Options } from '@storybook/core-common';
+import type { Options } from '@storybook/core-common';
 import { logger } from '@storybook/node-logger';
 
 // for frameworks that are not working with react, we need to configure
@@ -38,16 +38,7 @@ export async function webpack(
       typeof createCompiler
     >[0] */
 ) {
-  const { builder = 'webpack4' } = await options.presets.apply<{
-    builder: BuilderConfig;
-  }>('core', {} as any);
-
-  const builderName = typeof builder === 'string' ? builder : builder.name;
-  const resolvedBabelLoader = require.resolve('babel-loader', {
-    paths: builderName.match(/^webpack(4|5)$/)
-      ? [require.resolve(`@storybook/builder-${builderName}`)]
-      : [builderName],
-  });
+  const resolvedBabelLoader = require.resolve('babel-loader');
 
   const { module = {} } = webpackConfig;
 

diff --git a/yarn.lock b/yarn.lock
@@ -6334,25 +6334,17 @@ __metadata:
     remark-slug: ^6.0.0
     ts-dedent: ^2.0.0
     util-deprecate: ^1.0.2
-    webpack: 4
   peerDependencies:
     "@storybook/mdx2-csf": "*"
     react: ^16.8.0 || ^17.0.0
     react-dom: ^16.8.0 || ^17.0.0
-    webpack: "*"
   peerDependenciesMeta:
-    "@storybook/builder-webpack4":
-      optional: true
-    "@storybook/builder-webpack5":
-      optional: true
     "@storybook/mdx2-csf":
       optional: true
     react:
       optional: true
     react-dom:
       optional: true
-    webpack:
-      optional: true
   languageName: unknown
   linkType: soft