diff --git a/addons/api/package.json b/addons/api/package.json index 9c7d1b4cc..9ba72e985 100644 --- a/addons/api/package.json +++ b/addons/api/package.json @@ -58,7 +58,7 @@ "ember-resolver": "^8.0.3", "ember-source": "~3.24.0", "ember-source-channel-url": "^3.0.0", - "ember-template-lint": "^2.15.0", + "ember-template-lint": "^3.7.0", "ember-try": "^1.4.0", "eslint": "^7.31.0", "eslint-config-prettier": "^8.3.0", diff --git a/addons/auth/package.json b/addons/auth/package.json index 8c96fbec9..308f9d098 100644 --- a/addons/auth/package.json +++ b/addons/auth/package.json @@ -51,7 +51,7 @@ "ember-resolver": "^8.0.3", "ember-source": "~3.24.0", "ember-source-channel-url": "^3.0.0", - "ember-template-lint": "^2.15.0", + "ember-template-lint": "^3.7.0", "ember-try": "^1.4.0", "eslint": "^7.31.0", "eslint-config-prettier": "^8.3.0", diff --git a/addons/core/package.json b/addons/core/package.json index 8148737fe..c4f3a6fd2 100644 --- a/addons/core/package.json +++ b/addons/core/package.json @@ -65,7 +65,7 @@ "ember-resolver": "^8.0.3", "ember-source": "~3.24.0", "ember-source-channel-url": "^3.0.0", - "ember-template-lint": "^2.15.0", + "ember-template-lint": "^3.7.0", "ember-try": "^1.4.0", "eslint": "^7.31.0", "eslint-config-prettier": "^8.3.0", diff --git a/addons/rose/.template-lintrc.js b/addons/rose/.template-lintrc.js index 3b0b9af95..5399c1736 100644 --- a/addons/rose/.template-lintrc.js +++ b/addons/rose/.template-lintrc.js @@ -2,4 +2,27 @@ module.exports = { extends: 'octane', + overrides: [ + { + files: [ + 'addon/components/rose/anonymous/index.hbs', + 'addon/components/rose/table/row/cell/index.hbs', + ], + rules: { + 'no-yield-only': false, + }, + }, + { + files: ['addon/components/rose/dialog/index.hbs'], + rules: { + 'no-duplicate-landmark-elements': false, + }, + }, + { + files: ['addon/components/rose/form/actions/index.hbs'], + rules: { + 'no-passed-in-event-handlers': false, + }, + }, + ], }; diff --git a/addons/rose/package.json b/addons/rose/package.json index 380fb78aa..592401ce0 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -71,7 +71,7 @@ "ember-resolver": "^8.0.3", "ember-source": "~3.24.0", "ember-source-channel-url": "^3.0.0", - "ember-template-lint": "^2.15.0", + "ember-template-lint": "^3.7.0", "ember-try": "^1.4.0", "eslint": "^7.31.0", "eslint-config-prettier": "^8.3.0", diff --git a/ui/admin/.template-lintrc.js b/ui/admin/.template-lintrc.js index de5f6f270..8085394a5 100644 --- a/ui/admin/.template-lintrc.js +++ b/ui/admin/.template-lintrc.js @@ -4,6 +4,7 @@ module.exports = { plugins: ['ember-template-lint-plugin-prettier'], extends: ['octane', 'ember-template-lint-plugin-prettier:recommended'], rules: { + 'no-passed-in-event-handlers': false, 'no-bare-strings': true, 'no-curly-component-invocation': { allow: ['app-name', 'company-name', 'company-copyright'], diff --git a/ui/admin/package.json b/ui/admin/package.json index e70c4e32a..ee86680ba 100644 --- a/ui/admin/package.json +++ b/ui/admin/package.json @@ -75,7 +75,7 @@ "ember-qunit": "^5.1.4", "ember-resolver": "^8.0.3", "ember-source": "~3.24.0", - "ember-template-lint": "^2.15.0", + "ember-template-lint": "^3.7.0", "ember-template-lint-plugin-prettier": "^2.0.0", "eslint": "^7.31.0", "eslint-config-prettier": "^8.3.0", diff --git a/ui/desktop/.template-lintrc.js b/ui/desktop/.template-lintrc.js index 8741adbc7..7401a1e82 100644 --- a/ui/desktop/.template-lintrc.js +++ b/ui/desktop/.template-lintrc.js @@ -4,6 +4,7 @@ module.exports = { plugins: ['ember-template-lint-plugin-prettier'], extends: ['octane', 'ember-template-lint-plugin-prettier:recommended'], rules: { + 'no-passed-in-event-handlers': false, 'no-bare-strings': true, 'no-curly-component-invocation': { allow: ['app-name'] }, 'no-implicit-this': { allow: ['app-name', 'is-loading'] }, diff --git a/ui/desktop/package.json b/ui/desktop/package.json index cc26289aa..0c58aacd1 100755 --- a/ui/desktop/package.json +++ b/ui/desktop/package.json @@ -92,7 +92,7 @@ "ember-qunit": "^5.1.4", "ember-resolver": "^8.0.3", "ember-source": "~3.24.0", - "ember-template-lint": "^2.15.0", + "ember-template-lint": "^3.7.0", "ember-template-lint-plugin-prettier": "^2.0.0", "eslint": "^7.31.0", "eslint-config-prettier": "^8.3.0", diff --git a/yarn.lock b/yarn.lock index 4fcb1fb75..df243a9f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1549,6 +1549,16 @@ ember-cli-typescript "^4.0.0" heimdalljs "^0.3.0" +"@ember-template-lint/todo-utils@^10.0.0": + version "10.0.0" + resolved "https://registry.yarnpkg.com/@ember-template-lint/todo-utils/-/todo-utils-10.0.0.tgz#085aafcf31ca04ba4d3a9460f088aed752b90ea8" + integrity sha512-US8VKnetBOl8KfKz+rXGsosz6rIETNwSz2F2frM8hIoJfF/d6ME1Iz1K7tPYZEE6SoKqZFlBs5XZPSmzRnabjA== + dependencies: + "@types/eslint" "^7.2.13" + fs-extra "^9.1.0" + slash "^3.0.0" + tslib "^2.2.0" + "@ember/edition-utils@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6" @@ -3133,6 +3143,14 @@ resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080" integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw== +"@types/eslint@^7.2.13": + version "7.28.0" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a" + integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + "@types/estree@*": version "0.0.50" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" @@ -3232,7 +3250,7 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8": +"@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8": version "7.0.9" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== @@ -6523,7 +6541,7 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -7687,6 +7705,11 @@ date-and-time@^1.0.0: resolved "https://registry.yarnpkg.com/date-and-time/-/date-and-time-1.0.1.tgz#4959b7faf1ec5873e59d926d4528b9223a808a57" integrity sha512-7u+uNfnjWkX+YFQfivvW24TjaJG6ahvTrfw1auq7KlC7osuGcZBIWGBvB9UcENjH6JnLVhMqlRripk1dSHjAUA== +date-fns@^2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.23.0.tgz#4e886c941659af0cf7b30fafdd1eaa37e88788a9" + integrity sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA== + date-time@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/date-time/-/date-time-2.1.0.tgz#0286d1b4c769633b3ca13e1e62558d2dbdc2eba2" @@ -9451,7 +9474,7 @@ ember-template-lint-plugin-prettier@^2.0.0: dependencies: prettier-linter-helpers "^1.0.0" -ember-template-lint@^2.0.1, ember-template-lint@^2.15.0: +ember-template-lint@^2.0.1: version "2.21.0" resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-2.21.0.tgz#7e120abf309a8810eeed26c52377943faf15a95b" integrity sha512-19QbEqJQdMfcRS7PsQsubflRowEtnkbD0tpYR4q/xq4lodmhU7hhOFvlTQgbxD/jwW5Ur+tkOwH4KFy9JwOyXA== @@ -9468,7 +9491,27 @@ ember-template-lint@^2.0.1, ember-template-lint@^2.15.0: v8-compile-cache "^2.2.0" yargs "^16.2.0" -ember-template-recast@^5.0.1: +ember-template-lint@^3.7.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-3.7.0.tgz#e0565102b291974afeb65de6933f0d154be508d3" + integrity sha512-C3oFFdB+g14CvFKZrnAS8Yt0IojTpOhdU5KZoLUs6hOgQjkEF4l/OCBNPtBmL8Nm/dxmc5iTsd5TL98CCcnK+w== + dependencies: + "@ember-template-lint/todo-utils" "^10.0.0" + chalk "^4.1.2" + date-fns "^2.23.0" + ember-template-recast "^5.0.3" + find-up "^5.0.0" + fuse.js "^6.4.6" + get-stdin "^8.0.0" + globby "^11.0.4" + is-glob "^4.0.1" + micromatch "^4.0.4" + requireindex "^1.2.0" + resolve "^1.20.0" + v8-compile-cache "^2.3.0" + yargs "^16.2.0" + +ember-template-recast@^5.0.1, ember-template-recast@^5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/ember-template-recast/-/ember-template-recast-5.0.3.tgz#79df27a70bdce7be17f14db13886afde1e9d02d6" integrity sha512-qsJYQhf29Dk6QMfviXhUPE+byMOs6iRQxUDHgkj8yqjeppvjHaFG96hZi/NAXJTm/M7o3PpfF5YlmeaKtI9UeQ== @@ -11660,7 +11703,7 @@ globby@11.0.1: merge2 "^1.3.0" slash "^3.0.0" -globby@^11.0.2, globby@^11.0.3: +globby@^11.0.2, globby@^11.0.3, globby@^11.0.4: version "11.0.4" resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==