aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Vijay A <vraravam@users.noreply.github.com>2022-01-03 04:46:29 +0530
committerLibravatar Vijay A <vraravam@users.noreply.github.com>2022-01-03 04:46:29 +0530
commit5fa0a513a7118d8f6fa7efba7c2f8e01891b9cd1 (patch)
tree72283cfac0c7420f26147ec842456b210766536b
parentTurn off 'FuseV1Options.EnableEmbeddedAsarIntegrityValidation' since the pack... (diff)
downloadsophie-5fa0a513a7118d8f6fa7efba7c2f8e01891b9cd1.tar.gz
sophie-5fa0a513a7118d8f6fa7efba7c2f8e01891b9cd1.tar.zst
sophie-5fa0a513a7118d8f6fa7efba7c2f8e01891b9cd1.zip
Enhance 'About' dialog with more info
Signed-off-by: Vijay A <vraravam@users.noreply.github.com>
-rw-r--r--package.json2
-rw-r--r--packages/main/esbuild.config.js6
-rw-r--r--packages/main/src/index.ts17
-rw-r--r--packages/main/types/importMeta.d.ts3
-rw-r--r--yarn.lock37
5 files changed, 64 insertions, 1 deletions
diff --git a/package.json b/package.json
index 6bc6b90..1a7ef71 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
50 "electron-builder": "^22.14.11", 50 "electron-builder": "^22.14.11",
51 "esbuild": "^0.14.10", 51 "esbuild": "^0.14.10",
52 "eslint": "^8.6.0", 52 "eslint": "^8.6.0",
53 "git-repo-info": "^2.1.1",
53 "jest": "^27.4.5", 54 "jest": "^27.4.5",
54 "rimraf": "^3.0.2", 55 "rimraf": "^3.0.2",
55 "rollup": "^2.62.0", 56 "rollup": "^2.62.0",
@@ -59,6 +60,7 @@
59 "packageManager": "yarn@3.1.1", 60 "packageManager": "yarn@3.1.1",
60 "dependencies": { 61 "dependencies": {
61 "loglevel": "^1.8.0", 62 "loglevel": "^1.8.0",
63 "os-name": "^5.0.1",
62 "preload": "^0.1.0" 64 "preload": "^0.1.0"
63 } 65 }
64} 66}
diff --git a/packages/main/esbuild.config.js b/packages/main/esbuild.config.js
index af52f27..500590f 100644
--- a/packages/main/esbuild.config.js
+++ b/packages/main/esbuild.config.js
@@ -1,3 +1,4 @@
1import getRepoInfo from 'git-repo-info';
1import { node } from '../../config/buildConstants.js'; 2import { node } from '../../config/buildConstants.js';
2import { getConfig } from '../../config/esbuildConfig.js'; 3import { getConfig } from '../../config/esbuildConfig.js';
3import { fileURLToDirname } from '../../config/utils.js'; 4import { fileURLToDirname } from '../../config/utils.js';
@@ -8,6 +9,8 @@ if (process.env.MODE !== 'development') {
8 externalPackages.push('electron-devtools-installer'); 9 externalPackages.push('electron-devtools-installer');
9} 10}
10 11
12const gitInfo = getRepoInfo();
13
11export default getConfig({ 14export default getConfig({
12 absWorkingDir: fileURLToDirname(import.meta.url), 15 absWorkingDir: fileURLToDirname(import.meta.url),
13 entryPoints: [ 16 entryPoints: [
@@ -20,4 +23,7 @@ export default getConfig({
20 external: externalPackages, 23 external: externalPackages,
21}, { 24}, {
22 VITE_DEV_SERVER_URL: process.env.VITE_DEV_SERVER_URL || null, 25 VITE_DEV_SERVER_URL: process.env.VITE_DEV_SERVER_URL || null,
26 GIT_SHA: gitInfo.abbreviatedSha,
27 GIT_BRANCH: gitInfo.branch,
28 BUILD_DATE: new Date().getTime(),
23}); 29});
diff --git a/packages/main/src/index.ts b/packages/main/src/index.ts
index 19ef51b..ccfa4a1 100644
--- a/packages/main/src/index.ts
+++ b/packages/main/src/index.ts
@@ -25,6 +25,8 @@ import {
25 BrowserWindow, 25 BrowserWindow,
26 ipcMain, 26 ipcMain,
27} from 'electron'; 27} from 'electron';
28import { arch } from 'os';
29import osName from 'os-name';
28import { ensureDirSync, readFile, readFileSync } from 'fs-extra'; 30import { ensureDirSync, readFile, readFileSync } from 'fs-extra';
29import { autorun } from 'mobx'; 31import { autorun } from 'mobx';
30import { getSnapshot, onPatch } from 'mobx-state-tree'; 32import { getSnapshot, onPatch } from 'mobx-state-tree';
@@ -83,6 +85,21 @@ if (!isDevelopment) {
83 app.userAgentFallback = userAgent; 85 app.userAgentFallback = userAgent;
84} 86}
85 87
88app.setAboutPanelOptions({
89 applicationVersion: [
90 `Version: ${app.getVersion()}`,
91 `Electron: ${process.versions.electron}`,
92 `Chrome: ${process.versions.chrome}`,
93 `Node.js: ${process.versions.node}`,
94 `Platform: ${osName()}`,
95 `Arch: ${arch()}`,
96 `Build date: ${new Date(Number(import.meta.env.BUILD_DATE))}`,
97 `Git SHA: ${import.meta.env.GIT_SHA}`,
98 `Git branch: ${import.meta.env.GIT_BRANCH}`,
99 ].join('\n'),
100 version: '',
101});
102
86function getResourcePath(relativePath: string): string { 103function getResourcePath(relativePath: string): string {
87 return join(__dirname, relativePath); 104 return join(__dirname, relativePath);
88} 105}
diff --git a/packages/main/types/importMeta.d.ts b/packages/main/types/importMeta.d.ts
index 3da01d3..e422c30 100644
--- a/packages/main/types/importMeta.d.ts
+++ b/packages/main/types/importMeta.d.ts
@@ -4,5 +4,8 @@ interface ImportMeta {
4 MODE: string; 4 MODE: string;
5 PROD: boolean; 5 PROD: boolean;
6 VITE_DEV_SERVER_URL: string; 6 VITE_DEV_SERVER_URL: string;
7 GIT_SHA: string;
8 GIT_BRANCH: string;
9 BUILD_DATE: number;
7 } 10 }
8} 11}
diff --git a/yarn.lock b/yarn.lock
index 505c709..22f41ed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3757,7 +3757,7 @@ __metadata:
3757 languageName: node 3757 languageName: node
3758 linkType: hard 3758 linkType: hard
3759 3759
3760"execa@npm:^5.0.0": 3760"execa@npm:^5.0.0, execa@npm:^5.1.1":
3761 version: 5.1.1 3761 version: 5.1.1
3762 resolution: "execa@npm:5.1.1" 3762 resolution: "execa@npm:5.1.1"
3763 dependencies: 3763 dependencies:
@@ -4084,6 +4084,13 @@ __metadata:
4084 languageName: node 4084 languageName: node
4085 linkType: hard 4085 linkType: hard
4086 4086
4087"git-repo-info@npm:^2.1.1":
4088 version: 2.1.1
4089 resolution: "git-repo-info@npm:2.1.1"
4090 checksum: 58cedacae81bbe8fedc81d226346c472d11357d1758140ab0ee5d0c3360ad5b7a9d8613ca6e8b50d089d073e5b3f2e2893536d0cb57bced5f558dc913d5e21c6
4091 languageName: node
4092 linkType: hard
4093
4087"glob-parent@npm:^6.0.1": 4094"glob-parent@npm:^6.0.1":
4088 version: 6.0.2 4095 version: 6.0.2
4089 resolution: "glob-parent@npm:6.0.2" 4096 resolution: "glob-parent@npm:6.0.2"
@@ -5627,6 +5634,13 @@ __metadata:
5627 languageName: node 5634 languageName: node
5628 linkType: hard 5635 linkType: hard
5629 5636
5637"macos-release@npm:^3.0.1":
5638 version: 3.0.1
5639 resolution: "macos-release@npm:3.0.1"
5640 checksum: 117c78e92b995bcd391cd7a35cbae122aae491ec6ef726257c7d58ab06087506b9c09d2c89c1dc11cf8fca5ade7dbfb18f8bed01702f5faf7ea5371e07405074
5641 languageName: node
5642 linkType: hard
5643
5630"make-dir@npm:^3.0.0": 5644"make-dir@npm:^3.0.0":
5631 version: 3.1.0 5645 version: 3.1.0
5632 resolution: "make-dir@npm:3.1.0" 5646 resolution: "make-dir@npm:3.1.0"
@@ -6113,6 +6127,16 @@ __metadata:
6113 languageName: node 6127 languageName: node
6114 linkType: hard 6128 linkType: hard
6115 6129
6130"os-name@npm:^5.0.1":
6131 version: 5.0.1
6132 resolution: "os-name@npm:5.0.1"
6133 dependencies:
6134 macos-release: ^3.0.1
6135 windows-release: ^5.0.1
6136 checksum: 7fe0db633aae8a030d0897655deede763a5b76a2b7b156e3f956e28b1c2ba9bb43565ce6b82cb4cf1c196673a80ca68b420d33450e29dd82911f3b37fc168142
6137 languageName: node
6138 linkType: hard
6139
6116"p-cancelable@npm:^1.0.0": 6140"p-cancelable@npm:^1.0.0":
6117 version: 1.1.0 6141 version: 1.1.0
6118 resolution: "p-cancelable@npm:1.1.0" 6142 resolution: "p-cancelable@npm:1.1.0"
@@ -6988,8 +7012,10 @@ __metadata:
6988 electron-builder: ^22.14.11 7012 electron-builder: ^22.14.11
6989 esbuild: ^0.14.10 7013 esbuild: ^0.14.10
6990 eslint: ^8.6.0 7014 eslint: ^8.6.0
7015 git-repo-info: ^2.1.1
6991 jest: ^27.4.5 7016 jest: ^27.4.5
6992 loglevel: ^1.8.0 7017 loglevel: ^1.8.0
7018 os-name: ^5.0.1
6993 preload: ^0.1.0 7019 preload: ^0.1.0
6994 rimraf: ^3.0.2 7020 rimraf: ^3.0.2
6995 rollup: ^2.62.0 7021 rollup: ^2.62.0
@@ -7785,6 +7811,15 @@ __metadata:
7785 languageName: node 7811 languageName: node
7786 linkType: hard 7812 linkType: hard
7787 7813
7814"windows-release@npm:^5.0.1":
7815 version: 5.0.1
7816 resolution: "windows-release@npm:5.0.1"
7817 dependencies:
7818 execa: ^5.1.1
7819 checksum: b6b403333b7b3ea31a805c287f210962d8f3191865d81d2fd3955e603ab4d6893abc746d87b7da5b2a7a044b7b18df97c948e7d5392baed1d2bc5687fbf7431d
7820 languageName: node
7821 linkType: hard
7822
7788"word-wrap@npm:^1.2.3, word-wrap@npm:~1.2.3": 7823"word-wrap@npm:^1.2.3, word-wrap@npm:~1.2.3":
7789 version: 1.2.3 7824 version: 1.2.3
7790 resolution: "word-wrap@npm:1.2.3" 7825 resolution: "word-wrap@npm:1.2.3"