Skip to content

Commit 7f8184b

Browse files
committed
Merge branch 'main' into dbux-3
2 parents 7c8732a + 43a3fad commit 7f8184b

File tree

5 files changed

+40
-42
lines changed

5 files changed

+40
-42
lines changed

.eslintrc.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ module.exports = {
44
es2021: true,
55
node: true
66
},
7-
extends: ['eslint:recommended'],
87
rules: {
98
'no-console': 'error'
109
}

.prettierrc.json

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,11 @@
22
"trailingComma": "none",
33
"overrides": [
44
{
5-
"files": "**/*.js",
5+
"files": ["*.js", "*.jsx", "*.ts", "*.tsx"],
66
"options": {
7-
"singleQuote": true
8-
}
9-
},
10-
{
11-
"files": "**/*.mjs",
12-
"options": {
13-
"singleQuote": true
7+
"bracketSameLine": true
148
}
159
}
16-
]
10+
],
11+
"bracketSpacing": true
1712
}

CONTRIBUTING.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ We are committed to fostering a welcoming, respectful, and harassment-free envir
99
Please make sure that husky is installed correctly to validate your changes.
1010

1111
Moreover, you need to duplicate `.env.template` as `.env` and type your own email address. This ensures that you have the correct email set for this project.
12+
13+
### Conventions
14+
15+
Please be aware that we have some [code and git commit (message and branch naming) conventions](docs/conventions.adoc), that we ensure with some linting tools.

package-lock.json

Lines changed: 30 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"dialog-polyfill": "^0.5.6",
7777
"dotenv": "^16.0.3",
7878
"find-versions-cli": "^4.0.0",
79-
"html-validate": "^7.10.0",
79+
"html-validate": "^7.10.1",
8080
"html5-boilerplate": "^8.0.0",
8181
"husky": "^8.0.2",
8282
"iframe-resizer": "^4.3.2",
@@ -93,7 +93,7 @@
9393
"rimraf": "^3.0.2",
9494
"sass": "^1.56.1",
9595
"start-server-and-test": "^1.14.0",
96-
"stylelint": "^14.15.0",
96+
"stylelint": "^14.16.0",
9797
"stylelint-config-prettier": "^9.0.4",
9898
"stylelint-config-sass-guidelines": "^9.0.1",
9999
"validate-branch-name": "^1.3.0",

0 commit comments

Comments
 (0)