From 4d4a4c8de744a14067b54b057511742785a01a9a Mon Sep 17 00:00:00 2001 From: go-to-k <24818752+go-to-k@users.noreply.github.com> Date: Sun, 4 Jun 2023 20:01:16 +0900 Subject: [PATCH] chore: update prettier settings --- .eslintrc.json | 102 +++------------------------------------------ .gitattributes | 2 + .gitignore | 2 + .prettierignore | 1 + .prettierrc.json | 8 ++++ .projen/deps.json | 12 ++++++ .projen/files.json | 2 + .projenrc.ts | 16 ++++++- package.json | 3 ++ yarn.lock | 29 +++++++++++++ 10 files changed, 79 insertions(+), 98 deletions(-) create mode 100644 .prettierignore create mode 100644 .prettierrc.json diff --git a/.eslintrc.json b/.eslintrc.json index d741455..fb2b2de 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -7,7 +7,8 @@ "root": true, "plugins": [ "@typescript-eslint", - "import" + "import", + "prettier" ], "parser": "@typescript-eslint/parser", "parserOptions": { @@ -16,7 +17,9 @@ "project": "./tsconfig.dev.json" }, "extends": [ - "plugin:import/typescript" + "plugin:import/typescript", + "prettier", + "plugin:prettier/recommended" ], "settings": { "import/parsers": { @@ -43,102 +46,9 @@ "!projenrc/**/*.ts" ], "rules": { - "indent": [ - "off" - ], - "@typescript-eslint/indent": [ - "error", - 2 - ], - "quotes": [ - "error", - "single", - { - "avoidEscape": true - } - ], - "comma-dangle": [ - "error", - "always-multiline" - ], - "comma-spacing": [ - "error", - { - "before": false, - "after": true - } - ], - "no-multi-spaces": [ - "error", - { - "ignoreEOLComments": false - } - ], - "array-bracket-spacing": [ - "error", - "never" - ], - "array-bracket-newline": [ - "error", - "consistent" - ], - "object-curly-spacing": [ - "error", - "always" - ], - "object-curly-newline": [ - "error", - { - "multiline": true, - "consistent": true - } - ], - "object-property-newline": [ - "error", - { - "allowAllPropertiesOnSameLine": true - } - ], - "keyword-spacing": [ - "error" - ], - "brace-style": [ - "error", - "1tbs", - { - "allowSingleLine": true - } - ], - "space-before-blocks": [ + "prettier/prettier": [ "error" ], - "curly": [ - "error", - "multi-line", - "consistent" - ], - "@typescript-eslint/member-delimiter-style": [ - "error" - ], - "semi": [ - "error", - "always" - ], - "max-len": [ - "error", - { - "code": 150, - "ignoreUrls": true, - "ignoreStrings": true, - "ignoreTemplateLiterals": true, - "ignoreComments": true, - "ignoreRegExpLiterals": true - } - ], - "quote-props": [ - "error", - "consistent-as-needed" - ], "@typescript-eslint/no-require-imports": [ "error" ], diff --git a/.gitattributes b/.gitattributes index bda1e5e..df62e7a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -12,6 +12,8 @@ /.mergify.yml linguist-generated /.npmignore linguist-generated /.npmrc linguist-generated +/.prettierignore linguist-generated +/.prettierrc.json linguist-generated /.projen/** linguist-generated /.projen/deps.json linguist-generated /.projen/files.json linguist-generated diff --git a/.gitignore b/.gitignore index fcb6c87..c0f1792 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,8 @@ junit.xml !/.mergify.yml !/.github/workflows/upgrade-main.yml !/.github/pull_request_template.md +!/.prettierignore +!/.prettierrc.json !/.npmrc !/test/ !/tsconfig.dev.json diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..3385eb8 --- /dev/null +++ b/.prettierignore @@ -0,0 +1 @@ +# ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 0000000..042b69b --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,8 @@ +{ + "singleQuote": true, + "jsxSingleQuote": true, + "trailingComma": "all", + "semi": true, + "printWidth": 100, + "overrides": [] +} diff --git a/.projen/deps.json b/.projen/deps.json index e196608..180c689 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -29,6 +29,10 @@ "version": "10.0.5", "type": "build" }, + { + "name": "eslint-config-prettier", + "type": "build" + }, { "name": "eslint-import-resolver-node", "type": "build" @@ -41,6 +45,10 @@ "name": "eslint-plugin-import", "type": "build" }, + { + "name": "eslint-plugin-prettier", + "type": "build" + }, { "name": "eslint", "version": "^8", @@ -77,6 +85,10 @@ "version": "^16", "type": "build" }, + { + "name": "prettier", + "type": "build" + }, { "name": "projen", "type": "build" diff --git a/.projen/files.json b/.projen/files.json index c6df2fb..98da88e 100644 --- a/.projen/files.json +++ b/.projen/files.json @@ -10,6 +10,8 @@ ".gitignore", ".mergify.yml", ".npmrc", + ".prettierignore", + ".prettierrc.json", ".projen/deps.json", ".projen/files.json", ".projen/tasks.json", diff --git a/.projenrc.ts b/.projenrc.ts index 88ed488..8a4800c 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -1,4 +1,5 @@ import { awscdk } from 'projen'; +import { TrailingComma } from 'projen/lib/javascript'; const project = new awscdk.AwsCdkConstructLibrary({ author: 'go-to-k', authorAddress: '24818752+go-to-k@users.noreply.github.com', @@ -9,11 +10,22 @@ const project = new awscdk.AwsCdkConstructLibrary({ name: 'elb-other-5xx-alarm', projenrcTs: true, repositoryUrl: 'https://github.com/go-to-k/elb-other-5xx-alarm.git', - license: 'MIT', - keywords: ['aws', 'cdk', 'aws-cdk', 'cloudwatch', 'elb'], + prettier: true, + prettierOptions: { + settings: { + singleQuote: true, + jsxSingleQuote: true, + trailingComma: TrailingComma.ALL, + semi: true, + printWidth: 100, + }, + }, eslintOptions: { dirs: ['src'], + // prettier: true, }, + license: 'MIT', + keywords: ['aws', 'cdk', 'aws-cdk', 'cloudwatch', 'elb'], gitignore: ['*.js', '*.d.ts', 'cdk.out/'], // deps: [], /* Runtime dependencies of this module. */ // description: undefined, /* The description is just a string that helps people understand the purpose of the package. */ diff --git a/package.json b/package.json index 6c1828c..660dd3d 100644 --- a/package.json +++ b/package.json @@ -41,9 +41,11 @@ "aws-cdk-lib": "2.82.0", "constructs": "10.0.5", "eslint": "^8", + "eslint-config-prettier": "^8.8.0", "eslint-import-resolver-node": "^0.3.7", "eslint-import-resolver-typescript": "^3.5.5", "eslint-plugin-import": "^2.27.5", + "eslint-plugin-prettier": "^4.2.1", "jest": "^29.5.0", "jest-junit": "^15", "jsii": "~5.0.0", @@ -51,6 +53,7 @@ "jsii-docgen": "^8.0.37", "jsii-pacmak": "^1.82.0", "npm-check-updates": "^16", + "prettier": "^2.8.8", "projen": "^0.71.82", "standard-version": "^9", "ts-jest": "^29.1.0", diff --git a/yarn.lock b/yarn.lock index 6cba57d..d4abf08 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2420,6 +2420,11 @@ escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== +eslint-config-prettier@^8.8.0: + version "8.8.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348" + integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA== + eslint-import-resolver-node@^0.3.7: version "0.3.7" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7" @@ -2471,6 +2476,13 @@ eslint-plugin-import@^2.27.5: semver "^6.3.0" tsconfig-paths "^3.14.1" +eslint-plugin-prettier@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b" + integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ== + dependencies: + prettier-linter-helpers "^1.0.0" + eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" @@ -2631,6 +2643,11 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== +fast-diff@^1.1.2: + version "1.3.0" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0" + integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw== + fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.9: version "3.2.12" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" @@ -5184,6 +5201,18 @@ prelude-ls@^1.2.1: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== +prettier-linter-helpers@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" + integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w== + dependencies: + fast-diff "^1.1.2" + +prettier@^2.8.8: + version "2.8.8" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" + integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== + pretty-format@^29.0.0, pretty-format@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.5.0.tgz#283134e74f70e2e3e7229336de0e4fce94ccde5a"