Skip to content

Commit e38349d

Browse files
SergeAstapovSergeAstapov
authored
Merge pull request #2582 from miragejs/bump-pnpm
Bump pnpm to v9
2 parents 9bb54a2 + 6bb0645 commit e38349d

10 files changed

Lines changed: 13471 additions & 10734 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 24 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@ jobs:
1818
timeout-minutes: 60
1919

2020
steps:
21-
- uses: actions/checkout@v3
22-
- uses: pnpm/action-setup@v2
23-
with:
24-
version: 8
21+
- uses: actions/checkout@v4
22+
- uses: pnpm/action-setup@v4
2523

2624
- name: Install Node
27-
uses: actions/setup-node@v3
25+
uses: actions/setup-node@v4
2826
with:
29-
node-version: 16.x
27+
node-version: 18.x
3028
cache: pnpm
3129

3230
- name: Install Dependencies
@@ -46,15 +44,13 @@ jobs:
4644
timeout-minutes: 60
4745

4846
steps:
49-
- uses: actions/checkout@v3
50-
- uses: pnpm/action-setup@v2
51-
with:
52-
version: 8
47+
- uses: actions/checkout@v4
48+
- uses: pnpm/action-setup@v4
5349

5450
- name: Install Node
55-
uses: actions/setup-node@v3
51+
uses: actions/setup-node@v4
5652
with:
57-
node-version: 16.x
53+
node-version: 18.x
5854
cache: pnpm
5955

6056
- name: Update resolution-mode
@@ -72,15 +68,13 @@ jobs:
7268
runs-on: ubuntu-latest
7369

7470
steps:
75-
- uses: actions/checkout@v3
76-
- uses: pnpm/action-setup@v2
77-
with:
78-
version: 8
71+
- uses: actions/checkout@v4
72+
- uses: pnpm/action-setup@v4
7973

8074
- name: Install Node
81-
uses: actions/setup-node@v3
75+
uses: actions/setup-node@v4
8276
with:
83-
node-version: 16.x
77+
node-version: 18.x
8478
cache: pnpm
8579

8680
- name: Install Dependencies
@@ -100,15 +94,13 @@ jobs:
10094
timeout-minutes: 60
10195

10296
steps:
103-
- uses: actions/checkout@v3
104-
- uses: pnpm/action-setup@v2
105-
with:
106-
version: 8
97+
- uses: actions/checkout@v4
98+
- uses: pnpm/action-setup@v4
10799

108100
- name: Install Node
109-
uses: actions/setup-node@v3
101+
uses: actions/setup-node@v4
110102
with:
111-
node-version: 16.x
103+
node-version: 18.x
112104
cache: pnpm
113105

114106
- name: Install Dependencies
@@ -128,15 +120,13 @@ jobs:
128120
timeout-minutes: 60
129121

130122
steps:
131-
- uses: actions/checkout@v3
132-
- uses: pnpm/action-setup@v2
133-
with:
134-
version: 8
123+
- uses: actions/checkout@v4
124+
- uses: pnpm/action-setup@v4
135125

136126
- name: Install Node
137-
uses: actions/setup-node@v3
127+
uses: actions/setup-node@v4
138128
with:
139-
node-version: 16.x
129+
node-version: 18.x
140130
cache: pnpm
141131

142132
- name: Install Dependencies
@@ -171,15 +161,13 @@ jobs:
171161
# - embroider-optimized
172162

173163
steps:
174-
- uses: actions/checkout@v3
175-
- uses: pnpm/action-setup@v2
176-
with:
177-
version: 8
164+
- uses: actions/checkout@v4
165+
- uses: pnpm/action-setup@v4
178166

179167
- name: Install Node
180-
uses: actions/setup-node@v3
168+
uses: actions/setup-node@v4
181169
with:
182-
node-version: 16.x
170+
node-version: 18.x
183171
cache: pnpm
184172

185173
- name: Install Dependencies

‎.github/workflows/deploy.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@ jobs:
77
deploy:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3
11-
- uses: pnpm/action-setup@v2
12-
with:
13-
version: 8
10+
- uses: actions/checkout@v4
11+
- uses: pnpm/action-setup@v4
1412

