Skip to content

Commit 3082cf4

Browse files
authored
Merge pull request #838 from adopted-ember-addons/migrate-to-pnpm
migrate to PNPM
2 parents 0483592 + f38326c commit 3082cf4

File tree

9 files changed

+12710
-12501
lines changed

9 files changed

+12710
-12501
lines changed

.github/workflows/ci.yml

+10-15
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,13 @@ jobs:
1919

2020
steps:
2121
- uses: actions/checkout@v3
22-
- name: Install Node
23-
uses: actions/setup-node@v3
22+
- uses: wyvox/action-setup-pnpm@v2
2423
with:
2524
node-version: 18
26-
cache: yarn
27-
- name: Install Dependencies
28-
run: yarn install --frozen-lockfile
2925
- name: Lint
30-
run: yarn lint
26+
run: pnpm lint
3127
- name: Run Tests
32-
run: yarn test:ember
28+
run: pnpm test:ember
3329

3430
floating:
3531
name: "Floating Dependencies"
@@ -38,14 +34,17 @@ jobs:
3834

3935
steps:
4036
- uses: actions/checkout@v3
37+
- uses: pnpm/action-setup@v2
38+
with:
39+
version: 8
4140
- uses: actions/setup-node@v3
4241
with:
4342
node-version: 18
44-
cache: yarn
43+
cache: pnpm
4544
- name: Install Dependencies
46-
run: yarn install --no-lockfile
45+
run: pnpm install --no-lockfile
4746
- name: Run Tests
48-
run: yarn test:ember
47+
run: pnpm test:ember
4948

5049
try-scenarios:
5150
name: ${{ matrix.try-scenario }}
@@ -67,12 +66,8 @@ jobs:
6766

6867
steps:
6968
- uses: actions/checkout@v3
70-
- name: Install Node
71-
uses: actions/setup-node@v3
69+
- uses: wyvox/action-setup-pnpm@v2
7270
with:
7371
node-version: 18
74-
cache: yarn
75-
- name: Install Dependencies
76-
run: yarn install --frozen-lockfile
7772
- name: Run Tests
7873
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

.husky/pre-commit

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22
. "$(dirname "$0")/_/husky.sh"
33

4-
yarn lint-staged
4+
pnpm exec lint-staged

CONTRIBUTING.md

+7-8
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,22 @@
44

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

99
## Linting
1010

11-
- `yarn lint:hbs`
12-
- `yarn lint:js`
13-
- `yarn lint:js --fix`
11+
- `pnpm lint`
12+
- `pnpm lint:fix`
1413

1514
## Running tests
1615

17-
- `ember test` – Runs the test suite on the current Ember version
18-
- `ember test --server` – Runs the test suite in "watch mode"
19-
- `ember try:each` – 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
2019

2120
## Running the dummy application
2221

23-
- `ember serve`
22+
- `pnpm start`
2423
- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2524

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

addon/-base-popper-modifier.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ function getPopperOptions(positional, named) {
3737
const modifiers = isEmpty(options.modifiers)
3838
? []
3939
: isArray(options.modifiers)
40-
? options.modifiers
41-
: [options.modifiers];
40+
? options.modifiers
41+
: [options.modifiers];
4242

4343
// Add runloop integration and positional modifiers to the array of modifiers
4444
options.modifiers = [

package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@
106106
"node": "18.* || >= 20"
107107
},
108108
"volta": {
109-
"node": "20.9.0",
110-
"yarn": "1.22.4"
109+
"node": "20.9.0"
111110
},
112111
"publishConfig": {
113112
"registry": "https://registry.npmjs.org"

0 commit comments

Comments
 (0)