Skip to content

Commit

Permalink
feat. Kjørt prettier + oppdatert commit hook
Browse files Browse the repository at this point in the history
  • Loading branch information
eirikv committed Feb 13, 2024
1 parent aed7156 commit f895aca
Show file tree
Hide file tree
Showing 273 changed files with 3,143 additions and 2,453 deletions.
7 changes: 7 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
max_line_length = 120
14 changes: 9 additions & 5 deletions .github/workflows/bygg-og-deploy-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,22 @@ jobs:
steps:
- name: Sjekk ut kode
uses: actions/checkout@v3
- name: Server install
working-directory: ./server
- name: Install
run: npm ci
- name: Server build
- name: Server install
working-directory: ./server
run: npm run build
- name: Install
run: npm ci
- name: Typescript
run: npm run ts
- name: Prettier
run: npm run prettier
- name: Kjør tester
run: npm run test
- name: Build
run: npm run build
- name: Server build
working-directory: ./server
run: npm run build
- name: Sentry release
run: npm run release
- name: Bygg, tag og push Docker-image
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/bygg-og-deploy-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,19 @@ jobs:
- name: Server install
working-directory: ./server
run: npm ci
- name: Server build
working-directory: ./server
run: npm run build
- name: Install
run: npm ci
- name: Typescript
run: npm run ts
- name: Prettier
run: npm run prettier
- name: Kjør tester
run: npm run test
- name: Build
run: npm run build
- name: Server build
working-directory: ./server
run: npm run build
- name: Sentry release
run: npm run release
- name: Bygg, tag og push Docker-image
Expand Down
1 change: 1 addition & 0 deletions .husky/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx lint-staged
7 changes: 2 additions & 5 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# .prettierrc or .prettierrc.yaml
trailingComma: 'es5'
tabWidth: 4
semi: true
singleQuote: true
printWidth: 120
singleQuote: true
tabWidth: 4
Loading

0 comments on commit f895aca

Please sign in to comment.