From e7ac43f0f744086eb20b181c866bf9eca3fc241f Mon Sep 17 00:00:00 2001
From: forehalo <forehalo@gmail.com>
Date: Wed, 18 Sep 2024 05:09:42 +0000
Subject: [PATCH] ci: avoid twice by nx (#8279)

---
 .github/workflows/build-test.yml                       | 10 +++++-----
 package.json                                           |  2 +-
 packages/frontend/admin/package.json                   |  2 +-
 .../frontend/apps/electron/scripts/generate-assets.ts  |  5 +----
 packages/frontend/apps/mobile/package.json             |  2 +-
 packages/frontend/apps/web/package.json                |  2 +-
 tools/cli/package.json                                 |  2 +-
 7 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 9812f6e82e..ee12f0da9a 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -296,8 +296,8 @@ jobs:
           path: ./packages/backend/native/server-native.node
           if-no-files-found: error
 
-  build-web:
-    name: Build @affine/web
+  build-electron-renderer:
+    name: Build @affine/electron renderer
     runs-on: ubuntu-latest
 
     steps:
@@ -307,9 +307,9 @@ jobs:
         with:
           electron-install: false
           full-cache: true
-      - name: Build Web
+      - name: Build Electron renderer
         # always skip cache because its fast, and cache configuration is always changing
-        run: yarn nx build @affine/web --skip-nx-cache
+        run: yarn build
         env:
           DISTRIBUTION: desktop
       - name: zip web
@@ -520,7 +520,7 @@ jobs:
               test: true,
             }
     needs:
-      - build-web
+      - build-electron-renderer
       - build-native
     steps:
       - uses: actions/checkout@v4
diff --git a/package.json b/package.json
index 0cce643e16..b3f6ee505b 100644
--- a/package.json
+++ b/package.json
@@ -19,8 +19,8 @@
   },
   "scripts": {
     "dev": "yarn workspace @affine/cli dev",
+    "build": "yarn workspace @affine/cli bundle",
     "dev:electron": "yarn workspace @affine/electron dev",
-    "build": "yarn nx build @affine/web",
     "build:electron": "yarn nx build @affine/electron",
     "build:server-native": "yarn nx run-many -t build -p @affine/server-native",
     "start:web-static": "yarn workspace @affine/web static-server",
diff --git a/packages/frontend/admin/package.json b/packages/frontend/admin/package.json
index 4d96dfbc89..cce81ecb25 100644
--- a/packages/frontend/admin/package.json
+++ b/packages/frontend/admin/package.json
@@ -60,7 +60,7 @@
     "tailwindcss-animate": "^1.0.7"
   },
   "scripts": {
-    "build": "cross-env DISTRIBUTION=admin yarn workspace @affine/cli build",
+    "build": "cross-env DISTRIBUTION=admin yarn workspace @affine/cli bundle",
     "update-shadcn": "shadcn-ui add -p src/components/ui"
   },
   "exports": {
diff --git a/packages/frontend/apps/electron/scripts/generate-assets.ts b/packages/frontend/apps/electron/scripts/generate-assets.ts
index 928dced290..f548798ccd 100755
--- a/packages/frontend/apps/electron/scripts/generate-assets.ts
+++ b/packages/frontend/apps/electron/scripts/generate-assets.ts
@@ -47,12 +47,9 @@ process.env.DISTRIBUTION = 'desktop';
 
 const cwd = repoRootDir;
 
-const { SKIP_NX_CACHE } = process.env;
-const nxFlag = SKIP_NX_CACHE ? '--skip-nx-cache' : '';
-
 // step 1: build web dist
 if (!process.env.SKIP_WEB_BUILD) {
-  spawnSync('yarn', ['nx', 'build', '@affine/web', nxFlag], {
+  spawnSync('yarn', ['build'], {
     stdio: 'inherit',
     env: process.env,
     cwd,
diff --git a/packages/frontend/apps/mobile/package.json b/packages/frontend/apps/mobile/package.json
index 5336ba4d0e..44bc14a1f3 100644
--- a/packages/frontend/apps/mobile/package.json
+++ b/packages/frontend/apps/mobile/package.json
@@ -5,7 +5,7 @@
   "private": true,
   "browser": "src/index.tsx",
   "scripts": {
-    "build": "cross-env DISTRIBUTION=mobile yarn workspace @affine/cli build",
+    "build": "cross-env DISTRIBUTION=mobile yarn workspace @affine/cli bundle",
     "dev": "yarn workspace @affine/cli dev",
     "static-server": "cross-env DISTRIBUTION=mobile yarn workspace @affine/cli dev --static"
   },
diff --git a/packages/frontend/apps/web/package.json b/packages/frontend/apps/web/package.json
index ffcfe4255e..709244c1de 100644
--- a/packages/frontend/apps/web/package.json
+++ b/packages/frontend/apps/web/package.json
@@ -5,7 +5,7 @@
   "private": true,
   "browser": "src/index.tsx",
   "scripts": {
-    "build": "cross-env DISTRIBUTION=web yarn workspace @affine/cli build",
+    "build": "cross-env DISTRIBUTION=web yarn workspace @affine/cli bundle",
     "dev": "yarn workspace @affine/cli dev",
     "static-server": "yarn workspace @affine/cli dev --static"
   },
diff --git a/tools/cli/package.json b/tools/cli/package.json
index 5cbc16ae6b..3870742003 100644
--- a/tools/cli/package.json
+++ b/tools/cli/package.json
@@ -41,7 +41,7 @@
     "webpack-merge": "^6.0.0"
   },
   "scripts": {
-    "build": "node --loader ts-node/esm/transpile-only.mjs ./src/bin/build.ts",
+    "bundle": "node --loader ts-node/esm/transpile-only.mjs ./src/bin/build.ts",
     "dev": "node --loader ts-node/esm/transpile-only.mjs ./src/bin/dev.ts"
   },
   "version": "0.16.0"