1513
- name: Install Node
16-
uses: actions/setup-node@v3
14+
uses: actions/setup-node@v4
1715
with:
18-
node-version: 16.x
16+
node-version: 18.x
1917
cache: pnpm
2018

2119
- name: Install Dependencies

‎.github/workflows/publish.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@ jobs:
99
publish:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
13-
- uses: pnpm/action-setup@v2
14-
with:
15-
version: 8
12+
- uses: actions/checkout@v4
13+
- uses: pnpm/action-setup@v4
1614

1715
- name: Install Node
18-
uses: actions/setup-node@v3
16+
uses: actions/setup-node@v4
1917
with:
20-
node-version: 16.x
18+
node-version: 18.x
2119
cache: pnpm
2220
registry-url: https://registry.npmjs.org/
2321

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ A client-side server to develop, test and prototype your Ember CLI app.
1414

1515
* Ember.js v3.12 or above
1616
* Ember CLI v3.12 or above
17-
* Node.js v14 or above
17+
* Node.js v16 or above
1818

1919
## Installation
2020

‎package.json‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,33 @@
1414
"release": "release-it",
1515
"test": "cd packages/ember-cli-mirage && pnpm run test:ember"
1616
},
17-
"overrides": {
18-
"ember-cli-babel": "8.0.0",
19-
"colors": "1.4.0",
20-
"favicons": "5.3.0"
21-
},
2217
"devDependencies": {
23-
"release-it": "^16.2.1",
2418
"@release-it-plugins/lerna-changelog": "^6.0.0",
25-
"@release-it-plugins/workspaces": "^4.0.0"
19+
"@release-it-plugins/workspaces": "^4.0.0",
20+
"release-it": "^16.2.1"
21+
},
22+
"packageManager": "pnpm@9.9.0",
23+
"volta": {
24+
"node": "18.20.4",
25+
"pnpm": "9.9.0"
2626
},
2727
"publishConfig": {
2828
"registry": "https://registry.npmjs.org"
2929
},
30+
"changelog": {
31+
"labels": {
32+
"breaking": ":boom: Breaking Change",
33+
"Feature / Enhancement": ":rocket: Enhancement",
34+
"bug": ":bug: Bug Fix",
35+
"documentation": ":memo: Documentation",
36+
"internal": ":house: Internal"
37+
}
38+
},
39+
"overrides": {
40+
"ember-cli-babel": "8.0.0",
41+
"colors": "1.4.0",
42+
"favicons": "5.3.0"
43+
},
3044
"release-it": {
3145
"hooks": {
3246
"after:release": "cd packages/ember-cli-mirage-docs && pnpm run deploy"
@@ -51,14 +65,5 @@
5165
"tokenRef": "GITHUB_AUTH"
5266
},
5367
"npm": false
54-
},
55-
"changelog": {
56-
"labels": {
57-
"breaking": ":boom: Breaking Change",
58-
"Feature / Enhancement": ":rocket: Enhancement",
59-
"bug": ":bug: Bug Fix",
60-
"documentation": ":memo: Documentation",
61-
"internal": ":house: Internal"
62-
}
6368
}
6469
}

‎packages/ember-cli-mirage-docs/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@
8787
"engines": {
8888
"node": "16.* || >= 18"
8989
},
90-
"ember": {
91-
"edition": "octane"
92-
},
9390
"volta": {
9491
"extends": "../../package.json"
92+
},
93+
"ember": {
94+
"edition": "octane"
9595
}
9696
}

‎packages/ember-cli-mirage/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@
118118
"miragejs": "^0.1.43"
119119
},
120120
"peerDependenciesMeta": {
121-
"@ember/test-helpers": {
121+
"@ember-data/model": {
122122
"optional": true
123123
},
124-
"@ember-data/model": {
124+
"@ember/test-helpers": {
125125
"optional": true
126126
},
127127
"ember-data": {
@@ -134,6 +134,9 @@
134134
"engines": {
135135
"node": "16.* || >= 18"
136136
},
137+
"volta": {
138+
"extends": "../../package.json"
139+
},
137140
"ember": {
138141
"edition": "octane"
139142
},
@@ -145,8 +148,5 @@
145148
"after": [
146149
"ember-qunit"
147150
]
148-
},
149-
"volta": {
150-
"extends": "../../package.json"
151151
}
152152
}

0 commit comments

Comments
 (0)
⚡