From a0a0ee2920a68bc07056115b1b6619b3cfaf7cb8 Mon Sep 17 00:00:00 2001 From: Ryan Ling Date: Tue, 30 Aug 2022 19:55:55 +1000 Subject: [PATCH] Allow `.idea` and `.vscode` ignore overrides (#956) As discussed in `#typescriptification`. --- .changeset/tender-pianos-tell.md | 7 ++ .eslintignore | 5 +- .gitignore | 5 +- .prettierignore | 5 +- .../__snapshots__/project.test.ts.snap | 15 +-- template/base/_.eslintignore | 5 +- template/base/_.gitignore | 5 +- template/base/_.prettierignore | 5 +- yarn.lock | 91 ++++++++++--------- 9 files changed, 80 insertions(+), 63 deletions(-) create mode 100644 .changeset/tender-pianos-tell.md diff --git a/.changeset/tender-pianos-tell.md b/.changeset/tender-pianos-tell.md new file mode 100644 index 000000000..b16f7eb04 --- /dev/null +++ b/.changeset/tender-pianos-tell.md @@ -0,0 +1,7 @@ +--- +'skuba': patch +--- + +configure, template: Allow `.idea` and `.vscode` ignore overrides + +You can now append lines like `!.vscode/launch.json` to your ignore files to allow specific editor files to be committed, formatted and/or linted. diff --git a/.eslintignore b/.eslintignore index a7d09d0de..476d7a620 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,7 +1,8 @@ # managed by skuba -.idea/ +.idea/* +.vscode/* + .serverless/ -.vscode/ cdk.out/ node_modules*/ diff --git a/.gitignore b/.gitignore index 645f7ef1a..1441e1eab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,9 @@ # managed by skuba +.idea/* +.vscode/* + .cdk.staging/ -.idea/ .serverless/ -.vscode/ cdk.out/ node_modules*/ diff --git a/.prettierignore b/.prettierignore index d741996ff..5a6e7c22b 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,7 +1,8 @@ # managed by skuba -.idea/ +.idea/* +.vscode/* + .serverless/ -.vscode/ cdk.out/ node_modules*/ diff --git a/src/cli/configure/analysis/__snapshots__/project.test.ts.snap b/src/cli/configure/analysis/__snapshots__/project.test.ts.snap index ab2bdd19e..af8d14284 100644 --- a/src/cli/configure/analysis/__snapshots__/project.test.ts.snap +++ b/src/cli/configure/analysis/__snapshots__/project.test.ts.snap @@ -26,9 +26,10 @@ yarn-error.log }, ".eslintignore": Object { "data": "# managed by skuba -.idea/ +.idea/* +.vscode/* + .serverless/ -.vscode/ cdk.out/ node_modules*/ @@ -56,10 +57,11 @@ node_modules*/ }, ".gitignore": Object { "data": "# managed by skuba +.idea/* +.vscode/* + .cdk.staging/ -.idea/ .serverless/ -.vscode/ cdk.out/ node_modules*/ @@ -82,9 +84,10 @@ yarn-error.log }, ".prettierignore": Object { "data": "# managed by skuba -.idea/ +.idea/* +.vscode/* + .serverless/ -.vscode/ cdk.out/ node_modules*/ diff --git a/template/base/_.eslintignore b/template/base/_.eslintignore index 8b890f72d..0a3eef35a 100644 --- a/template/base/_.eslintignore +++ b/template/base/_.eslintignore @@ -1,7 +1,8 @@ # managed by skuba -.idea/ +.idea/* +.vscode/* + .serverless/ -.vscode/ cdk.out/ node_modules*/ diff --git a/template/base/_.gitignore b/template/base/_.gitignore index 76d50dd1b..48187c6cf 100644 --- a/template/base/_.gitignore +++ b/template/base/_.gitignore @@ -1,8 +1,9 @@ # managed by skuba +.idea/* +.vscode/* + .cdk.staging/ -.idea/ .serverless/ -.vscode/ cdk.out/ node_modules*/ diff --git a/template/base/_.prettierignore b/template/base/_.prettierignore index f339a52df..1f43e3080 100644 --- a/template/base/_.prettierignore +++ b/template/base/_.prettierignore @@ -1,7 +1,8 @@ # managed by skuba -.idea/ +.idea/* +.vscode/* + .serverless/ -.vscode/ cdk.out/ node_modules*/ diff --git a/yarn.lock b/yarn.lock index 6ee453ab9..b44a12d6c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1814,13 +1814,13 @@ "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^5.16.0", "@typescript-eslint/eslint-plugin@^5.27.0": - version "5.33.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz#c0a480d05211660221eda963cc844732fe9b1714" - integrity sha512-S1iZIxrTvKkU3+m63YUOxYPKaP+yWDQrdhxTglVDVEVBf+aCSw85+BmJnyUaQQsk5TXFG/LpBu9fa+LrAQ91fQ== + version "5.36.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.36.0.tgz#8f159c4cdb3084eb5d4b72619a2ded942aa109e5" + integrity sha512-X3In41twSDnYRES7hO2xna4ZC02SY05UN9sGW//eL1P5k4CKfvddsdC2hOq0O3+WU1wkCPQkiTY9mzSnXKkA0w== dependencies: - "@typescript-eslint/scope-manager" "5.33.1" - "@typescript-eslint/type-utils" "5.33.1" - "@typescript-eslint/utils" "5.33.1" + "@typescript-eslint/scope-manager" "5.36.0" + "@typescript-eslint/type-utils" "5.36.0" + "@typescript-eslint/utils" "5.36.0" debug "^4.3.4" functional-red-black-tree "^1.0.1" ignore "^5.2.0" @@ -1829,68 +1829,69 @@ tsutils "^3.21.0" "@typescript-eslint/parser@^5.16.0", "@typescript-eslint/parser@^5.27.0": - version "5.33.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.33.1.tgz#e4b253105b4d2a4362cfaa4e184e2d226c440ff3" - integrity sha512-IgLLtW7FOzoDlmaMoXdxG8HOCByTBXrB1V2ZQYSEV1ggMmJfAkMWTwUjjzagS6OkfpySyhKFkBw7A9jYmcHpZA== + version "5.36.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.36.0.tgz#c08883073fb65acaafd268a987fd2314ce80c789" + integrity sha512-dlBZj7EGB44XML8KTng4QM0tvjI8swDh8MdpE5NX5iHWgWEfIuqSfSE+GPeCrCdj7m4tQLuevytd57jNDXJ2ZA== dependencies: - "@typescript-eslint/scope-manager" "5.33.1" - "@typescript-eslint/types" "5.33.1" - "@typescript-eslint/typescript-estree" "5.33.1" + "@typescript-eslint/scope-manager" "5.36.0" + "@typescript-eslint/types" "5.36.0" + "@typescript-eslint/typescript-estree" "5.36.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.33.1": - version "5.33.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.33.1.tgz#8d31553e1b874210018ca069b3d192c6d23bc493" - integrity sha512-8ibcZSqy4c5m69QpzJn8XQq9NnqAToC8OdH/W6IXPXv83vRyEDPYLdjAlUx8h/rbusq6MkW4YdQzURGOqsn3CA== +"@typescript-eslint/scope-manager@5.36.0": + version "5.36.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.36.0.tgz#f4f859913add160318c0a5daccd3a030d1311530" + integrity sha512-PZUC9sz0uCzRiuzbkh6BTec7FqgwXW03isumFVkuPw/Ug/6nbAqPUZaRy4w99WCOUuJTjhn3tMjsM94NtEj64g== dependencies: - "@typescript-eslint/types" "5.33.1" - "@typescript-eslint/visitor-keys" "5.33.1" + "@typescript-eslint/types" "5.36.0" + "@typescript-eslint/visitor-keys" "5.36.0" -"@typescript-eslint/type-utils@5.33.1": - version "5.33.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.33.1.tgz#1a14e94650a0ae39f6e3b77478baff002cec4367" - integrity sha512-X3pGsJsD8OiqhNa5fim41YtlnyiWMF/eKsEZGsHID2HcDqeSC5yr/uLOeph8rNF2/utwuI0IQoAK3fpoxcLl2g== +"@typescript-eslint/type-utils@5.36.0": + version "5.36.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.36.0.tgz#5d2f94a36a298ae240ceca54b3bc230be9a99f0a" + integrity sha512-W/E3yJFqRYsjPljJ2gy0YkoqLJyViWs2DC6xHkXcWyhkIbCDdaVnl7mPLeQphVI+dXtY05EcXFzWLXhq8Mm/lQ== dependencies: - "@typescript-eslint/utils" "5.33.1" + "@typescript-eslint/typescript-estree" "5.36.0" + "@typescript-eslint/utils" "5.36.0" debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/types@5.33.1": - version "5.33.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.33.1.tgz#3faef41793d527a519e19ab2747c12d6f3741ff7" - integrity sha512-7K6MoQPQh6WVEkMrMW5QOA5FO+BOwzHSNd0j3+BlBwd6vtzfZceJ8xJ7Um2XDi/O3umS8/qDX6jdy2i7CijkwQ== +"@typescript-eslint/types@5.36.0": + version "5.36.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.36.0.tgz#cde7b94d1c09a4f074f46db99e7bd929fb0a5559" + integrity sha512-3JJuLL1r3ljRpFdRPeOtgi14Vmpx+2JcR6gryeORmW3gPBY7R1jNYoq4yBN1L//ONZjMlbJ7SCIwugOStucYiQ== -"@typescript-eslint/typescript-estree@5.33.1": - version "5.33.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.1.tgz#a573bd360790afdcba80844e962d8b2031984f34" - integrity sha512-JOAzJ4pJ+tHzA2pgsWQi4804XisPHOtbvwUyqsuuq8+y5B5GMZs7lI1xDWs6V2d7gE/Ez5bTGojSK12+IIPtXA== +"@typescript-eslint/typescript-estree@5.36.0": + version "5.36.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.0.tgz#0acce61b4850bdb0e578f0884402726680608789" + integrity sha512-EW9wxi76delg/FS9+WV+fkPdwygYzRrzEucdqFVWXMQWPOjFy39mmNNEmxuO2jZHXzSQTXzhxiU1oH60AbIw9A== dependencies: - "@typescript-eslint/types" "5.33.1" - "@typescript-eslint/visitor-keys" "5.33.1" + "@typescript-eslint/types" "5.36.0" + "@typescript-eslint/visitor-keys" "5.36.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/utils@5.33.1", "@typescript-eslint/utils@^5.10.0": - version "5.33.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.33.1.tgz#171725f924fe1fe82bb776522bb85bc034e88575" - integrity sha512-uphZjkMaZ4fE8CR4dU7BquOV6u0doeQAr8n6cQenl/poMaIyJtBu8eys5uk6u5HiDH01Mj5lzbJ5SfeDz7oqMQ== +"@typescript-eslint/utils@5.36.0", "@typescript-eslint/utils@^5.10.0": + version "5.36.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.36.0.tgz#104c864ecc1448417606359275368bf3872bbabb" + integrity sha512-wAlNhXXYvAAUBbRmoJDywF/j2fhGLBP4gnreFvYvFbtlsmhMJ4qCKVh/Z8OP4SgGR3xbciX2nmG639JX0uw1OQ== dependencies: "@types/json-schema" "^7.0.9" - "@typescript-eslint/scope-manager" "5.33.1" - "@typescript-eslint/types" "5.33.1" - "@typescript-eslint/typescript-estree" "5.33.1" + "@typescript-eslint/scope-manager" "5.36.0" + "@typescript-eslint/types" "5.36.0" + "@typescript-eslint/typescript-estree" "5.36.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/visitor-keys@5.33.1": - version "5.33.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.1.tgz#0155c7571c8cd08956580b880aea327d5c34a18b" - integrity sha512-nwIxOK8Z2MPWltLKMLOEZwmfBZReqUdbEoHQXeCpa+sRVARe5twpJGHCB4dk9903Yaf0nMAlGbQfaAH92F60eg== +"@typescript-eslint/visitor-keys@5.36.0": + version "5.36.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.0.tgz#565d35a5ca00d00a406a942397ead2cb190663ba" + integrity sha512-pdqSJwGKueOrpjYIex0T39xarDt1dn4p7XJ+6FqBWugNQwXlNGC5h62qayAIYZ/RPPtD+ButDWmpXT1eGtiaYg== dependencies: - "@typescript-eslint/types" "5.33.1" + "@typescript-eslint/types" "5.36.0" eslint-visitor-keys "^3.3.0" JSONStream@^1.0.4: