From efe59ada83ba1edf3f2d1086d3387b18195c0ee2 Mon Sep 17 00:00:00 2001 From: Jedidiah Amaraegbu Date: Wed, 20 Dec 2023 12:26:23 +0100 Subject: [PATCH 1/2] chore: updated contributing and readme to remove outdated content --- CONTRIBUTING.md | 6 +----- README.md | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4469cb6..e9f4d2b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,8 +1,5 @@ # Contributing -Currently, this project is in [Phase 2](https://github.com/amjedidiah/dad/milestone/2). -To contribute, pick any item in either [#44](https://github.com/amjedidiah/dad/issues/44), or [#46](https://github.com/amjedidiah/dad/issues/46) based on your competency level. - - Before you make any changes, keep your fork in sync to avoid merge conflicts: ```bash @@ -21,7 +18,7 @@ git checkout -b Refer to the [naming conventions](#naming-conventions) for guide on how to name branches - After making changes, add the changes with `git add`, `git commit` (write a good commit message, refer to [commit convention](#commit-conventions) for guide) -**_Never commit `yarn.lock` file_** +**_Never commit lock files: `yarn.lock`, `package-lock.json`, or `pnpm-lock.yaml` files_** - Push your changes to your forked repository: @@ -59,5 +56,4 @@ If there are any conflicts, you will get a notification and be required to resol > Don't **push** to, **merge** into, or **delete** these branches - `chore/readme-update`: This branch is for updating the readme file -- `chore/checkly`: This branch is for updating checkly tests for monitoring the website - `main`: This is the production branch. Only @amjedidiah or one of the maintainers can merge into this branch. diff --git a/README.md b/README.md index 883eb18..37dfa91 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Practice / grow your skills while contributing to a real-world project. - Install dependencies: `yarn install` -- Fetch env variables: `yarn env` +- Request env variables - Start development server: `yarn dev` From ab77444ca37f9b71584d753becea8adcefdbf98b Mon Sep 17 00:00:00 2001 From: Jedidiah Amaraegbu Date: Fri, 22 Dec 2023 12:24:58 +0100 Subject: [PATCH 2/2] chore: switching from yarn to pnpm --- .gitignore | 2 ++ .husky/pre-commit | 4 ++-- README.md | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9fe8b13..bf5de69 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,5 @@ public/sw.js.map public/fallback-*.js public/workbox-*.js public/workbox-*.js.map + +pnpm-lock.yaml diff --git a/.husky/pre-commit b/.husky/pre-commit index 5423b8e..36b971d 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,5 +1,5 @@ #!/usr/bin/env sh . "$(dirname -- "$0")/_/husky.sh" -yarn lint -yarn build +pnpm lint +pnpm build diff --git a/README.md b/README.md index 37dfa91..2c40326 100644 --- a/README.md +++ b/README.md @@ -20,11 +20,11 @@ Practice / grow your skills while contributing to a real-world project. - Checkout to develop: `git checkout develop` -- Install dependencies: `yarn install` +- Install dependencies: `pnpm install` - Request env variables -- Start development server: `yarn dev` +- Start development server: `pnpm dev` - Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.