diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000..1d9ade2f1 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,10 @@ +# Ignore directories: +packages/build +packages/teleterm/src/services/tshd/v1/** +packages/teleterm/src/sharedProcess/** + +# Ignore file types: +packages/**/*.md +packages/**/*.css +packages/**/*.json +packages/**/*.yaml diff --git a/.prettierrc b/.prettierrc index c25c722a9..ac075b6c5 100644 --- a/.prettierrc +++ b/.prettierrc @@ -2,7 +2,7 @@ "arrowParens": "avoid", "printWidth": 80, "bracketSpacing": true, - "jsxBracketSameLine": false, + "bracketSameLine": false, "semi": true, "singleQuote": true, "tabWidth": 2, diff --git a/package.json b/package.json index 697f2403b..6b3a822a3 100644 --- a/package.json +++ b/package.json @@ -4,24 +4,26 @@ "main": "index.js", "license": "Apache-2.0", "scripts": { - "storybook": "start-storybook -p 9002 -c .storybook", - "test": "jest", - "test-coverage": "jest --coverage && scripts/print-coverage-link.sh", - "tdd": "jest --watch", - "package-term": "yarn workspace @gravitational/teleterm package", - "build-term": "yarn workspace @gravitational/teleterm build", "build-and-package-term": "yarn build-term && yarn package-term", - "start-term": "yarn workspace @gravitational/teleterm start", - "start-teleport": "yarn workspace @gravitational/teleport start", - "start-teleport-e": "yarn workspace @gravitational/teleport.e start", + "build-e": "yarn build-teleport-e", + "build-oss": "yarn build-teleport-oss", "build-teleport": "yarn build-teleport-oss && yarn build-teleport-e", - "build-teleport-oss": "yarn workspace @gravitational/teleport build --output-path=../../dist/teleport/app", "build-teleport-e": "yarn workspace @gravitational/teleport.e build --output-path=../../../dist/e/teleport/app", - "build-oss": "yarn build-teleport-oss", - "build-e": "yarn build-teleport-e", - "type-check-and-lint": "yarn type-check && yarn lint", + "build-teleport-oss": "yarn workspace @gravitational/teleport build --output-path=../../dist/teleport/app", + "build-term": "yarn workspace @gravitational/teleterm build", "lint": "eslint --ext .js,.jsx,.ts,.tsx packages/", - "type-check": "tsc --noEmit" + "package-term": "yarn workspace @gravitational/teleterm package", + "prettier-check": "yarn prettier --check ./packages", + "prettier-write": "yarn prettier --write ./packages", + "start-teleport": "yarn workspace @gravitational/teleport start", + "start-teleport-e": "yarn workspace @gravitational/teleport.e start", + "start-term": "yarn workspace @gravitational/teleterm start", + "storybook": "start-storybook -p 9002 -c .storybook", + "tdd": "jest --watch", + "test": "jest", + "test-coverage": "jest --coverage && scripts/print-coverage-link.sh", + "type-check": "tsc --noEmit", + "type-check-and-lint": "yarn type-check && yarn lint" }, "private": true, "resolutions": { diff --git a/yarn.lock b/yarn.lock index b9e1c754c..3113abb68 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2631,11 +2631,6 @@ resolved "https://registry.yarnpkg.com/@types/google-protobuf/-/google-protobuf-3.15.6.tgz#674a69493ef2c849b95eafe69167ea59079eb504" integrity sha512-pYVNNJ+winC4aek+lZp93sIKxnXt5qMkuKmaqS3WGuTq0Bw1ZDYNBgzG5kkdtwcv+GmYJGo3yEg6z2cKKAiEdw== -"@types/google-protobuf@^3.7.2": - version "3.15.5" - resolved "https://registry.yarnpkg.com/@types/google-protobuf/-/google-protobuf-3.15.5.tgz#644b2be0f5613b1f822c70c73c6b0e0b5b5fa2ad" - integrity sha512-6bgv24B+A2bo9AfzReeg5StdiijKzwwnRflA8RLd1V4Yv995LeTmo0z69/MPbBDFSiZWdZHQygLo/ccXhMEDgw== - "@types/graceful-fs@^4.1.2": version "4.1.5" resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"