🐛 fix release date display

Doccrazy · Apr 4, 2023 · e6004f8 · e6004f8
1 parent c975ad9
commit e6004f8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/app/main.ts b/app/main.ts
@@ -113,7 +113,10 @@ async function createMainWindow(reopen?: boolean) {
   };
   const config: Splashscreen.Config = {
     windowOpts: mainOpts,
-    templateUrl: `${__dirname}/splash-screen.html`,
+    templateUrl: `${__dirname}/splash-screen.html?appVersion=${app.getVersion()}&buildDate=${(typeof BUILD_DATE === 'undefined'
+      ? new Date()
+      : new Date(BUILD_DATE)
+    ).toISOString()}`,
     delay: 250,
     splashScreenOpts: {
       width: 575,
@@ -122,7 +125,6 @@ async function createMainWindow(reopen?: boolean) {
     }
   };
   const splash = Splashscreen.initDynamicSplashScreen(config);
-  (splash.splashScreen as any).buildDate = typeof BUILD_DATE === 'undefined' ? new Date() : new Date(BUILD_DATE);
   mainWindow = splash.main;
 
   remote.enable(mainWindow.webContents);

diff --git a/app/splash-screen.html b/app/splash-screen.html
@@ -52,8 +52,8 @@
       <div id="version">Version 1.2.3</div>
     </div>
     <script>
-      const version = require('electron').remote.app.getVersion();
-      const buildDate = require('electron').remote.getCurrentWindow().buildDate.toLocaleString(undefined, { year: 'numeric', month: '2-digit', day: '2-digit' });
+      const version = new URLSearchParams(location.search).get('appVersion');
+      const buildDate = new Date(new URLSearchParams(location.search).get('buildDate')).toLocaleString(undefined, { year: 'numeric', month: '2-digit', day: '2-digit' });
       document.getElementById('version').innerText = 'v' + version + ' built ' + buildDate;
     </script>
   </body>

diff --git a/webpack.config.base.ts b/webpack.config.base.ts
@@ -10,7 +10,7 @@ import GitRevisionPlugin from 'git-revision-webpack-plugin';
 import TerserPlugin from 'terser-webpack-plugin';
 // import { dependencies as externals } from './app/package.json';
 
-const gitRevisionPlugin = new GitRevisionPlugin();
+const gitRevisionPlugin = new GitRevisionPlugin({ lightweightTags: true });
 
 const baseConfig: Configuration = {
   // externals: Object.keys(externals || {}),