Merge pull request #22160 from storybookjs/valentin/fix-tsconfig-reso…

…lution-in-nextjs-projects Fix tsconfig resolution in Nextjs projects
storybookjs · May 3, 2023 · 4326882 · 4326882
1 parent 3c8b205
commit 4326882
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/code/frameworks/nextjs/src/imports/webpack.ts b/code/frameworks/nextjs/src/imports/webpack.ts
@@ -2,8 +2,14 @@ import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin';
 import { loadConfig } from 'tsconfig-paths';
 import type { Configuration as WebpackConfig } from 'webpack';
 
-export const configureImports = (baseConfig: WebpackConfig): void => {
-  const configLoadResult = loadConfig();
+export const configureImports = ({
+  baseConfig,
+  configDir,
+}: {
+  baseConfig: WebpackConfig;
+  configDir: string;
+}): void => {
+  const configLoadResult = loadConfig(configDir);
 
   if (configLoadResult.resultType === 'failed' || !configLoadResult.baseUrl) {
     // either not a typescript project or tsconfig contains no baseUrl

diff --git a/code/frameworks/nextjs/src/preset.ts b/code/frameworks/nextjs/src/preset.ts
@@ -145,7 +145,7 @@ export const webpackFinal: StorybookConfig['webpackFinal'] = async (baseConfig,
   configureNextFont(baseConfig);
   configureNextImport(baseConfig);
   configureRuntimeNextjsVersionResolution(baseConfig);
-  configureImports(baseConfig);
+  configureImports({ baseConfig, configDir: options.configDir });
   configureCss(baseConfig, nextConfig);
   configureImages(baseConfig);
   configureRouting(baseConfig);