From 9c6eba897142a0f6a9fb1ce932aa0aea50402c12 Mon Sep 17 00:00:00 2001
From: EYHN <cneyhn@gmail.com>
Date: Mon, 1 Apr 2024 07:51:35 +0000
Subject: [PATCH] fix(electron): fix build script (#6422)

---
 .github/workflows/build-test.yml                      | 2 +-
 packages/frontend/electron/scripts/generate-assets.ts | 8 +++++++-
 tools/cli/src/bin/build.ts                            | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index ae650e84a8..c16ea21fa5 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -283,7 +283,7 @@ jobs:
         env:
           DISTRIBUTION: 'desktop'
       - name: zip web
-        run: tar -czf dist.tar.gz --directory=packages/frontend/electron/dist .
+        run: tar -czf dist.tar.gz --directory=packages/frontend/electron/renderer/dist .
       - name: Upload web artifact
         uses: actions/upload-artifact@v4
         with:
diff --git a/packages/frontend/electron/scripts/generate-assets.ts b/packages/frontend/electron/scripts/generate-assets.ts
index 429c2d4e25..a66ca1fbb4 100755
--- a/packages/frontend/electron/scripts/generate-assets.ts
+++ b/packages/frontend/electron/scripts/generate-assets.ts
@@ -12,7 +12,13 @@ const __dirname = fileURLToPath(new URL('.', import.meta.url));
 const repoRootDir = path.join(__dirname, '..', '..', '..', '..');
 const electronRootDir = path.join(__dirname, '..');
 const publicDistDir = path.join(electronRootDir, 'resources');
-const webDir = path.join(repoRootDir, 'packages', 'frontend', 'electron');
+const webDir = path.join(
+  repoRootDir,
+  'packages',
+  'frontend',
+  'electron',
+  'renderer'
+);
 const affineWebOutDir = path.join(webDir, 'dist');
 const publicAffineOutDir = path.join(publicDistDir, `web-static`);
 const releaseVersionEnv = process.env.RELEASE_VERSION || '';
diff --git a/tools/cli/src/bin/build.ts b/tools/cli/src/bin/build.ts
index 88d856b818..ba767c754b 100644
--- a/tools/cli/src/bin/build.ts
+++ b/tools/cli/src/bin/build.ts
@@ -44,8 +44,8 @@ const getDistribution = () => {
       cwd = path.join(projectRoot, 'packages/frontend/web');
       return 'browser';
     case 'desktop':
-      cwd = path.join(projectRoot, 'packages/frontend/electron');
-      entry = path.join(cwd, 'renderer', 'index.tsx');
+      cwd = path.join(projectRoot, 'packages/frontend/electron/renderer');
+      entry = path.join(cwd, 'index.tsx');
       return DISTRIBUTION;
     default: {
       throw new Error('DISTRIBUTION must be one of browser, desktop');