Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix tsconfig resolution in Nextjs projects #22160

Merged
merged 1 commit into from
Apr 19, 2023
Merged

Fix tsconfig resolution in Nextjs projects #22160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions code/frameworks/nextjs/src/imports/webpack.ts
View file
Open in desktop
Expand Up @@ -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);
valentinpalkovic marked this conversation as resolved.
Show resolved Hide resolved

if (configLoadResult.resultType === 'failed' || !configLoadResult.baseUrl) {
// either not a typescript project or tsconfig contains no baseUrl
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/nextjs/src/preset.ts
View file
Open in desktop
Expand Up @@ -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);
Expand Down