Skip to content

Commit e8574ec

Browse files
authored
Merge pull request #576 from lockdown-systems/back-to-npm
Switch back to npm
2 parents b90ee53 + f9a710a commit e8574ec

File tree

15 files changed

+31897
-35468
lines changed

15 files changed

+31897
-35468
lines changed

.github/workflows/deploy-docs.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,15 @@ jobs:
2525
uses: actions/setup-node@v4
2626
with:
2727
node-version: "18"
28-
29-
- name: Setup pnpm
30-
uses: pnpm/action-setup@v4
31-
with:
32-
version: 8
28+
cache: "npm"
3329

3430
- name: Install dependencies
35-
run: pnpm install
31+
run: npm ci
3632

3733
- name: Build documentation
3834
run: |
3935
cd docs
40-
pnpm build
36+
npm run build
4137
4238
- name: Setup Pages
4339
uses: actions/configure-pages@v4

.github/workflows/tests.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,32 @@ jobs:
1818
- name: Checkout repository
1919
uses: actions/checkout@v4
2020

21-
- name: Install pnpm
22-
uses: pnpm/action-setup@v4
23-
with:
24-
version: 10
25-
2621
- name: Install node
2722
uses: actions/setup-node@v4
2823
with:
2924
node-version: "22.x"
30-
cache: "pnpm"
25+
cache: "npm"
3126

3227
- name: Install build dependencies
3328
run: |
3429
sudo apt-get update
3530
sudo apt-get install -y build-essential python3 xvfb
3631
3732
- name: Install dependencies (skip postinstall)
38-
run: pnpm install --frozen-lockfile
33+
run: npm ci
3934
env:
4035
CI: true
4136

4237
- name: Rebuild better-sqlite3 for Electron
4338
run: |
4439
ELECTRON_VERSION=$(node -e "console.log(require('./node_modules/electron/package.json').version)")
4540
echo "Rebuilding better-sqlite3 for Electron $ELECTRON_VERSION"
46-
npm_config_runtime=electron npm_config_target=$ELECTRON_VERSION npm_config_disturl=https://electronjs.org/headers npm_config_build_from_source=true pnpm rebuild better-sqlite3
41+
npm_config_runtime=electron npm_config_target=$ELECTRON_VERSION npm_config_disturl=https://electronjs.org/headers npm_config_build_from_source=true npm rebuild better-sqlite3
4742
4843
- name: Run lint
49-
run: pnpm lint
44+
run: npm run lint
5045

5146
- name: Run tests
52-
run: xvfb-run -a pnpm run test:ci
47+
run: xvfb-run -a npm run test:ci
5348
env:
5449
CI: true

Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,5 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
1010
zip \
1111
sudo
1212

13-
# Install pnpm
14-
RUN npm install -g pnpm
15-
1613
WORKDIR /workspace
1714

archive-static-sites/facebook-archive/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
"build": "vue-cli-service build"
88
},
99
"dependencies": {
10-
"@fortawesome/fontawesome-free": "^6.7.2",
11-
"bootstrap": "^5.3.6",
12-
"vue": "^3.5.15",
10+
"@fortawesome/fontawesome-free": "^7.0.0",
11+
"bootstrap": "^5.3.7",
12+
"vue": "^3.5.19",
1313
"vue-class-component": "^8.0.0-0",
1414
"vue-router": "^4.5.1"
1515
},
1616
"devDependencies": {
17-
"@vue/cli-plugin-router": "~5.0.8",
18-
"@vue/cli-plugin-typescript": "~5.0.8",
19-
"@vue/cli-service": "~5.0.8",
20-
"typescript": "~5.8.3"
17+
"@vue/cli-plugin-router": "~5.0.9",
18+
"@vue/cli-plugin-typescript": "~5.0.9",
19+
"@vue/cli-service": "~5.0.9",
20+
"typescript": "~5.9.2"
2121
}
2222
}

archive-static-sites/x-archive/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
"build": "vue-cli-service build"
88
},
99
"dependencies": {
10-
"@fortawesome/fontawesome-free": "^6.7.2",
10+
"@fortawesome/fontawesome-free": "^7.0.0",
1111
"bootstrap": "^5.3.7",
12-
"vue": "^3.5.17",
12+
"vue": "^3.5.19",
1313
"vue-class-component": "8.0.0-rc.1",
1414
"vue-router": "^4.5.1"
1515
},
1616
"devDependencies": {
17-
"@types/node": "^22.16.2",
18-
"@vue/cli-plugin-router": "~5.0.8",
19-
"@vue/cli-plugin-typescript": "~5.0.8",
20-
"@vue/cli-service": "~5.0.8",
21-
"typescript": "^5.8.3"
17+
"@types/node": "^24.3.0",
18+
"@vue/cli-plugin-router": "~5.0.9",
19+
"@vue/cli-plugin-typescript": "~5.0.9",
20+
"@vue/cli-service": "~5.0.9",
21+
"typescript": "^5.9.2"
2222
}
2323
}

