mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #5295 from nielsvanvelzen/startup-log

Browse source 
Log current version to console to help out with issue triage and debugging
This commit is contained in:
Bill Thornton 2024-03-23 11:17:16 -04:00 • committed by GitHub
commit 360394d959
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.eslintrc.js
View file

@ -264,6 +264,8 @@ module.exports = {
'Windows': 'readonly',
// Build time definitions
__JF_BUILD_VERSION__: 'readonly',
__PACKAGE_JSON_NAME__: 'readonly',
__PACKAGE_JSON_VERSION__: 'readonly',
__USE_SYSTEM_FONTS__: 'readonly',
__WEBPACK_SERVE__: 'readonly'
},

5
src/components/apphost.js
View file

@ -1,4 +1,3 @@
import Package from '../../package.json';
import appSettings from '../scripts/settings/appSettings';
import browser from '../scripts/browser';
import Events from '../utils/events.ts';
@ -36,7 +35,7 @@ function getDeviceProfile(item) {
let profile;
if (window.NativeShell) {
profile = window.NativeShell.AppHost.getDeviceProfile(profileBuilder, Package.version);
profile = window.NativeShell.AppHost.getDeviceProfile(profileBuilder, __PACKAGE_JSON_VERSION__);
} else {
const builderOpts = getBaseProfileOptions(item);
profile = profileBuilder(builderOpts);
@ -378,7 +377,7 @@ export const appHost = {
},
appVersion: function () {
return window.NativeShell?.AppHost?.appVersion ?
window.NativeShell.AppHost.appVersion() : Package.version;
window.NativeShell.AppHost.appVersion() : __PACKAGE_JSON_VERSION__;
},
getPushTokenInfo: function () {
return {};

4
src/controllers/dashboard/dashboard.js
View file

@ -26,8 +26,6 @@ import { getSystemInfoQuery } from 'hooks/useSystemInfo';
import { toApi } from 'utils/jellyfin-apiclient/compat';
import { queryClient } from 'utils/query/queryClient';
import { version as WEB_VERSION } from '../../../package.json';
import '../../elements/emby-button/emby-button';
import '../../elements/emby-itemscontainer/emby-itemscontainer';
@ -210,7 +208,7 @@ function refreshActiveRecordings(view, apiClient) {
function reloadSystemInfo(view, apiClient) {
view.querySelector('#buildVersion').innerText = __JF_BUILD_VERSION__;
view.querySelector('#webVersion').innerText = WEB_VERSION;
view.querySelector('#webVersion').innerText = __PACKAGE_JSON_VERSION__;
queryClient
.fetchQuery(getSystemInfoQuery(toApi(apiClient)))

2
src/global.d.ts vendored
View file

@ -16,6 +16,8 @@ export declare global {
}
const __JF_BUILD_VERSION__: string;
const __PACKAGE_JSON_NAME__: string;
const __PACKAGE_JSON_VERSION__: string;
const __USE_SYSTEM_FONTS__: string;
const __WEBPACK_SERVE__: string;
}

3
src/index.jsx
View file

@ -59,6 +59,9 @@ 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__}`);
// This is used in plugins
window.Events = Events;
window.TaskButton = taskButton;

3
webpack.common.js
View file

@ -5,6 +5,7 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const { DefinePlugin } = require('webpack');
const packageJson = require('./package.json');
const Assets = [
'native-promise-only/npo.js',
@ -51,6 +52,8 @@ const config = {
process.env.WEBPACK_SERVE ?
'Dev Server' :
process.env.JELLYFIN_VERSION || 'Release'),
__PACKAGE_JSON_NAME__: JSON.stringify(packageJson.name),
__PACKAGE_JSON_VERSION__: JSON.stringify(packageJson.version),
__USE_SYSTEM_FONTS__: JSON.stringify(!!process.env.USE_SYSTEM_FONTS),
__WEBPACK_SERVE__: JSON.stringify(!!process.env.WEBPACK_SERVE)
}),