Skip to content

Commit d4123ee

Browse files
committed
Merge branch 'master' of https://github.com/BoostIO/Boostnote into fixIssue2534
2 parents b91a76b + d727a61 commit d4123ee

File tree

269 files changed

+11633
-8535
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

269 files changed

+11633
-8535
lines changed

.eslintrc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"extends": ["standard", "standard-jsx", "plugin:react/recommended"],
3-
"plugins": ["react"],
2+
"extends": ["standard", "standard-jsx", "plugin:react/recommended", "prettier"],
3+
"plugins": ["react", "prettier"],
44
"rules": {
55
"no-useless-escape": 0,
66
"prefer-const": ["warn", {
@@ -13,7 +13,8 @@
1313
"react/no-string-refs": 0,
1414
"react/no-find-dom-node": "warn",
1515
"react/no-render-return-value": "warn",
16-
"react/no-deprecated": "warn"
16+
"react/no-deprecated": "warn",
17+
"prettier/prettier": ["error"]
1718
},
1819
"globals": {
1920
"FileReader": true,

.prettierrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"singleQuote": true,
3+
"semi": false,
4+
"jsxSingleQuote": true
5+
}

0 commit comments

Comments
 (0)