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

meeroslav · Dec 14, 2023 · ec37bd1 · ec37bd1
1 parent c7d9249
commit ec37bd1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/webpack/src/executors/dev-server/dev-server.impl.ts b/packages/webpack/src/executors/dev-server/dev-server.impl.ts
@@ -83,8 +83,8 @@ export async function* devServerExecutor(
     // Otherwise, user should define `devServer` option directly in their webpack config.
     if (
       typeof userDefinedWebpackConfig === 'function' &&
-      isNxWebpackComposablePlugin(userDefinedWebpackConfig) &&
-      !buildOptions.standardWebpackConfigFunction
+      (isNxWebpackComposablePlugin(userDefinedWebpackConfig) ||
+        !buildOptions.standardWebpackConfigFunction)
     ) {
       config = await userDefinedWebpackConfig(
         { devServer },

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