Skip to content

Commit cbedca9

Browse files
committed
style: reformat source files
1 parent b852fdb commit cbedca9

27 files changed

+2192
-2207
lines changed

.circleci/config.yml

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,40 @@
11
version: 2
22
jobs:
3-
build_12.18.2:
3+
build_14.15.4:
44
docker:
5-
- image: 'circleci/node:12.18.2'
6-
- image: 'circleci/redis'
5+
- image: circleci/node:14.15.4
76
working_directory: ~/app
87
steps:
98
- checkout
109
- restore_cache:
1110
keys:
12-
- 'v1-dependencies-{{ checksum "package-lock.json" }}'
11+
- v1-dependencies-{{ checksum "package.json" }}
1312
- v1-dependencies-
1413
- run: npm install
1514
- save_cache:
1615
paths:
1716
- node_modules
18-
key: 'v1-dependencies-{{ checksum "package-lock.json" }}'
19-
- run:
20-
name: install dockerize
21-
command: wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && sudo tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
22-
environment:
23-
DOCKERIZE_VERSION: v0.3.0
24-
- run:
25-
name: Wait for db
26-
command: dockerize -wait tcp://localhost:6379 -timeout 1m
17+
key: v1-dependencies-{{ checksum "package.json" }}
2718
- run: npm test
2819
build_latest:
2920
docker:
30-
- image: 'circleci/node:latest'
31-
- image: 'circleci/redis'
21+
- image: circleci/node:latest
3222
working_directory: ~/app
3323
steps:
3424
- checkout
3525
- restore_cache:
3626
keys:
37-
- 'v1-dependencies-{{ checksum "package-lock.json" }}'
27+
- v1-dependencies-{{ checksum "package.json" }}
3828
- v1-dependencies-
3929
- run: npm install
4030
- save_cache:
4131
paths:
4232
- node_modules
43-
key: 'v1-dependencies-{{ checksum "package-lock.json" }}'
44-
- run:
45-
name: install dockerize
46-
command: wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && sudo tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
47-
environment:
48-
DOCKERIZE_VERSION: v0.3.0
49-
- run:
50-
name: Wait for db
51-
command: dockerize -wait tcp://localhost:6379 -timeout 1m
33+
key: v1-dependencies-{{ checksum "package.json" }}
5234
- run: npm test
5335
workflows:
5436
version: 2
5537
workflow:
5638
jobs:
57-
- build_12.18.2
39+
- build_14.15.4
5840
- build_latest

.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# http://editorconfig.org
22

33
[*]
4-
indent_style = tab
4+
indent_style = space
55
indent_size = 2
66
end_of_line = lf
77
charset = utf-8
@@ -16,7 +16,7 @@ indent_style = ignore
1616
insert_final_newline = ignore
1717

1818
[MakeFile]
19-
indent_style = tab
19+
indent_style = space
2020

2121
[*.md]
2222
trim_trailing_whitespace = false

.eslintrc.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
],
1010
"rules": {
1111
"prettier/prettier": [
12-
"error"
12+
"error",
13+
{
14+
"endOfLine": "auto"
15+
}
1316
]
1417
}
1518
}

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ config.json
55
.eslintrc.json
66
package.json
77
*.html
8+
*.txt

.prettierrc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"trailingComma": "es5",
3-
"semi": false,
4-
"singleQuote": true,
5-
"useTabs": true,
6-
"quoteProps": "consistent",
7-
"bracketSpacing": true,
8-
"arrowParens": "always",
9-
"printWidth": 100
2+
"trailingComma": "es5",
3+
"semi": false,
4+
"singleQuote": true,
5+
"useTabs": false,
6+
"quoteProps": "consistent",
7+
"bracketSpacing": true,
8+
"arrowParens": "always",
9+
"printWidth": 100
1010
}

adonis-typings/container.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
*/
99

1010
declare module '@ioc:Adonis/Core/Application' {
11-
import { SessionManagerContract } from '@ioc:Adonis/Addons/Session'
11+
import { SessionManagerContract } from '@ioc:Adonis/Addons/Session'
1212

13-
interface ContainerBindings {
14-
'Adonis/Addons/Session': SessionManagerContract
15-
}
13+
interface ContainerBindings {
14+
'Adonis/Addons/Session': SessionManagerContract
15+
}
1616
}

adonis-typings/context.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
*/
99

1010
declare module '@ioc:Adonis/Core/HttpContext' {
11-
import { SessionContract } from '@ioc:Adonis/Addons/Session'
11+
import { SessionContract } from '@ioc:Adonis/Addons/Session'
1212

13-
interface HttpContextContract {
14-
session: SessionContract
15-
}
13+
interface HttpContextContract {
14+
session: SessionContract
15+
}
1616
}

0 commit comments

Comments
 (0)