Skip to content

Commit f6a6e2e

Browse files
Switch from yarn to pnpm (#1816)
* Switch from yarn to pnpm * Remove lib changes * Delete lib/tasks/pnpm-yarn-or-npm.js
1 parent 6e7e4b4 commit f6a6e2e

File tree

8 files changed

+20459
-17013
lines changed

8 files changed

+20459
-17013
lines changed

.github/workflows/main.yml

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,21 @@ jobs:
1717
name: Lint
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v2
21-
- uses: volta-cli/action@v1
22-
- run: yarn install --frozen-lockfile --network-timeout 100000
20+
- uses: actions/checkout@v4
21+
- name: Install Node
22+
uses: actions/setup-node@v3
23+
with:
24+
node-version: 18.x
25+
- uses: pnpm/action-setup@v2
26+
with:
27+
version: 9
28+
- name: Install Dependencies
29+
run: pnpm install --frozen-lockfile
2330

2431
- name: 'Lint'
2532
run: |
26-
yarn lint:hbs
27-
yarn lint:js
33+
pnpm lint:hbs
34+
pnpm lint:js
2835
2936
test:
3037
name: Basic tests (${{ matrix.os }})
@@ -34,12 +41,18 @@ jobs:
3441
os: [macos-latest, ubuntu-latest, windows-latest]
3542

3643
steps:
37-
- uses: actions/checkout@v2
38-
- uses: volta-cli/action@v1
39-
- run: yarn install --frozen-lockfile --network-timeout 100000
40-
44+
- uses: actions/checkout@v4
45+
- name: Install Node
46+
uses: actions/setup-node@v3
47+
with:
48+
node-version: 18.x
49+
- uses: pnpm/action-setup@v2
50+
with:
51+
version: 9
52+
- name: Install Dependencies
53+
run: pnpm install --frozen-lockfile
4154
- name: 'Basic Tests'
42-
run: yarn test-fast
55+
run: pnpm test-fast
4356

4457
# runs slow end-to-end tests, parallelizing yarn and npm cases
4558
test-end-to-end:
@@ -50,14 +63,20 @@ jobs:
5063
os: [macos-latest, ubuntu-latest, windows-latest]
5164

5265
steps:
53-
- uses: actions/checkout@v2
54-
- uses: volta-cli/action@v1
55-
- run: yarn install --frozen-lockfile --network-timeout 100000
56-
66+
- uses: actions/checkout@v4
67+
- name: Install Node
68+
uses: actions/setup-node@v3
69+
with:
70+
node-version: 18.x
71+
- uses: pnpm/action-setup@v2
72+
with:
73+
version: 9
74+
- name: Install Dependencies
75+
run: pnpm install --frozen-lockfile
5776
- name: 'End-to-end Tests'
5877
uses: GabrielBB/xvfb-action@v1
5978
with:
60-
run: yarn test-slow
79+
run: pnpm test-slow
6180

6281
automerge:
6382
needs: [lint, test, test-end-to-end]

CONTRIBUTING.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44

55
* `git clone <repository-url>`
66
* `cd ember-electron`
7-
* `yarn install`
7+
* `pnpm install`
88

99
## Linting
1010

11-
* `yarn lint`
12-
* `yarn lint:fix`
11+
* `pnpm lint`
12+
* `pnpm lint:fix`
1313

1414
## Running tests
1515

16-
* `yarn test` – Runs the test suite on the current Ember version
17-
* `yarn test:ember --server` – Runs the test suite in "watch mode"
18-
* `yarn test:ember-compatibility` – Runs the test suite against multiple Ember versions
16+
* `pnpm test` – Runs the test suite on the current Ember version
17+
* `pnpm test:ember --server` – Runs the test suite in "watch mode"
18+
* `pnpm test:ember-compatibility` – Runs the test suite against multiple Ember versions
1919

2020
## Running the dummy application
2121

22-
* `yarn start`
22+
* `pnpm start`
2323
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2424

2525
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"codemodsSource": "ember-addon-codemods-manifest@1",
1212
"isBaseBlueprint": true,
1313
"options": [
14-
"--yarn",
14+
"--pnpm",
1515
"--no-welcome"
1616
]
1717
}

package.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"lint:js:fix": "eslint . --fix",
5151
"release": "release-it",
5252
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
53-
"test:electron": "yarn test-fast && yarn test-slow",
53+
"test:electron": "pnpm test-fast && pnpm test-slow",
5454
"test:ember": "ember test",
5555
"test:ember-compatibility": "ember try:each",
5656
"test-fast": "mocha node-tests/integration/**/*.js node-tests/unit/**/*.js",
@@ -63,7 +63,6 @@
6363
"debug": "^4.1.1",
6464
"ember-cli-babel": "^8.2.0",
6565
"execa": "^5.0.0",
66-
"find-yarn-workspace-root": "^2.0.0",
6766
"ncp": "^2.0.0",
6867
"portfinder": "^1.0.25",
6968
"rimraf": "^3.0.2",
@@ -164,9 +163,5 @@
164163
"github": {
165164
"release": true
166165
}
167-
},
168-
"volta": {
169-
"node": "20.12.2",
170-
"yarn": "1.22.19"
171166
}
172167
}

0 commit comments

Comments
 (0)