Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/tar-npm-6.2.1-237800bb20-f1322768c9.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions packages/desktop/app/javascripts/Main/Types/Paths.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import index from '../../../index.html'

function url(fileName: string): string {
if ('APP_RELATIVE_PATH' in process.env) {
return path.join('file://', __dirname, process.env.APP_RELATIVE_PATH as string, fileName)
return 'file://' + path.resolve(__dirname, process.env.APP_RELATIVE_PATH as string, fileName)
}
return path.join('file://', __dirname, fileName)
return 'file://' + path.resolve(__dirname, fileName)
}

function filePath(fileName: string): string {
Expand Down
4 changes: 2 additions & 2 deletions packages/desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"compare-versions": "^6.1.0",
"decrypt": "github:standardnotes/decrypt#master",
"dotenv": "^16.3.1",
"electron": "34.1.1",
"electron": "35.2.0",
"electron-log": "^4.4.8",
"electron-updater": "^6.1.4",
"fs-extra": "^11.1.1",
Expand All @@ -55,7 +55,7 @@
"@babel/core": "*",
"@babel/preset-env": "*",
"@electron/notarize": "^3.0.0",
"@electron/rebuild": "3.7.2",
"@electron/rebuild": "3.6.0",
"@types/fs-extra": "^11.0.1",
"@types/lodash": "^4.14.189",
"@types/mime-types": "^2.1.1",
Expand Down
Loading
Loading