diff --git a/.eslintrc.json b/.eslintrc.json index f7dd140c7..64d9f5c30 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -20,7 +20,6 @@ }, "globals": { "__static": true, - "staticResourcesPath": true, "__": true, "__n": true, "app": true diff --git a/CHANGELOG.md b/CHANGELOG.md index cc52d8cff..adc7c6c1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). * Error when clicking LBRY URLs when app is closed on macOS ([#1119](https://github.com/lbryio/lbry-app/issues/1119)) * LBRY URLs not working on Linux ([#1120](https://github.com/lbryio/lbry-app/issues/1120)) * Fix Windows notifications not showing ([1145](https://github.com/lbryio/lbry-app/pull/1145)) + * Fix __static path not resolving on development environment ### Deprecated * diff --git a/src/renderer/app.js b/src/renderer/app.js index 9933b47eb..9a49e51d7 100644 --- a/src/renderer/app.js +++ b/src/renderer/app.js @@ -22,16 +22,6 @@ const app = { }, }; -// Workaround for https://github.com/electron-userland/electron-webpack/issues/52 -if (!isDev) { - window.staticResourcesPath = Path.join(remote.app.getAppPath(), '../static').replace( - /\\/g, - '\\\\' - ); -} else { - window.staticResourcesPath = ''; -} - // eslint-disable-next-line no-underscore-dangle global.__ = i18n.__; // eslint-disable-next-line no-underscore-dangle diff --git a/src/renderer/lbry.js b/src/renderer/lbry.js index 79855b4ce..3505f1c84 100644 --- a/src/renderer/lbry.js +++ b/src/renderer/lbry.js @@ -172,7 +172,7 @@ Lbry.publishDeprecated = (params, fileListedCallback, publishedCallback, errorCa ); }; -Lbry.imagePath = file => `${staticResourcesPath}/img/${file}`; +Lbry.imagePath = file => `file://${__static}/img/${file}`; Lbry.getMediaType = (contentType, fileName) => { if (contentType) { diff --git a/src/renderer/redux/selectors/settings.js b/src/renderer/redux/selectors/settings.js index 9c90cfac2..348df4b2e 100644 --- a/src/renderer/redux/selectors/settings.js +++ b/src/renderer/redux/selectors/settings.js @@ -30,6 +30,6 @@ export const selectThemePath = createSelector( selectIsNight, (theme, automaticDarkModeEnabled, isNight) => { const dynamicTheme = automaticDarkModeEnabled && isNight ? 'dark' : theme; - return `${staticResourcesPath}/themes/${dynamicTheme || 'light'}.css`; + return `file://${__static}/themes/${dynamicTheme || 'light'}.css`; } );