From 30248619e28d5f173c4dfd149d3d8ba39e3b8796 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Wed, 27 Jan 2021 10:38:37 +0100 Subject: [PATCH] DEV: prettier 2.2.1 (#114) --- .../extend-for-solved-button.js.es6 | 3 +-- package.json | 2 +- .../acceptance/discourse-solved-test.js.es6 | 9 ++++----- yarn.lock | 18 +++++++++--------- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6 b/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6 index 5c714fd..45e522d 100644 --- a/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6 +++ b/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6 @@ -8,8 +8,7 @@ import { withPluginApi } from "discourse/lib/plugin-api"; import { ajax } from "discourse/lib/ajax"; import PostCooked from "discourse/widgets/post-cooked"; import { formatUsername } from "discourse/lib/utilities"; -import { iconHTML } from "discourse-common/lib/icon-library"; -import { iconNode } from "discourse-common/lib/icon-library"; +import { iconHTML, iconNode } from "discourse-common/lib/icon-library"; function clearAccepted(topic) { const posts = topic.get("postStream.posts"); diff --git a/package.json b/package.json index 9df2b90..9e28b7c 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,6 @@ "author": "Discourse", "license": "MIT", "devDependencies": { - "eslint-config-discourse": "latest" + "eslint-config-discourse": "^1.1.8" } } diff --git a/test/javascripts/acceptance/discourse-solved-test.js.es6 b/test/javascripts/acceptance/discourse-solved-test.js.es6 index 4fb12a1..be5f332 100644 --- a/test/javascripts/acceptance/discourse-solved-test.js.es6 +++ b/test/javascripts/acceptance/discourse-solved-test.js.es6 @@ -235,7 +235,9 @@ acceptance("Discourse Solved Plugin", function (needs) { test("A topic with an accepted answer shows an excerpt of the answer, if provided", async function (assert) { await visit("/t/with-excerpt/11"); - assert.ok(queryAll('.quote blockquote:contains("this is an excerpt")').length === 1); + assert.ok( + queryAll('.quote blockquote:contains("this is an excerpt")').length === 1 + ); await visit("/t/without-excerpt/12"); @@ -251,9 +253,6 @@ acceptance("Discourse Solved Plugin", function (needs) { assert.ok(queryAll(".fps-topic").length === 1, "has one post"); - assert.ok( - queryAll(".topic-status .solved").length, - "shows the right icon" - ); + assert.ok(queryAll(".topic-status .solved").length, "shows the right icon"); }); }); diff --git a/yarn.lock b/yarn.lock index aece863..9c223f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -498,10 +498,10 @@ escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -eslint-config-discourse@latest: - version "1.1.3" - resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-1.1.3.tgz#38b85e810cad72280073d659565bf25611331ac3" - integrity sha512-n6ZRuFPMVn+jHpszZhNQwFRsIG1mRq5LrFdbN/WNDW7ohk+iyYyLkwB8btJFms5CcfHLsiiey92EAh3oNavrpw== +eslint-config-discourse@^1.1.8: + version "1.1.8" + resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-1.1.8.tgz#c297831876811ea08203aa348d1ba2a963b2ae78" + integrity sha512-ZSQfhliiO5Cfa7WcKoMkN4wW/1rBJpecpMJpfjiFsElfgPj4EV4Pzksi5CvFnRbJDoZh6DYYrQfO+tW062VOUA== dependencies: babel-eslint "^10.1.0" ember-template-lint "^2.11.0" @@ -511,7 +511,7 @@ eslint-config-discourse@latest: eslint-plugin-ember "^6.10.0" eslint-plugin-lodash "^7.1.0" eslint-plugin-node "^8.0.0" - prettier "^2.1.1" + prettier "2.2.1" eslint-plugin-discourse-ember@latest: version "0.0.3" @@ -1204,10 +1204,10 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= -prettier@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.1.tgz#d9485dd5e499daa6cb547023b87a6cf51bee37d6" - integrity sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw== +prettier@2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" + integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== progress@^2.0.0: version "2.0.3"