diff --git a/.prettierrc b/.prettierrc index 02962146..33bc97f8 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,20 +1,22 @@ { - "printWidth": 100, - "semi": true, - "singleQuote": true, - "overrides": [ - { - "files": ["**/*.css", "**/*.scss", "**/*.html"], - "options": { - "singleQuote": false - } - } - ], - "trailingComma": "all", - "bracketSpacing": true, - "arrowParens": "always", - "proseWrap": "never", - "htmlWhitespaceSensitivity": "strict", - "endOfLine": "lf", - "singleAttributePerLine": true + "printWidth": 100, + "semi": true, + "singleQuote": true, + "tabWidth": 4, + "useTabs": false, + "overrides": [ + { + "files": ["**/*.css", "**/*.scss", "**/*.html"], + "options": { + "singleQuote": false + } + } + ], + "trailingComma": "all", + "bracketSpacing": true, + "arrowParens": "always", + "proseWrap": "never", + "htmlWhitespaceSensitivity": "strict", + "endOfLine": "lf", + "singleAttributePerLine": true } diff --git a/.vscode/settings.json b/.vscode/settings.json index 4b490666..b7d0634d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,7 +10,6 @@ { "directory": "./server", "changeProcessCWD": true } ], "typescript.tsserver.experimental.enableProjectDiagnostics": true, - "editor.tabSize": 2, "editor.codeActionsOnSave": { "source.fixAll.eslint": true, "source.fixAll.stylelint": false diff --git a/package.json b/package.json index 899e01ac..3dea6bf8 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "build:renderer": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.prod.ts", "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir release/app", "lint": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx", + "lint:fix": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx --fix", "lint:styles": "npx stylelint **/*.tsx", "package": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never", "package:pr": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never --win --mac --linux",