Skip to content

Commit

Permalink
run prettier in root directory where the prettier config is
Browse files Browse the repository at this point in the history
  • Loading branch information
arnard76 committed May 1, 2024
1 parent 46ba231 commit cd2cefc
Show file tree
Hide file tree
Showing 9 changed files with 12,646 additions and 12,668 deletions.
28 changes: 10 additions & 18 deletions .github/workflows/prettier.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
name: Prettier formatting
on:
pull_request:
branches: [main, dev]
pull_request:
branches: [main, dev]
jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
cd frontend
npm ci -D
cd ../backend
npm ci -D
- name: Run Prettier format check
run: |
cd frontend
npm run prettier
cd ../backend
npm run prettier
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install Dependencies
run: npm ci -D
- name: Run Prettier format check
run: npm run prettier
2 changes: 2 additions & 0 deletions frontend/.prettierignore → .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@
# typescript
next-env.d.ts
.vercel

**/.next/**
7 changes: 0 additions & 7 deletions .prettierrc

This file was deleted.

4,066 changes: 2,025 additions & 2,041 deletions backend/package-lock.json

Large diffs are not rendered by default.

63 changes: 30 additions & 33 deletions backend/package.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,32 @@
{
"name": "aapc-backend",
"version": "0.1.1",
"private": true,
"description": "The backend of the AAPC website.",
"scripts": {
"dev": "nodemon -x tsx ./src/index.ts",
"build": "tsc --build && tsc-alias",
"start": "node ./dist/index.js",
"deploy:development": "npm run build && vercel build && vercel deploy --prebuilt",
"deploy:production": "npm run build && vercel build --prod && vercel --prod deploy --prebuilt",
"prettier": "prettier . --check",
"prettier:fix": "prettier . --write"
},
"dependencies": {
"@aapc/types": "0.3.3",
"amazon-cognito-identity-js": "^6.3.12",
"cors": "^2.8.5",
"dotenv": "^16.4.5",
"express": "^4.19.2",
"express-async-handler": "^1.2.0",
"jsonwebtoken": "^9.0.2",
"mongodb": "^6.5.0"
},
"devDependencies": {
"@types/express": "^4.17.21",
"@types/jsonwebtoken": "^9.0.6",
"@types/node": "^20.12.7",
"nodemon": "^3.1.0",
"prettier": "3.2.5",
"tsc-alias": "^1.8.8",
"tsx": "^4.7.1",
"typescript": "^5.4.3"
}
"name": "aapc-backend",
"version": "0.1.1",
"private": true,
"description": "The backend of the AAPC website.",
"scripts": {
"dev": "nodemon -x tsx ./src/index.ts",
"build": "tsc --build && tsc-alias",
"start": "node ./dist/index.js",
"deploy:development": "npm run build && vercel build && vercel deploy --prebuilt",
"deploy:production": "npm run build && vercel build --prod && vercel --prod deploy --prebuilt"
},
"dependencies": {
"@aapc/types": "0.3.3",
"amazon-cognito-identity-js": "^6.3.12",
"cors": "^2.8.5",
"dotenv": "^16.4.5",
"express": "^4.19.2",
"express-async-handler": "^1.2.0",
"jsonwebtoken": "^9.0.2",
"mongodb": "^6.5.0"
},
"devDependencies": {
"@types/express": "^4.17.21",
"@types/jsonwebtoken": "^9.0.6",
"@types/node": "^20.12.7",
"nodemon": "^3.1.0",
"tsc-alias": "^1.8.8",
"tsx": "^4.7.1",
"typescript": "^5.4.3"
}
}
Loading

0 comments on commit cd2cefc

Please sign in to comment.