diff --git a/apps/desktop/README.md b/apps/desktop/README.md index 990ae6db36..dd51a87499 100644 --- a/apps/desktop/README.md +++ b/apps/desktop/README.md @@ -9,7 +9,7 @@ Please follow the Tauri [getting started guide](https://tauri.app/v1/guides/gett After the environment is ready, start development build: ```sh -pnpm tauri dev +yarn tauri dev ``` ## Development @@ -22,8 +22,8 @@ We will provide its binary binding soon, to replace the git-submodule, before Oc On this folder: -- `pnpm dev:app` will start a vite server -- `pnpm build:prerequisite` will link the Octobase and prepare affine dist html and tauri preload script, also will generate ts type from rs. You should run this before start your first development time. +- `yarn dev:app` will start a vite server +- `yarn build:prerequisite` will link the Octobase and prepare affine dist html and tauri preload script, also will generate ts type from rs. You should run this before start your first development time. On project root folder: diff --git a/apps/desktop/scripts/buildAffine.mjs b/apps/desktop/scripts/buildAffine.mjs index 90e51a1bdd..3bb121a33b 100644 --- a/apps/desktop/scripts/buildAffine.mjs +++ b/apps/desktop/scripts/buildAffine.mjs @@ -14,11 +14,11 @@ if (process.platform === 'win32') $.shell = 'pwsh'; * Build affine dist html */ cd(repoDirectory); -await $`pnpm i -r`; -await $`pnpm build`; +await $`yarn install`; +await $`yarn build`; cd(affineSrcDirectory); $.env.NEXT_BASE_PATH = '/affine-out'; -await $`pnpm build`; -await $`pnpm export`; +await $`yarn build`; +await $`yarn export`; await fs.remove(publicAffineOutDirectory); await fs.move(affineSrcOutDirectory, publicAffineOutDirectory); diff --git a/apps/desktop/src-tauri/tauri.conf.json b/apps/desktop/src-tauri/tauri.conf.json index 568775bb5d..5112ad012a 100644 --- a/apps/desktop/src-tauri/tauri.conf.json +++ b/apps/desktop/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "build": { - "beforeDevCommand": "pnpm dev:web", - "beforeBuildCommand": "pnpm build:preload && pnpm build:affine", + "beforeDevCommand": "yarn dev:web", + "beforeBuildCommand": "yarn build:preload && yarn build:affine", "devPath": "http://localhost:8080", "distDir": "../public", "withGlobalTauri": false