pnpm setup

pull/395/head
starknt 2024-11-15 19:21:16 +08:00
parent 8bb2d62c45
commit 1e469c3cd4
7 changed files with 42 additions and 64 deletions

View File

@ -28,6 +28,15 @@ jobs:
node-version: ${{ matrix.node }}
registry-url: https://npm.pkg.github.com/
- name: 'Setup pnpm'
uses: pnpm/action-setup@v4
- name: 'Setup Python environment (Mac) Because of electron-builder install-app-deps requires Python setuptools'
if: matrix.os == 'macos'
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: 'Get package info'
id: package-info
uses: luizfelipelaviola/get-package-info@v1
@ -41,19 +50,7 @@ jobs:
echo "github.ref = ${{ github.ref }}";
echo "github.ref_name = ${{ github.ref_name }}";
- name: 'npm install -g lerna@6/yarn'
run: |
echo "======================================================================";
echo "npm install -g lerna@6";
echo "--------------------";
npm install -g lerna@6;
echo "======================================================================";
echo "npm install -g yarn";
echo "--------------------";
npm install -g yarn;
- name: 'npm -v | yarn -v | lerna -v'
- name: 'npm -v | pnpm -v | python --version'
run: |
echo "======================================================================";
echo "npm -v";
@ -61,24 +58,24 @@ jobs:
npm -v;
echo "======================================================================";
echo "yarn -v";
echo "pnpm -v";
echo "--------------------";
yarn -v;
pnpm -v;
echo "======================================================================";
echo "lerna -v";
echo "python --version";
echo "--------------------";
lerna -v;
python --version;
- name: 'lerna bootstrap'
- name: 'pnpm install'
run: |
echo "======================================================================";
dir || ls -lah;
echo "======================================================================";
echo "lerna bootstrap --npm-client=yarn";
echo "pnpm install";
echo "--------------------";
lerna bootstrap --npm-client=yarn;
pnpm install;
- name: 'npm run electron:build'
run: |

View File

@ -22,7 +22,7 @@ jobs:
- ubuntu
- macos
node:
- 16
- 22
steps:
- name: 'Checkout'
uses: actions/checkout@v4.1.7
@ -33,6 +33,16 @@ jobs:
node-version: ${{ matrix.node }}
registry-url: https://npm.pkg.github.com/
- name: 'Setup pnpm'
uses: pnpm/action-setup@v4
- name: 'Setup Python environment (Mac) Because of electron-builder install-app-deps requires Python setuptools'
if: matrix.os == 'macos'
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: 'Get package info'
id: package-info
uses: luizfelipelaviola/get-package-info@v1
@ -46,19 +56,7 @@ jobs:
echo "github.ref = ${{ github.ref }}";
echo "github.ref_name = ${{ github.ref_name }}";
- name: 'npm install -g lerna@6/yarn'
run: |
echo "======================================================================";
echo "npm install -g lerna@6";
echo "--------------------";
npm install -g lerna@6;
echo "======================================================================";
echo "npm install -g yarn";
echo "--------------------";
npm install -g yarn;
- name: 'npm -v | yarn -v | lerna -v'
- name: 'npm -v | pnpm -v | python --version'
run: |
echo "======================================================================";
echo "npm -v";
@ -66,24 +64,24 @@ jobs:
npm -v;
echo "======================================================================";
echo "yarn -v";
echo "pnpm -v";
echo "--------------------";
yarn -v;
pnpm -v;
echo "======================================================================";
echo "lerna -v";
echo "python --version";
echo "--------------------";
lerna -v;
python --version;
- name: 'lerna bootstrap'
- name: 'pnpm install'
run: |
echo "======================================================================";
dir || ls -lah;
echo "======================================================================";
echo "lerna bootstrap --npm-client=yarn";
echo "pnpm install";
echo "--------------------";
lerna bootstrap --npm-client=yarn;
pnpm install;
- name: 'npm run electron:build'
run: |

1
.npmrc Normal file
View File

@ -0,0 +1 @@
shamefully-hoist=true

View File

@ -1,18 +0,0 @@
{
"packages": [
"packages/*"
],
"command": {
"publish": {
"ignoreChanges": [
"*.md",
"config",
"doc"
]
},
"bootstrap": {
"ignore": []
}
},
"version": "1.8.9"
}

View File

@ -6,6 +6,6 @@
"dependencies": {
},
"devDependencies": {
"lerna": "^6.6.2"
}
}

View File

@ -17,7 +17,7 @@
"test": "mocha"
},
"dependencies": {
"@docmirror/mitmproxy": "^1.8.9",
"@docmirror/mitmproxy": "workspace:*",
"agentkeepalive": "^2.1.1",
"babel-preset-es2020": "^1.0.2",
"charset": "^1.0.0",

View File

@ -21,8 +21,8 @@
"electron:icons-black": "electron-icon-builder --input=./public/logo/win-black.png --output=build/black --flatten"
},
"dependencies": {
"@docmirror/dev-sidecar": "^1.8.9",
"@docmirror/mitmproxy": "^1.8.9",
"@docmirror/dev-sidecar": "workspace:*",
"@docmirror/mitmproxy": "workspace:*",
"@mihomo-party/sysproxy": "^2.0.4",
"@natmri/platform-napi": "^0.0.7",
"adm-zip": "^0.5.5",
@ -54,7 +54,7 @@
"@vue/eslint-config-standard": "^5.1.2",
"babel-eslint": "^10.1.0",
"electron": "^17.4.11",
"electron-builder": "^23.0.3",
"electron-builder": "^25.0.6",
"electron-devtools-installer": "^3.1.0",
"electron-icon-builder": "^2.0.1",
"eslint": "^6.7.2",