Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to PNPM #552

Merged
merged 7 commits into from
Dec 22, 2024
Merged

Migrate to PNPM #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b1e4f50
switch to PNPM
jelhan Dec 17, 2024
d5a3230
migrate from resolutions to pnpm.overrides
jelhan Dec 17, 2024
edbe05e
generate lockfile with PNPM version used in CI
jelhan Dec 17, 2024
10495e3
upgrade ember-try configuration to use PNPM
jelhan Dec 18, 2024
2e2ef59
use a consistent @ember/string version
jelhan Dec 21, 2024
87f6ab8
add dependency on ember-auto-import
jelhan Dec 21, 2024
cb51fc1
Merge remote-tracking branch 'origin/master' into switch-to-pnpm
jelhan Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,20 @@ jobs:

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jelhan out of curiosity, why not using pnpm v9 right away?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I followed the setup of the latest Ember CLI blueprints: https://github.com/ember-cli/ember-cli/blob/6691ea1008dd734a9c18c0ec5ed7a389987f608b/blueprints/addon/files/.github/workflows/ci.yml#L22-L24

- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18.x
cache: yarn
node-version: 18
cache: pnpm
- name: Install Dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile
- name: Lint
run: yarn lint
run: pnpm lint
- name: Run Tests
run: yarn test:ember
run: pnpm test:ember

floating:
name: "Floating Dependencies"
Expand All @@ -38,14 +41,17 @@ jobs:

steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/setup-node@v3
with:
node-version: 18.x
cache: yarn
node-version: 18
cache: pnpm
- name: Install Dependencies
run: yarn install --no-lockfile
run: pnpm install --no-lockfile
- name: Run Tests
run: yarn test:ember
run: pnpm test:ember

try-scenarios:
name: ${{ matrix.try-scenario }}
Expand All @@ -69,12 +75,15 @@ jobs:

steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18.x
cache: yarn
node-version: 18
cache: pnpm
- name: Install Dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

- `git clone <repository-url>`
- `cd ember-metrics`
- `yarn install`
- `pnpm install`

## Linting

- `yarn lint`
- `yarn lint:fix`
- `pnpm lint`
- `pnpm lint:fix`

## Running tests

Expand Down
14 changes: 10 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@babel/eslint-parser": "^7.21.3",
"@babel/plugin-proposal-decorators": "^7.21.0",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.0.1",
"@ember/string": "^4.0.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes an issue introduced in #547. The project had a direct dependency on ^3.0.1 of @ember/string but a resolution forcing all transitive dependencies to resolve to ^4.0.0. Please let me know if you prefer this to be pulled out to a separate PR.

"@ember/test-helpers": "^2.9.3",
"@embroider/test-setup": "^2.1.1",
"@glimmer/tracking": "^1.1.2",
Expand Down Expand Up @@ -127,9 +127,11 @@
"@ember/string": ">= 3.0.0",
"ember-source": ">= 3.28.0"
},
"resolutions": {
"@babel/plugin-transform-modules-amd": "7.16.5",
"@ember/string": "^4.0.0"
"pnpm": {
"overrides": {
"@babel/plugin-transform-modules-amd": "7.16.5",
"@ember/string": "^4.0.0"
}
},
"engines": {
"node": "18.* || 20.* || >= 22"
Expand Down Expand Up @@ -160,5 +162,9 @@
},
"lint-staged": {
"*.js": "eslint --cache --fix"
},
"volta": {
"node": "18.20.5",
"pnpm": "8.15.9"
}
}
Loading
Loading