Provide location of babel-loader from builder-webpack5

storybookjs · Oct 18, 2022 · bf16c57 · bf16c57
1 parent 22c2f06
commit bf16c57
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json
@@ -82,22 +82,17 @@
     "@babel/core": "^7.12.10",
     "@storybook/mdx2-csf": "0.0.4-canary.14.04ffbe8.0",
     "@types/util-deprecate": "^1.0.0",
-    "babel-loader": "^8.2.5",
     "typescript": "~4.6.3"
   },
   "peerDependencies": {
     "@storybook/mdx2-csf": "0.0.4-canary.14.04ffbe8.0",
-    "babel-loader": "^8.2.5",
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "peerDependenciesMeta": {
     "@storybook/mdx2-csf": {
       "optional": true
     },
-    "babel-loader": {
-      "optional": true
-    },
     "react": {
       "optional": true
     },

diff --git a/code/addons/docs/src/preset.ts b/code/addons/docs/src/preset.ts
@@ -48,7 +48,7 @@ export async function webpack(
       typeof createCompiler
     >[0] */
 ) {
-  const resolvedBabelLoader = require.resolve('babel-loader');
+  const resolvedBabelLoader = await options.presets.apply('babelLoaderRef');
 
   const { module = {} } = webpackConfig;
 

diff --git a/code/lib/builder-webpack5/src/presets/preview-preset.ts b/code/lib/builder-webpack5/src/presets/preview-preset.ts
@@ -28,3 +28,5 @@ export const babel = async (config: any, options: any) => ({
     },
   ],
 });
+
+export const babelLoaderRef = () => require.resolve('babel-loader');
diff --git a/code/yarn.lock b/code/yarn.lock
@@ -6478,7 +6478,6 @@ __metadata:
     "@storybook/store": 7.0.0-alpha.38
     "@storybook/theming": 7.0.0-alpha.38
     "@types/util-deprecate": ^1.0.0
-    babel-loader: ^8.2.5
     dequal: ^2.0.2
     fs-extra: ^9.0.1
     global: ^4.4.0
@@ -6490,14 +6489,11 @@ __metadata:
     util-deprecate: ^1.0.2
   peerDependencies:
     "@storybook/mdx2-csf": 0.0.4-canary.14.04ffbe8.0
-    babel-loader: ^8.2.5
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
   peerDependenciesMeta:
     "@storybook/mdx2-csf":
       optional: true
-    babel-loader:
-      optional: true
     react:
       optional: true
     react-dom:
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,3 +28,5 @@ export const babel = async (config: any, options: any) => ({ @@
         },
       ],
     });
+    export const babelLoaderRef = () => require.resolve('babel-loader');