From 43604bf1ba69cc338cfb811de55da82302785bf7 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 7 Jan 2022 18:43:56 +0100 Subject: [PATCH] Merge pull request #511 from getAlby/revisit-prettier-setup Revisit prettier setup --- .eslintrc.json | 2 +- .husky/pre-commit | 2 +- .prettierignore | 3 +++ .prettierrc.json | 1 + package.json | 7 +++---- 5 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 .prettierignore create mode 100644 .prettierrc.json diff --git a/.eslintrc.json b/.eslintrc.json index d78beee621..e459f401d5 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -5,7 +5,7 @@ "plugin:react/recommended", "plugin:react-hooks/recommended", "plugin:react/jsx-runtime", - "plugin:prettier/recommended" + "prettier" ], "parser": "@typescript-eslint/parser", "parserOptions": { diff --git a/.husky/pre-commit b/.husky/pre-commit index 845da8ead1..448858bda0 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,5 +1,5 @@ #!/bin/sh . "$(dirname "$0")/_/husky.sh" -npx tsc --noEmit npx lint-staged +npx tsc --noEmit diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000000..cbd1e19310 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,3 @@ +# Ignore artifacts: +dist +coverage \ No newline at end of file diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1 @@ +{} diff --git a/package.json b/package.json index eb227183c2..c2a230d9c9 100644 --- a/package.json +++ b/package.json @@ -20,9 +20,9 @@ "build:chrome": "cross-env NODE_ENV=production cross-env TARGET_BROWSER=chrome webpack", "build:firefox": "cross-env NODE_ENV=production cross-env TARGET_BROWSER=firefox webpack", "build:opera": "cross-env NODE_ENV=production cross-env TARGET_BROWSER=opera webpack", - "build": "yarn run build:chrome && yarn run build:firefox && yarn run build:opera", - "package": "yarn run build && ./create-packages.sh", - "lint": "yarn run lint:js && yarn run tsc:compile", + "build": "yarn build:chrome && yarn build:firefox && yarn build:opera", + "package": "yarn build && ./create-packages.sh", + "lint": "yarn lint:js && yarn tsc:compile", "lint:js": "eslint src --ext .js,.jsx,.ts,.tsx --max-warnings 0", "lint:js:fix": "eslint src --ext .js,.jsx,.ts,.tsx --fix", "tsc:compile": "tsc --noEmit", @@ -116,7 +116,6 @@ "eslint": "^8.3.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-import": "^2.25.3", - "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-react": "^7.27.1", "eslint-plugin-react-hooks": "^4.3.0", "filemanager-webpack-plugin": "^6.1.7",