From dd7e701276ea0397b089bc3bff965032a173ca88 Mon Sep 17 00:00:00 2001 From: Peng Xiao Date: Mon, 14 Aug 2023 23:40:00 +0800 Subject: [PATCH] fix: allow multiple versions to be installed on windows (#3740) (cherry picked from commit 08da58aa1e7e1852c4fa98836ad3104c2791b8db) --- apps/electron/forge.config.js | 2 +- apps/electron/scripts/generate-assets.mjs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/electron/forge.config.js b/apps/electron/forge.config.js index 282ac04b97..493198c3ce 100644 --- a/apps/electron/forge.config.js +++ b/apps/electron/forge.config.js @@ -82,7 +82,7 @@ const makers = [ !process.env.SKIP_BUNDLE && { name: '@electron-forge/maker-squirrel', config: { - name: 'AFFiNE', + name: productName, setupIcon: icoPath, iconUrl: windowsIconUrl, loadingGif: './resources/icons/affine_installing.gif', diff --git a/apps/electron/scripts/generate-assets.mjs b/apps/electron/scripts/generate-assets.mjs index db40b55f92..757fc7a5b2 100755 --- a/apps/electron/scripts/generate-assets.mjs +++ b/apps/electron/scripts/generate-assets.mjs @@ -37,12 +37,14 @@ if (process.platform === 'win32') { $.prefix = ''; } +$.env.DISTRIBUTION = 'desktop'; + cd(repoRootDir); // step 1: build web (nextjs) dist if (!process.env.SKIP_WEB_BUILD) { await $`yarn -T run build:plugins`; - await $`DISTRIBUTION=desktop yarn nx build @affine/core`; + await $`yarn nx build @affine/core`; await fs.move(affineCoreOutDir, publicAffineOutDir, { overwrite: true }); }