Skip to content

Commit 85cada0

Browse files
SergeAstapovSergeAstapov
authored
Merge pull request #926 from embermap/pnpm
switch to pnpm
2 parents e04f89d + 30f230a commit 85cada0

File tree

8 files changed

+19195
-15606
lines changed

8 files changed

+19195
-15606
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -19,57 +19,66 @@ jobs:
1919
timeout-minutes: 10
2020

2121
steps:
22-
- uses: actions/checkout@v4
23-
- name: Install Node
24-
uses: actions/setup-node@v4
22+
- uses: actions/checkout@v5
23+
- uses: pnpm/action-setup@v4
24+
with:
25+
version: 10
26+
- uses: actions/setup-node@v6
2527
with:
2628
node-version: 18
27-
cache: yarn
29+
registry-url: 'https://registry.npmjs.org'
30+
cache: pnpm
2831

29-
- name: Install Dependencies
30-
run: yarn install --frozen-lockfile
32+
- run: pnpm install --frozen-lockfile
3133

3234
- name: Lint
33-
run: yarn lint
35+
run: pnpm lint
3436

3537
- name: Run Tests
36-
run: yarn test:ember
38+
run: pnpm test:ember
3739

3840
floating:
3941
name: "Floating Dependencies"
4042
runs-on: ubuntu-latest
4143
timeout-minutes: 10
4244

4345
steps:
44-
- uses: actions/checkout@v4
45-
- uses: actions/setup-node@v4
46+
- uses: actions/checkout@v5
47+
- uses: pnpm/action-setup@v4
48+
with:
49+
version: 10
50+
- uses: actions/setup-node@v6
4651
with:
4752
node-version: 18
48-
cache: yarn
53+
registry-url: 'https://registry.npmjs.org'
54+
cache: pnpm
4955

5056
- name: Install Dependencies
51-
run: yarn install --no-lockfile
57+
run: pnpm install --no-lockfile
5258

5359
- name: Run Tests
54-
run: yarn test:ember
60+
run: pnpm test:ember
5561

5662
separate_build:
5763
name: "Tests with separate build"
5864
runs-on: ubuntu-latest
5965

6066
steps:
61-
- uses: actions/checkout@v4
62-
- name: Install Node
63-
uses: actions/setup-node@v4
67+
- uses: actions/checkout@v5
68+
- uses: pnpm/action-setup@v4
69+
with:
70+
version: 10
71+
- uses: actions/setup-node@v6
6472
with:
6573
node-version: 18
66-
cache: yarn
74+
registry-url: 'https://registry.npmjs.org'
75+
cache: pnpm
6776

6877
- name: Install Dependencies
69-
run: yarn install --frozen-lockfile
78+
run: pnpm install --frozen-lockfile
7079

7180
- name: Run Tests
72-
run: yarn test:separate-build
81+
run: pnpm test:separate-build
7382

7483
try-scenarios:
7584
name: ${{ matrix.try-scenario }}
@@ -95,15 +104,18 @@ jobs:
95104
- embroider-optimized
96105

97106
steps:
98-
- uses: actions/checkout@v4
99-
- name: Install Node
100-
uses: actions/setup-node@v4
107+
- uses: actions/checkout@v5
108+
- uses: pnpm/action-setup@v4
109+
with:
110+
version: 10
111+
- uses: actions/setup-node@v6
101112
with:
102113
node-version: 18
103-
cache: yarn
114+
registry-url: 'https://registry.npmjs.org'
115+
cache: pnpm
104116

105117
- name: Install Dependencies
106-
run: yarn install --frozen-lockfile
118+
run: pnpm install --frozen-lockfile
107119

108120
- name: Run Tests
109121
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
@@ -115,15 +127,18 @@ jobs:
115127
needs: [ test, try-scenarios ]
116128

117129
steps:
118-
- uses: actions/checkout@v4
119-
- name: Install Node
120-
uses: actions/setup-node@v4
130+
- uses: actions/checkout@v5
131+
- uses: pnpm/action-setup@v4
132+
with:
133+
version: 10
134+
- uses: actions/setup-node@v6
121135
with:
122136
node-version: 18
123-
cache: yarn
137+
registry-url: 'https://registry.npmjs.org'
138+
cache: pnpm
124139

