From 5f8a171c2c706a884321c16f9798874fc1bf364b Mon Sep 17 00:00:00 2001
From: Eric Eastwood <erice@element.io>
Date: Wed, 20 Apr 2022 11:55:48 -0500
Subject: [PATCH] Fix asset build throwing and swallowing errors (#721)

 - Fix `svg-colorizer` throwing errors with Windows file paths
 - Fix `css-url-parser` swallowing errors because it was `async`
 - Fail SDK build script (`yarn build:sdk`, `build.sh`) overall when some commands are failing
---
 scripts/postcss/css-url-processor.js | 2 +-
 scripts/postcss/svg-colorizer.js     | 2 +-
 scripts/sdk/build.sh                 | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/postcss/css-url-processor.js b/scripts/postcss/css-url-processor.js
index 3ae7c60d..f58818f1 100644
--- a/scripts/postcss/css-url-processor.js
+++ b/scripts/postcss/css-url-processor.js
@@ -39,7 +39,7 @@ function colorsFromURL(url, colorMap) {
 function processURL(decl, replacer, colorMap) {
     const value = decl.value;
     const parsed = valueParser(value);
-    parsed.walk(async node => {
+    parsed.walk(node => {
         if (node.type !== "function" || node.value !== "url") {
             return;
         }
diff --git a/scripts/postcss/svg-colorizer.js b/scripts/postcss/svg-colorizer.js
index 95355ea8..06b7b14b 100644
--- a/scripts/postcss/svg-colorizer.js
+++ b/scripts/postcss/svg-colorizer.js
@@ -37,7 +37,7 @@ module.exports.buildColorizedSVG = function (svgLocation, primaryColor, secondar
     if (svgCode === coloredSVGCode) {
         throw new Error("svg-colorizer made no color replacements! The input svg should only contain colors #ff00ff (primary, case-sensitive) and #00ffff (secondary, case-sensitive).");
     }
-    const fileName = svgLocation.match(/.+\/(.+\.svg)/)[1];
+    const fileName = svgLocation.match(/.+[/\\](.+\.svg)/)[1];
     const outputName = `${fileName.substring(0, fileName.length - 4)}-${createHash(coloredSVGCode)}.svg`;
     const outputPath = path.resolve(__dirname, "../../.tmp");
     try {
diff --git a/scripts/sdk/build.sh b/scripts/sdk/build.sh
index 2ac4be3a..ae3a794e 100755
--- a/scripts/sdk/build.sh
+++ b/scripts/sdk/build.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+# Exit whenever one of the commands fail with a non-zero exit code
+set -e
+set -o pipefail
+
 rm -rf target
 yarn run vite build -c vite.sdk-assets-config.js
 yarn run vite build -c vite.sdk-lib-config.js