diff --git a/app/assets/javascripts/admin/models/report.js.es6 b/app/assets/javascripts/admin/models/report.js.es6
index cbe397df987..019f19a8805 100644
--- a/app/assets/javascripts/admin/models/report.js.es6
+++ b/app/assets/javascripts/admin/models/report.js.es6
@@ -332,9 +332,7 @@ const Report = Discourse.Model.extend({
ignoreTitle: true
});
- return `${avatarImg}${
- user.name
- }`;
+ return `${avatarImg}${user.name}`;
};
return {
diff --git a/app/assets/javascripts/discourse/components/composer-action-title.js.es6 b/app/assets/javascripts/discourse/components/composer-action-title.js.es6
index bf7c9bcc414..c4e014c5f71 100644
--- a/app/assets/javascripts/discourse/components/composer-action-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-action-title.js.es6
@@ -72,9 +72,7 @@ export default Ember.Component.extend({
},
_formatReplyToUserPost(avatar, link) {
- const htmlLink = `${
- link.anchor
- }`;
+ const htmlLink = `${link.anchor}`;
return `${avatar}${htmlLink}`.htmlSafe();
}
});
diff --git a/app/assets/javascripts/discourse/lib/link-mentions.js.es6 b/app/assets/javascripts/discourse/lib/link-mentions.js.es6
index 16bc7304c19..07f37388e4b 100644
--- a/app/assets/javascripts/discourse/lib/link-mentions.js.es6
+++ b/app/assets/javascripts/discourse/lib/link-mentions.js.es6
@@ -10,9 +10,7 @@ function replaceSpan($e, username, opts) {
if (opts && opts.group) {
if (opts.mentionable) {
- extra = `data-name='${username}' data-mentionable-user-count='${
- opts.mentionable.user_count
- }' data-max-mentions='${maxGroupMention}'`;
+ extra = `data-name='${username}' data-mentionable-user-count='${opts.mentionable.user_count}' data-max-mentions='${maxGroupMention}'`;
extraClass = "notify";
}
$e.replaceWith(
diff --git a/app/assets/javascripts/discourse/lib/register-topic-footer-button.js.es6 b/app/assets/javascripts/discourse/lib/register-topic-footer-button.js.es6
index 789122618dd..8c132c830bc 100644
--- a/app/assets/javascripts/discourse/lib/register-topic-footer-button.js.es6
+++ b/app/assets/javascripts/discourse/lib/register-topic-footer-button.js.es6
@@ -53,9 +53,7 @@ export function registerTopicFooterButton(button) {
!normalizedButton.translatedTitle
) {
Ember.error(
- `Attempted to register a topic button: ${
- button.id
- } with no icon or title.`
+ `Attempted to register a topic button: ${button.id} with no icon or title.`
);
return;
}
diff --git a/app/assets/javascripts/discourse/widgets/connector.js.es6 b/app/assets/javascripts/discourse/widgets/connector.js.es6
index 41e6a896acb..b077bde0eba 100644
--- a/app/assets/javascripts/discourse/widgets/connector.js.es6
+++ b/app/assets/javascripts/discourse/widgets/connector.js.es6
@@ -16,9 +16,7 @@ export default class Connector {
if (opts.templateName) {
deprecated(
- `Using a 'templateName' for a connector is deprecated. Use 'component' instead [${
- opts.templateName
- }]`
+ `Using a 'templateName' for a connector is deprecated. Use 'component' instead [${opts.templateName}]`
);
}
diff --git a/app/assets/javascripts/discourse/widgets/default-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/default-notification-item.js.es6
index eb2caff154e..610ac1f1285 100644
--- a/app/assets/javascripts/discourse/widgets/default-notification-item.js.es6
+++ b/app/assets/javascripts/discourse/widgets/default-notification-item.js.es6
@@ -67,9 +67,7 @@ export const DefaultNotificationItem = createWidget(
if (this.attrs.fancy_title) {
if (this.attrs.topic_id) {
- return `${
- this.attrs.fancy_title
- }`;
+ return `${this.attrs.fancy_title}`;
}
return this.attrs.fancy_title;
}
diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6
index 271600cbb07..b48b302bbcb 100644
--- a/app/assets/javascripts/discourse/widgets/header.js.es6
+++ b/app/assets/javascripts/discourse/widgets/header.js.es6
@@ -399,9 +399,7 @@ export default createWidget("header", {
var params = "";
if (context) {
- params = `?context=${context.type}&context_id=${
- context.id
- }&skip_context=${this.state.skipSearchContext}`;
+ params = `?context=${context.type}&context_id=${context.id}&skip_context=${this.state.skipSearchContext}`;
}
const currentPath = this.register
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
index b6acdf85873..c65c34a9f1f 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
@@ -73,9 +73,7 @@ createSearchResult({
return h(
"span",
{
- className: `tag-${tag} discourse-tag ${
- Discourse.SiteSettings.tag_style
- }`
+ className: `tag-${tag} discourse-tag ${Discourse.SiteSettings.tag_style}`
},
tag
);
diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js.es6
index ac366ec92ae..004cce469d2 100644
--- a/app/assets/javascripts/discourse/widgets/widget.js.es6
+++ b/app/assets/javascripts/discourse/widgets/widget.js.es6
@@ -230,9 +230,7 @@ export default class Widget {
return result;
} else {
throw new Error(
- `Couldn't find ${widgetName} or fallback ${
- otherOpts.fallbackWidgetName
- }`
+ `Couldn't find ${widgetName} or fallback ${otherOpts.fallbackWidgetName}`
);
}
}
diff --git a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6 b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
index 20fb744c43a..f0e9835e437 100644
--- a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
@@ -14,9 +14,7 @@ export default Ember.Mixin.create({
this.bodySelector = ".select-kit-body";
this.wrapperSelector = ".select-kit-wrapper";
this.scrollableParentSelector = ".modal-body";
- this.fixedPlaceholderSelector = `.select-kit-fixed-placeholder-${
- this.elementId
- }`;
+ this.fixedPlaceholderSelector = `.select-kit-fixed-placeholder-${this.elementId}`;
},
$findRowByValue(value) {
diff --git a/package.json b/package.json
index 6a040ffd53c..d49c13b29c5 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
"chrome-remote-interface": "^0.25",
"eslint": "^4.19",
"pretender": "^1.6",
- "prettier": "^1.16.4",
+ "prettier": "^1.18.2",
"puppeteer": "1.16",
"qunit": "2.8.0",
"route-recognizer": "^0.3.3",
diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js.es6
index 3623d74c4e1..9760ffec8a3 100644
--- a/test/javascripts/acceptance/topic-test.js.es6
+++ b/test/javascripts/acceptance/topic-test.js.es6
@@ -22,9 +22,7 @@ QUnit.test("Reply as new topic", async assert => {
find(".d-editor-input")
.val()
.trim(),
- `Continuing the discussion from [Internationalization / localization](${
- window.location.origin
- }/t/internationalization-localization/280):`,
+ `Continuing the discussion from [Internationalization / localization](${window.location.origin}/t/internationalization-localization/280):`,
"it fills composer with the ring string"
);
assert.equal(
@@ -47,9 +45,7 @@ QUnit.test("Reply as new message", async assert => {
find(".d-editor-input")
.val()
.trim(),
- `Continuing the discussion from [PM for testing](${
- window.location.origin
- }/t/pm-for-testing/12):`,
+ `Continuing the discussion from [PM for testing](${window.location.origin}/t/pm-for-testing/12):`,
"it fills composer with the ring string"
);
diff --git a/yarn.lock b/yarn.lock
index e8b5afbe812..8180e843dcc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1863,10 +1863,10 @@ pretender@^1.6:
fake-xml-http-request "^1.6.0"
route-recognizer "^0.3.3"
-prettier@^1.16.4:
- version "1.16.4"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
- integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
+prettier@^1.18.2:
+ version "1.18.2"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
+ integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
process-nextick-args@~2.0.0:
version "2.0.0"