From aeb5a40948f8d122871bd111a072df2ea827afa3 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 28 Dec 2022 15:57:06 +0100
Subject: [PATCH] refactor: flatten composables and enable auto-imports on dirs
 (#608)

---
 components/aria/AriaAnnouncer.vue                     |  3 +--
 components/aria/AriaLog.vue                           |  3 +--
 components/aria/AriaStatus.vue                        |  3 +--
 components/common/CommonBlurhash.ts                   |  1 -
 components/content/ContentRich.setup.ts               |  2 --
 components/modal/ModalDialog.vue                      |  1 -
 .../notification/NotificationPreferences.client.vue   |  2 --
 components/publish/PublishEmojiPicker.client.vue      |  1 -
 composables/{aria/index.ts => aria.ts}                |  3 ++-
 composables/aria/types.ts                             |  2 --
 composables/emojis.ts                                 |  1 -
 .../push-notifications/createPushSubscription.ts      |  2 --
 composables/push-notifications/usePushManager.ts      |  8 +++-----
 nuxt.config.ts                                        | 11 +++++++++--
 14 files changed, 17 insertions(+), 26 deletions(-)
 rename composables/{aria/index.ts => aria.ts} (89%)
 delete mode 100644 composables/aria/types.ts

diff --git a/components/aria/AriaAnnouncer.vue b/components/aria/AriaAnnouncer.vue
index 04d7997b..c4543575 100644
--- a/components/aria/AriaAnnouncer.vue
+++ b/components/aria/AriaAnnouncer.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
-import type { AriaAnnounceType, AriaLive } from '~/composables/aria/types'
-import { useAriaAnnouncer } from '~/composables/aria'
+import type { AriaAnnounceType, AriaLive } from '~/composables/aria'
 import type { LocaleObject } from '#i18n'
 
 const router = useRouter()
diff --git a/components/aria/AriaLog.vue b/components/aria/AriaLog.vue
index fd4a3c1e..f99a3cae 100644
--- a/components/aria/AriaLog.vue
+++ b/components/aria/AriaLog.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
-import type { AriaLive } from '~/composables/aria/types'
-import { useAriaLog } from '~/composables/aria'
+import type { AriaLive } from '~/composables/aria'
 
 // tsc complaining when using $defineProps
 withDefaults(defineProps<{
diff --git a/components/aria/AriaStatus.vue b/components/aria/AriaStatus.vue
index 567010be..c04a4713 100644
--- a/components/aria/AriaStatus.vue
+++ b/components/aria/AriaStatus.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
-import type { AriaLive } from '~/composables/aria/types'
-import { useAriaStatus } from '~/composables/aria'
+import type { AriaLive } from '~/composables/aria'
 
 // tsc complaining when using $defineProps
 withDefaults(defineProps<{
diff --git a/components/common/CommonBlurhash.ts b/components/common/CommonBlurhash.ts
index b9b76d27..7f8bcff2 100644
--- a/components/common/CommonBlurhash.ts
+++ b/components/common/CommonBlurhash.ts
@@ -1,5 +1,4 @@
 import { decode } from 'blurhash'
-import { getDataUrlFromArr } from '~/composables/utils'
 
 export default defineComponent({
   inheritAttrs: false,
diff --git a/components/content/ContentRich.setup.ts b/components/content/ContentRich.setup.ts
index d04aefed..b0b5fb7d 100644
--- a/components/content/ContentRich.setup.ts
+++ b/components/content/ContentRich.setup.ts
@@ -1,6 +1,4 @@
 import type { Emoji } from 'masto'
-import { emojisArrayToObject } from '~/composables/utils'
-import { currentCustomEmojis } from '~/composables/emojis'
 
 defineOptions({
   name: 'ContentRich',
diff --git a/components/modal/ModalDialog.vue b/components/modal/ModalDialog.vue
index f607f5e5..614348c1 100644
--- a/components/modal/ModalDialog.vue
+++ b/components/modal/ModalDialog.vue
@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import { useFocusTrap } from '@vueuse/integrations/useFocusTrap'
-import { useDeactivated } from '~/composables/lifecycle'
 
 export interface Props {
   /** v-model dislog visibility */
diff --git a/components/notification/NotificationPreferences.client.vue b/components/notification/NotificationPreferences.client.vue
index 8e6c35a0..c8bac6da 100644
--- a/components/notification/NotificationPreferences.client.vue
+++ b/components/notification/NotificationPreferences.client.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import { usePushManager } from '~/composables/push-notifications/usePushManager'
-
 defineProps<{ show: boolean }>()
 
 let busy = $ref<boolean>(false)
diff --git a/components/publish/PublishEmojiPicker.client.vue b/components/publish/PublishEmojiPicker.client.vue
index 858d9f74..be6e7afa 100644
--- a/components/publish/PublishEmojiPicker.client.vue
+++ b/components/publish/PublishEmojiPicker.client.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { Picker } from 'emoji-mart'
-import { updateCustomEmojis } from '~/composables/emojis'
 
 const emit = defineEmits<{
   (e: 'select', code: string): void
diff --git a/composables/aria/index.ts b/composables/aria.ts
similarity index 89%
rename from composables/aria/index.ts
rename to composables/aria.ts
index 5546ecba..2c22a738 100644
--- a/composables/aria/index.ts
+++ b/composables/aria.ts
@@ -1,4 +1,5 @@
-import type { AriaAnnounceType } from '~/composables/aria/types'
+export type AriaLive = 'off' | 'polite' | 'assertive'
+export type AriaAnnounceType = 'announce' | 'mute' | 'unmute'
 
 const ariaAnnouncer = useEventBus<AriaAnnounceType, string | undefined>(Symbol('aria-announcer'))
 
diff --git a/composables/aria/types.ts b/composables/aria/types.ts
deleted file mode 100644
index ca5457ae..00000000
--- a/composables/aria/types.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export type AriaLive = 'off' | 'polite' | 'assertive'
-export type AriaAnnounceType = 'announce' | 'mute' | 'unmute'
diff --git a/composables/emojis.ts b/composables/emojis.ts
index 17a3c8d9..5e466c16 100644
--- a/composables/emojis.ts
+++ b/composables/emojis.ts
@@ -1,7 +1,6 @@
 import type { Emoji } from 'masto'
 import type { CustomEmojisInfo } from './push-notifications/types'
 import { STORAGE_KEY_CUSTOM_EMOJIS } from '~/constants'
-import { useUserLocalStorage } from '~/composables/users'
 
 const TTL = 1000 * 60 * 60 * 24 // 1 day
 
diff --git a/composables/push-notifications/createPushSubscription.ts b/composables/push-notifications/createPushSubscription.ts
index e159f894..30599ab0 100644
--- a/composables/push-notifications/createPushSubscription.ts
+++ b/composables/push-notifications/createPushSubscription.ts
@@ -8,8 +8,6 @@ import type {
   PushManagerSubscriptionInfo,
   RequiredUserLogin,
 } from '~/composables/push-notifications/types'
-import { useMasto } from '~/composables/masto'
-import { currentUser, removePushNotificationData, removePushNotifications } from '~/composables/users'
 
 export const createPushSubscription = async (
   user: RequiredUserLogin,
diff --git a/composables/push-notifications/usePushManager.ts b/composables/push-notifications/usePushManager.ts
index 94f1b963..32bbafd3 100644
--- a/composables/push-notifications/usePushManager.ts
+++ b/composables/push-notifications/usePushManager.ts
@@ -5,14 +5,12 @@ import type {
   PushNotificationRequest,
   SubscriptionResult,
 } from '~/composables/push-notifications/types'
-import { createPushSubscription } from '~/composables/push-notifications/createPushSubscription'
 import { STORAGE_KEY_NOTIFICATION, STORAGE_KEY_NOTIFICATION_POLICY } from '~/constants'
-import { currentUser, removePushNotifications } from '~/composables/users'
 
 const supportsPushNotifications = typeof window !== 'undefined'
-    && 'serviceWorker' in navigator
-    && 'PushManager' in window
-    && 'getKey' in PushSubscription.prototype
+  && 'serviceWorker' in navigator
+  && 'PushManager' in window
+  && 'getKey' in PushSubscription.prototype
 
 export const usePushManager = () => {
   const masto = useMasto()
diff --git a/nuxt.config.ts b/nuxt.config.ts
index b10b5ff7..7dbd360a 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -1,9 +1,10 @@
-import { fileURLToPath } from 'node:url'
+import { createResolver } from '@nuxt/kit'
 import Inspect from 'vite-plugin-inspect'
 import { isCI, isDevelopment } from 'std-env'
 import { i18n } from './config/i18n'
 import { pwa } from './config/pwa'
 
+const { resolve } = createResolver(import.meta.url)
 const isPreview = process.env.PULL_REQUEST === 'true' || process.env.CONTEXT === 'deploy-preview' || process.env.CONTEXT === 'dev'
 
 export default defineNuxtConfig({
@@ -44,6 +45,12 @@ export default defineNuxtConfig({
     'change-case': 'scule',
     'semver': 'unenv/runtime/mock/empty',
   },
+  imports: {
+    dirs: [
+      './composables/push-notifications',
+      './composables/tiptap',
+    ],
+  },
   vite: {
     define: {
       'process.env.VSCODE_TEXTMATE_DEBUG': 'false',
@@ -100,7 +107,7 @@ export default defineNuxtConfig({
   },
   nitro: {
     publicAssets: [
-      ...(!isCI || isPreview ? [{ dir: fileURLToPath(new URL('./public-dev', import.meta.url)) }] : []),
+      ...(!isCI || isPreview ? [{ dir: resolve('./public-dev') }] : []),
     ],
     prerender: {
       crawlLinks: false,