125140
- name: Install Dependencies
126-
run: yarn install --frozen-lockfile
141+
run: pnpm install --frozen-lockfile
127142

128143
- name: Ember Deploy
129144
run: node_modules/.bin/ember deploy production

‎.github/workflows/publish.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,17 @@ jobs:
2727

2828
steps:
2929
- uses: actions/checkout@v5
30+
- uses: pnpm/action-setup@v4
31+
with:
32+
version: 10
3033
- uses: actions/setup-node@v6
3134
with:
3235
node-version: 22
3336
registry-url: 'https://registry.npmjs.org'
34-
- run: npm ci
37+
cache: pnpm
38+
- run: pnpm install --frozen-lockfile
39+
- run: npm install -g npm@latest # ensure that the globally installed npm is new enough to support OIDC
3540
- name: Publish to NPM
36-
run: npx release-plan publish --provenance
41+
run: NPM_CONFIG_PROVENANCE=true pnpm release-plan publish
3742
env:
3843
GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}

‎.release-plan.json‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎.travis.yml‎

Lines changed: 0 additions & 82 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1 @@
11
# Changelog
2-
3-
## Release (2025-12-03)
4-
5-
* ember-cli-fastboot-testing 0.7.0 (major)
6-
7-
#### :boom: Breaking Change
8-
* `ember-cli-fastboot-testing`
9-
* [#874](https://github.com/embermap/ember-cli-fastboot-testing/pull/874) Drop support for Node.js v16 and below ([@SergeAstapov](https://github.com/SergeAstapov))
10-
11-
#### :rocket: Enhancement
12-
* `ember-cli-fastboot-testing`
13-
* [#875](https://github.com/embermap/ember-cli-fastboot-testing/pull/875) Sync with latest addon blueprint via ember-cli-update; widen ember-source in peer deps ([@SergeAstapov](https://github.com/SergeAstapov))
14-
15-
#### :bug: Bug Fix
16-
* `ember-cli-fastboot-testing`
17-
* [#923](https://github.com/embermap/ember-cli-fastboot-testing/pull/923) Avoid eagerly importing nock outside of testing ([@sergey-panov](https://github.com/sergey-panov))
18-
19-
#### :house: Internal
20-
* `ember-cli-fastboot-testing`
21-
* [#924](https://github.com/embermap/ember-cli-fastboot-testing/pull/924) Setup release-plan ([@SergeAstapov](https://github.com/SergeAstapov))
22-
* [#876](https://github.com/embermap/ember-cli-fastboot-testing/pull/876) Drop fastboot@1 and fastboot@2 from testing matrix ([@SergeAstapov](https://github.com/SergeAstapov))
23-
24-
#### Committers: 2
25-
- Sergey Astapov ([@SergeAstapov](https://github.com/SergeAstapov))
26-
- Sergey Panov ([@sergey-panov](https://github.com/sergey-panov))

‎package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember-cli-fastboot-testing",
3-
"version": "0.7.0",
3+
"version": "0.6.2",
44
"description": "Test your FastBoot-rendered HTML alongside your application's tests.",
55
"keywords": [
66
"ember-addon"
@@ -30,7 +30,7 @@
3030
"test:separate-build": "yarn build --environment test && yarn test:ember --path=dist --filter 'Fastboot | basic'"
3131
},
3232
"dependencies": {
33-
"body-parser": "^1.20.3",
33+
"body-parser": "^1.20.3 || ^2.2.1",
3434
"ember-auto-import": "^2.8.1",
3535
"ember-cli-babel": "^8.2.0",
3636
"fastboot": "^3.0.3 || ^4.1.5",
@@ -109,7 +109,8 @@
109109
},
110110
"volta": {
111111
"node": "18.20.4",
112-
"yarn": "1.22.22"
112+
"yarn": "1.22.22",
113+
"pnpm": "10.24.0"
113114
},
114115
"ember": {
115116
"edition": "octane"

0 commit comments

Comments
 (0)