Skip to content

refactor: migration to pnpm #444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zerob13 merged 4 commits into from
Jun 3, 2025
Merged

refactor: migration to pnpm #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bfb5d47
chore: yarn to pnpm
zhangmo8 Jun 3, 2025
ea7da03
fix: fix ci for pnpm
zhangmo8 Jun 3, 2025
d52b1a2
fix: fix ci for pnpm
zhangmo8 Jun 3, 2025
e46da0a
chore: only pnpm
zhangmo8 Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 34 additions & 15 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,24 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '22'
node-version: '20.12.2'
- name: Setup pnpm
uses: pnpm/action-setup@v2
with:
version: 10.11.0
- name: Install dependencies
run: npm install
run: pnpm install
env:
npm_config_platform: win32
npm_config_arch: ${{ matrix.arch }}
- name: Install Node Runtime
run: npm run installRuntime:win:${{ matrix.arch }}
run: pnpm run installRuntime:win:${{ matrix.arch }}
- name: Install Sharp
run: npm install sharp --build-from-source
run: pnpm install sharp
env:
npm_config_build_from_source: true
- name: Build Windows
run: npm run build:win:${{ matrix.arch }}
run: pnpm run build:win:${{ matrix.arch }}
env:
VITE_GITHUB_CLIENT_ID: ${{ secrets.DC_GITHUB_CLIENT_ID }}
VITE_GITHUB_CLIENT_SECRET: ${{ secrets.DC_GITHUB_CLIENT_SECRET }}
Expand Down Expand Up @@ -70,18 +76,24 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '22'
node-version: '20.12.2'
- name: Setup pnpm
uses: pnpm/action-setup@v2
with:
version: 10.11.0
- name: Install dependencies
run: npm install
run: pnpm install
env:
npm_config_platform: linux
npm_config_arch: ${{ matrix.arch }}
- name: Install Node Runtime
run: npm run installRuntime:linux:${{ matrix.arch }}
run: pnpm run installRuntime:linux:${{ matrix.arch }}
- name: Install Sharp
run: npm install --cpu=wasm32 sharp
run: pnpm install sharp
env:
npm_config_cpu: wasm32
- name: Build Linux
run: npm run build:linux:${{ matrix.arch }}
run: pnpm run build:linux:${{ matrix.arch }}
env:
VITE_GITHUB_CLIENT_ID: ${{ secrets.DC_GITHUB_CLIENT_ID }}
VITE_GITHUB_CLIENT_SECRET: ${{ secrets.DC_GITHUB_CLIENT_SECRET }}
Expand Down Expand Up @@ -110,18 +122,25 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '22'
node-version: '20.12.2'
- name: Setup pnpm
uses: pnpm/action-setup@v2
with:
version: 10.11.0
- name: Install dependencies
run: npm install
run: pnpm install
env:
npm_config_platform: darwin
npm_config_arch: ${{ matrix.arch }}
- name: Install Node Runtime
run: npm run installRuntime:mac:${{ matrix.arch }}
run: pnpm run installRuntime:mac:${{ matrix.arch }}
- name: Install Sharp
run: npm i --cpu=${{ matrix.arch }} --os=darwin sharp
run: pnpm install sharp
env:
npm_config_cpu: ${{ matrix.arch }}
npm_config_os: darwin
- name: Build Mac
run: npm run build:mac:${{ matrix.arch }}
run: pnpm run build:mac:${{ matrix.arch }}
env:
CSC_LINK: ${{ secrets.DEEPCHAT_CSC_LINK }}
CSC_KEY_PASSWORD: ${{ secrets.DEEPCHAT_CSC_KEY_PASS }}
Expand Down
30 changes: 18 additions & 12 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,34 @@
"main": "./out/main/index.js",
"author": "ThinkInAIXYZ",
"type": "module",
"engines": {
"node": ">=20.12.2",
"pnpm": ">=10.11.0"
},
"packageManager": "pnpm@10.11.0",
"scripts": {
"preinstall": "npx only-allow pnpm",
"format": "prettier --write .",
"lint": "eslint --cache .",
"typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
"typecheck:web": "vue-tsc --noEmit -p tsconfig.web.json --composite false",
"typecheck": "npm run typecheck:node && npm run typecheck:web",
"typecheck": "pnpm run typecheck:node && pnpm run typecheck:web",
"start": "electron-vite preview",
"dev": "electron-vite dev --watch",
"dev:inspect": "electron-vite dev --watch --inspect=9229",
"dev:linux": "electron-vite dev --watch --noSandbox",
"build": "npm run typecheck && electron-vite build",
"build": "pnpm run typecheck && electron-vite build",
"postinstall": "node scripts/postinstall.js && electron-builder install-app-deps",
"build:unpack": "npm run build && electron-builder --dir",
"build:win": "npm run build && electron-builder --win",
"build:win:x64": "npm run build && electron-builder --win --x64",
"build:win:arm64": "npm run build && electron-builder --win --arm64",
"build:mac": "npm run build && electron-builder --mac",
"build:mac:arm64": "npm run build && electron-builder --mac --arm64",
"build:mac:x64": "npm run build && electron-builder -c electron-builder-macx64.yml --mac --x64 ",
"build:linux": "npm run build && electron-builder --linux",
"build:linux:x64": "npm run build && electron-builder --linux --x64",
"build:linux:arm64": "npm run build && electron-builder --linux --arm64",
"build:unpack": "pnpm run build && electron-builder --dir",
"build:win": "pnpm run build && electron-builder --win",
"build:win:x64": "pnpm run build && electron-builder --win --x64",
"build:win:arm64": "pnpm run build && electron-builder --win --arm64",
"build:mac": "pnpm run build && electron-builder --mac",
"build:mac:arm64": "pnpm run build && electron-builder --mac --arm64",
"build:mac:x64": "pnpm run build && electron-builder -c electron-builder-macx64.yml --mac --x64 ",
"build:linux": "pnpm run build && electron-builder --linux",
"build:linux:x64": "pnpm run build && electron-builder --linux --x64",
"build:linux:arm64": "pnpm run build && electron-builder --linux --arm64",
"afterSign": "scripts/notarize.js",
"installRuntime": "tiny-runtime-injector -d runtime/node -n v22.15.0 --no-docs --no-dev --no-sourcemaps",
"installRuntime:win:x64": "tiny-runtime-injector -d runtime/node -n v22.15.0 -a x64 -p win32 --no-docs --no-dev --no-sourcemaps",
Expand Down