miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(webpack): fix check for standardWebpackConfigFunction (#20728)

Browse Source
This commit is contained in:
Jack Hsu 2023-12-12 12:59:06 -05:00 committed by GitHub
parent d9540ef7cd
commit 3655269411
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/webpack/src/executors/dev-server/dev-server.impl.ts
View File

@ -83,8 +83,8 @@ export async function* devServerExecutor(
// Otherwise, user should define `devServer` option directly in their webpack config. // Otherwise, user should define `devServer` option directly in their webpack config.
if ( if (
typeof userDefinedWebpackConfig === 'function' && typeof userDefinedWebpackConfig === 'function' &&
isNxWebpackComposablePlugin(userDefinedWebpackConfig) && (isNxWebpackComposablePlugin(userDefinedWebpackConfig) ||
!buildOptions.standardWebpackConfigFunction !buildOptions.standardWebpackConfigFunction)
) { ) {
config = await userDefinedWebpackConfig( config = await userDefinedWebpackConfig(
{ devServer }, { devServer },

4
packages/webpack/src/executors/webpack/webpack.impl.ts
View File

@ -60,8 +60,8 @@ async function getWebpackConfigs(
if ( if (
typeof userDefinedWebpackConfig === 'function' && typeof userDefinedWebpackConfig === 'function' &&
isNxWebpackComposablePlugin(userDefinedWebpackConfig) && (isNxWebpackComposablePlugin(userDefinedWebpackConfig) ||
!options.standardWebpackConfigFunction !options.standardWebpackConfigFunction)
) { ) {
// Old behavior, call the Nx-specific webpack config function that user exports // Old behavior, call the Nx-specific webpack config function that user exports
return await userDefinedWebpackConfig(config, { return await userDefinedWebpackConfig(config, {