From 2be3920dbc5ed58e621e414a95c0a7dd3f1e593a Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Thu, 25 May 2023 13:48:27 -0400
Subject: [PATCH] chore: Fix lens-webpack-build failing due to warnings

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../webpack/src/scripts/do-webpack-build.test.ts   | 14 +++++++++-----
 .../webpack/src/scripts/do-webpack-build.ts        |  8 +++++---
 .../infrastructure/webpack/src/scripts/get-di.ts   |  3 ++-
 .../webpack/src/scripts/log-warning.injectable.ts  |  8 ++++++++
 4 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 packages/infrastructure/webpack/src/scripts/log-warning.injectable.ts

diff --git a/packages/infrastructure/webpack/src/scripts/do-webpack-build.test.ts b/packages/infrastructure/webpack/src/scripts/do-webpack-build.test.ts
index a5484783c6..c2abb22dbc 100644
--- a/packages/infrastructure/webpack/src/scripts/do-webpack-build.test.ts
+++ b/packages/infrastructure/webpack/src/scripts/do-webpack-build.test.ts
@@ -4,11 +4,13 @@ import asyncFn, { AsyncFnMock } from "@async-fn/jest";
 import { DoWebpackBuild, doWebpackBuildInjectable } from "./do-webpack-build";
 import { getPromiseStatus } from "@ogre-tools/test-utils";
 import { LogSuccess, logSuccessInjectable } from "./log-success.injectable";
+import { LogWarning, logWarningInjectable } from "./log-warning.injectable";
 
 describe("do-webpack-build", () => {
   let execMock: AsyncFnMock<Exec>;
   let doWebpackBuild: DoWebpackBuild;
   let logSuccessMock: AsyncFnMock<LogSuccess>;
+  let logWarningMock: AsyncFnMock<LogWarning>;
 
   beforeEach(() => {
     const di = getDi();
@@ -17,6 +19,8 @@ describe("do-webpack-build", () => {
     di.override(execInjectable, () => execMock);
     logSuccessMock = asyncFn();
     di.override(logSuccessInjectable, () => logSuccessMock);
+    logWarningMock = asyncFn();
+    di.override(logWarningInjectable, () => logWarningMock);
 
     doWebpackBuild = di.inject(doWebpackBuildInjectable);
   });
@@ -88,8 +92,8 @@ describe("do-webpack-build", () => {
           expect(logSuccessMock).not.toHaveBeenCalled();
         });
 
-        it("throws", () => {
-          return expect(actualPromise).rejects.toThrow("some-other-stderr");
+        it("logs a warning", () => {
+          expect(logWarningMock).toBeCalledWith("Warning while executing \"linkable-push\": some-other-stderr");
         });
       });
 
@@ -123,13 +127,13 @@ describe("do-webpack-build", () => {
         expect(logSuccessMock).not.toHaveBeenCalled();
       });
 
-      it("throws", () => {
-        return expect(actualPromise).rejects.toThrow("some-stderr");
+      it("logs a warning", () => {
+        expect(logWarningMock).toBeCalledWith("Warning while executing \"webpack\": some-stderr");
       });
     });
 
     describe("when webpack rejects", () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         execMock.reject(new Error("some-error"));
       });
 
diff --git a/packages/infrastructure/webpack/src/scripts/do-webpack-build.ts b/packages/infrastructure/webpack/src/scripts/do-webpack-build.ts
index ba81352ed5..01e8bf7087 100644
--- a/packages/infrastructure/webpack/src/scripts/do-webpack-build.ts
+++ b/packages/infrastructure/webpack/src/scripts/do-webpack-build.ts
@@ -1,6 +1,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { execInjectable } from "./exec.injectable";
 import { logSuccessInjectable } from "./log-success.injectable";
+import { logWarningInjectable } from "./log-warning.injectable";
 
 export type DoWebpackBuild = () => Promise<void>;
 
@@ -10,15 +11,16 @@ export const doWebpackBuildInjectable = getInjectable({
   instantiate: (di) => {
     const exec = di.inject(execInjectable);
     const logSuccess = di.inject(logSuccessInjectable);
+    const logWarning = di.inject(logWarningInjectable);
 
     const execWithResultHandling = async (command: string) => {
       const { stdout, stderr } = await exec(command);
 
       if (stderr) {
-        throw new Error(stderr);
+        logWarning(`Warning while executing "${command}": ${stderr}`);
+      } else if (stdout) {
+        logSuccess(stdout);
       }
-
-      logSuccess(stdout);
     };
 
     return async () => {
diff --git a/packages/infrastructure/webpack/src/scripts/get-di.ts b/packages/infrastructure/webpack/src/scripts/get-di.ts
index 28774e026f..9610207da5 100644
--- a/packages/infrastructure/webpack/src/scripts/get-di.ts
+++ b/packages/infrastructure/webpack/src/scripts/get-di.ts
@@ -2,11 +2,12 @@ import { createContainer } from "@ogre-tools/injectable";
 import { execInjectable } from "./exec.injectable";
 import { doWebpackBuildInjectable } from "./do-webpack-build";
 import { logSuccessInjectable } from "./log-success.injectable";
+import { logWarningInjectable } from "./log-warning.injectable";
 
 export const getDi = () => {
   const di = createContainer("do-webpack-build");
 
-  di.register(execInjectable, doWebpackBuildInjectable, logSuccessInjectable);
+  di.register(execInjectable, doWebpackBuildInjectable, logSuccessInjectable, logWarningInjectable);
 
   return di;
 };
diff --git a/packages/infrastructure/webpack/src/scripts/log-warning.injectable.ts b/packages/infrastructure/webpack/src/scripts/log-warning.injectable.ts
new file mode 100644
index 0000000000..144a671d2d
--- /dev/null
+++ b/packages/infrastructure/webpack/src/scripts/log-warning.injectable.ts
@@ -0,0 +1,8 @@
+import { getInjectable } from "@ogre-tools/injectable";
+
+export type LogWarning = typeof console.warn;
+
+export const logWarningInjectable = getInjectable({
+  id: "log-warning",
+  instantiate: (di): LogWarning => console.warn,
+});