Skip to content

Commit

Permalink
Use npm instead of yarn (#114)
Browse files Browse the repository at this point in the history
* Use npm instead of yarn

npm has brought in many improvements since yarn 1.
This means we can switch to something that all developers
ought to have installed anyway. Development is slow enough
on this repo that the speed benefits of yarn 3 are
outweighed by ease of contributing.

* update package lock
  • Loading branch information
jenweber authored Sep 18, 2023
1 parent 56620ec commit 6f0542e
Show file tree
Hide file tree
Showing 5 changed files with 48,829 additions and 13,294 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ jobs:
- name: Use Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v3
with:
cache: 'yarn'
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}

- name: Install dependencies
run: yarn install --frozen-lockfile
run: npm install --frozen-lockfile

- name: Lint
run: yarn lint
run: npm run lint


test-app:
Expand All @@ -44,14 +44,14 @@ jobs:
- name: Use Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v3
with:
cache: 'yarn'
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}

- name: Install dependencies
run: yarn install --frozen-lockfile
run: npm install --frozen-lockfile

- name: Test
run: npx percy exec -- yarn test
run: npx percy exec -- npm test
env:
PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}
Expand Down Expand Up @@ -82,11 +82,11 @@ jobs:
- name: Use Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v3
with:
cache: 'yarn'
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}

- name: Install dependencies
run: yarn install --frozen-lockfile
run: npm install --frozen-lockfile

- name: Deploy
run: yarn deploy
run: npm run deploy
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This is an Ember app, so the usual steps follow:
```
1. Install packages.
```bash
yarn
npm install
```
1. Run the app.
```bash
Expand Down Expand Up @@ -64,4 +64,4 @@ We store code snippets in `snippets` folder. Afterwards, we update the `model` h

## How It's Made (Recap)

You can find the text in `translations/en-us.yaml`, the code in `snippets`, and the app structure in `app/routes/application.js`! 💖
You can find the text in `translations/en-us.yaml`, the code in `snippets`, and the app structure in `app/routes/application.js`! 💖
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ We use [GitHub Actions](.github/workflows/ci-cd.yml) to lint and test the app wh
Run the following commands to lint and test from local machine:

```bash
yarn lint
yarn test
npm run lint
npm test
```

To fix linting errors, try the following command:

```bash
yarn lint:fix
npm run lint:fix
```


Expand All @@ -38,7 +38,7 @@ We use [GitHub Actions](.github/workflows/ci-cd.yml) to deploy the app to `gh-pa
If you are a repo maintainer, you can run the following command to deploy from local machine:

```bash
yarn deploy
npm run deploy
```


Expand Down
Loading

0 comments on commit 6f0542e

Please sign in to comment.