jellyfin/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-23 05:59:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #5531 from thornbill/add-commit-sha

Browse Source
This commit is contained in:
Bill Thornton 2024-07-11 02:29:49 -04:00 committed by GitHub
commit 3002a135ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintrc.js
View File

@ -263,6 +263,7 @@ module.exports = {
'UserParentalControlPage': 'writable',
'Windows': 'readonly',
// Build time definitions
__COMMIT_SHA__: 'readonly',
__JF_BUILD_VERSION__: 'readonly',
__PACKAGE_JSON_NAME__: 'readonly',
__PACKAGE_JSON_VERSION__: 'readonly',

7
src/controllers/dashboard/dashboard.js
View File

@ -208,7 +208,12 @@ function refreshActiveRecordings(view, apiClient) {
function reloadSystemInfo(view, apiClient) {
view.querySelector('#buildVersion').innerText = __JF_BUILD_VERSION__;
view.querySelector('#webVersion').innerText = __PACKAGE_JSON_VERSION__;
let webVersion = __PACKAGE_JSON_VERSION__;
if (__COMMIT_SHA__) {
webVersion += ` (${__COMMIT_SHA__})`;
}
view.querySelector('#webVersion').innerText = webVersion;
queryClient
.fetchQuery(getSystemInfoQuery(toApi(apiClient)))

1
src/global.d.ts vendored
View File

@ -15,6 +15,7 @@ export declare global {
'viewshow': CustomEvent;
}
const __COMMIT_SHA__: string;
const __JF_BUILD_VERSION__: string;
const __PACKAGE_JSON_NAME__: string;
const __PACKAGE_JSON_VERSION__: string;

6
src/index.jsx
View File

@ -61,7 +61,11 @@ function loadCoreDictionary() {
function init() {
// Log current version to console to help out with issue triage and debugging
console.log(`${__PACKAGE_JSON_NAME__} version ${__PACKAGE_JSON_VERSION__} build ${__JF_BUILD_VERSION__}`);
console.info(
`[${__PACKAGE_JSON_NAME__}]
version: ${__PACKAGE_JSON_VERSION__}
commit: ${__COMMIT_SHA__}
build: ${__JF_BUILD_VERSION__}`);
// This is used in plugins
window.Events = Events;

10
webpack.common.js
View File

@ -23,6 +23,15 @@ const LibarchiveWasm = [
];
const DEV_MODE = process.env.NODE_ENV !== 'production';
let COMMIT_SHA = '';
try {
COMMIT_SHA = require('child_process')
.execSync('git describe --always --dirty')
.toString()
.trim();
} catch (err) {
console.warn('Failed to get commit sha. Is git installed?', err);
}
const NODE_MODULES_REGEX = /[\\/]node_modules[\\/]/;
@ -47,6 +56,7 @@ const config = {
},
plugins: [
new DefinePlugin({
__COMMIT_SHA__: JSON.stringify(COMMIT_SHA),
__JF_BUILD_VERSION__: JSON.stringify(
process.env.WEBPACK_SERVE ?
'Dev Server' :