Skip to content

Commit

Permalink
Merge pull request #2582 from miragejs/bump-pnpm
Browse files Browse the repository at this point in the history
Bump pnpm to v9
  • Loading branch information
SergeAstapov authored Sep 4, 2024
2 parents 9bb54a2 + 6bb0645 commit e38349d
Show file tree
Hide file tree
Showing 10 changed files with 13,471 additions and 10,734 deletions.
60 changes: 24 additions & 36 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,13 @@ jobs:
timeout-minutes: 60

steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: pnpm

- name: Install Dependencies
Expand All @@ -46,15 +44,13 @@ jobs:
timeout-minutes: 60

steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: pnpm

- name: Update resolution-mode
Expand All @@ -72,15 +68,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: pnpm

- name: Install Dependencies
Expand All @@ -100,15 +94,13 @@ jobs:
timeout-minutes: 60

steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: pnpm

- name: Install Dependencies
Expand All @@ -128,15 +120,13 @@ jobs:
timeout-minutes: 60

steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: pnpm

- name: Install Dependencies
Expand Down Expand Up @@ -171,15 +161,13 @@ jobs:
# - embroider-optimized

steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: pnpm

- name: Install Dependencies
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: pnpm

- name: Install Dependencies
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,13 @@ jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: pnpm
registry-url: https://registry.npmjs.org/

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ A client-side server to develop, test and prototype your Ember CLI app.

* Ember.js v3.12 or above
* Ember CLI v3.12 or above
* Node.js v14 or above
* Node.js v16 or above

## Installation

Expand Down
37 changes: 21 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,33 @@
"release": "release-it",
"test": "cd packages/ember-cli-mirage && pnpm run test:ember"
},
"overrides": {
"ember-cli-babel": "8.0.0",
"colors": "1.4.0",
"favicons": "5.3.0"
},
"devDependencies": {
"release-it": "^16.2.1",
"@release-it-plugins/lerna-changelog": "^6.0.0",
"@release-it-plugins/workspaces": "^4.0.0"
"@release-it-plugins/workspaces": "^4.0.0",
"release-it": "^16.2.1"
},
"packageManager": "[email protected]",
"volta": {
"node": "18.20.4",
"pnpm": "9.9.0"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
},
"changelog": {
"labels": {
"breaking": ":boom: Breaking Change",
"Feature / Enhancement": ":rocket: Enhancement",
"bug": ":bug: Bug Fix",
"documentation": ":memo: Documentation",
"internal": ":house: Internal"
}
},
"overrides": {
"ember-cli-babel": "8.0.0",
"colors": "1.4.0",
"favicons": "5.3.0"
},
"release-it": {
"hooks": {
"after:release": "cd packages/ember-cli-mirage-docs && pnpm run deploy"
Expand All @@ -51,14 +65,5 @@
"tokenRef": "GITHUB_AUTH"
},
"npm": false
},
"changelog": {
"labels": {
"breaking": ":boom: Breaking Change",
"Feature / Enhancement": ":rocket: Enhancement",
"bug": ":bug: Bug Fix",
"documentation": ":memo: Documentation",
"internal": ":house: Internal"
}
}
}
6 changes: 3 additions & 3 deletions packages/ember-cli-mirage-docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@
"engines": {
"node": "16.* || >= 18"
},
"ember": {
"edition": "octane"
},
"volta": {
"extends": "../../package.json"
},
"ember": {
"edition": "octane"
}
}
10 changes: 5 additions & 5 deletions packages/ember-cli-mirage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@
"miragejs": "^0.1.43"
},
"peerDependenciesMeta": {
"@ember/test-helpers": {
"@ember-data/model": {
"optional": true
},
"@ember-data/model": {
"@ember/test-helpers": {
"optional": true
},
"ember-data": {
Expand All @@ -134,6 +134,9 @@
"engines": {
"node": "16.* || >= 18"
},
"volta": {
"extends": "../../package.json"
},
"ember": {
"edition": "octane"
},
Expand All @@ -145,8 +148,5 @@
"after": [
"ember-qunit"
]
},
"volta": {
"extends": "../../package.json"
}
}
Loading

0 comments on commit e38349d

Please sign in to comment.