Skip to content

Commit 7f3d422

Browse files
authored
Merge pull request #696 from adopted-ember-addons/pnpm
Switch from npm to pnpm
2 parents 2f23bd6 + be4cc94 commit 7f3d422

File tree

13 files changed

+14134
-35722
lines changed

13 files changed

+14134
-35722
lines changed

.github/workflows/ci.yml

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,40 @@ jobs:
1818
timeout-minutes: 10
1919

2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
22+
- uses: pnpm/action-setup@v4
23+
with:
24+
version: 9
2225
- name: Install Node
23-
uses: actions/setup-node@v3
26+
uses: actions/setup-node@v4
2427
with:
25-
node-version: 18.x
26-
cache: npm
28+
node-version: 18
29+
cache: pnpm
2730
- name: Install Dependencies
28-
run: npm ci
31+
run: pnpm install --frozen-lockfile
2932
- name: Lint
30-
run: npm run lint
33+
run: pnpm lint
3134
- name: Run Tests
32-
run: npm run test:ember
35+
run: pnpm test:ember
3336

3437
floating:
3538
name: "Floating Dependencies"
3639
runs-on: ubuntu-latest
3740
timeout-minutes: 10
3841

3942
steps:
40-
- uses: actions/checkout@v3
41-
- uses: actions/setup-node@v3
43+
- uses: actions/checkout@v4
44+
- uses: pnpm/action-setup@v4
45+
with:
46+
version: 9
47+
- uses: actions/setup-node@v4
4248
with:
43-
node-version: 18.x
44-
cache: npm
49+
node-version: 18
50+
cache: pnpm
4551
- name: Install Dependencies
46-
run: npm install --no-shrinkwrap
52+
run: pnpm install --no-lockfile
4753
- name: Run Tests
48-
run: npm run test:ember
54+
run: pnpm test:ember
4955

5056
try-scenarios:
5157
name: ${{ matrix.try-scenario }}
@@ -74,13 +80,16 @@ jobs:
7480
# - embroider-optimized
7581

7682
steps:
77-
- uses: actions/checkout@v3
83+
- uses: actions/checkout@v4
84+
- uses: pnpm/action-setup@v4
85+
with:
86+
version: 9
7887
- name: Install Node
79-
uses: actions/setup-node@v3
88+
uses: actions/setup-node@v4
8089
with:
81-
node-version: 18.x
82-
cache: npm
90+
node-version: 18
91+
cache: pnpm
8392
- name: Install Dependencies
84-
run: npm ci
93+
run: pnpm install --frozen-lockfile
8594
- name: Run Tests
8695
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

.github/workflows/plan-release.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,15 @@ jobs:
5555
- uses: actions/setup-node@v4
5656
with:
5757
node-version: 18
58-
- run: npm ci
58+
- uses: pnpm/action-setup@v4
59+
with:
60+
version: 9
61+
- run: pnpm install --frozen-lockfile
5962
- name: "Generate Explanation and Prep Changelogs"
6063
id: explanation
6164
run: |
6265
set +e
63-
npx release-plan prepare 2> >(tee -a release-plan-stderr.txt >&2)
66+
pnpm release-plan prepare 2> >(tee -a release-plan-stderr.txt >&2)
6467
6568
if [ $? -ne 0 ]; then
6669
echo 'text<<EOF' >> $GITHUB_OUTPUT

.github/workflows/publish.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,12 @@ jobs:
4949
node-version: 18
5050
# This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable
5151
registry-url: 'https://registry.npmjs.org'
52-
- run: npm ci
52+
- uses: pnpm/action-setup@v4
53+
with:
54+
version: 9
55+
- run: pnpm install --frozen-lockfile
5356
- name: npm publish
54-
run: npx release-plan publish
57+
run: pnpm release-plan publish
5558
env:
5659
GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
5760
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.template-lintrc.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,4 @@
22

33
module.exports = {
44
extends: 'recommended',
5-
6-
rules: {
7-
// TODO: consider enabling this rule
8-
'no-action': false,
9-
},
105
};

CONTRIBUTING.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,22 @@ issue's number to the description of your pull-request.
4747

4848
- `git clone [email protected]:adopted-ember-addons/ember-changeset.git`
4949
- `cd ember-changeset`
50-
- `npm install`
50+
- `pnpm install`
5151

5252
## Linting
5353

54-
- `npm run lint`
55-
- `npm run lint:fix`
54+
- `pnpm lint`
55+
- `pnpm lint:fix`
5656

5757
## Running tests
5858

59-
- `npm run test` – Runs the test suite on the current Ember version
60-
- `npm run test:ember -- --server` – Runs the test suite in "watch mode"
61-
- `npm run test:ember-compatibility` – Runs the test suite against multiple Ember versions
59+
- `pnpm test` – Runs the test suite on the current Ember version
60+
- `pnpm test:ember --server` – Runs the test suite in "watch mode"
61+
- `pnpm test:ember-compatibility` – Runs the test suite against multiple Ember versions
6262

6363
## Running the dummy application
6464

65-
- `npm run start`
65+
- `pnpm start`
6666
- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
6767

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

ember-cli-build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module.exports = function (defaults) {
1212
addon, located in `/tests/dummy`
1313
This build file does *not* influence how the addon or the app using it
1414
behave. You most likely want to be modifying `./index.js` or app's build file
15-
*/
15+
*/
1616

1717
const { maybeEmbroider } = require('@embroider/test-setup');
1818
return maybeEmbroider(app, {

0 commit comments

Comments
 (0)