Mirrors/trezor-suite
2
0
Fork 0
mirror of https://github.com/trezor/trezor-suite.git synced 2026-03-21 22:57:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore(suite-desktop): clean up ASSET_PREFIX for desktop vs. other apps

Browse Source
This commit is contained in:
Jiri Zbytovsky
2025-11-24 17:45:44 +01:00
committed by Jiri Zbytovsky
parent 588f9e5218
commit 3bfdfc6c9b
4 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/env-utils/src/__tests__/resolveStaticPath.test.ts
View File

@@ -13,18 +13,24 @@ describe(resolveStaticPath.name, () => {
it('return default static path with empty ASSET_PREFIX', () => {
process.env.ASSET_PREFIX = '';
expect(resolveStaticPath('mypath')).toBe('./static/mypath');
expect(resolveStaticPath('mypath')).toBe('/static/mypath');
});
it('return default static path with undefined ASSET_PREFIX', () => {
process.env.ASSET_PREFIX = undefined;
expect(resolveStaticPath('mypath')).toBe('./static/mypath');
expect(resolveStaticPath('/mypath')).toBe('./static/mypath');
expect(resolveStaticPath('mypath')).toBe('/static/mypath');
expect(resolveStaticPath('/mypath')).toBe('/static/mypath');
});
it('return static path prefixed with ASSET_PREFIX', () => {
it('return static path prefixed with branch name ASSET_PREFIX', () => {
process.env.ASSET_PREFIX = 'branchName';
expect(resolveStaticPath('mypath')).toBe('branchName/static/mypath');
expect(resolveStaticPath('/mypath')).toBe('branchName/static/mypath');
});
it('return static path prefixed with ASSET_PREFIX that is used on Suite Desktop', () => {
process.env.ASSET_PREFIX = '.';
expect(resolveStaticPath('mypath')).toBe('./static/mypath');
expect(resolveStaticPath('/mypath')).toBe('./static/mypath');
});
});

25
packages/env-utils/src/resolveStaticPath.ts
View File

@@ -1,16 +1,21 @@
const isWeb = () => process.env.SUITE_TYPE === 'web'; // duplicated with envUtils.ts to prevent importing it in mobile
// This needs to be set as `.` so it loads from appDir of the Electron app.
// For example (in case of AppImage): `file:///tmp/.mount_TrezorAvGo8g/resources/app.asar/build`,
// where the requested asset (for example: `static/images/images/app-store-badge.svg`) is located.
const getDefaultAssetPrefix = () => (isWeb() ? '' : '.');
/*
Most apps use empty string as ASSET_PREFIX, which means loading assets from root of location.origin
e.g. https://suite.trezor.io/web/settings will load /static/images/logo.svg from https://suite.trezor.io/static/images/logo.svg
However on desktop, the app runs from file, for example AppImage: file:///tmp/.mount_TrezorAvGo8g/resources/app.asar/build
There is no location.origin, so using /path would incorrectly resolve as file:///path
On Desktop, we therefore need to use relative paths, e.g. ./static/images/logo.svg
Note that `process` may not be defined (e.g. in storybook), so accessing it without checking would crash.
*/
const getEnvAssetPrefix = () =>
typeof process !== 'undefined' ? process.env?.ASSET_PREFIX : undefined;
const getDefaultPrefix = () => getEnvAssetPrefix() ?? '';
export const resolveStaticPath = (
path: string,
pathPrefix: string | undefined = process.env.ASSET_PREFIX,
) => `${pathPrefix || getDefaultAssetPrefix()}/static/${path.replace(/^\/+/, '')}`;
pathPrefix: string | undefined = getDefaultPrefix(),
) => `${pathPrefix}/static/${path.replace(/^\/+/, '')}`;
export const resolveConnectPath = (
path: string,
pathPrefix: string | undefined = process.env.ASSET_PREFIX,
) => `${pathPrefix || getDefaultAssetPrefix()}/${path.replace(/^\/+/, '')}`;
pathPrefix: string | undefined = getDefaultPrefix(),
) => `${pathPrefix}/${path.replace(/^\/+/, '')}`;

2
packages/suite-build/package.json
View File

@@ -17,7 +17,7 @@
"dev:web": "yarn run web",
"dev:web:vite": "vite",
"build:web": "NODE_ENV=production yarn run web",
"desktop": "PROJECT=desktop yarn run base",
"desktop": "PROJECT=desktop ASSET_PREFIX=. yarn run base",
"dev:desktop": "yarn run desktop",
"build:desktop": "NODE_ENV=production yarn run desktop",
"type-check": "yarn g:tsc --build tsconfig.json",

5
packages/suite-desktop-ui/src/support/DesktopUpdater/JustUpdated.tsx
View File

@@ -13,16 +13,13 @@ interface AvailableProps {
onCancel: () => void;
}
const DEFAULT_ASSET_PREFIX = '.';
export const JustUpdated = ({ onCancel }: AvailableProps) => {
const [changelog, setChangelog] = useState<string | null>(null);
const theme = useTheme();
const suiteCurrentVersion = process.env.VERSION || '';
const getReleaseNotes = useCallback(async () => {
const releaseNotesPath =
(process.env.ASSET_PREFIX || DEFAULT_ASSET_PREFIX) + '/release-notes.md';
const releaseNotesPath = process.env.ASSET_PREFIX + '/release-notes.md';
const result = await (await fetch(releaseNotesPath)).text();
setChangelog(result);
}, []);