From 30fb93b410cdd2b184d87aedecaeef0690fd7495 Mon Sep 17 00:00:00 2001
From: Nick Lucas <me@nicklucas.co.uk>
Date: Mon, 8 Nov 2021 13:06:42 +0000
Subject: [PATCH] Fix issue where NODE_ENV was not set in production, causing
 file loads to fail

---
 .../giterm/app/renderer/components/terminal/bash-config.js | 3 ++-
 packages/giterm/app/renderer/lib/env.ts                    | 7 +++++++
 packages/giterm/app/renderer/store/index.ts                | 3 ++-
 packages/giterm/app/sentry.js                              | 2 ++
 packages/giterm/package.json                               | 2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 packages/giterm/app/renderer/lib/env.ts

diff --git a/packages/giterm/app/renderer/components/terminal/bash-config.js b/packages/giterm/app/renderer/components/terminal/bash-config.js
index 9494ba07..0f311409 100644
--- a/packages/giterm/app/renderer/components/terminal/bash-config.js
+++ b/packages/giterm/app/renderer/components/terminal/bash-config.js
@@ -1,8 +1,9 @@
 import fs from 'fs'
 import path from 'path'
+import { NODE_ENV } from 'app/lib/env'
 
 let bashPath = ''
-if (process.env.NODE_ENV === 'production') {
+if (NODE_ENV === 'production') {
   bashPath = path.resolve(process.resourcesPath, 'bashrc')
 } else {
   bashPath = path.resolve(__dirname, './bashrc')
diff --git a/packages/giterm/app/renderer/lib/env.ts b/packages/giterm/app/renderer/lib/env.ts
new file mode 100644
index 00000000..00c034a5
--- /dev/null
+++ b/packages/giterm/app/renderer/lib/env.ts
@@ -0,0 +1,7 @@
+if (process.env.NODE_ENV == undefined) {
+  process.env.NODE_ENV = 'production'
+}
+
+type Env = 'production' | 'development' | 'test'
+
+export const NODE_ENV: Env = process.env.NODE_ENV as Env
diff --git a/packages/giterm/app/renderer/store/index.ts b/packages/giterm/app/renderer/store/index.ts
index 6e312c3a..294c0c27 100644
--- a/packages/giterm/app/renderer/store/index.ts
+++ b/packages/giterm/app/renderer/store/index.ts
@@ -2,6 +2,7 @@ import { createStore, applyMiddleware, combineReducers, compose } from 'redux'
 import createSagaMiddleware from 'redux-saga'
 import * as Sentry from '@sentry/electron'
 import * as ReactRedux from 'react-redux'
+import { NODE_ENV } from 'app/lib/env'
 
 // Reducers
 import * as reducers from './reducers'
@@ -14,7 +15,7 @@ function configureStore() {
   const composeEnhancers = (() => {
     const compose_ =
       window && (window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
-    if (process.env.NODE_ENV === 'development' && compose_) {
+    if (NODE_ENV === 'development' && compose_) {
       return compose_
     }
     return compose
diff --git a/packages/giterm/app/sentry.js b/packages/giterm/app/sentry.js
index a4294dd6..f465dd45 100644
--- a/packages/giterm/app/sentry.js
+++ b/packages/giterm/app/sentry.js
@@ -1,5 +1,7 @@
 import * as Sentry from '@sentry/electron'
 
+process.env.NODE_ENV ||= 'production'
+
 Sentry.init({
   dsn: 'https://f29419b8f8224777921536665dca82e7@o137374.ingest.sentry.io/5412064',
   enabled: process.env.NODE_ENV === 'production' || !!process.env.FORCE_SENTRY,
diff --git a/packages/giterm/package.json b/packages/giterm/package.json
index 3d9bb5e2..06b9166e 100644
--- a/packages/giterm/package.json
+++ b/packages/giterm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "giterm",
-  "version": "0.20.2",
+  "version": "0.20.3",
   "description": "A git gui for terminal lovers",
   "homepage": "https://github.com/Nick-Lucas/giterm",
   "main": "init.js",