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

Next.js: Fix for @nx/react/plugin/storybook with SVGs #23210

Merged
merged 4 commits into from Jul 8, 2023
Merged

Next.js: Fix for @nx/react/plugin/storybook with SVGs #23210

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d63869c
Update webpack.ts to match changes made in storybook-addon-next
daves28 Jun 26, 2023
e5c4146
Merge remote-tracking branch 'upstream/next' into patch-1
valentinpalkovic Jul 6, 2023
7c5fe03
Add semicolon
valentinpalkovic Jul 7, 2023
a4d93b9
Merge branch 'next' into patch-1
valentinpalkovic Jul 7, 2023
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
6 changes: 4 additions & 2 deletions code/frameworks/nextjs/src/images/webpack.ts
View file
Open in desktop
Expand Up @@ -9,6 +9,8 @@ export const configureImages = (baseConfig: WebpackConfig, nextConfig: NextConfi
configureImageDefaults(baseConfig);
};

const fallbackFilename = 'static/media/[path][name][ext]';

const configureImageDefaults = (baseConfig: WebpackConfig): void => {
const version = getNextjsVersion();
const resolve = baseConfig.resolve ?? {};
Expand Down Expand Up @@ -58,7 +60,7 @@ const configureStaticImageImport = (baseConfig: WebpackConfig, nextConfig: NextC
{
loader: require.resolve('@storybook/nextjs/next-image-loader-stub.js'),
options: {
filename: assetRule.generator?.filename,
filename: assetRule.generator?.filename ?? fallbackFilename,
nextConfig,
},
},
Expand All @@ -69,7 +71,7 @@ const configureStaticImageImport = (baseConfig: WebpackConfig, nextConfig: NextC
issuer: /\.(css|scss|sass)$/,
type: 'asset/resource',
generator: {
filename: assetRule.generator?.filename,
filename: assetRule.generator?.filename ?? fallbackFilename,
},
});
};