Skip to content

Commit

Permalink
Merge pull request #35 from WildCodeSchool/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
Manooonlb authored Nov 17, 2023
2 parents 4b68e90 + 692b253 commit 54a441a
Show file tree
Hide file tree
Showing 98 changed files with 26,010 additions and 27,389 deletions.
21 changes: 11 additions & 10 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: dev

on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
branches:
- main
- develop
Expand All @@ -22,19 +23,19 @@ jobs:
with:
fetch-depth: 0

- name: Set up Node.js
uses: actions/setup-node@v3
- name: Cache dependencies
id: cache-nextjob
uses: actions/cache@v3
with:
node-version: 16

- name: Install pnpm
run: npm -g install pnpm

- name: Set package.json config.cli
run: sed -i 's/.*"cli":.*/"cli":"pnpm"/' package.json
path: |
./node_modules
./backend/node_modules
./frontend/node_modules
key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}

- name: Install package dependencies
run: pnpm install
if: steps.cache-nextjob.outputs.cache-hit != 'true'
run: npm install

- name: Run linters
run: npx lint-staged --diff="origin/${GITHUB_BASE_REF}...origin/${GITHUB_HEAD_REF}"
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Nothing right now. [Open an issue](https://github.com/WildCodeSchool/js-template-fullstack/issues) if you find something.

## [4.1.2] - 2023-10-26

### Changed

- Removing `yarn` and `pnpm` package managers in favor of npm.

- Use of the cache to optimize job execution time.

## [4.1.1] - 2023-10-18

### Fixed
Expand Down
7 changes: 1 addition & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@ git config --global core.autocrlf false

- In VSCode, install plugins **Prettier - Code formatter** and **ESLint** and configure them
- Clone this repo, enter it
- If you are using `yarn` or `pnpm`, adapt the `config/cli` in `package.json`
- Run command `npm install` (or equivalent using `yarn` or `pnpm`)
- Run command `npm install`
- Create environment files (`.env`) in both `backend` and `frontend`: you can copy `.env.sample` files as starters (**don't** delete them)

### Before you start

- To ensure compatibility and prevent conflicts, please consistently employ a **single** package manager: `npm`, `yarn`, or `pnpm`.

### Available Commands

- `db:migrate` : Run the database migration script
Expand Down
Loading

0 comments on commit 54a441a

Please sign in to comment.