docs/docs/contributing/developers.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,37 @@ sidebar_position: 2
44

55
# For Developers
66

7-
Cyd is a desktop app for Windows, Mac, and Linux written in Node.js. To run Cyd locally, you need is [Node.JS LTS](https://nodejs.org/en) for your operating systems and [pnpm](https://pnpm.io/).
7+
Cyd is a desktop app for Windows, Mac, and Linux written in Node.js. To run Cyd locally, you need is [Node.JS LTS](https://nodejs.org/en) for your operating systems.
88

99
Install dependencies.
1010

1111
```sh
12-
pnpm install
12+
npm install
1313
```
1414

1515
Configure your Cyd environment to use "open" mode. This disables the server, which allows outside contributors to build features.
1616

1717
```sh
18-
pnpm config-open
18+
npm run config-open
1919
```
2020

2121
Run Cyd:
2222

2323
```sh
24-
pnpm start
24+
npm start
2525
```
2626

2727
To make it so devtools automatically opens, and so each embedded webview has a separate devtools window open, set the environment variables `CYD_DEV` to `1`:
2828

2929
```sh
30-
CYD_DEV=1
31-
pnpm start
30+
CYD_DEV=1 npm start
3231
```
3332

3433
Run the tests:
3534

3635
```sh
3736
# Node.js tests
38-
pnpm test
37+
npm test
3938
```
4039

4140
## Other server modes
@@ -46,11 +45,11 @@ If you're part of Lockdown Systems and you need to test functionality that uses
4645

4746
```sh
4847
# local mode: use a locally-hosted server at localhost:5000
49-
pnpm config-local
48+
npm run config-local
5049

5150
# dev mode: use the dev server at dev-api.cyd.social
52-
pnpm config-dev
51+
npm run config-dev
5352

5453
# prod mode: use the prod server at prod-api.cyd.social
55-
pnpm config-prod
54+
npm run config-prod
5655
```

docs/versioned_docs/version-1.1.x/contributing/developers.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,37 @@ sidebar_position: 2
44

55
# For Developers
66

7-
Cyd is a desktop app for Windows, Mac, and Linux written in Node.js. To run Cyd locally, you need is [Node.JS LTS](https://nodejs.org/en) for your operating systems and [pnpm](https://pnpm.io/).
7+
Cyd is a desktop app for Windows, Mac, and Linux written in Node.js. To run Cyd locally, you need is [Node.JS LTS](https://nodejs.org/en) for your operating systems.
88

99
Install dependencies.
1010

1111
```sh
12-
pnpm install
12+
npm install
1313
```
1414

1515
Configure your Cyd environment to use "open" mode. This disables the server, which allows outside contributors to build features.
1616

1717
```sh
18-
pnpm config-open
18+
npm run config-open
1919
```
2020

2121
Run Cyd:
2222

2323
```sh
24-
pnpm start
24+
npm start
2525
```
2626

2727
To make it so devtools automatically opens, and so each embedded webview has a separate devtools window open, set the environment variables `CYD_DEV` to `1`:
2828

2929
```sh
30-
CYD_DEV=1
31-
pnpm start
30+
CYD_DEV=1 npm start
3231
```
3332

3433
Run the tests:
3534

3635
```sh
3736
# Node.js tests
38-
pnpm test
37+
npm test
3938
```
4039

4140
## Other server modes
@@ -46,11 +45,11 @@ If you're part of Lockdown Systems and you need to test functionality that uses
4645

4746
```sh
4847
# local mode: use a locally-hosted server at localhost:5000
49-
pnpm config-local
48+
npm run config-local
5049

5150
# dev mode: use the dev server at dev-api.cyd.social
52-
pnpm config-dev
51+
npm run config-dev
5352

5453
# prod mode: use the prod server at prod-api.cyd.social
55-
pnpm config-prod
54+
npm run config-prod
5655
```

0 commit comments

Comments
 (0)