From 8b42de41f33d8f80abfa61b98c3ab76969997aa0 Mon Sep 17 00:00:00 2001 From: Josemar Luedke Date: Wed, 25 Mar 2020 16:59:43 -0700 Subject: [PATCH 1/2] Upgrade to Underline's eslint-config --- .eslintrc.js | 4 +- .prettierrc.js | 2 +- package.json | 4 +- yarn.lock | 172 ++++++++++++++++++++----------------------------- 4 files changed, 76 insertions(+), 106 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 0a7aabe4..c2924c28 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -6,7 +6,7 @@ module.exports = { project: join(__dirname, './tsconfig.eslint.json') }, plugins: [], - extends: ['@neighborly/eslint-config-ember-typescript'], + extends: ['@underline/eslint-config-ember-typescript'], rules: { '@typescript-eslint/no-empty-interface': 'off' }, @@ -38,7 +38,7 @@ module.exports = { 'packages/*/addon/tailwind/*.js', 'packages/tailwindcss-plugin-helpers/**/*.js' ], - extends: ['@neighborly/eslint-config-node'], + extends: ['@underline/eslint-config-node'], rules: {} } ] diff --git a/.prettierrc.js b/.prettierrc.js index 5df723ef..5c0efad1 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -1 +1 @@ -module.exports = require('@neighborly/eslint-config/.prettierrc.js'); +module.exports = require('@underline/eslint-config/.prettierrc.js'); diff --git a/package.json b/package.json index f99e18ac..143f32d9 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,8 @@ "try:one": "yarn workspaces run try:one" }, "devDependencies": { - "@neighborly/eslint-config-ember-typescript": "^0.6.0", - "@neighborly/eslint-config-node": "^0.6.0", + "@underline/eslint-config-ember-typescript": "^0.7.0", + "@underline/eslint-config-node": "^0.7.0", "ember-source-channel-url": "^2.0.1", "ember-template-lint": "^2.4.1", "eslint": "^6.8.0", diff --git a/yarn.lock b/yarn.lock index 1acaeb72..927de64a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1945,49 +1945,6 @@ call-me-maybe "^1.0.1" glob-to-regexp "^0.3.0" -"@neighborly/eslint-config-ember-typescript@^0.6.0": - version "0.6.0" - resolved "https://registry.yarnpkg.com/@neighborly/eslint-config-ember-typescript/-/eslint-config-ember-typescript-0.6.0.tgz#44856b7c13fa7a3029ab288dc125c5538c007eca" - integrity sha512-IAnqDs+T83ujnxeNnV+UYqDIa+9nRL/o37aOzYIec+qZAMV6TPXZ6OPGKsfeA8TURye8uaM6mhSkHn8I7xzvAg== - dependencies: - "@neighborly/eslint-config-ember" "^0.6.0" - "@neighborly/eslint-config-typescript" "^0.6.0" - -"@neighborly/eslint-config-ember@^0.6.0": - version "0.6.0" - resolved "https://registry.yarnpkg.com/@neighborly/eslint-config-ember/-/eslint-config-ember-0.6.0.tgz#a4c426e4d6a745d8eabf7b2447f914976a6180a7" - integrity sha512-VG35RmJcyvyDInvUQ3rHnmphkS1BFGWClrPTC683WOER5QQ6iXy+epPLB6w3ZV7nBHcC0whd5jZnRZ+2gmy78A== - dependencies: - "@neighborly/eslint-config" "^0.6.0" - eslint-plugin-ember "^7.7.2" - eslint-plugin-ember-best-practices "^1.1.2" - -"@neighborly/eslint-config-node@^0.6.0": - version "0.6.0" - resolved "https://registry.yarnpkg.com/@neighborly/eslint-config-node/-/eslint-config-node-0.6.0.tgz#fcf0fc4775cb38745405829319454100160d7c38" - integrity sha512-xN7AlvC7oEA0ZCFW+zg/mOZUK5CCddWD6/vXKFntwISQsC/kKjRn+9hhlJt6kqPAKbiLqgECXrK84eg0SKMbwA== - dependencies: - "@neighborly/eslint-config" "^0.6.0" - eslint-plugin-node "^10.0.0" - -"@neighborly/eslint-config-typescript@^0.6.0": - version "0.6.0" - resolved "https://registry.yarnpkg.com/@neighborly/eslint-config-typescript/-/eslint-config-typescript-0.6.0.tgz#e6785e23fbc432921cc67cc50bdd00121e323494" - integrity sha512-GrhjmDDESs69DRYJslS+VuDbjaH3vOTQdR4CrNGWILmDTN2cKf0WAcFjty8rOj1dFLq0NSoFuufmeU0UX7FWtg== - dependencies: - "@neighborly/eslint-config" "^0.6.0" - "@typescript-eslint/eslint-plugin" "^2.11.0" - "@typescript-eslint/parser" "^2.11.0" - -"@neighborly/eslint-config@^0.6.0": - version "0.6.0" - resolved "https://registry.yarnpkg.com/@neighborly/eslint-config/-/eslint-config-0.6.0.tgz#8519ef45eca5b54d960e312ea25757232b4551db" - integrity sha512-7nTCBhhH2+CH+0VLtwE6YxOBwonQSWG2LgOs8Q4lnqmSFEYiYiWRzsg2uTL70NxZ7tTLn4DYXn6gcQRK3wKjpg== - dependencies: - eslint-config-prettier "^6.7.0" - eslint-plugin-prettier "^3.1.2" - prettier "^1.19.1" - "@nodelib/fs.scandir@2.1.3": version "2.1.3" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b" @@ -2518,7 +2475,7 @@ resolved "https://registry.yarnpkg.com/@types/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#4151a81b4052c80bc2becbae09f3a9ec010a9c7a" integrity sha512-Lja2xYuuf2B3knEsga8ShbOdsfNOtzT73GyJmZyY7eGl2+ajOqrs8yM5ze0fsSoYwvA6bw7/Qr7OZ7PEEmYwWg== -"@typescript-eslint/eslint-plugin@^2.11.0": +"@typescript-eslint/eslint-plugin@^2.25.0": version "2.25.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.25.0.tgz#0b60917332f20dcff54d0eb9be2a9e9f4c9fbd02" integrity sha512-W2YyMtjmlrOjtXc+FtTelVs9OhuR6OlYc4XKIslJ8PUJOqgYYAPRJhAqkYRQo3G4sjvG8jSodsNycEn4W2gHUw== @@ -2538,7 +2495,7 @@ eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/parser@^2.11.0": +"@typescript-eslint/parser@^2.25.0": version "2.25.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.25.0.tgz#abfb3d999084824d9a756d9b9c0f36fba03adb76" integrity sha512-mccBLaBSpNVgp191CP5W+8U1crTyXsRziWliCqzj02kpxdjKMvFHGJbK33NroquH3zB/gZ8H511HEsJBa2fNEg== @@ -2561,6 +2518,49 @@ semver "^6.3.0" tsutils "^3.17.1" +"@underline/eslint-config-ember-typescript@^0.7.0": + version "0.7.0" + resolved "https://registry.yarnpkg.com/@underline/eslint-config-ember-typescript/-/eslint-config-ember-typescript-0.7.0.tgz#cc1207ab3e2b46beda345cbe37031e684a59bf2e" + integrity sha512-OndnLre5ElbThOC2DTVo6Vuut6utdUfor/4Z4+A9u8hjJQJd5H6eZOkFF9PRexuJbmhJPbj6DjPxiazpvTQxXw== + dependencies: + "@underline/eslint-config-ember" "^0.7.0" + "@underline/eslint-config-typescript" "^0.7.0" + +"@underline/eslint-config-ember@^0.7.0": + version "0.7.0" + resolved "https://registry.yarnpkg.com/@underline/eslint-config-ember/-/eslint-config-ember-0.7.0.tgz#4564a5796466687a38b6e4405e5ee12308269121" + integrity sha512-ttpMfVHGGVq49/Ir4/T/VGDV+KGHC5o3yKlQVORIZMIZXx4BZH+Nb9u4M5JyYBe811PilSXFpitoUI7Xq9dC5g== + dependencies: + "@underline/eslint-config" "^0.7.0" + eslint-plugin-ember "^7.11.0" + eslint-plugin-ember-best-practices "^1.1.2" + +"@underline/eslint-config-node@^0.7.0": + version "0.7.0" + resolved "https://registry.yarnpkg.com/@underline/eslint-config-node/-/eslint-config-node-0.7.0.tgz#228a999b1fb88df85581fa5bedb1fcd2fa0a313a" + integrity sha512-kO0EgjZoTjkp8AvZlObveAErPFQX1uSmimvPe1dRdXVHPQr8ek4ZJ89O5L/CHDSoHj8DXGPJtEsGW+FmL/3eZQ== + dependencies: + "@underline/eslint-config" "^0.7.0" + eslint-plugin-node "^11.0.0" + +"@underline/eslint-config-typescript@^0.7.0": + version "0.7.0" + resolved "https://registry.yarnpkg.com/@underline/eslint-config-typescript/-/eslint-config-typescript-0.7.0.tgz#66590e541bc2de4fa76bfdfb50de32f2bce5c2f2" + integrity sha512-NIuuGXK8zIZOHinUiKSWzoUvK7T6Ayr8TIl00mnHor46jgAg24tGZeWBkKiL0IaMMmWwCpUiLUmlcFiiEyi7ZA== + dependencies: + "@typescript-eslint/eslint-plugin" "^2.25.0" + "@typescript-eslint/parser" "^2.25.0" + "@underline/eslint-config" "^0.7.0" + +"@underline/eslint-config@^0.7.0": + version "0.7.0" + resolved "https://registry.yarnpkg.com/@underline/eslint-config/-/eslint-config-0.7.0.tgz#7d9f2222f2334df9295e478cfb468bc3ab654f9e" + integrity sha512-xHcuILMGOUlrI7BBzEba74P4dxwf6qikLLpdhNErLmYr47CBl/vXLNQgLcFj7++MyiYhdvJRs+qAPD9OFsYQkA== + dependencies: + eslint-config-prettier "^6.10.1" + eslint-plugin-prettier "^3.1.2" + prettier "^2.0.1" + "@webassemblyjs/ast@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace" @@ -6224,7 +6224,7 @@ debug@3.1.0, debug@~3.1.0: dependencies: ms "2.0.0" -debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6: +debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.1.1: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -6394,11 +6394,6 @@ detect-indent@^6.0.0: resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd" integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA== -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - detect-newline@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" @@ -8109,7 +8104,7 @@ esdoc-ecmascript-proposal-plugin@^1.0.0: resolved "https://registry.yarnpkg.com/esdoc-ecmascript-proposal-plugin/-/esdoc-ecmascript-proposal-plugin-1.0.0.tgz#390dc5656ba8a2830e39dba3570d79138df2ffd9" integrity sha1-OQ3FZWuoooMOOdujVw15E43y/9k= -"esdoc@github:pzuraq/esdoc#015a342": +esdoc@pzuraq/esdoc#015a342: version "1.0.4" resolved "https://codeload.github.com/pzuraq/esdoc/tar.gz/015a3426b2e53b2b0270a9c00133780db3f1d144" dependencies: @@ -8125,7 +8120,7 @@ esdoc-ecmascript-proposal-plugin@^1.0.0: minimist "1.2.0" taffydb "2.7.2" -eslint-config-prettier@^6.7.0: +eslint-config-prettier@^6.10.1: version "6.10.1" resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.10.1.tgz#129ef9ec575d5ddc0e269667bf09defcd898642a" integrity sha512-svTy6zh1ecQojvpbJSgH3aei/Rt7C6i090l5f2WQ4aB05lYHeZIR1qL4wZyyILTbtmnbHP5Yn8MrsOJMGa8RkQ== @@ -8139,7 +8134,7 @@ eslint-plugin-ember-best-practices@^1.1.2: dependencies: requireindex "^1.1.0" -eslint-plugin-ember@^7.7.2: +eslint-plugin-ember@^7.11.0: version "7.11.1" resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-7.11.1.tgz#d0f0205eab605d5fddaeb706ec6f73b3a71bb971" integrity sha512-BebVe2jXos+nAU6ptdhxAVFqX6y7ZITjpDS+FhKD33FxtPPzNghJIqg/Yc2NwKCjetrW5zmfHXkIODtq49M1Sg== @@ -8148,21 +8143,21 @@ eslint-plugin-ember@^7.7.2: ember-rfc176-data "^0.3.12" snake-case "^3.0.3" -eslint-plugin-es@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-2.0.0.tgz#0f5f5da5f18aa21989feebe8a73eadefb3432976" - integrity sha512-f6fceVtg27BR02EYnBhgWLFQfK6bN4Ll0nQFrBHOlCsAyxeZkn0NHns5O0YZOPrV1B3ramd6cgFwaoFLcSkwEQ== +eslint-plugin-es@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.0.tgz#98cb1bc8ab0aa807977855e11ad9d1c9422d014b" + integrity sha512-6/Jb/J/ZvSebydwbBJO1R9E5ky7YeElfK56Veh7e4QGFHCXoIXGH9HhVz+ibJLM3XJ1XjP+T7rKBLUa/Y7eIng== dependencies: - eslint-utils "^1.4.2" + eslint-utils "^2.0.0" regexpp "^3.0.0" -eslint-plugin-node@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-10.0.0.tgz#fd1adbc7a300cf7eb6ac55cf4b0b6fc6e577f5a6" - integrity sha512-1CSyM/QCjs6PXaT18+zuAXsjXGIGo5Rw630rSKwokSs2jrYURQc4R5JZpoanNCqwNmepg+0eZ9L7YiRUJb8jiQ== +eslint-plugin-node@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.0.0.tgz#365944bb0804c5d1d501182a9bc41a0ffefed726" + integrity sha512-chUs/NVID+sknFiJzxoN9lM7uKSOEta8GC8365hw1nDfwIPIjjpRSwwPvQanWv8dt/pDe9EV4anmVSwdiSndNg== dependencies: - eslint-plugin-es "^2.0.0" - eslint-utils "^1.4.2" + eslint-plugin-es "^3.0.0" + eslint-utils "^2.0.0" ignore "^5.1.1" minimatch "^3.0.4" resolve "^1.10.1" @@ -8191,7 +8186,7 @@ eslint-scope@^5.0.0: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.4.2, eslint-utils@^1.4.3: +eslint-utils@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== @@ -9828,7 +9823,7 @@ ice-cap@0.0.4: cheerio "0.20.0" color-logger "0.0.3" -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: +iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -11820,15 +11815,6 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -needle@^2.2.1: - version "2.3.3" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117" - integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -11951,22 +11937,6 @@ node-notifier@^5.0.1: shellwords "^0.1.1" which "^1.3.0" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - node-releases@^1.1.52: version "1.1.52" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz#bcffee3e0a758e92e44ecfaecd0a47554b0bcba9" @@ -12095,7 +12065,7 @@ npm-package-arg@^8.0.0: semver "^7.0.0" validate-npm-package-name "^3.0.0" -npm-packlist@^1.1.6, npm-packlist@^1.4.4: +npm-packlist@^1.4.4: version "1.4.8" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== @@ -12134,7 +12104,7 @@ npm-run-path@^4.0.0: dependencies: path-key "^3.0.0" -npmlog@^4.0.0, npmlog@^4.0.2, npmlog@^4.1.2: +npmlog@^4.0.0, npmlog@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -12919,10 +12889,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^1.19.1: - version "1.19.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" - integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== +prettier@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.2.tgz#1ba8f3eb92231e769b7fcd7cb73ae1b6b74ade08" + integrity sha512-5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg== pretty-hrtime@^1.0.3: version "1.0.3" @@ -13212,7 +13182,7 @@ raw-body@~1.1.0: bytes "1" string_decoder "0.10" -rc@^1.0.1, rc@^1.1.6, rc@^1.2.7: +rc@^1.0.1, rc@^1.1.6: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -13912,7 +13882,7 @@ sass@^1.22.10: dependencies: chokidar ">=2.0.0 <4.0.0" -sax@^1.1.4, sax@^1.2.4, sax@~1.2.4: +sax@^1.1.4, sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -14838,7 +14808,7 @@ tapable@^1.0.0, tapable@^1.1.0: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tar@^4.4.10, tar@^4.4.12, tar@^4.4.2, tar@^4.4.8: +tar@^4.4.10, tar@^4.4.12, tar@^4.4.8: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== From 91e08fc947028d0ce719c8947024e2c886ed2f0b Mon Sep 17 00:00:00 2001 From: Josemar Luedke Date: Wed, 25 Mar 2020 16:59:50 -0700 Subject: [PATCH 2/2] Fix lint issues after prettier & eslint upgrade --- config/ember-try.js | 4 +-- packages/buttons/addon/tailwind/index.js | 6 ++-- packages/buttons/config/environment.js | 2 +- packages/buttons/ember-cli-build.js | 2 +- packages/buttons/tests/dummy/app/router.js | 2 +- .../buttons/tests/dummy/config/environment.js | 2 +- .../integration/components/button-test.ts | 30 ++++++++--------- .../components/changeset-form/fields/base.ts | 2 +- .../changeset-form/fields/checkbox-group.ts | 2 +- .../changeset-form/fields/checkbox.ts | 2 +- packages/changeset-form/config/environment.js | 2 +- packages/changeset-form/ember-cli-build.js | 2 +- .../app/components/changeset-form-example.ts | 2 +- .../changeset-form/tests/dummy/app/router.js | 2 +- .../tests/dummy/config/environment.js | 2 +- .../components/changeset-form-test.ts | 16 ++++------ .../fields/checkbox-group-test.ts | 8 ++--- .../changeset-form/fields/checkbox-test.ts | 8 ++--- .../changeset-form/fields/input-test.ts | 10 +++--- .../changeset-form/fields/radio-group-test.ts | 10 +++--- .../changeset-form/fields/radio-test.ts | 8 ++--- .../changeset-form/fields/select-test.ts | 10 +++--- .../changeset-form/fields/textarea-test.ts | 10 +++--- packages/core/config/environment.js | 2 +- packages/core/ember-cli-build.js | 2 +- packages/core/tests/dummy/app/router.js | 2 +- .../core/tests/dummy/config/environment.js | 2 +- .../components/visually-hidden-test.ts | 4 +-- .../changeset-form/complete-form/index.js | 2 +- packages/docs/app/router.js | 16 +++++----- packages/docs/config/deploy.js | 2 +- packages/docs/config/environment.js | 2 +- packages/docs/ember-cli-build.js | 2 +- .../forms/addon/tailwind/default-options.js | 4 +-- packages/forms/addon/tailwind/index.js | 6 ++-- packages/forms/config/environment.js | 2 +- packages/forms/ember-cli-build.js | 2 +- packages/forms/index.js | 2 +- .../dummy/app/components/form-example.ts | 2 +- packages/forms/tests/dummy/app/router.js | 2 +- .../forms/tests/dummy/config/environment.js | 2 +- .../components/form-checkbox-group-test.ts | 20 ++++++------ .../components/form-checkbox-test.ts | 22 ++++++------- .../integration/components/form-field-test.ts | 6 ++-- .../components/form-field/checkbox-test.ts | 20 ++++++------ .../components/form-field/feedback-test.ts | 18 +++++------ .../components/form-field/hint-test.ts | 6 ++-- .../components/form-field/input-test.ts | 20 ++++++------ .../components/form-field/label-test.ts | 6 ++-- .../components/form-field/radio-test.ts | 20 ++++++------ .../components/form-field/textarea-test.ts | 16 +++++----- .../integration/components/form-input-test.ts | 32 +++++++++---------- .../components/form-radio-group-test.ts | 22 ++++++------- .../integration/components/form-radio-test.ts | 24 +++++++------- .../components/form-select-test.ts | 26 +++++++-------- .../components/form-textarea-test.ts | 32 +++++++++---------- .../notifications/addon/-private/manager.ts | 4 +-- .../addon/tailwind/default-options.js | 2 +- .../notifications/addon/tailwind/index.js | 6 ++-- packages/notifications/config/environment.js | 2 +- packages/notifications/ember-cli-build.js | 2 +- .../notifications/tests/dummy/app/router.js | 2 +- .../tests/dummy/config/environment.js | 2 +- .../components/notification-card-test.ts | 14 ++++---- .../notifications-container-test.ts | 10 +++--- .../tests/unit/notification-test.ts | 10 +++--- .../tests/unit/services/notifications-test.ts | 14 ++++---- .../notifications/tests/unit/timer-test.ts | 6 ++-- .../tailwindcss-plugin-helpers/src/index.js | 4 +-- 69 files changed, 284 insertions(+), 286 deletions(-) diff --git a/config/ember-try.js b/config/ember-try.js index c99cd674..226eb560 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -2,12 +2,12 @@ const getChannelURL = require('ember-source-channel-url'); -module.exports = function() { +module.exports = function () { return Promise.all([ getChannelURL('release'), getChannelURL('beta'), getChannelURL('canary') - ]).then(urls => { + ]).then((urls) => { return { useYarn: true, scenarios: [ diff --git a/packages/buttons/addon/tailwind/index.js b/packages/buttons/addon/tailwind/index.js index 443da81e..f537ede8 100644 --- a/packages/buttons/addon/tailwind/index.js +++ b/packages/buttons/addon/tailwind/index.js @@ -1,8 +1,8 @@ const plugin = require('tailwindcss/plugin'); const { resolve, isEmpty } = require('@frontile/tailwindcss-plugin-helpers'); -module.exports = plugin.withOptions(function(userConfig) { - return function({ addComponents, theme }) { +module.exports = plugin.withOptions(function (userConfig) { + return function ({ addComponents, theme }) { const { options } = resolve( '@frontile/buttons', require('./default-options'), @@ -46,7 +46,7 @@ module.exports = plugin.withOptions(function(userConfig) { } } - Object.keys(options).forEach(key => { + Object.keys(options).forEach((key) => { const modifier = key === 'default' ? '' : `-${key}`; addButton(options[key].button, modifier); }); diff --git a/packages/buttons/config/environment.js b/packages/buttons/config/environment.js index 9707ea62..331ab30d 100644 --- a/packages/buttons/config/environment.js +++ b/packages/buttons/config/environment.js @@ -1,5 +1,5 @@ 'use strict'; -module.exports = function(/* environment, appConfig */) { +module.exports = function (/* environment, appConfig */) { return {}; }; diff --git a/packages/buttons/ember-cli-build.js b/packages/buttons/ember-cli-build.js index b93cba3d..733c6804 100644 --- a/packages/buttons/ember-cli-build.js +++ b/packages/buttons/ember-cli-build.js @@ -3,7 +3,7 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); const path = require('path'); -module.exports = function(defaults) { +module.exports = function (defaults) { const app = new EmberAddon(defaults, { postcssOptions: { compile: { diff --git a/packages/buttons/tests/dummy/app/router.js b/packages/buttons/tests/dummy/app/router.js index 4680a80b..0e8ea698 100644 --- a/packages/buttons/tests/dummy/app/router.js +++ b/packages/buttons/tests/dummy/app/router.js @@ -6,6 +6,6 @@ export default class Router extends EmberRouter { rootURL = config.rootURL; } -Router.map(function() { +Router.map(function () { // there are no routes in this dummy app }); diff --git a/packages/buttons/tests/dummy/config/environment.js b/packages/buttons/tests/dummy/config/environment.js index 76e199aa..c18df800 100644 --- a/packages/buttons/tests/dummy/config/environment.js +++ b/packages/buttons/tests/dummy/config/environment.js @@ -1,6 +1,6 @@ 'use strict'; -module.exports = function(environment) { +module.exports = function (environment) { const ENV = { modulePrefix: 'dummy', environment, diff --git a/packages/buttons/tests/integration/components/button-test.ts b/packages/buttons/tests/integration/components/button-test.ts index 3405726c..84ab5be0 100644 --- a/packages/buttons/tests/integration/components/button-test.ts +++ b/packages/buttons/tests/integration/components/button-test.ts @@ -3,17 +3,17 @@ import { setupRenderingTest } from 'ember-qunit'; import { render } from '@ember/test-helpers'; import hbs from 'htmlbars-inline-precompile'; -module('Integration | Component | Button', function(hooks) { +module('Integration | Component | Button', function (hooks) { setupRenderingTest(hooks); - test('it renders', async function(assert) { + test('it renders', async function (assert) { await render(hbs``); assert.dom('[data-test-id="button"]').hasText('My Button'); assert.dom('[data-test-id="button"]').hasAttribute('type', 'button'); }); - test('it accepts @type argument', async function(assert) { + test('it accepts @type argument', async function (assert) { await render( hbs`` ); @@ -23,13 +23,13 @@ module('Integration | Component | Button', function(hooks) { module('Style classes', () => { module('@appearance', () => { - test('it adds class for default appearance', async function(assert) { + test('it adds class for default appearance', async function (assert) { await render(hbs``); assert.dom('[data-test-id="button"]').hasClass('btn'); }); - test('it adds class for outlined appearance', async function(assert) { + test('it adds class for outlined appearance', async function (assert) { await render( hbs`` ); @@ -39,7 +39,7 @@ module('Integration | Component | Button', function(hooks) { assert.dom('[data-test-id="button"]').hasClass('btn-outlined'); }); - test('it adds class for outlined appearance', async function(assert) { + test('it adds class for outlined appearance', async function (assert) { await render( hbs`` ); @@ -51,7 +51,7 @@ module('Integration | Component | Button', function(hooks) { }); module('@intent', () => { - test('it adds class for the an intent', async function(assert) { + test('it adds class for the an intent', async function (assert) { await render( hbs`` ); @@ -65,7 +65,7 @@ module('Integration | Component | Button', function(hooks) { .doesNotHaveClass('btn-minimal-primary'); }); - test('it adds class for the an intent with appearance=outlined', async function(assert) { + test('it adds class for the an intent with appearance=outlined', async function (assert) { await render( hbs`` ); @@ -111,7 +111,7 @@ module('Integration | Component | Button', function(hooks) { assert.dom('[data-test-id="button"]').hasClass('btn-xs'); }); - test('it adds class @isSmall', async function(assert) { + test('it adds class @isSmall', async function (assert) { await render( hbs`` ); @@ -119,7 +119,7 @@ module('Integration | Component | Button', function(hooks) { assert.dom('[data-test-id="button"]').hasClass('btn-sm'); }); - test('it adds class @isLarge', async function(assert) { + test('it adds class @isLarge', async function (assert) { await render( hbs`` ); @@ -127,7 +127,7 @@ module('Integration | Component | Button', function(hooks) { assert.dom('[data-test-id="button"]').hasClass('btn-lg'); }); - test('it adds class @isXLarge', async function(assert) { + test('it adds class @isXLarge', async function (assert) { await render( hbs`` ); @@ -135,7 +135,7 @@ module('Integration | Component | Button', function(hooks) { assert.dom('[data-test-id="button"]').hasClass('btn-xl'); }); - test('it adds class @isLarge with appearance', async function(assert) { + test('it adds class @isLarge with appearance', async function (assert) { await render( hbs`` ); @@ -145,7 +145,7 @@ module('Integration | Component | Button', function(hooks) { }); }); - test('it yields classNames when renderless', async function(assert) { + test('it yields classNames when renderless', async function (assert) { await render( hbs`