Fix: Add git hash to version on settings page

TheHolyRogerCoin · Sep 4, 2023 · e04ae40 · e04ae40
1 parent 0ef0486
commit e04ae40
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -34,13 +34,13 @@
     "lint:fix": "eslint --ext .ts,.tsx src --fix",
     "mockAPI": "node mocks/mockAPI.js",
     "mockWS": "node mocks/mockWS.js",
-    "start": "cross-env APP_VERSION=$(cat VERSION)-dev NODE_OPTIONS=--max_old_space_size=8192 webpack-dev-server --config ./webpack/development.ts",
+    "start": "cross-env NODE_OPTIONS=--max_old_space_size=8192 webpack-dev-server --config ./webpack/development.ts",
     "start-mock": "npm-run-all -p start mockAPI",
     "start-mock-ws": "npm-run-all -p start mockAPI mockWS",
-    "build": "cross-env APP_VERSION=$(cat VERSION) NODE_ENV=production NODE_OPTIONS=--max_old_space_size=8192 webpack --config ./webpack/production.ts",
+    "build": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=8192 webpack --config ./webpack/production.ts",
     "build:mobile": "./scripts/build_capacitor.sh",
-    "build:mobile:android": "./scripts/build_capacitor_android.sh",
-    "build:mobile:ios": "./scripts/build_capacitor_ios.sh",
+    "build:mobile:android": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=8192 webpack --config ./webpack/mobile_android.ts",
+    "build:mobile:ios": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=8192 webpack --config ./webpack/mobile.ts",
     "analyze": "cross-env ANALYZE=1 NODE_ENV=production NODE_OPTIONS=--max_old_space_size=8192 webpack --config ./webpack/production.ts  --profile --json > stats.json",
     "test": "jest --config jest.config.js --silent",
     "test:coverage": "jest --config jest.config.js --collectCoverage=true",

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-export REACT_APP_GIT_SHA=$(git rev-parse --short HEAD)
 export BUILD_DOMAIN=${BUILD_DOMAIN:-$(cat .domains)}
 [ -n "$BUILD_EXPIRE" ] && export REACT_APP_BUILD_EXPIRE=$(date -d "+${BUILD_EXPIRE}" +%s000)
 

diff --git a/scripts/build_capacitor_android.sh b/scripts/build_capacitor_android.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-cross-env APP_VERSION=$(cat VERSION) NODE_ENV=production NODE_OPTIONS=--max_old_space_size=8192 webpack --config ./webpack/mobile_android.ts
+export REACT_APP_GIT_SHA=$(git rev-parse --short HEAD)
+
+yarn build:mobile:android
 
 npx cap add android
 

diff --git a/scripts/build_capacitor_ios.sh b/scripts/build_capacitor_ios.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-cross-env APP_VERSION=$(cat VERSION) NODE_ENV=production NODE_OPTIONS=--max_old_space_size=8192 webpack --config ./webpack/mobile.ts
+export REACT_APP_GIT_SHA=$(git rev-parse --short HEAD)
+
+yarn build:mobile:ios
 
 npx cap add ios
 

diff --git a/src/components/Settings/Settings.tsx b/src/components/Settings/Settings.tsx
@@ -103,7 +103,9 @@ const SettingsComponent: React.FC = () => {
                 <TableCell className={classes.descriptionCol} component="th" scope="row">
                     App Version
                 </TableCell>
-                <TableCell>{process.env.APP_VERSION}</TableCell>
+                <TableCell>
+                    {process.env.APP_VERSION}-{process.env.REACT_APP_GIT_SHA}
+                </TableCell>
             </TableRow>
         );
     }, [classes.descriptionCol]);

diff --git a/webpack/common.ts b/webpack/common.ts
@@ -1,3 +1,4 @@
+const fs = require('fs');
 import { DefinePlugin } from 'webpack';
 import webpack from 'webpack';
 import ESLintPlugin from 'eslint-webpack-plugin';
@@ -12,6 +13,8 @@ import alias from './alias.js';
 const rootDir = path.resolve(__dirname, '..');
 const BUILD_DIR = path.resolve(rootDir, 'public');
 
+const app_version = fs.readFileSync('VERSION').toString();
+
 const config: webpack.Configuration = {
     output: {
         path: BUILD_DIR,
@@ -20,8 +23,11 @@ const config: webpack.Configuration = {
         publicPath: '/',
     },
     plugins: [
-        new DefinePlugin({ 'process.env.BUILD_EXPIRE': JSON.stringify(process.env.BUILD_EXPIRE) }),
-        new DefinePlugin({ 'process.env.APP_VERSION': JSON.stringify(process.env.APP_VERSION) }),
+        new DefinePlugin({
+            'process.env.BUILD_EXPIRE': JSON.stringify(process.env.BUILD_EXPIRE),
+            'process.env.REACT_APP_GIT_SHA': JSON.stringify(process.env.REACT_APP_GIT_SHA || 'dev'),
+            'process.env.APP_VERSION': JSON.stringify(app_version),
+        }),
         new webpack.EnvironmentPlugin({
             envType: 'dev',
         }),