Skip to content

Commit

Permalink
chore: prettier config
Browse files Browse the repository at this point in the history
  • Loading branch information
Julusian committed May 29, 2020
1 parent 034b7aa commit 4864ff5
Show file tree
Hide file tree
Showing 10 changed files with 1,276 additions and 100 deletions.
17 changes: 17 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
root: .
paths:
- .

tests:
docker:
- image: sofietv/tv-automation-meteor-base:1.6.1.4
Expand All @@ -44,6 +45,16 @@ jobs:
name: Run tests and send coverage
command: cd meteor && meteor npm install && meteor npm run prepareForTest && meteor npm run ci
no_output_timeout: 60m
lint:
docker:
- image: sofietv/tv-automation-meteor-base:1.6.1.4
steps:
- checkout
- run:
name: Typecheck and lint code
command: cd meteor && meteor npm install && meteor npm run prepareForTest && meteor npm run ci:lint
no_output_timeout: 60m

publish-tag:
docker:
- image: circleci/buildpack-deps:buster
Expand Down Expand Up @@ -117,6 +128,12 @@ workflows:
only: /v.*/
branches:
only: /.*/
- lint:
filters:
tags:
only: /v.*/
branches:
only: /.*/
- tests:
filters:
tags:
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto eol=lf
2 changes: 2 additions & 0 deletions meteor/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
package*.json
CHANGELOG*.md
11 changes: 11 additions & 0 deletions meteor/.prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"arrowParens": "always",
"bracketSpacing": true,
"trailingComma": "es5",
"singleQuote": true,
"jsxBracketSameLine": true,
"printWidth": 120,
"useTabs": true,
"endOfLine": "lf",
"semi": false
}
2 changes: 1 addition & 1 deletion meteor/__mocks__/helpers/jest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export async function runAllTimers () {
// Run all timers, and wait, multiple times.
// This is to allow timers AND internal promises to resolve in inner functions
for (let i = 0; i < 50; i++) {
await jest.runOnlyPendingTimers()
jest.runOnlyPendingTimers()
await new Promise(resolve => orgSetTimeout(resolve, 0))
}
}
Expand Down
Loading

0 comments on commit 4864ff5

Please sign in to comment.