milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2858 from thornbill/fix-build-warnings

Browse source
This commit is contained in:
Bill Thornton 2021-08-12 18:44:52 -07:00 • committed by GitHub
commit 5d09af7ee6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/apphost.js
View file

@ -1,4 +1,4 @@
import { version as appVersion } from '../../package.json'; import Package from '../../package.json';
import appSettings from '../scripts/settings/appSettings'; import appSettings from '../scripts/settings/appSettings';
import browser from '../scripts/browser'; import browser from '../scripts/browser';
import { Events } from 'jellyfin-apiclient'; import { Events } from 'jellyfin-apiclient';
@ -33,7 +33,7 @@ function getDeviceProfile(item) {
let profile; let profile;
if (window.NativeShell) { if (window.NativeShell) {
profile = window.NativeShell.AppHost.getDeviceProfile(profileBuilder, appVersion); profile = window.NativeShell.AppHost.getDeviceProfile(profileBuilder, Package.version);
} else { } else {
const builderOpts = getBaseProfileOptions(item); const builderOpts = getBaseProfileOptions(item);
profile = profileBuilder(builderOpts); profile = profileBuilder(builderOpts);
@ -373,7 +373,7 @@ export const appHost = {
}, },
appVersion: function () { appVersion: function () {
return window.NativeShell?.AppHost?.appVersion return window.NativeShell?.AppHost?.appVersion
? window.NativeShell.AppHost.appVersion() : appVersion; ? window.NativeShell.AppHost.appVersion() : Package.version;
}, },
getPushTokenInfo: function () { getPushTokenInfo: function () {
return {}; return {};

2
webpack.dev.js
View file

@ -12,11 +12,13 @@ module.exports = merge(common, {
rules: [ rules: [
{ {
test: /\.(js|jsx)$/, test: /\.(js|jsx)$/,
exclude: /node_modules/,
enforce: 'pre', enforce: 'pre',
use: ['source-map-loader'] use: ['source-map-loader']
}, },
{ {
test: /\.(ts|tsx)$/, test: /\.(ts|tsx)$/,
exclude: /node_modules/,
enforce: 'pre', enforce: 'pre',
use: ['source-map-loader'] use: ['source-map-loader']
} }