diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ffd373e88..3878c88a8f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -374,8 +374,16 @@ jobs: run: yarn nx test @affine/monorepo env: NATIVE_TEST: 'true' - - name: Build AFFiNE Desktop + + - name: Build Infra + run: yarn run build:infra + + - name: Build Plugins + run: yarn run build:plugins + + - name: Build Desktop Layers run: yarn nx build @affine/electron + - name: Download static resource artifact uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index ceabc36e1e..a0cd3b6637 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -124,9 +124,12 @@ jobs: path: apps/electron/resources/web-static - name: Build Infra - run: yarn nx run-many -t build -p plugin-infra infra + run: yarn run build:infra - - name: Build layers + - name: Build Plugins + run: yarn run build:plugins + + - name: Build Desktop Layers run: yarn nx build @affine/electron - name: Signing By Apple Developer ID diff --git a/.github/workflows/release-desktop-app.yml b/.github/workflows/release-desktop-app.yml index 6ef9998b4b..de99d4ca4f 100644 --- a/.github/workflows/release-desktop-app.yml +++ b/.github/workflows/release-desktop-app.yml @@ -124,9 +124,12 @@ jobs: path: apps/electron/resources/web-static - name: Build Infra - run: yarn nx run-many -t build -p plugin-infra infra + run: yarn run build:infra - - name: Build AFFiNE Desktop + - name: Build Plugins + run: yarn run build:plugins + + - name: Build Desktop Layers run: yarn nx build @affine/electron - name: Signing By Apple Developer ID diff --git a/apps/electron/package.json b/apps/electron/package.json index 22282ba972..370f2b1367 100644 --- a/apps/electron/package.json +++ b/apps/electron/package.json @@ -24,7 +24,6 @@ "main": "./dist/main.js", "devDependencies": { "@affine-test/kit": "workspace:*", - "@affine/bookmark-block": "workspace:*", "@affine/native": "workspace:*", "@blocksuite/blocks": "0.0.0-20230630081054-55a25248-nightly", "@blocksuite/editor": "0.0.0-20230630081054-55a25248-nightly", diff --git a/package.json b/package.json index 6ec1248a06..4ffa4e02db 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "build": "yarn nx build @affine/web", "build:electron": "yarn nx build @affine/electron", "build:infra": "yarn nx run-many -t build -p plugin-infra infra", + "build:plugins": "yarn nx run-many -t build -p @affine/bookmark-block", "build:storybook": "yarn nx build @affine/storybook", "start:web": "yarn workspace @affine/web start", "start:web-static": "yarn exec serve apps/web/out -l 8080", diff --git a/yarn.lock b/yarn.lock index 66d6c65222..4acb89194b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -50,7 +50,7 @@ __metadata: languageName: unknown linkType: soft -"@affine/bookmark-block@workspace:*, @affine/bookmark-block@workspace:plugins/bookmark-block": +"@affine/bookmark-block@workspace:plugins/bookmark-block": version: 0.0.0-use.local resolution: "@affine/bookmark-block@workspace:plugins/bookmark-block" dependencies: @@ -207,7 +207,6 @@ __metadata: resolution: "@affine/electron@workspace:apps/electron" dependencies: "@affine-test/kit": "workspace:*" - "@affine/bookmark-block": "workspace:*" "@affine/native": "workspace:*" "@blocksuite/blocks": 0.0.0-20230630081054-55a25248-nightly "@blocksuite/editor": 0.0.0-20230630081054-55a25248-nightly