diff --git a/assets/javascripts/discourse/controllers/docs-index.js.es6 b/assets/javascripts/discourse/controllers/docs-index.js.es6 index 5a3ae47..2732b82 100644 --- a/assets/javascripts/discourse/controllers/docs-index.js.es6 +++ b/assets/javascripts/discourse/controllers/docs-index.js.es6 @@ -1,8 +1,6 @@ -import Controller from "@ember/controller"; -import { inject } from "@ember/controller"; -import discourseComputed from "discourse-common/utils/decorators"; -import { alias, readOnly, equal } from "@ember/object/computed"; -import { on } from "discourse-common/utils/decorators"; +import Controller, { inject } from "@ember/controller"; +import discourseComputed, { on } from "discourse-common/utils/decorators"; +import { alias, equal, readOnly } from "@ember/object/computed"; import Docs from "discourse/plugins/discourse-docs/discourse/models/docs"; import { getOwner } from "@ember/application"; diff --git a/assets/javascripts/discourse/controllers/docs.js.es6 b/assets/javascripts/discourse/controllers/docs.js.es6 index 3190b15..5e29b01 100644 --- a/assets/javascripts/discourse/controllers/docs.js.es6 +++ b/assets/javascripts/discourse/controllers/docs.js.es6 @@ -1,5 +1,4 @@ -import Controller from "@ember/controller"; -import { inject } from "@ember/controller"; +import Controller, { inject } from "@ember/controller"; export default Controller.extend({ indexController: inject("docs.index"), diff --git a/package.json b/package.json index c540b67..9e28b7c 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,6 @@ "author": "Discourse", "license": "MIT", "devDependencies": { - "eslint-config-discourse": "^1.1.4" + "eslint-config-discourse": "^1.1.8" } } diff --git a/yarn.lock b/yarn.lock index 3f25bf0..e0f6f3b 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@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-1.1.4.tgz#cff9f93f17dfcefe4852bb417f747c28444b4bd7" - integrity sha512-4Yilkkmdkz/LdEiQCbng6evI2w33HDs9lXgiae0DutjTboqs/TauQXySusxHagKr9GFtefPOxovzNKwD2s1ggw== +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@^1.1.4: 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.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5" - integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg== +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"