diff --git a/electron-builder.json b/electron-builder.json index e437f38d..1eb085a2 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -6,15 +6,13 @@ "output": "dist_electron", "buildResources": "build" }, - "asarUnpack": ["**/node_modules/sharp/**", "**/node_modules/ssh2-no-cpu-features/**", "**/node_modules/@img/**"], - "files": ["out/**/*", "dist/**/*", "resources/**/*", "package.json"], - "extraResources": [ - { - "from": "resources", - "to": ".", - "filter": ["**/*"] - } + "asarUnpack": [ + "**/node_modules/sharp/**", + "**/node_modules/ssh2-no-cpu-features/**", + "**/node_modules/@img/**", + "resources/**" ], + "files": ["out/**/*", "resources/**", "package.json"], "publish": [ { "provider": "s3", @@ -78,8 +76,7 @@ "include": "build/installer.nsh" }, "linux": { - "icon": "resources/", - "asarUnpack": ["**/node_modules/sharp/**", "**/node_modules/ssh2-no-cpu-features/**", "**/node_modules/@img/**"] + "icon": "resources/" }, "snap": { "publish": ["github"] diff --git a/src/main/apis/app/system/index.ts b/src/main/apis/app/system/index.ts index 8e9f6526..cd3efbaa 100644 --- a/src/main/apis/app/system/index.ts +++ b/src/main/apis/app/system/index.ts @@ -29,11 +29,11 @@ import { isMacOSVersionGreaterThanOrEqualTo } from '~/utils/getMacOSVersion' import pasteTemplate from '~/utils/pasteTemplate' import { hideMiniWindow, openMainWindow, openMiniWindow } from '~/utils/windowHelper' -import menubarPng from '../../../../../resources/menubar.png?asset' -import menubarNewDarwinTemplate from '../../../../../resources/menubar-newdarwinTemplate.png?asset' -import menubarNodarwin from '../../../../../resources/menubar-nodarwin.png?asset' -import uploadPng from '../../../../../resources/upload.png?asset' -import uploadDarkPng from '../../../../../resources/upload-dark.png?asset' +import menubarPng from '../../../../../resources/menubar.png?asset&asarUnpack' +import menubarNewDarwinTemplate from '../../../../../resources/menubar-newdarwinTemplate.png?asset&asarUnpack' +import menubarNodarwin from '../../../../../resources/menubar-nodarwin.png?asset&asarUnpack' +import uploadPng from '../../../../../resources/upload.png?asset&asarUnpack' +import uploadDarkPng from '../../../../../resources/upload-dark.png?asset&asarUnpack' let contextMenu: Menu | null export function setDockMenu () { diff --git a/src/main/apis/app/window/windowList.ts b/src/main/apis/app/window/windowList.ts index 2caa402a..76a64e94 100644 --- a/src/main/apis/app/window/windowList.ts +++ b/src/main/apis/app/window/windowList.ts @@ -13,7 +13,7 @@ import { T as $t } from '~/i18n' import { configPaths } from '~/utils/configPaths' import { IWindowList } from '~/utils/enum' -import logo from '../../../../../resources/logo.png?asset' +import logo from '../../../../../resources/logo.png?asset&asarUnpack' const windowList = new Map() @@ -94,7 +94,7 @@ const settingWindowOptions = { if (process.platform !== 'darwin') { settingWindowOptions.frame = false - settingWindowOptions.icon = '../../../../../resources/logo.png' + settingWindowOptions.icon = logo } const miniWindowOptions = { diff --git a/src/main/i18n/index.ts b/src/main/i18n/index.ts index 5c8535f5..100987be 100644 --- a/src/main/i18n/index.ts +++ b/src/main/i18n/index.ts @@ -26,7 +26,7 @@ const builtinI18nList: II18nItem[] = [ ] class I18nManager { private i18n: I18n | null = null - private builtinI18nFolder = path.join(__dirname, '../../resources', 'i18n') + private builtinI18nFolder = path.join(__dirname, '../../resources', 'i18n').replace('app.asar', 'app.asar.unpacked') private outterI18nFolder = '' private localesMap: Map = new Map() private currentLanguage: string = 'zh-CN' diff --git a/src/main/utils/beforeOpen.ts b/src/main/utils/beforeOpen.ts index b2439dd6..3e7ff2b1 100644 --- a/src/main/utils/beforeOpen.ts +++ b/src/main/utils/beforeOpen.ts @@ -48,7 +48,7 @@ function copyFileOutsideOfElectronAsar (sourceInAsarArchive: string, destOutside function resolveMacWorkFlow () { const dest = `${os.homedir()}/Library/Services/Upload pictures with PicList.workflow` try { - copyFileOutsideOfElectronAsar(path.join(__dirname, '../../resources', 'Upload pictures with PicList.workflow'), dest) + copyFileOutsideOfElectronAsar(path.join(__dirname, '../../resources', 'Upload pictures with PicList.workflow').replace('app.asar', 'app.asar.unpacked'), dest) } catch (e) { console.log(e) } @@ -79,6 +79,7 @@ function resolveClipboardImageGenerator () { }) } else { clipboardFiles.forEach(item => { + console.log(`Updating ${item.origin} to ${item.dest}`) diffFilesAndUpdate(item.origin, item.dest) }) } @@ -88,7 +89,7 @@ function resolveClipboardImageGenerator () { return files.map(item => { return { - origin: path.join(__dirname, '../../resources', item), + origin: path.join(__dirname, '../../resources', item).replace('app.asar', 'app.asar.unpacked'), dest: path.join(CONFIG_DIR, item) } }) diff --git a/src/renderer/utils/static.ts b/src/renderer/utils/static.ts index fbef1b7c..976a12c8 100644 --- a/src/renderer/utils/static.ts +++ b/src/renderer/utils/static.ts @@ -1,4 +1,4 @@ -import { IStringKeyMap } from 'root/src/universal/types/types' +import type { IStringKeyMap } from '#/types/types' export const RELEASE_URL = 'https://api.github.com/repos/Kuingsmile/PicList/releases' export const RELEASE_URL_BACKUP = 'https://release.piclist.cn'