Skip to content

Commit

Permalink
Move to pnpm
Browse files Browse the repository at this point in the history
  • Loading branch information
lukemelia committed Sep 27, 2024
1 parent 532984b commit 8085c3f
Show file tree
Hide file tree
Showing 9 changed files with 16,983 additions and 14,004 deletions.
35 changes: 15 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: CI

env:
VOLTA_FEATURE_PNPM: 1

on:
push:
branches:
Expand All @@ -18,34 +21,29 @@ jobs:
timeout-minutes: 10

steps:
- name: Install volta
uses: volta-cli/action@v4
- uses: actions/checkout@v3
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
- 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"
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- name: Install volta
uses: volta-cli/action@v4
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
- 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 @@ -68,13 +66,10 @@ jobs:
- embroider-optimized

steps:
- name: Install volta
uses: volta-cli/action@v4
- uses: actions/checkout@v3
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
- 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 }}
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn compile-styles
pnpm compile-styles
git add ./vendor/ember-freestyle.css
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

* `git clone git@github.com:chrislopresto/ember-freestyle.git`
* `cd ember-freestyle`
* `yarn install`
* `pnpm install`

## Linting

* `yarn lint`
* `yarn lint:fix`
* `pnpm lint`
* `pnpm lint:fix`

## Running Tests

Expand Down
4 changes: 2 additions & 2 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Once the prep work is completed, the actual release is straight forward:
* First, ensure that you have installed your projects dependencies:

```sh
yarn install
pnpn install
```

* Second, ensure that you have obtained a
Expand All @@ -50,7 +50,7 @@ yarn install
* And last (but not least 😁) do your release.

```sh
npx release-it
pnpm release
```

[release-it](https://github.com/release-it/release-it/) manages the actual
Expand Down
2 changes: 1 addition & 1 deletion config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');

module.exports = async function () {
return {
useYarn: true,
usePnpm: true,
scenarios: [
{
name: 'ember-lts-3.24',
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
"@types/ember__error": "^4.0.3",
"@types/ember__helper": "^4.0.0",
"@types/ember__object": "^4.0.4",
"@types/ember__owner": "^4.0.9",
"@types/ember__polyfills": "^4.0.0",
"@types/ember__routing": "^4.0.10",
"@types/ember__runloop": "^4.0.1",
Expand Down Expand Up @@ -142,8 +143,8 @@
"node": ">= 18"
},
"volta": {
"node": "18.19.1",
"yarn": "1.22.21"
"node": "20.14.0",
"pnpm": "9.2.0"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
Expand Down
Loading

0 comments on commit 8085c3f

Please sign in to comment.