From 2a7743611800c5f5b4b0e7f71ba6a203bcb9fe7e Mon Sep 17 00:00:00 2001
From: Dan Roujinsky <d.roujinsky@island.io>
Date: Fri, 17 Feb 2023 13:33:07 +0200
Subject: [PATCH] fix(webpack): restore supporting a configuration array
 (#14977)

---
 .../src/executors/webpack/webpack.impl.ts     | 45 ++++++++++++++-----
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/packages/webpack/src/executors/webpack/webpack.impl.ts b/packages/webpack/src/executors/webpack/webpack.impl.ts
index c1aac491e6..20463e8aa2 100644
--- a/packages/webpack/src/executors/webpack/webpack.impl.ts
+++ b/packages/webpack/src/executors/webpack/webpack.impl.ts
@@ -1,9 +1,15 @@
 import 'dotenv/config';
 import { ExecutorContext, logger } from '@nrwl/devkit';
 import { eachValueFrom } from '@nrwl/devkit/src/utils/rxjs-for-await';
-import type { Configuration } from 'webpack';
-import { of } from 'rxjs';
-import { switchMap, tap } from 'rxjs/operators';
+import type { Configuration, Stats } from 'webpack';
+import { from, of } from 'rxjs';
+import {
+  bufferCount,
+  mergeMap,
+  mergeScan,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
 import { resolve } from 'path';
 import {
   calculateProjectDependencies,
@@ -23,7 +29,7 @@ import { normalizeOptions } from './lib/normalize-options';
 async function getWebpackConfigs(
   options: NormalizedWebpackExecutorOptions,
   context: ExecutorContext
-): Promise<Configuration> {
+): Promise<Configuration | Configuration[]> {
   if (options.isolatedConfig && !options.webpackConfig) {
     throw new Error(
       `Using "isolatedConfig" without a "webpackConfig" is not supported.`
@@ -134,17 +140,32 @@ export async function* webpackExecutor(
   }
 
   const configs = await getWebpackConfigs(options, context);
+
   return yield* eachValueFrom(
     of(configs).pipe(
-      switchMap((config) => {
-        return runWebpack(config).pipe(
-          tap((stats) => {
-            console.info(stats.toString(config.stats));
-          })
+      mergeMap((config) => (Array.isArray(config) ? from(config) : of(config))),
+      // Run build sequentially and bail when first one fails.
+      mergeScan(
+        (acc, config) => {
+          if (!acc.hasErrors()) {
+            return runWebpack(config).pipe(
+              tap((stats) => {
+                console.info(stats.toString(config.stats));
+              })
+            );
+          } else {
+            return of();
+          }
+        },
+        { hasErrors: () => false } as Stats,
+        1
+      ),
+      // Collect build results as an array.
+      bufferCount(Array.isArray(configs) ? configs.length : 1),
+      switchMap(async (results) => {
+        const success = results.every(
+          (result) => Boolean(result) && !result.hasErrors()
         );
-      }),
-      switchMap(async (result) => {
-        const success = result && !result.hasErrors();
         return {
           success,
           outfile: resolve(