Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-12-27 00:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1952 from MartinFournier/feature/git-commit-version

Browse Source 
Fix #1880: Show git commit of bundled app
This commit is contained in:
hydroflame 2021-12-16 15:45:25 -05:00 committed by GitHub
commit 55d386a504
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/@types/global.d.ts vendored Normal file
View File

@ -0,0 +1,2 @@
// Defined by webpack on startup or compilation
declare const __COMMIT_HASH__: string;

7
src/Sidebar/ui/SidebarRoot.tsx
View File

@ -6,6 +6,7 @@ import makeStyles from "@mui/styles/makeStyles";
import MuiDrawer from "@mui/material/Drawer";
import List from "@mui/material/List";
import Divider from "@mui/material/Divider";
import Tooltip from "@mui/material/Tooltip";
import ChevronLeftIcon from "@mui/icons-material/ChevronLeft";
import ChevronRightIcon from "@mui/icons-material/ChevronRight";
import ListItem from "@mui/material/ListItem";
@ -337,7 +338,11 @@ export function SidebarRoot(props: IProps): React.ReactElement {
<ListItemIcon>
{!open ? <ChevronRightIcon color="primary" /> : <ChevronLeftIcon color="primary" />}
</ListItemIcon>
<ListItemText primary={<Typography>Bitburner v{CONSTANTS.VersionString}</Typography>} />
<ListItemText primary={
<Tooltip title={__COMMIT_HASH__}>
<Typography>Bitburner v{CONSTANTS.VersionString}</Typography>
</Tooltip>
} />
</ListItem>
<Divider />
<List>

4
src/Terminal/Terminal.ts
View File

@ -77,7 +77,7 @@ export class Terminal implements ITerminal {
commandHistory: string[] = [];
commandHistoryIndex = 0;
outputHistory: (Output | Link | RawOutput)[] = [new Output(`Bitburner v${CONSTANTS.VersionString}`, "primary")];
outputHistory: (Output | Link | RawOutput)[] = [new Output(`Bitburner v${CONSTANTS.VersionString} (${__COMMIT_HASH__})`, "primary")];
// True if a Coding Contract prompt is opened
contractOpen = false;
@ -555,7 +555,7 @@ export class Terminal implements ITerminal {
}
clear(): void {
this.outputHistory = [new Output(`Bitburner v${CONSTANTS.VersionString}`, "primary")];
this.outputHistory = [new Output(`Bitburner v${CONSTANTS.VersionString} (${__COMMIT_HASH__})`, "primary")];
TerminalEvents.emit();
TerminalClearEvents.emit();
}

2
src/ui/LoadingScreen.tsx
View File

@ -69,7 +69,7 @@ export function LoadingScreen(): React.ReactElement {
<CircularProgress size={150} color="primary" />
</Grid>
<Grid item>
<Typography variant="h3">Loading Bitburner v{CONSTANTS.VersionString}</Typography>
<Typography variant="h3">Loading Bitburner v{CONSTANTS.VersionString} ({__COMMIT_HASH__})</Typography>
</Grid>
{show && (
<Grid item>

10
webpack.config.js
View File

@ -42,6 +42,13 @@ module.exports = (env, argv) => {
};
}
// Get the current commit hash to inject into the app
// https://stackoverflow.com/a/38401256
const commitHash = require('child_process')
.execSync('git rev-parse --short HEAD')
.toString()
.trim();
return {
plugins: [
new webpack.DefinePlugin({
@ -105,6 +112,9 @@ module.exports = (env, argv) => {
},
},
}),
new webpack.DefinePlugin({
__COMMIT_HASH__: JSON.stringify(commitHash)
}),
// In dev mode, use a faster method of create sourcemaps
// while keeping lines/columns accurate
isDevServer &&