test version control

Author: rinriko

dist/build/static/js/bundle.min.js

@@ -1 +1 @@
-/*! For license information please see main.4f3316df.js.LICENSE.txt */
+/*! For license information please see main.9e9a9a1a.js.LICENSE.txt */

dist/build/static/js/bundle.min.js.LICENSE.txt

@@ -1,16 +1,15 @@
-require('dotenv').config();
+
 const path = require("path");
 const TerserPlugin = require("terser-webpack-plugin");
 const glob = require("glob");
-const { execSync } = require("child_process");
 const webpack = require("webpack");
-const commitHash = process.env.LOCAL_COMMIT_HASH || (() => {
-  try {
-    return execSync("git rev-parse HEAD").toString().trim();
-  } catch (error) {
-    return "unknown";
-  }
-})();
+
+const child_process = require("child_process");
+
+function git(command) {
+  return child_process.execSync(`git ${command}`, { encoding: "utf8" }).trim();
+}
+
 module.exports = {
   mode: "production",
   entry: {
@@ -23,7 +22,6 @@ module.exports = {
     rules: [
       {
         test: /\.css$/,
-        exclude: /dist|design/,
         use: ["style-loader", "css-loader"],
       },
     ],
@@ -34,7 +32,11 @@ module.exports = {
   },
   plugins: [
     new webpack.DefinePlugin({
-      "process.env.LOCAL_COMMIT_HASH": JSON.stringify(commitHash)
+      "process.env.GIT_VERSION": JSON.stringify(git("describe --always")),
+      "process.env.GIT_AUTHOR_DATE": JSON.stringify(git("log -1 --format=%aI")),
+      "process.env.LOCAL_COMMIT_HASH": JSON.stringify(git("rev-parse HEAD")),
     }),
   ],
+  
+  
 };

webpack.config.js renamed to old.webpack.config.js

@@ -12,6 +12,7 @@
     "@material-ui/lab": "^4.0.0-alpha.61",
     "axios": "^1.7.7",
     "better-react-mathjax": "^2.0.4-beta1",
+    "cross-env": "^7.0.3",
     "css-loader": "^7.1.2",
     "d3": "^6.3.1",
     "d3-delaunay": "^6.0.2",
@@ -21,6 +22,7 @@
     "electron-is-dev": "^2.0.0",
     "electron-squirrel-startup": "^1.0.0",
     "gh-pages": "^3.2.3",
+    "git-revision-webpack-plugin": "^5.0.0",
     "material-ui-image": "^3.3.2",
     "material-ui-popup-state": "^3.1.1",
     "moment": "^2.29.4",
@@ -38,13 +40,15 @@
     "xlsx-populate": "^1.21.0",
     "xlsx-style": "^0.8.13"
   },
-  "browser":{
-  "child_process": false
+  "browser": {
+    "child_process": false
   },
   "scripts": {
     "start": "electron-forge start",
     "dev2": "react-scripts start",
-    "build": "npm run build:react && npm run build:bundle",
+    "old.build": "npm run build:react && npm run build:bundle",
+    "build-linux": "REACT_APP_COMMIT_HASH=$(git rev-parse HEAD) react-scripts build",
+    "build-win": "git rev-parse HEAD && cross-env REACT_APP_COMMIT_HASH=$(\"git rev-parse HEAD\") react-scripts build",
     "build:react": "react-scripts build",
     "build:bundle": "webpack --config webpack.config.js",
     "test": "react-scripts test",
@@ -157,4 +161,4 @@
     "wait-on": "^6.0.0",
     "webpack-cli": "^4.10.0"
   }
-}
+}

package-lock.json

@@ -16,7 +16,7 @@
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <!-- <link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> -->
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.

package.json

@@ -12,6 +12,7 @@ import { createMuiTheme } from "@material-ui/core/styles";
 import headerPic from './image/Header_EXBD_prnt_fromMac.png';
 import packagejson from '../package.json';
 
+
 let theme = createMuiTheme({
   palette: {
     primary: { main: '#14375A' },
@@ -72,7 +73,6 @@ function App() {
   async function checkForUpdates() {
     const repo = "iDataVisualizationLab/TxDOT";
     const branch = "main";
-  
     try {
       // Use the GitHub API to get the latest commit
       const response = await fetch(`https://api.github.com/repos/${repo}/commits/${branch}`);
@@ -83,9 +83,8 @@ function App() {
 
       const data = await response.json();
       const latestCommitHash = data.sha;
-      console.log(process.env.LOCAL_COMMIT_HASH, latestCommitHash)
-      // Compare with the local commit hash
-      if (process.env.LOCAL_COMMIT_HASH !== latestCommitHash) {
+      console.log(process.env.REACT_APP_COMMIT_HASH, latestCommitHash)
+      if (process.env.REACT_APP_COMMIT_HASH !== latestCommitHash) {
         if (!isShown) {
           setOpenUpdateDialog(true);
         } else {

public/index.html

@@ -4969,6 +4969,13 @@ cross-dirname@^0.1.0:
   resolved "https://registry.npmjs.org/cross-dirname/-/cross-dirname-0.1.0.tgz"
   integrity sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==
 
+cross-env@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz"
+  integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
+  dependencies:
+    cross-spawn "^7.0.1"
+
 cross-spawn-windows-exe@^1.1.0, cross-spawn-windows-exe@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/cross-spawn-windows-exe/-/cross-spawn-windows-exe-1.2.0.tgz"
@@ -6118,11 +6125,6 @@ dotenv@^10.0.0:
   resolved "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz"
   integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
 
-dotenv@^16.4.5:
-  version "16.4.5"
-  resolved "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz"
-  integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==
-
 dotenv@^9.0.2:
   version "9.0.2"
   resolved "https://registry.npmjs.org/dotenv/-/dotenv-9.0.2.tgz"
@@ -7598,6 +7600,11 @@ gh-pages@^3.2.3:
     fs-extra "^8.1.0"
     globby "^6.1.0"
 
+git-revision-webpack-plugin@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/git-revision-webpack-plugin/-/git-revision-webpack-plugin-5.0.0.tgz"
+  integrity sha512-RptQN/4UKcEPkCBmRy8kLPo5i8MnF8+XfAgFYN9gbwmKLTLx4YHsQw726H+C5+sIGDixDkmGL3IxPA2gKo+u4w==
+
 gl-mat4@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/gl-mat4/-/gl-mat4-1.2.0.tgz"