From 55d76fc76d19cac3e36f73dca983723273820193 Mon Sep 17 00:00:00 2001
From: Sam Wilkins <samwilkins333@gmail.com>
Date: Fri, 15 May 2020 17:50:36 -0700
Subject: env fixes?

---
 src/client/views/DocumentDecorations.tsx |  2 +-
 webpack.config.js                        | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx
index fc7c16296..6639f1cce 100644
--- a/src/client/views/DocumentDecorations.tsx
+++ b/src/client/views/DocumentDecorations.tsx
@@ -483,7 +483,7 @@ export class DocumentDecorations extends React.Component<{}, { value: string }>
                 <div className="documentDecorations-title" key="title" onPointerDown={this.onTitleDown} >
                     <span style={{ width: "calc(100% - 25px)", display: "inline-block" }}>{`${this.selectionTitle}`}</span>
                 </div>
-            </>
+            </>;
 
         bounds.x = Math.max(0, bounds.x - this._resizeBorderWidth / 2) + this._resizeBorderWidth / 2;
         bounds.y = Math.max(0, bounds.y - this._resizeBorderWidth / 2 - this._titleHeight) + this._resizeBorderWidth / 2 + this._titleHeight;
diff --git a/webpack.config.js b/webpack.config.js
index 67d492e1f..1351008ea 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -16,7 +16,7 @@ const plugins = [
     new webpack.HotModuleReplacementPlugin(),
 ];
 
-(function transferEnvironmentVariables() {
+function transferEnvironmentVariables() {
     const prefix = "_CLIENT_";
     const {
         parsed
@@ -24,13 +24,16 @@ const plugins = [
     if (!parsed) {
         return;
     }
-    plugins.push(new webpack.DefinePlugin(Object.keys(parsed).reduce((mapping, envKey) => {
+    const resolvedClientSide = Object.keys(parsed).reduce((mapping, envKey) => {
         if (envKey.startsWith(prefix)) {
-            mapping[`process.env.${envKey.replace(prefix, "")}`] = JSON.stringify(parsed[envKey]);
+            mapping[`process.env.${envKey.replace(prefix, "")}`] = parsed[envKey];
         }
         return mapping;
-    }, {})));
-})();
+    }, {});
+    plugins.push(new webpack.DefinePlugin(resolvedClientSide));
+}
+
+transferEnvironmentVariables();
 
 module.exports = {
     mode: 'development',
-- 
cgit v1.2.3-70-g09d2


From 28985a26b4f852dffeb02a43d135776314a1f600 Mon Sep 17 00:00:00 2001
From: Sam Wilkins <samwilkins333@gmail.com>
Date: Fri, 15 May 2020 17:58:30 -0700
Subject: undoing env fixes lol

---
 webpack.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webpack.config.js b/webpack.config.js
index 1351008ea..737882fe2 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -26,7 +26,7 @@ function transferEnvironmentVariables() {
     }
     const resolvedClientSide = Object.keys(parsed).reduce((mapping, envKey) => {
         if (envKey.startsWith(prefix)) {
-            mapping[`process.env.${envKey.replace(prefix, "")}`] = parsed[envKey];
+            mapping[`process.env.${envKey.replace(prefix, "")}`] = JSON.stringify(parsed[envKey]);
         }
         return mapping;
     }, {});
-- 
cgit v1.2.3-70-g09d2