From 7b7a59b576b540d4de0f193d0885461cb97ecbc7 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 11 Sep 2023 11:32:36 +0200
Subject: [PATCH] DEV: Use `import x` rather than `import { default as x }`
 (#23496)

---
 .../discourse/app/components/uppy-image-uploader.js  |  3 +--
 .../app/routes/user-private-messages-user-new.js     |  3 +--
 .../app/routes/user-private-messages-user-unread.js  |  3 +--
 .../discourse/tests/unit/lib/deprecated-test.js      |  3 +--
 .../tests/unit/lib/ember-action-modifer-test.js      |  2 +-
 .../discourse/tests/unit/lib/ember-events-test.js    | 12 ++++++------
 6 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/uppy-image-uploader.js b/app/assets/javascripts/discourse/app/components/uppy-image-uploader.js
index 8818ffb4d38..3e92cec3623 100644
--- a/app/assets/javascripts/discourse/app/components/uppy-image-uploader.js
+++ b/app/assets/javascripts/discourse/app/components/uppy-image-uploader.js
@@ -5,9 +5,8 @@ import UppyUploadMixin from "discourse/mixins/uppy-upload";
 import discourseComputed, { on } from "discourse-common/utils/decorators";
 import { getURLWithCDN } from "discourse-common/lib/get-url";
 import { isEmpty } from "@ember/utils";
-import {
+import lightbox, {
   cleanupLightboxes,
-  default as lightbox,
   setupLightboxes,
 } from "discourse/lib/lightbox";
 import { next } from "@ember/runloop";
diff --git a/app/assets/javascripts/discourse/app/routes/user-private-messages-user-new.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-user-new.js
index 5e0ab10824b..055a2346ace 100644
--- a/app/assets/javascripts/discourse/app/routes/user-private-messages-user-new.js
+++ b/app/assets/javascripts/discourse/app/routes/user-private-messages-user-new.js
@@ -1,6 +1,5 @@
-import {
+import createPMRoute, {
   NEW_FILTER,
-  default as createPMRoute,
 } from "discourse/routes/build-private-messages-route";
 
 export default createPMRoute("user", "private-messages-new", NEW_FILTER);
diff --git a/app/assets/javascripts/discourse/app/routes/user-private-messages-user-unread.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-user-unread.js
index 689fff4687c..c3a59a1f6e6 100644
--- a/app/assets/javascripts/discourse/app/routes/user-private-messages-user-unread.js
+++ b/app/assets/javascripts/discourse/app/routes/user-private-messages-user-unread.js
@@ -1,6 +1,5 @@
-import {
+import createPMRoute, {
   UNREAD_FILTER,
-  default as createPMRoute,
 } from "discourse/routes/build-private-messages-route";
 
 export default createPMRoute("user", "private-messages-unread", UNREAD_FILTER);
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/deprecated-test.js b/app/assets/javascripts/discourse/tests/unit/lib/deprecated-test.js
index 1b53cbb2ac4..115613f27df 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/deprecated-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/deprecated-test.js
@@ -1,5 +1,4 @@
-import {
-  default as deprecated,
+import deprecated, {
   withSilencedDeprecations,
   withSilencedDeprecationsAsync,
 } from "discourse-common/lib/deprecated";
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js b/app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js
index 985da6c5475..b75a3d474f9 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/ember-action-modifer-test.js
@@ -2,7 +2,7 @@ import { module, test } from "qunit";
 import { setupRenderingTest } from "ember-qunit";
 import { click, doubleClick, render } from "@ember/test-helpers";
 import { hbs } from "ember-cli-htmlbars";
-import { default as ClassicComponent } from "@ember/component";
+import ClassicComponent from "@ember/component";
 
 module("Unit | Lib | ember-action-modifer", function (hooks) {
   setupRenderingTest(hooks);
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/ember-events-test.js b/app/assets/javascripts/discourse/tests/unit/lib/ember-events-test.js
index a3d2828d99a..d713317a0a8 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/ember-events-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/ember-events-test.js
@@ -1,13 +1,13 @@
+/* eslint-disable ember/require-tagless-components */
+/* eslint-disable ember/no-classic-classes */
+/* eslint-disable ember/no-classic-components */
+
 import { module, test } from "qunit";
 import { setupRenderingTest } from "ember-qunit";
 import { click, render } from "@ember/test-helpers";
 import { hbs } from "ember-cli-htmlbars";
-
-/* eslint-disable ember/require-tagless-components */
-/* eslint-disable ember/no-classic-classes */
-/* eslint-disable ember/no-classic-components */
-import { default as ClassicComponent } from "@ember/component";
-import { default as GlimmerComponent } from "@glimmer/component";
+import ClassicComponent from "@ember/component";
+import GlimmerComponent from "@glimmer/component";
 import { action } from "@ember/object";
 
 // Configure test-local Classic and Glimmer components that