fix config check

storybookjs · Jan 5, 2023 · 600a5ec · 600a5ec
1 parent 8969c56
commit 600a5ec
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/code/lib/cli/src/automigrate/fixes/missing-babelrc.test.ts b/code/lib/cli/src/automigrate/fixes/missing-babelrc.test.ts
@@ -26,13 +26,12 @@ const babelContent = JSON.stringify({
 });
 
 const check = async ({ packageJson = {}, main = {}, extraFiles }: any) => {
-  if (extraFiles) {
-    // eslint-disable-next-line global-require
-    require('fs-extra').__setMockFiles({
-      [path.join('.storybook', 'main.js')]: `module.exports = ${JSON.stringify(main)};`,
-      ...extraFiles,
-    });
-  }
+  // eslint-disable-next-line global-require
+  require('fs-extra').__setMockFiles({
+    [path.join('.storybook', 'main.js')]: `module.exports = ${JSON.stringify(main)};`,
+    ...(extraFiles || {}),
+  });
+
   const packageManager = {
     retrievePackageJson: () => ({ dependencies: {}, devDependencies: {}, ...packageJson }),
   } as JsPackageManager;
@@ -84,7 +83,9 @@ describe('missing-babelrc fix', () => {
       },
     };
 
-    await expect(check({ packageJson })).resolves.toBe({
+    await expect(
+      check({ main: { framework: '@storybook/react-webpack5' }, packageJson })
+    ).resolves.toEqual({
       needsBabelRc: true,
     });
   });

diff --git a/code/lib/cli/src/automigrate/fixes/missing-babelrc.ts b/code/lib/cli/src/automigrate/fixes/missing-babelrc.ts
@@ -58,8 +58,11 @@ export const missingBabelRc: Fix<MissingBabelRcOptions> = {
       typeof frameworkField === 'string' ? frameworkField : frameworkField?.name;
 
     if (frameworksThatNeedBabelConfig.includes(frameworkPackage)) {
-      const config = await loadPartialConfigAsync();
-      if (!config.config && !packageJson.babel) {
+      const config = await loadPartialConfigAsync({
+        babelrc: true,
+      });
+
+      if (!config.config && !config.babelrc && !packageJson.babel) {
         return { needsBabelRc: true };
       }
     }