Unverified Commit 1c996d77 authored by Steven's avatar Steven Committed by GitHub

Allow user to override next-image-loader (#26548)

In PR #26281, we solved one use case but broke another.

This PR will allow the user to [override the built-in loader](https://github.com/vercel/next.js/pull/26281#issuecomment-866251944) via custom webpack config.
parent 1012630b
...@@ -1030,6 +1030,16 @@ export default async function getBaseWebpackConfig( ...@@ -1030,6 +1030,16 @@ export default async function getBaseWebpackConfig(
] ]
: defaultLoaders.babel, : defaultLoaders.babel,
}, },
...(!config.images.disableStaticImages && isWebpack5
? [
{
test: /\.(png|jpg|jpeg|gif|webp|ico|bmp|svg)$/i,
loader: 'next-image-loader',
issuer: { not: regexLikeCss },
dependency: { not: ['url'] },
},
]
: []),
].filter(Boolean), ].filter(Boolean),
}, },
plugins: [ plugins: [
...@@ -1459,27 +1469,23 @@ export default async function getBaseWebpackConfig( ...@@ -1459,27 +1469,23 @@ export default async function getBaseWebpackConfig(
} }
if (!config.images.disableStaticImages && isWebpack5) { if (!config.images.disableStaticImages && isWebpack5) {
if (!webpackConfig.module) { const rules = webpackConfig.module?.rules || []
webpackConfig.module = { rules: [] } const hasCustomSvg = rules.some(
}
const hasSvg = webpackConfig.module.rules.some(
(rule) => (rule) =>
'test' in rule && rule.test instanceof RegExp && rule.test.test('.svg') rule.loader !== 'next-image-loader' &&
'test' in rule &&
rule.test instanceof RegExp &&
rule.test.test('.svg')
) )
const nextImageRule = rules.find(
// Exclude svg if the user already defined it in custom (rule) => rule.loader === 'next-image-loader'
// webpack config such as `@svgr/webpack` plugin or )
// the `babel-plugin-inline-react-svg` plugin. if (hasCustomSvg && nextImageRule) {
webpackConfig.module.rules.push({ // Exclude svg if the user already defined it in custom
test: hasSvg // webpack config such as `@svgr/webpack` plugin or
? /\.(png|jpg|jpeg|gif|webp|ico|bmp)$/i // the `babel-plugin-inline-react-svg` plugin.
: /\.(png|svg|jpg|jpeg|gif|webp|ico|bmp)$/i, nextImageRule.test = /\.(png|jpg|jpeg|gif|webp|ico|bmp)$/i
loader: 'next-image-loader', }
dependency: { not: ['url'] },
// @ts-ignore
issuer: { not: regexLikeCss },
})
} }
if ( if (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment