DEV: prettier 1.18.2 (#7810)

app/assets/javascripts/admin/models/report.js.es6

@@ -332,9 +332,7 @@ const Report = Discourse.Model.extend({
         ignoreTitle: true
       });
 
-      return `<a href='${href}'>${avatarImg}<span class='username'>${
+      return `<a href='${href}'>${avatarImg}<span class='username'>${user.name}</span></a>`;
-        user.name
-      }</span></a>`;
     };
 
     return {

app/assets/javascripts/discourse/components/composer-action-title.js.es6

@@ -72,9 +72,7 @@ export default Ember.Component.extend({
   },
 
   _formatReplyToUserPost(avatar, link) {
-    const htmlLink = `<a class="user-link" href="${link.href}">${
+    const htmlLink = `<a class="user-link" href="${link.href}">${link.anchor}</a>`;
-      link.anchor
-    }</a>`;
     return `${avatar}${htmlLink}`.htmlSafe();
   }
 });

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='${
+      extra = `data-name='${username}' data-mentionable-user-count='${opts.mentionable.user_count}' data-max-mentions='${maxGroupMention}'`;
-        opts.mentionable.user_count
-      }' data-max-mentions='${maxGroupMention}'`;
       extraClass = "notify";
     }
     $e.replaceWith(

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: ${
+      `Attempted to register a topic button: ${button.id} with no icon or title.`
-        button.id
-      } with no icon or title.`
     );
     return;
   }

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 [${
+          `Using a 'templateName' for a connector is deprecated. Use 'component' instead [${opts.templateName}]`
-            opts.templateName
-          }]`
         );
       }
 

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 `<span data-topic-id="${this.attrs.topic_id}">${
+          return `<span data-topic-id="${this.attrs.topic_id}">${this.attrs.fancy_title}</span>`;
-            this.attrs.fancy_title
-          }</span>`;
         }
         return this.attrs.fancy_title;
       }

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=${
+        params = `?context=${context.type}&context_id=${context.id}&skip_context=${this.state.skipSearchContext}`;
-          context.id
-        }&skip_context=${this.state.skipSearchContext}`;
       }
 
       const currentPath = this.register

app/assets/javascripts/discourse/widgets/search-menu-results.js.es6

@@ -73,9 +73,7 @@ createSearchResult({
     return h(
       "span",
       {
-        className: `tag-${tag} discourse-tag ${
+        className: `tag-${tag} discourse-tag ${Discourse.SiteSettings.tag_style}`
-          Discourse.SiteSettings.tag_style
-        }`
       },
       tag
     );

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 ${
+        `Couldn't find ${widgetName} or fallback ${otherOpts.fallbackWidgetName}`
-          otherOpts.fallbackWidgetName
-        }`
       );
     }
   }

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.fixedPlaceholderSelector = `.select-kit-fixed-placeholder-${this.elementId}`;
-      this.elementId
-    }`;
   },
 
   $findRowByValue(value) {

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",

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](${
+    `Continuing the discussion from [Internationalization / localization](${window.location.origin}/t/internationalization-localization/280):`,
-      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](${
+    `Continuing the discussion from [PM for testing](${window.location.origin}/t/pm-for-testing/12):`,
-      window.location.origin
-    }/t/pm-for-testing/12):`,
     "it fills composer with the ring string"
   );
 

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:
+prettier@^1.18.2:
-  version "1.16.4"
+  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
-  integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
+  integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
 
 process-nextick-args@~2.0.0:
   version "2.0.0"